@mobilenext/mobile-mcp 0.0.20 → 0.0.22

package/lib/android.js

@@ -37,14 +37,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AndroidDeviceManager = exports.AndroidRobot = void 0;
-const path_1 = __importDefault(require("path"));
-const child_process_1 = require("child_process");
+const node_path_1 = __importDefault(require("node:path"));
+const node_child_process_1 = require("node:child_process");
 const xml = __importStar(require("fast-xml-parser"));
 const robot_1 = require("./robot");
 const getAdbPath = () => {
     let executable = "adb";
     if (process.env.ANDROID_HOME) {
-        executable = path_1.default.join(process.env.ANDROID_HOME, "platform-tools", "adb");
+        executable = node_path_1.default.join(process.env.ANDROID_HOME, "platform-tools", "adb");
     }
     return executable;
 };
@@ -68,7 +68,7 @@ class AndroidRobot {
         this.deviceId = deviceId;
     }
     adb(...args) {
-        return (0, child_process_1.execFileSync)(getAdbPath(), ["-s", this.deviceId, ...args], {
+        return (0, node_child_process_1.execFileSync)(getAdbPath(), ["-s", this.deviceId, ...args], {
             maxBuffer: MAX_BUFFER_SIZE,
             timeout: TIMEOUT,
         });
@@ -111,6 +111,7 @@ class AndroidRobot {
         return this.adb("shell", "pm", "list", "packages")
             .toString()
             .split("\n")
+            .map(line => line.trim())
             .filter(line => line.startsWith("package:"))
             .map(line => line.substring("package:".length));
     }
@@ -333,11 +334,12 @@ class AndroidDeviceManager {
     }
     getConnectedDevices() {
         try {
-            const names = (0, child_process_1.execFileSync)(getAdbPath(), ["devices"])
+            const names = (0, node_child_process_1.execFileSync)(getAdbPath(), ["devices"])
                 .toString()
                 .split("\n")
+                .map(line => line.trim())
+                .filter(line => line !== "")
                 .filter(line => !line.startsWith("List of devices attached"))
-                .filter(line => line.trim() !== "")
                 .map(line => line.split("\t")[0]);
             return names.map(name => ({
                 deviceId: name,

package/lib/ios.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IosManager = exports.IosRobot = void 0;
-const child_process_1 = require("child_process");
-const net_1 = require("net");
+const node_net_1 = require("node:net");
+const node_child_process_1 = require("node:child_process");
 const webdriver_agent_1 = require("./webdriver-agent");
 const robot_1 = require("./robot");
 const WDA_PORT = 8100;
@@ -21,7 +21,7 @@ class IosRobot {
     }
     isListeningOnPort(port) {
         return new Promise((resolve, reject) => {
-            const client = new net_1.Socket();
+            const client = new node_net_1.Socket();
             client.connect(port, "localhost", () => {
                 client.destroy();
                 resolve(true);
@@ -56,7 +56,7 @@ class IosRobot {
         return wda;
     }
     async ios(...args) {
-        return (0, child_process_1.execFileSync)(getGoIosPath(), ["--udid", this.deviceId, ...args], {}).toString();
+        return (0, node_child_process_1.execFileSync)(getGoIosPath(), ["--udid", this.deviceId, ...args], {}).toString();
     }
     async getIosVersion() {
         const output = await this.ios("info");
@@ -144,9 +144,9 @@ class IosRobot {
 }
 exports.IosRobot = IosRobot;
 class IosManager {
-    async isGoIosInstalled() {
+    isGoIosInstalled() {
         try {
-            const output = (0, child_process_1.execFileSync)(getGoIosPath(), ["version"], { stdio: ["pipe", "pipe", "ignore"] }).toString();
+            const output = (0, node_child_process_1.execFileSync)(getGoIosPath(), ["version"], { stdio: ["pipe", "pipe", "ignore"] }).toString();
             const json = JSON.parse(output);
             return json.version !== undefined && (json.version.startsWith("v") || json.version === "local-build");
         }
@@ -155,7 +155,7 @@ class IosManager {
         }
     }
     getDeviceName(deviceId) {
-        const output = (0, child_process_1.execFileSync)(getGoIosPath(), ["info", "--udid", deviceId]).toString();
+        const output = (0, node_child_process_1.execFileSync)(getGoIosPath(), ["info", "--udid", deviceId]).toString();
         const json = JSON.parse(output);
         return json.DeviceName;
     }
@@ -164,7 +164,7 @@ class IosManager {
             console.error("go-ios is not installed, no physical iOS devices can be detected");
             return [];
         }
-        const output = (0, child_process_1.execFileSync)(getGoIosPath(), ["list"]).toString();
+        const output = (0, node_child_process_1.execFileSync)(getGoIosPath(), ["list"]).toString();
         const json = JSON.parse(output);
         const devices = json.deviceList.map(device => ({
             deviceId: device,

package/lib/iphone-simulator.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimctlManager = exports.Simctl = void 0;
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
+const logger_1 = require("./logger");
 const webdriver_agent_1 = require("./webdriver-agent");
 const robot_1 = require("./robot");
 const TIMEOUT = 30000;
@@ -12,15 +13,46 @@ class Simctl {
     constructor(simulatorUuid) {
         this.simulatorUuid = simulatorUuid;
     }
+    async isWdaInstalled() {
+        const apps = await this.listApps();
+        return apps.map(app => app.packageName).includes("com.facebook.WebDriverAgentRunner.xctrunner");
+    }
+    async startWda() {
+        if (!(await this.isWdaInstalled())) {
+            // wda is not even installed, won't attempt to start it
+            return;
+        }
+        (0, logger_1.trace)("Starting WebDriverAgent");
+        const webdriverPackageName = "com.facebook.WebDriverAgentRunner.xctrunner";
+        this.simctl("launch", this.simulatorUuid, webdriverPackageName);
+        // now we wait for wda to have a successful status
+        const wda = new webdriver_agent_1.WebDriverAgent("localhost", WDA_PORT);
+        // wait up to 10 seconds for wda to start
+        const timeout = +new Date() + 10 * 1000;
+        while (+new Date() < timeout) {
+            // cross fingers and see if wda is already running
+            if (await wda.isRunning()) {
+                (0, logger_1.trace)("WebDriverAgent is now running");
+                return;
+            }
+            // wait 100ms before trying again
+            await new Promise(resolve => setTimeout(resolve, 100));
+        }
+        (0, logger_1.trace)("Could not start WebDriverAgent in time, giving up");
+    }
     async wda() {
         const wda = new webdriver_agent_1.WebDriverAgent("localhost", WDA_PORT);
         if (!(await wda.isRunning())) {
-            throw new robot_1.ActionableError("WebDriverAgent is not running on simulator, please see https://github.com/mobile-next/mobile-mcp/wiki/");
+            await this.startWda();
+            if (!(await wda.isRunning())) {
+                throw new robot_1.ActionableError("WebDriverAgent is not running on simulator, please see https://github.com/mobile-next/mobile-mcp/wiki/");
+            }
+            // was successfully started
         }
         return wda;
     }
     simctl(...args) {
-        return (0, child_process_1.execFileSync)("xcrun", ["simctl", ...args], {
+        return (0, node_child_process_1.execFileSync)("xcrun", ["simctl", ...args], {
             timeout: TIMEOUT,
             maxBuffer: MAX_BUFFER_SIZE,
         });
@@ -43,7 +75,7 @@ class Simctl {
     }
     async listApps() {
         const text = this.simctl("listapps", this.simulatorUuid).toString();
-        const result = (0, child_process_1.execFileSync)("plutil", ["-convert", "json", "-o", "-", "-r", "-"], {
+        const result = (0, node_child_process_1.execFileSync)("plutil", ["-convert", "json", "-o", "-", "-r", "-"], {
             input: text,
         });
         const output = JSON.parse(result.toString());
@@ -98,7 +130,7 @@ class SimctlManager {
             return [];
         }
         try {
-            const text = (0, child_process_1.execFileSync)("xcrun", ["simctl", "list", "devices", "-j"]).toString();
+            const text = (0, node_child_process_1.execFileSync)("xcrun", ["simctl", "list", "devices", "-j"]).toString();
             const json = JSON.parse(text);
             return Object.values(json.devices).flatMap(device => {
                 return device.map(d => {

package/lib/logger.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.error = exports.trace = void 0;
-const fs_1 = require("fs");
+const node_fs_1 = require("node:fs");
 const writeLog = (message) => {
     if (process.env.LOG_FILE) {
         const logfile = process.env.LOG_FILE;
         const timestamp = new Date().toISOString();
         const levelStr = "INFO";
         const logMessage = `[${timestamp}] ${levelStr} ${message}`;
-        (0, fs_1.appendFileSync)(logfile, logMessage + "\n");
+        (0, node_fs_1.appendFileSync)(logfile, logMessage + "\n");
     }
     console.error(message);
 };

package/lib/server.js

@@ -7,6 +7,7 @@ exports.createMcpServer = exports.getAgentVersion = void 0;
 const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
 const zod_1 = require("zod");
 const node_fs_1 = __importDefault(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const logger_1 = require("./logger");
 const android_1 = require("./android");
@@ -54,6 +55,7 @@ const createMcpServer = () => {
                 (0, logger_1.trace)(`Invoking ${name} with args: ${JSON.stringify(args)}`);
                 const response = await cb(args);
                 (0, logger_1.trace)(`=> ${response}`);
+                posthog("tool_invoked", {}).then();
                 return {
                     content: [{ type: "text", text: response }],
                 };
@@ -76,27 +78,39 @@ const createMcpServer = () => {
         };
         server.tool(name, description, paramsSchema, args => wrappedCb(args));
     };
-    const posthog = (event, properties) => {
-        const url = "https://us.i.posthog.com/i/v0/e/";
-        const api_key = "phc_KHRTZmkDsU7A8EbydEK8s4lJpPoTDyyBhSlwer694cS";
-        const distinct_id = node_crypto_1.default.createHash("sha256").update(process.execPath).digest("hex");
-        fetch(url, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json"
-            },
-            body: JSON.stringify({
-                api_key,
-                event,
-                properties,
-                distinct_id,
-            })
-        }).then().catch();
+    const posthog = async (event, properties) => {
+        try {
+            const url = "https://us.i.posthog.com/i/v0/e/";
+            const api_key = "phc_KHRTZmkDsU7A8EbydEK8s4lJpPoTDyyBhSlwer694cS";
+            const name = node_os_1.default.hostname() + process.execPath;
+            const distinct_id = node_crypto_1.default.createHash("sha256").update(name).digest("hex");
+            const systemProps = {
+                Platform: node_os_1.default.platform(),
+                Product: "mobile-mcp",
+                Version: (0, exports.getAgentVersion)(),
+                NodeVersion: process.version,
+            };
+            await fetch(url, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({
+                    api_key,
+                    event,
+                    properties: {
+                        ...systemProps,
+                        ...properties,
+                    },
+                    distinct_id,
+                })
+            });
+        }
+        catch (err) {
+            // ignore
+        }
     };
-    posthog("launch", {
-        Product: "mobile-mcp",
-        Version: (0, exports.getAgentVersion)(),
-    });
+    posthog("launch", {}).then();
     let robot;
     const simulatorManager = new iphone_simulator_1.SimctlManager();
     const requireRobot = () => {

package/lib/webdriver-agent.js

@@ -13,10 +13,11 @@ class WebDriverAgent {
         const url = `http://${this.host}:${this.port}/status`;
         try {
             const response = await fetch(url);
-            return response.status === 200;
+            const json = await response.json();
+            return response.status === 200 && json.value?.ready === true;
         }
         catch (error) {
-            console.error(`Failed to connect to WebDriverAgent: ${error}`);
+            // console.error(`Failed to connect to WebDriverAgent: ${error}`);
             return false;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mobilenext/mobile-mcp",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "Mobile MCP",
   "repository": {
     "type": "git",
@@ -23,8 +23,6 @@
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.6.1",
-    "@types/commander": "^2.12.0",
-    "@types/express": "^5.0.3",
     "commander": "^14.0.0",
     "express": "^5.1.0",
     "fast-xml-parser": "^5.0.9",
@@ -34,6 +32,8 @@
     "@eslint/eslintrc": "^3.2.0",
     "@eslint/js": "^9.19.0",
     "@stylistic/eslint-plugin": "^3.0.1",
+    "@types/commander": "^2.12.0",
+    "@types/express": "^5.0.3",
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.13.10",
     "@typescript-eslint/eslint-plugin": "^8.28.0",