@limrun/api 0.5.2 → 0.6.2

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":";AAAA,sFAAsF;;;;AAEtF,sCAA6C;AAApC,iGAAA,MAAM,OAAW;AAE1B,6CAAyD;AAA/B,iGAAA,MAAM,OAAA;AAChC,qDAAgD;AAAvC,yGAAA,UAAU,OAAA;AACnB,sCAAsD;AAA7C,gGAAA,MAAM,OAAA;AACf,yCAcsB;AAbpB,oGAAA,WAAW,OAAA;AACX,iGAAA,QAAQ,OAAA;AACR,2GAAA,kBAAkB,OAAA;AAClB,kHAAA,yBAAyB,OAAA;AACzB,0GAAA,iBAAiB,OAAA;AACjB,sGAAA,aAAa,OAAA;AACb,sGAAA,aAAa,OAAA;AACb,uGAAA,cAAc,OAAA;AACd,wGAAA,eAAe,OAAA;AACf,4GAAA,mBAAmB,OAAA;AACnB,4GAAA,mBAAmB,OAAA;AACnB,8GAAA,qBAAqB,OAAA;AACrB,iHAAA,wBAAwB,OAAA;AAG1B,mFAAsD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":";AAAA,sFAAsF;;;AAEtF,sCAA6C;AAApC,iGAAA,MAAM,OAAW;AAE1B,6CAAyD;AAA/B,iGAAA,MAAM,OAAA;AAChC,qDAAgD;AAAvC,yGAAA,UAAU,OAAA;AACnB,sCAAsD;AAA7C,gGAAA,MAAM,OAAA;AACf,yCAcsB;AAbpB,oGAAA,WAAW,OAAA;AACX,iGAAA,QAAQ,OAAA;AACR,2GAAA,kBAAkB,OAAA;AAClB,kHAAA,yBAAyB,OAAA;AACzB,0GAAA,iBAAiB,OAAA;AACjB,sGAAA,aAAa,OAAA;AACb,sGAAA,aAAa,OAAA;AACb,uGAAA,cAAc,OAAA;AACd,wGAAA,eAAe,OAAA;AACf,4GAAA,mBAAmB,OAAA;AACnB,4GAAA,mBAAmB,OAAA;AACnB,8GAAA,qBAAqB,OAAA;AACrB,iHAAA,wBAAwB,OAAA"}

package/index.mjs

@@ -4,5 +4,4 @@ export { toFile } from "./core/uploads.mjs";
 export { APIPromise } from "./core/api-promise.mjs";
 export { Limrun } from "./client.mjs";
 export { LimrunError, APIError, APIConnectionError, APIConnectionTimeoutError, APIUserAbortError, NotFoundError, ConflictError, RateLimitError, BadRequestError, AuthenticationError, InternalServerError, PermissionDeniedError, UnprocessableEntityError, } from "./core/error.mjs";
-export * from "./resources/android-instances-helpers.mjs";
 //# sourceMappingURL=index.mjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@limrun/api",
-  "version": "0.5.2",
+  "version": "0.6.2",
   "description": "The official TypeScript library for the Limrun API",
   "author": "Limrun <contact@limrun.com>",
   "types": "./index.d.ts",
@@ -136,8 +136,5 @@
     "./version.mjs": {
       "default": "./version.mjs"
     }
-  },
-  "optionalDependencies": {
-    "bufferutil": "^4.0.9"
   }
 }

package/resources/android-instances-helpers.d.mts

@@ -1,30 +1,57 @@
-import * as net from 'net';
+import type { Tunnel } from "./tunnel.mjs";
+export type { Tunnel } from "./tunnel.mjs";
 import { AndroidInstance } from "./android-instances.mjs";
 /**
- * Opens a WebSocket TCP proxy for the ADB port and connects the local adb
- * client to it.
+ * A client for interacting with a Limbar instance
  */
-export declare const startAdbTunnel: (androidInstance: AndroidInstance, hostname?: string, port?: number) => Promise<Proxy>;
-/** Returned by `startTcpProxy` – holds the chosen localhost port and a close callback. */
-export interface Proxy {
-    address: net.AddressInfo;
-    close: () => void;
-}
+export type InstanceClient = {
+    /**
+     * Take a screenshot of the current screen
+     * @returns A promise that resolves to the screenshot data
+     */
+    screenshot: () => Promise<ScreenshotData>;
+    /**
+     * Disconnect from the Limbar instance
+     */
+    disconnect: () => void;
+    /**
+     * Establish an ADB tunnel to the instance.
+     * Returns the local TCP port and a cleanup function.
+     */
+    startAdbTunnel: () => Promise<Tunnel>;
+    /**
+     * Send an asset URL to the instance. The instance will download the asset
+     * and process it (currently APK install is supported). Resolves on success,
+     * rejects with an Error on failure.
+     */
+    sendAsset: (url: string) => Promise<void>;
+};
 /**
- * Starts a one-shot TCP → WebSocket proxy.
- *
- * The function creates a local TCP server that listens on an ephemeral port on
- * 127.0.0.1.  As soon as the **first** TCP client connects the server stops
- * accepting further connections and forwards all traffic between that client
- * and `remoteURL` through an authenticated WebSocket.  If you need to proxy
- * more than one TCP connection, call `startTcpProxy` again to create a new
- * proxy instance.
- *
- * @param remoteURL Remote WebSocket endpoint (e.g. wss://example.com/instance)
- * @param token     Bearer token sent as `Authorization` header
- * @param hostname  Optional IP address to listen on. Default is 127.0.0.1
- * @param port      Optional port number to listen on. Default is to ask Node.js
- *                  to find an available non-privileged port.
+ * Controls the verbosity of logging in the client
  */
-export declare function startTcpProxy(remoteURL: string, token: string, hostname: string, port: number): Promise<Proxy>;
+export type LogLevel = 'none' | 'error' | 'warn' | 'info' | 'debug';
+/**
+ * Configuration options for creating an Instance API client
+ */
+export type InstanceClientOptions = {
+    /**
+     * Path to the ADB executable.
+     * @default 'adb'
+     */
+    adbPath?: string;
+    /**
+     * Controls logging verbosity
+     * @default 'info'
+     */
+    logLevel?: LogLevel;
+};
+type ScreenshotData = {
+    dataUri: string;
+};
+/**
+ * Creates a client for interacting with a Limbar instance
+ * @param options Configuration options including webrtcUrl, token and log level
+ * @returns An InstanceClient for controlling the instance
+ */
+export declare function createInstanceClient(androidInstance: AndroidInstance, options?: InstanceClientOptions): Promise<InstanceClient>;
 //# sourceMappingURL=android-instances-helpers.d.mts.map

package/resources/android-instances-helpers.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"android-instances-helpers.d.mts","sourceRoot":"","sources":["../src/resources/android-instances-helpers.ts"],"names":[],"mappings":"OACO,KAAK,GAAG,MAAM,KAAK;OAGnB,EAAE,eAAe,EAAE;AAE1B;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,iBAAiB,eAAe,EAChC,WAAW,MAAM,EACjB,OAAO,MAAM,KACZ,OAAO,CAAC,KAAK,CAsBf,CAAC;AAEF,0FAA0F;AAC1F,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,KAAK,CAAC,CA6FhB"}
+{"version":3,"file":"android-instances-helpers.d.mts","sourceRoot":"","sources":["../src/resources/android-instances-helpers.ts"],"names":[],"mappings":"OAIO,KAAK,EAAE,MAAM,EAAE;YACV,EAAE,MAAM,EAAE;OACf,EAAE,eAAe,EAAE;AAE1B;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;;OAGG;IACH,UAAU,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1C;;OAEG;IACH,UAAU,EAAE,MAAM,IAAI,CAAC;IAEvB;;;OAGG;IACH,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC;;;;OAIG;IACH,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAaF,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA0BF;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,eAAe,EAChC,OAAO,GAAE,qBAGR,GACA,OAAO,CAAC,cAAc,CAAC,CAmPzB"}

package/resources/android-instances-helpers.d.ts

@@ -1,30 +1,57 @@
-import * as net from 'net';
+import type { Tunnel } from "./tunnel.js";
+export type { Tunnel } from "./tunnel.js";
 import { AndroidInstance } from "./android-instances.js";
 /**
- * Opens a WebSocket TCP proxy for the ADB port and connects the local adb
- * client to it.
+ * A client for interacting with a Limbar instance
  */
-export declare const startAdbTunnel: (androidInstance: AndroidInstance, hostname?: string, port?: number) => Promise<Proxy>;
-/** Returned by `startTcpProxy` – holds the chosen localhost port and a close callback. */
-export interface Proxy {
-    address: net.AddressInfo;
-    close: () => void;
-}
+export type InstanceClient = {
+    /**
+     * Take a screenshot of the current screen
+     * @returns A promise that resolves to the screenshot data
+     */
+    screenshot: () => Promise<ScreenshotData>;
+    /**
+     * Disconnect from the Limbar instance
+     */
+    disconnect: () => void;
+    /**
+     * Establish an ADB tunnel to the instance.
+     * Returns the local TCP port and a cleanup function.
+     */
+    startAdbTunnel: () => Promise<Tunnel>;
+    /**
+     * Send an asset URL to the instance. The instance will download the asset
+     * and process it (currently APK install is supported). Resolves on success,
+     * rejects with an Error on failure.
+     */
+    sendAsset: (url: string) => Promise<void>;
+};
 /**
- * Starts a one-shot TCP → WebSocket proxy.
- *
- * The function creates a local TCP server that listens on an ephemeral port on
- * 127.0.0.1.  As soon as the **first** TCP client connects the server stops
- * accepting further connections and forwards all traffic between that client
- * and `remoteURL` through an authenticated WebSocket.  If you need to proxy
- * more than one TCP connection, call `startTcpProxy` again to create a new
- * proxy instance.
- *
- * @param remoteURL Remote WebSocket endpoint (e.g. wss://example.com/instance)
- * @param token     Bearer token sent as `Authorization` header
- * @param hostname  Optional IP address to listen on. Default is 127.0.0.1
- * @param port      Optional port number to listen on. Default is to ask Node.js
- *                  to find an available non-privileged port.
+ * Controls the verbosity of logging in the client
  */
-export declare function startTcpProxy(remoteURL: string, token: string, hostname: string, port: number): Promise<Proxy>;
+export type LogLevel = 'none' | 'error' | 'warn' | 'info' | 'debug';
+/**
+ * Configuration options for creating an Instance API client
+ */
+export type InstanceClientOptions = {
+    /**
+     * Path to the ADB executable.
+     * @default 'adb'
+     */
+    adbPath?: string;
+    /**
+     * Controls logging verbosity
+     * @default 'info'
+     */
+    logLevel?: LogLevel;
+};
+type ScreenshotData = {
+    dataUri: string;
+};
+/**
+ * Creates a client for interacting with a Limbar instance
+ * @param options Configuration options including webrtcUrl, token and log level
+ * @returns An InstanceClient for controlling the instance
+ */
+export declare function createInstanceClient(androidInstance: AndroidInstance, options?: InstanceClientOptions): Promise<InstanceClient>;
 //# sourceMappingURL=android-instances-helpers.d.ts.map

package/resources/android-instances-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"android-instances-helpers.d.ts","sourceRoot":"","sources":["../src/resources/android-instances-helpers.ts"],"names":[],"mappings":"OACO,KAAK,GAAG,MAAM,KAAK;OAGnB,EAAE,eAAe,EAAE;AAE1B;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,iBAAiB,eAAe,EAChC,WAAW,MAAM,EACjB,OAAO,MAAM,KACZ,OAAO,CAAC,KAAK,CAsBf,CAAC;AAEF,0FAA0F;AAC1F,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,KAAK,CAAC,CA6FhB"}
+{"version":3,"file":"android-instances-helpers.d.ts","sourceRoot":"","sources":["../src/resources/android-instances-helpers.ts"],"names":[],"mappings":"OAIO,KAAK,EAAE,MAAM,EAAE;YACV,EAAE,MAAM,EAAE;OACf,EAAE,eAAe,EAAE;AAE1B;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;;OAGG;IACH,UAAU,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1C;;OAEG;IACH,UAAU,EAAE,MAAM,IAAI,CAAC;IAEvB;;;OAGG;IACH,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC;;;;OAIG;IACH,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAaF,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA0BF;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,eAAe,EAChC,OAAO,GAAE,qBAGR,GACA,OAAO,CAAC,cAAc,CAAC,CAmPzB"}

package/resources/android-instances-helpers.js

@@ -1,129 +1,221 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startAdbTunnel = void 0;
-exports.startTcpProxy = startTcpProxy;
-const tslib_1 = require("../internal/tslib.js");
-const child_process_1 = require("child_process");
-const net = tslib_1.__importStar(require("net"));
+exports.createInstanceClient = createInstanceClient;
 const ws_1 = require("ws");
+const node_child_process_1 = require("node:child_process");
+const tunnel_js_1 = require("./tunnel.js");
 /**
- * Opens a WebSocket TCP proxy for the ADB port and connects the local adb
- * client to it.
+ * Creates a client for interacting with a Limbar instance
+ * @param options Configuration options including webrtcUrl, token and log level
+ * @returns An InstanceClient for controlling the instance
  */
-const startAdbTunnel = async (androidInstance, hostname, port) => {
-    if (!androidInstance.status.adbWebSocketUrl) {
-        throw new Error('ADB WebSocket URL is not available');
-    }
-    const { address, close } = await startTcpProxy(androidInstance.status.adbWebSocketUrl, androidInstance.status.token, hostname ?? '127.0.0.1', port ?? 0);
-    try {
-        await new Promise((resolve, reject) => {
-            (0, child_process_1.exec)(`adb connect ${address.address}:${address.port}`, (err) => {
-                if (err)
-                    return reject(err);
-                resolve();
-            });
-        });
-    }
-    catch (err) {
-        close();
-        throw err;
-    }
-    return { address, close };
-};
-exports.startAdbTunnel = startAdbTunnel;
-/**
- * Starts a one-shot TCP → WebSocket proxy.
- *
- * The function creates a local TCP server that listens on an ephemeral port on
- * 127.0.0.1.  As soon as the **first** TCP client connects the server stops
- * accepting further connections and forwards all traffic between that client
- * and `remoteURL` through an authenticated WebSocket.  If you need to proxy
- * more than one TCP connection, call `startTcpProxy` again to create a new
- * proxy instance.
- *
- * @param remoteURL Remote WebSocket endpoint (e.g. wss://example.com/instance)
- * @param token     Bearer token sent as `Authorization` header
- * @param hostname  Optional IP address to listen on. Default is 127.0.0.1
- * @param port      Optional port number to listen on. Default is to ask Node.js
- *                  to find an available non-privileged port.
- */
-async function startTcpProxy(remoteURL, token, hostname, port) {
-    return new Promise((resolve, reject) => {
-        const server = net.createServer();
-        let ws;
-        let pingInterval;
-        // close helper
-        const close = () => {
-            if (pingInterval) {
-                clearInterval(pingInterval);
-                pingInterval = undefined;
+async function createInstanceClient(androidInstance, options = {
+    adbPath: 'adb',
+    logLevel: 'info',
+}) {
+    const token = androidInstance.status.token;
+    const serverAddress = `${androidInstance.status.endpointWebSocketUrl}?token=${token}`;
+    const logLevel = options.logLevel ?? 'info';
+    let ws = undefined;
+    const screenshotRequests = new Map();
+    const assetRequests = new Map();
+    // Logger functions
+    const logger = {
+        debug: (...args) => {
+            if (logLevel === 'debug')
+                console.log(...args);
+        },
+        info: (...args) => {
+            if (logLevel === 'info' || logLevel === 'debug')
+                console.log(...args);
+        },
+        warn: (...args) => {
+            if (logLevel === 'warn' || logLevel === 'info' || logLevel === 'debug')
+                console.warn(...args);
+        },
+        error: (...args) => {
+            if (logLevel !== 'none')
+                console.error(...args);
+        },
+    };
+    return new Promise((resolveConnection, rejectConnection) => {
+        logger.debug(`Attempting to connect to WebSocket server at ${serverAddress}...`);
+        ws = new ws_1.WebSocket(serverAddress);
+        ws.on('message', (data) => {
+            let message;
+            try {
+                message = JSON.parse(data.toString());
             }
-            if (ws && ws.readyState === ws_1.WebSocket.OPEN) {
-                ws.close(1000, 'close');
+            catch (e) {
+                logger.error({ data, error: e }, 'Failed to parse JSON message');
+                return;
             }
-            if (server.listening) {
-                server.close();
+            switch (message.type) {
+                case 'screenshot': {
+                    if (!('dataUri' in message) || typeof message.dataUri !== 'string' || !('id' in message)) {
+                        logger.warn('Received invalid screenshot message:', message);
+                        break;
+                    }
+                    const screenshotMessage = message;
+                    const request = screenshotRequests.get(screenshotMessage.id);
+                    if (!request) {
+                        logger.warn(`Received screenshot data for unknown or already handled session: ${screenshotMessage.id}`);
+                        break;
+                    }
+                    logger.debug(`Received screenshot data URI for session ${screenshotMessage.id}.`);
+                    request.resolver({ dataUri: screenshotMessage.dataUri });
+                    screenshotRequests.delete(screenshotMessage.id);
+                    break;
+                }
+                case 'screenshotError': {
+                    if (!('message' in message) || !('id' in message)) {
+                        logger.warn('Received invalid screenshot error message:', message);
+                        break;
+                    }
+                    const errorMessage = message;
+                    const request = screenshotRequests.get(errorMessage.id);
+                    if (!request) {
+                        logger.warn(`Received screenshot error for unknown or already handled session: ${errorMessage.id}`);
+                        break;
+                    }
+                    logger.error(`Server reported an error capturing screenshot for session ${errorMessage.id}:`, errorMessage.message);
+                    request.rejecter(new Error(errorMessage.message));
+                    screenshotRequests.delete(errorMessage.id);
+                    break;
+                }
+                case 'assetResult': {
+                    logger.debug('Received assetResult:', message);
+                    const request = assetRequests.get(message.url);
+                    if (!request) {
+                        logger.warn(`Received assetResult for unknown or already handled url: ${message.url}`);
+                        break;
+                    }
+                    if (message.result === 'success') {
+                        logger.debug('Asset result is success');
+                        request.resolver();
+                        assetRequests.delete(message.url);
+                        break;
+                    }
+                    const errorMessage = typeof message.message === 'string' && message.message ?
+                        message.message
+                        : `Asset processing failed: ${JSON.stringify(message)}`;
+                    logger.debug('Asset result is failure', errorMessage);
+                    request.rejecter(new Error(errorMessage));
+                    assetRequests.delete(message.url);
+                    break;
+                }
+                default:
+                    logger.warn(`Received unexpected message type: ${message.type}`);
+                    break;
             }
-        };
-        // No AbortController support – proxy can be closed via the returned handle
-        // TCP server error
-        server.once('error', (err) => {
-            close();
-            reject(new Error(`TCP server error: ${err.message}`));
         });
-        // Listening
-        server.once('listening', () => {
-            const address = server.address();
-            if (!address || typeof address === 'string') {
-                close();
-                return reject(new Error('Failed to obtain listening address'));
+        ws.on('error', (err) => {
+            logger.error('WebSocket error:', err.message);
+            if (ws && (ws.readyState === ws_1.WebSocket.CONNECTING || ws.readyState === ws_1.WebSocket.OPEN)) {
+                rejectConnection(err);
             }
-            resolve({ address, close });
+            screenshotRequests.forEach((request) => request.rejecter(err));
         });
-        // On first TCP connection
-        server.on('connection', (tcpSocket) => {
-            // Single-connection proxy
-            server.close();
-            ws = new ws_1.WebSocket(remoteURL, {
-                headers: { Authorization: `Bearer ${token}` },
-                perMessageDeflate: false,
-            });
-            // WebSocket error
-            ws.once('error', (err) => {
-                console.error('WebSocket error:', err);
-                tcpSocket.destroy();
-                close();
-            });
-            ws.once('open', () => {
-                const socket = ws; // non-undefined after open
-                pingInterval = setInterval(() => {
-                    if (socket.readyState === ws_1.WebSocket.OPEN) {
-                        socket.ping();
-                    }
-                }, 30000);
-                // TCP → WS
-                tcpSocket.on('data', (chunk) => {
-                    if (socket.readyState === ws_1.WebSocket.OPEN) {
-                        socket.send(chunk);
+        ws.on('close', () => {
+            logger.debug('Disconnected from server.');
+            screenshotRequests.forEach((request) => request.rejecter('Disconnected from server'));
+        });
+        const screenshot = async () => {
+            if (!ws || ws.readyState !== ws_1.WebSocket.OPEN) {
+                return Promise.reject(new Error('WebSocket is not connected or connection is not open.'));
+            }
+            const id = 'ts-client-' + Date.now();
+            const screenshotRequest = {
+                type: 'screenshot',
+                id,
+            };
+            return new Promise((resolve, reject) => {
+                logger.debug('Sending screenshot request:', screenshotRequest);
+                ws.send(JSON.stringify(screenshotRequest), (err) => {
+                    if (err) {
+                        logger.error('Failed to send screenshot request:', err);
+                        reject(err);
                     }
                 });
-                // WS → TCP
-                socket.on('message', (data) => {
-                    if (!tcpSocket.destroyed) {
-                        tcpSocket.write(data);
+                const timeout = setTimeout(() => {
+                    if (screenshotRequests.has(id)) {
+                        logger.error(`Screenshot request timed out for session ${id}`);
+                        screenshotRequests.get(id)?.rejecter(new Error('Screenshot request timed out'));
+                        screenshotRequests.delete(id);
                     }
+                }, 30000);
+                screenshotRequests.set(id, {
+                    resolver: (value) => {
+                        clearTimeout(timeout);
+                        resolve(value);
+                        screenshotRequests.delete(id);
+                    },
+                    rejecter: (reason) => {
+                        clearTimeout(timeout);
+                        reject(reason);
+                        screenshotRequests.delete(id);
+                    },
                 });
             });
-            // Mutual close
-            tcpSocket.on('close', close);
-            tcpSocket.on('error', (err) => {
-                console.error('TCP socket error:', err);
+        };
+        const disconnect = () => {
+            if (ws) {
+                logger.debug('Closing WebSocket connection.');
+                ws.close();
+            }
+            screenshotRequests.forEach((request) => request.rejecter('Websocket connection closed'));
+        };
+        /**
+         * Opens a WebSocket TCP proxy for the ADB port and connects the local adb
+         * client to it.
+         */
+        const startAdbTunnel = async () => {
+            if (!androidInstance.status.adbWebSocketUrl) {
+                return Promise.reject(new Error('ADB WebSocket URL is not set'));
+            }
+            const { address, close } = await (0, tunnel_js_1.startTcpTunnel)(androidInstance.status.adbWebSocketUrl, token, '127.0.0.1', 0);
+            try {
+                await new Promise((resolve, reject) => {
+                    (0, node_child_process_1.exec)(`${options.adbPath ?? 'adb'} connect ${address.address}:${address.port}`, (err) => {
+                        if (err)
+                            return reject(err);
+                        resolve();
+                    });
+                });
+                logger.debug(`ADB connected on ${address.address}`);
+            }
+            catch (err) {
                 close();
+                throw err;
+            }
+            return { address, close };
+        };
+        const sendAsset = async (url) => {
+            if (!ws || ws.readyState !== ws_1.WebSocket.OPEN) {
+                return Promise.reject(new Error('WebSocket is not connected or connection is not open.'));
+            }
+            const assetRequest = {
+                type: 'asset',
+                url,
+            };
+            ws.send(JSON.stringify(assetRequest), (err) => {
+                if (err) {
+                    logger.error('Failed to send asset request:', err);
+                }
+            });
+            return new Promise((resolve, reject) => {
+                assetRequests.set(url, { resolver: resolve, rejecter: reject });
+            });
+        };
+        ws.on('open', () => {
+            logger.debug(`Connected to ${serverAddress}`);
+            resolveConnection({
+                screenshot,
+                disconnect,
+                startAdbTunnel,
+                sendAsset,
             });
-            ws.on('close', () => tcpSocket.destroy());
         });
-        // Start listening
-        server.listen(port, hostname);
     });
 }
 //# sourceMappingURL=android-instances-helpers.js.map

package/resources/android-instances-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"android-instances-helpers.js","sourceRoot":"","sources":["../src/resources/android-instances-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"android-instances-helpers.js","sourceRoot":"","sources":["../src/resources/android-instances-helpers.ts"],"names":[],"mappings":"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"}