frida-screenshot 6.0.0 → 6.1.0

package/dist/index.d.ts

@@ -1,2 +1,5 @@
 import ObjC from "frida-objc-bridge";
-export default function screenshot(view: ObjC.Object): Promise<ArrayBuffer>;
+export default function screenshot(view: ObjC.Object, options?: ScreenshotOptions): Promise<ArrayBuffer>;
+export interface ScreenshotOptions {
+    constrainSize?: number;
+}

package/dist/index.js

@@ -2,9 +2,9 @@ import ObjC from "frida-objc-bridge";
 import { ios } from './lib/ios.js';
 const IOS = Symbol('ios');
 const UNKNOWN = Symbol('unknown');
-export default function screenshot(view) {
+export default function screenshot(view, options) {
     if (getOS() === IOS) {
-        return ios(view);
+        return ios(view, options);
     }
     else {
         return new Promise(function (_, reject) {

package/dist/lib/ios.d.ts

@@ -1,2 +1,3 @@
 import ObjC from "frida-objc-bridge";
-export declare function ios(view: ObjC.Object): Promise<ArrayBuffer>;
+import { ScreenshotOptions } from "../index.js";
+export declare function ios(view: ObjC.Object, options: ScreenshotOptions | undefined): Promise<ArrayBuffer>;

package/dist/lib/ios.js

@@ -1,8 +1,6 @@
 import ObjC from "frida-objc-bridge";
-const CGFloat = (Process.pointerSize === 4) ? 'float' : 'double';
-const CGSize = [CGFloat, CGFloat];
 const blocks = new Set();
-export function ios(view) {
+export function ios(view, options) {
     return performOnMainThread(() => {
         const api = getApi();
         if (api === null) {
@@ -13,10 +11,29 @@ export function ios(view) {
         }
         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 format = api.UIGraphicsImageRendererFormat.preferredFormat();
+        const constrainSize = options?.constrainSize;
+        if (constrainSize !== undefined) {
+            if (typeof constrainSize !== "number" || constrainSize <= 0) {
+                throw new Error("Invalid constrainSize value");
+            }
+            const maxDimension = Math.max(size[0], size[1]);
+            const scale = format.scale().valueOf();
+            if (maxDimension * scale > constrainSize) {
+                format.setScale_(constrainSize / maxDimension);
+            }
+        }
+        const renderer = api.UIGraphicsImageRenderer.alloc().initWithSize_format_(size, format).autorelease();
+        const actionBlock = new ObjC.Block({
+            argTypes: ["object"],
+            retType: "void",
+            implementation: () => {
+                view.drawViewHierarchyInRect_afterScreenUpdates_(bounds, true);
+                setTimeout(() => blocks.delete(actionBlock), 0);
+            }
+        });
+        blocks.add(actionBlock);
+        const image = renderer.imageWithActions_(actionBlock);
         const png = new ObjC.Object(api.UIImagePNGRepresentation(image));
         const data = png.bytes();
         return data.readByteArray(png.length());
@@ -39,7 +56,7 @@ function performOnMainThread(action) {
                 return;
             }
             const block = new ObjC.Block({
-                retType: 'void',
+                retType: "void",
                 argTypes: [],
                 implementation() {
                     try {
@@ -61,15 +78,14 @@ function performOnMainThread(action) {
 let cachedApi = null;
 function getApi() {
     if (cachedApi === null) {
-        const uikit = Process.getModuleByName('UIKit');
+        const uikit = Process.getModuleByName("UIKit");
         cachedApi = {
             UIApplication: ObjC.classes.UIApplication,
             UIWindow: ObjC.classes.UIWindow,
+            UIGraphicsImageRendererFormat: ObjC.classes.UIGraphicsImageRendererFormat,
+            UIGraphicsImageRenderer: ObjC.classes.UIGraphicsImageRenderer,
             NSThread: ObjC.classes.NSThread,
-            UIGraphicsBeginImageContextWithOptions: new NativeFunction(uikit.getExportByName('UIGraphicsBeginImageContextWithOptions'), 'void', [CGSize, 'bool', CGFloat]),
-            UIGraphicsEndImageContext: new NativeFunction(uikit.getExportByName('UIGraphicsEndImageContext'), 'void', []),
-            UIGraphicsGetImageFromCurrentImageContext: new NativeFunction(uikit.getExportByName('UIGraphicsGetImageFromCurrentImageContext'), 'pointer', []),
-            UIImagePNGRepresentation: new NativeFunction(uikit.getExportByName('UIImagePNGRepresentation'), 'pointer', ['pointer'])
+            UIImagePNGRepresentation: new NativeFunction(uikit.getExportByName("UIImagePNGRepresentation"), "pointer", ["pointer"])
         };
     }
     return cachedApi;

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "frida-screenshot",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Grab screenshots using Frida",
+  "keywords": [
+    "frida-gum"
+  ],
   "main": "dist/index.js",
   "type": "module",
   "files": [