lamda 3.123__tar.gz → 3.138__tar.gz

{lamda-3.123 → lamda-3.138}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lamda
-Version: 3.123
+Version: 3.138
 Summary: Android reverse engineering & automation framework
 Home-page: https://github.com/rev1si0n/lamda
 Author: rev1si0n
@@ -12,4 +12,5 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: Android
 Classifier: Topic :: Security
 Requires-Python: >=3.6,<3.11
-Provides-Extra: frida
+Provides-Extra: next
+Provides-Extra: full

{lamda-3.123 → lamda-3.138}/README.md

@@ -300,7 +300,7 @@ pip3 install -U lamda
 # 如果需要使用内置 frida，务必使用下列方法安装
 # 你可能需要外网访问来安装 frida，否则可能会卡住许久(~10分钟)直至安装失败
 # 即使之前安装过 frida，也应该重新执行以下命令
-pip3 install -U --force-reinstall 'lamda[frida]'
+pip3 install -U --force-reinstall 'lamda[full]'
 # 请注意完成安装后，你需要同时使用 pip 更新任何依赖 frida
 # 的第三方库例如 frida-tools objection 等（如果安装过的话）
 # 否则后期使用可能会出现难以察觉的异常
@@ -1467,6 +1467,12 @@ d.dump_window_hierarchy().getvalue()
 d.wait_for_idle(5*1000)
 ```
 
+> 获取最近的 toast
+
+```python
+d.get_last_toast()
+```
+
 ## 进阶UI操作
 
 > Selector

{lamda-3.123 → lamda-3.138}/lamda/__init__.py

@@ -2,4 +2,4 @@
 #
 # Distributed under MIT license.
 # See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
-__version__ = "3.123"
+__version__ = "3.138"

{lamda-3.123 → lamda-3.138}/lamda/client.py

@@ -16,6 +16,10 @@ import builtins
 import logging
 import grpc
 
+import collections.abc
+# fix pyreadline on windows py310
+collections.Callable = collections.abc.Callable
+
 from urllib.parse import quote
 from collections import defaultdict
 from os.path import basename, dirname, expanduser, join as joinpath
@@ -689,6 +693,12 @@ class UiAutomatorStub(BaseServiceStub):
         获取此 watcher 是否启用
         """
         return self.watchers.get(name, {}).get("enable")
+    def get_last_toast(self):
+        """
+        获取系统中最后一个 toast 消息
+        """
+        r = self.stub.getLastToast(protos.Empty())
+        return r
     def remove_watcher(self, name):
         """
         移除一个 watcher
@@ -1754,6 +1764,8 @@ class Device(object):
         return self.stub("UiAutomator").dump_window_hierarchy()
     def wait_for_idle(self, timeout):
         return self.stub("UiAutomator").wait_for_idle(timeout)
+    def get_last_toast(self):
+        return self.stub("UiAutomator").get_last_toast()
     # watcher
     def remove_all_watchers(self):
         return self.stub("UiAutomator").remove_all_watchers()
@@ -1817,11 +1829,12 @@ if __name__ == "__main__":
     import argparse
 
     parser = argparse.ArgumentParser()
-    parser.add_argument("-device", type=str, required=True,
+    crt = os.environ.get("CERTIFICATE", None)
+    port = int(os.environ.get("PORT", 65000))
+    parser.add_argument("-device", type=str, default="localhost",
                                    help="service ip address")
-    parser.add_argument("-port", type=int, default=65000,
+    parser.add_argument("-port", type=int, default=port,
                                    help="service port")
-    crt = os.environ.get("CERTIFICATE", None)
     parser.add_argument("-cert", type=str, default=crt,
                                    help="ssl cert")
     args = parser.parse_args()

{lamda-3.123 → lamda-3.138}/lamda/rpc/services.proto

@@ -148,6 +148,7 @@ service UiAutomator {
     rpc selectorLongClick(SelectorClickRequest) returns (Boolean) {}
 
     rpc selectorExists(SelectorOnlyRequest) returns (Boolean) {}
+    rpc getLastToast(google.protobuf.Empty) returns (ToastInfo) {}
 
     rpc selectorObjInfo(SelectorOnlyRequest) returns (ObjInfo) {}
     rpc selectorObjInfoOfAllInstances(SelectorOnlyRequest) returns (ObjInfoList) {}

{lamda-3.123 → lamda-3.138}/lamda/rpc/uiautomator.proto

@@ -369,6 +369,12 @@ message ObjInfo {
         Bound visibleBounds = 17;
 }
 
+message ToastInfo {
+        uint64 timestamp    = 1;
+        string package      = 2;
+        string message      = 3;
+}
+
 message ObjInfoList {
         repeated ObjInfo objects = 1;
 }

{lamda-3.123 → lamda-3.138}/lamda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lamda
-Version: 3.123
+Version: 3.138
 Summary: Android reverse engineering & automation framework
 Home-page: https://github.com/rev1si0n/lamda
 Author: rev1si0n
@@ -12,4 +12,5 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: Android
 Classifier: Topic :: Security
 Requires-Python: >=3.6,<3.11
-Provides-Extra: frida
+Provides-Extra: next
+Provides-Extra: full

{lamda-3.123 → lamda-3.138}/lamda.egg-info/requires.txt

@@ -6,5 +6,8 @@ asn1crypto<2,>=1.0.0
 [:sys_platform == "win32"]
 pyreadline==2.1
 
-[frida]
+[full]
 frida!=15.1.15,!=15.1.16,!=15.1.17,<16.0.0,>=15.0.0
+
+[next]
+frida<17.0.0,>=16.0.0

{lamda-3.123 → lamda-3.138}/setup.py

@@ -13,7 +13,8 @@ setuptools.setup(
     python_requires = ">=3.6,<3.11",
     zip_safe        = False,
     extras_require  = {
-        "frida": ["frida>=15.0.0,<16.0.0,!=15.1.15,!=15.1.16,!=15.1.17"],
+        "next": ["frida>=16.0.0,<17.0.0"],
+        "full": ["frida>=15.0.0,<16.0.0,!=15.1.15,!=15.1.16,!=15.1.17"],
         ":sys_platform == \"win32\"": [
             "pyreadline==2.1",
         ],