Skip to content

Commit 75e9f1e

Browse files
committed
3.135
1 parent f3c832c commit 75e9f1e

14 files changed

Lines changed: 31 additions & 20 deletions

CHANGELOG.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
3.125
2+
* 修复远程桌面加载中的问题
3+
* 彻底修复协议中的竞争条件问题
4+
* 响应式布局
5+
16
3.123
27
* 修复获取最近活动不全的问题
38

README.en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ pip3 install -U lamda
293293
# If you need to use the built-in frida, be sure to install it using the following method
294294
# You may need extranet access to install frida, otherwise you may be stuck for a long time (~10 minutes) until the installation fails
295295
# Even if you have installed frida before, you should re-run the following command
296-
pip3 install -U --force-reinstall 'lamda[frida]'
296+
pip3 install -U --force-reinstall 'lamda[full]'
297297
# Please note that after completing the installation you will need to update any third party libraries that rely on frida using pip at the same time
298298
# any third party libraries such as frida-tools objection etc. (if installed)
299299
# Otherwise you may get undetectable exceptions in later use

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ pip3 install -U lamda
300300
# 如果需要使用内置 frida,务必使用下列方法安装
301301
# 你可能需要外网访问来安装 frida,否则可能会卡住许久(~10分钟)直至安装失败
302302
# 即使之前安装过 frida,也应该重新执行以下命令
303-
pip3 install -U --force-reinstall 'lamda[frida]'
303+
pip3 install -U --force-reinstall 'lamda[full]'
304304
# 请注意完成安装后,你需要同时使用 pip 更新任何依赖 frida
305305
# 的第三方库例如 frida-tools objection 等(如果安装过的话)
306306
# 否则后期使用可能会出现难以察觉的异常

lamda/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
#
33
# Distributed under MIT license.
44
# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
5-
__version__ = "3.123"
5+
__version__ = "3.135"

lamda/client.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
import logging
1717
import grpc
1818

19+
import collections.abc
20+
# fix pyreadline on windows py310
21+
collections.Callable = collections.abc.Callable
22+
1923
from urllib.parse import quote
2024
from collections import defaultdict
2125
from os.path import basename, dirname, expanduser, join as joinpath
@@ -1817,11 +1821,12 @@ def __exit__(self, type, value, traceback):
18171821
import argparse
18181822

18191823
parser = argparse.ArgumentParser()
1820-
parser.add_argument("-device", type=str, required=True,
1824+
crt = os.environ.get("CERTIFICATE", None)
1825+
port = int(os.environ.get("PORT", 65000))
1826+
parser.add_argument("-device", type=str, default="localhost",
18211827
help="service ip address")
1822-
parser.add_argument("-port", type=int, default=65000,
1828+
parser.add_argument("-port", type=int, default=port,
18231829
help="service port")
1824-
crt = os.environ.get("CERTIFICATE", None)
18251830
parser.add_argument("-cert", type=str, default=crt,
18261831
help="ssl cert")
18271832
args = parser.parse_args()

setup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
python_requires = ">=3.6,<3.11",
1414
zip_safe = False,
1515
extras_require = {
16-
"frida": ["frida>=15.0.0,<16.0.0,!=15.1.15,!=15.1.16,!=15.1.17"],
16+
"next": ["frida>=16.0.0,<17.0.0"],
17+
"full": ["frida>=15.0.0,<16.0.0,!=15.1.15,!=15.1.16,!=15.1.17"],
1718
":sys_platform == \"win32\"": [
1819
"pyreadline==2.1",
1920
],
2021
},
2122
install_requires= [
22-
"grpcio-tools>=1.35.0,<1.49.0",
23-
"grpc-interceptor>=0.13.0,<0.15.0",
24-
"grpcio>=1.35.0,<1.49.0",
23+
"grpcio-tools>=1.35.0,<=1.50.0",
24+
"grpc-interceptor>=0.13.0,<0.14.2",
25+
"grpcio>=1.35.0,<=1.50.0",
2526
"asn1crypto>=1.0.0,<2",
2627
],
2728
classifiers = [

tools/README.en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ If you have changed lamda's default port 65000, you will also need to set the en
4343

4444
```bash
4545
# For linux / Mac
46-
export LAMDAPORT=8123
46+
export PORT=8123
4747
# For Windows (path must not contain spaces)
48-
set LAMDAPORT=8123
48+
set PORT=8123
4949
```
5050

5151
192.168.1.2 is the example IP, please get the actual IP address of the device yourself.

tools/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ set CERTIFICATE=C:\Users\path\to\lamda.pem
4343

4444
```bash
4545
# 对于 linux / Mac
46-
export LAMDAPORT=8123
46+
export PORT=8123
4747
# 对于 Windows(路径不能包含空格)
48-
set LAMDAPORT=8123
48+
set PORT=8123
4949
```
5050

5151
192.168.1.2 为示例IP,请自行获取设备的实际IP地址。

tools/adb_pubkey.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from lamda.client import *
88

99
certfile = os.environ.get("CERTIFICATE", None)
10-
port = int(os.environ.get("LAMDAPORT", 65000))
10+
port = int(os.environ.get("PORT", 65000))
1111

1212
android_path = os.path.join("~", ".android")
1313
abs_android_path = os.path.expanduser(android_path)

tools/discover.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
BcastResponse = protos.BcastResponse
1414
BcastRequest = protos.BcastRequest
1515

16-
port = int(os.environ.get("LAMDAPORT", 65000))
16+
port = int(os.environ.get("PORT", 65000))
1717

1818

1919
def BcastCallMethod(method):

0 commit comments

Comments
 (0)