frida-screenshot 3.0.3 → 5.0.0

package/README.md

@@ -1,11 +1,11 @@
 # frida-screenshot
 
-Grab screenshots using [Frida](https://www.frida.re).
+Grab screenshots using [Frida](https://frida.re).
 
 ## Example
 
 ```js
-const screenshot = require('frida-screenshot');
+import screenshot from 'frida-screenshot';
 
 const png = await screenshot();
 send({

package/dist/index.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="frida-gum" />
+export default function screenshot(view: ObjC.Object): Promise<ArrayBuffer>;

package/dist/index.js

@@ -0,0 +1,29 @@
+import { ios } from './lib/ios.js';
+const IOS = Symbol('ios');
+const UNKNOWN = Symbol('unknown');
+export default function screenshot(view) {
+    if (getOS() === IOS) {
+        return ios(view);
+    }
+    else {
+        return new Promise(function (_, reject) {
+            reject(new Error('Not yet implemented for this OS'));
+        });
+    }
+}
+;
+let cachedOS = null;
+function getOS() {
+    if (cachedOS === null) {
+        cachedOS = detectOS();
+    }
+    return cachedOS;
+}
+function detectOS() {
+    if (ObjC.available && 'UIView' in ObjC.classes) {
+        return IOS;
+    }
+    else {
+        return UNKNOWN;
+    }
+}

package/dist/lib/ios.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="frida-gum" />
+export declare function ios(view: ObjC.Object): Promise<ArrayBuffer>;

package/dist/lib/ios.js

@@ -0,0 +1,58 @@
+const CGFloat = (Process.pointerSize === 4) ? 'float' : 'double';
+const CGSize = [CGFloat, CGFloat];
+export function ios(view) {
+    return performOnMainThread(() => {
+        const api = getApi();
+        if (api === null) {
+            throw new Error("Cannot retrieve the API");
+        }
+        if (!view) {
+            view = api.UIWindow.keyWindow();
+        }
+        const bounds = view.bounds();
+        const size = bounds[1];
+        api.UIGraphicsBeginImageContextWithOptions(size, 0, 0);
+        view.drawViewHierarchyInRect_afterScreenUpdates_(bounds, true);
+        const image = api.UIGraphicsGetImageFromCurrentImageContext();
+        api.UIGraphicsEndImageContext();
+        const png = new ObjC.Object(api.UIImagePNGRepresentation(image));
+        const data = png.bytes();
+        return data.readByteArray(png.length());
+    });
+}
+;
+function performOnMainThread(action) {
+    return new Promise((resolve, reject) => {
+        const api = getApi();
+        if (api.NSThread.isMainThread()) {
+            performAction();
+        }
+        else {
+            ObjC.schedule(ObjC.mainQueue, performAction);
+        }
+        function performAction() {
+            try {
+                const result = action();
+                resolve(result);
+            }
+            catch (e) {
+                reject(e);
+            }
+        }
+    });
+}
+;
+let cachedApi = null;
+function getApi() {
+    if (cachedApi === null) {
+        cachedApi = {
+            UIWindow: ObjC.classes.UIWindow,
+            NSThread: ObjC.classes.NSThread,
+            UIGraphicsBeginImageContextWithOptions: new NativeFunction(Module.getExportByName('UIKit', 'UIGraphicsBeginImageContextWithOptions'), 'void', [CGSize, 'bool', CGFloat]),
+            UIGraphicsEndImageContext: new NativeFunction(Module.getExportByName('UIKit', 'UIGraphicsEndImageContext'), 'void', []),
+            UIGraphicsGetImageFromCurrentImageContext: new NativeFunction(Module.getExportByName('UIKit', 'UIGraphicsGetImageFromCurrentImageContext'), 'pointer', []),
+            UIImagePNGRepresentation: new NativeFunction(Module.getExportByName('UIKit', 'UIImagePNGRepresentation'), 'pointer', ['pointer'])
+        };
+    }
+    return cachedApi;
+}

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "frida-screenshot",
-  "version": "3.0.3",
+  "version": "5.0.0",
   "description": "Grab screenshots using Frida",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "type": "module",
   "files": [
-    "/index.js",
-    "/lib/**/*.js"
+    "/dist/"
   ],
+  "scripts": {
+    "prepare": "npm run build",
+    "build": "tsc",
+    "watch": "tsc -w"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nowsecure/frida-screenshot.git"
@@ -15,5 +20,10 @@
   "bugs": {
     "url": "https://github.com/nowsecure/frida-screenshot/issues"
   },
-  "homepage": "https://github.com/nowsecure/frida-screenshot#readme"
+  "homepage": "https://github.com/nowsecure/frida-screenshot#readme",
+  "devDependencies": {
+    "@types/frida-gum": "^18.3.0",
+    "@types/node": "^18.11.18",
+    "typescript": "^4.7.3"
+  }
 }

package/index.js

@@ -1,30 +0,0 @@
-const ios = require('./lib/ios');
-
-const IOS = Symbol('ios');
-const UNKNOWN = Symbol('unknown');
-
-module.exports = function (view) {
-  if (getOS() === IOS) {
-    return ios(view);
-  } else {
-    return new Promise(function (resolve, reject) {
-      reject(new Error('Not yet implemented for this OS'));
-    });
-  }
-};
-
-let cachedOS = null;
-function getOS() {
-  if (cachedOS === null) {
-    cachedOS = detectOS();
-  }
-  return cachedOS;
-}
-
-function detectOS() {
-  if (ObjC.available && 'UIView' in ObjC.classes) {
-    return IOS;
-  } else {
-    return UNKNOWN;
-  }
-}

package/lib/ios.js

@@ -1,66 +0,0 @@
-const CGFloat = (Process.pointerSize === 4) ? 'float' : 'double';
-const CGSize = [CGFloat, CGFloat];
-
-module.exports = function (view) {
-  return performOnMainThread(function () {
-    const api = getApi();
-
-    if (!view) {
-      view = api.UIWindow.keyWindow();
-    }
-
-    const bounds = view.bounds();
-    const size = bounds[1];
-    api.UIGraphicsBeginImageContextWithOptions(size, 0, 0);
-
-    view.drawViewHierarchyInRect_afterScreenUpdates_(bounds, true);
-
-    const image = api.UIGraphicsGetImageFromCurrentImageContext();
-    api.UIGraphicsEndImageContext();
-
-    const png = new ObjC.Object(api.UIImagePNGRepresentation(image));
-    return png.bytes().readByteArray(png.length());
-  });
-};
-
-function performOnMainThread(action) {
-  return new Promise(function (resolve, reject) {
-    if (getApi().NSThread.isMainThread()) {
-      performAction();
-    } else {
-      ObjC.schedule(ObjC.mainQueue, performAction);
-    }
-
-    function performAction() {
-      try {
-        const result = action();
-        resolve(result);
-      } catch (e) {
-        reject(e);
-      }
-    }
-  });
-}
-
-let cachedApi = null;
-function getApi() {
-  if (cachedApi === null) {
-    cachedApi = {
-      UIWindow: ObjC.classes.UIWindow,
-      NSThread: ObjC.classes.NSThread,
-      UIGraphicsBeginImageContextWithOptions: new NativeFunction(
-          Module.findExportByName('UIKit', 'UIGraphicsBeginImageContextWithOptions'),
-          'void', [CGSize, 'bool', CGFloat]),
-      UIGraphicsEndImageContext: new NativeFunction(
-          Module.findExportByName('UIKit', 'UIGraphicsEndImageContext'),
-          'void', []),
-      UIGraphicsGetImageFromCurrentImageContext: new NativeFunction(
-          Module.findExportByName('UIKit', 'UIGraphicsGetImageFromCurrentImageContext'),
-          'pointer', []),
-      UIImagePNGRepresentation: new NativeFunction(
-          Module.findExportByName('UIKit', 'UIImagePNGRepresentation'),
-          'pointer', ['pointer'])
-    };
-  }
-  return cachedApi;
-}