@midscene/ios 0.30.6-beta-20251021121032.0 → 0.30.6-beta-20251022061949.0

package/dist/es/bin.mjs

@@ -11540,6 +11540,24 @@ class PlaygroundServer {
         writeFileSync(tmpFile, context);
         return tmpFile;
     }
+    async recreateAgent() {
+        if (!this.pageFactory || !this.agentFactory) return void console.warn('Cannot recreate agent: factory functions not provided. Agent recreation is only available when using factory mode.');
+        console.log('Recreating agent to cancel current task...');
+        try {
+            if (this.agent && 'function' == typeof this.agent.destroy) await this.agent.destroy();
+            if (this.page && 'function' == typeof this.page.destroy) await this.page.destroy();
+        } catch (error) {
+            console.warn('Failed to destroy old agent/page:', error);
+        }
+        try {
+            this.page = await this.pageFactory();
+            this.agent = this.agentFactory(this.page);
+            console.log('Agent recreated successfully');
+        } catch (error) {
+            console.error('Failed to recreate agent:', error);
+            throw error;
+        }
+    }
     setupRoutes() {
         this._app.get('/status', async (req, res)=>{
             res.send({
@@ -11616,7 +11634,12 @@ class PlaygroundServer {
             if (!type) return res.status(400).json({
                 error: 'type is required'
             });
+            if (this.currentTaskId) return res.status(409).json({
+                error: 'Another task is already running',
+                currentTaskId: this.currentTaskId
+            });
             if (requestId) {
+                this.currentTaskId = requestId;
                 this.taskProgressTips[requestId] = '';
                 this.agent.onTaskStartTip = (tip)=>{
                     this.taskProgressTips[requestId] = tip;
@@ -11658,7 +11681,10 @@ class PlaygroundServer {
             const timeCost = Date.now() - startTime;
             if (response.error) console.error(`handle request failed after ${timeCost}ms: requestId: ${requestId}, ${response.error}`);
             else console.log(`handle request done after ${timeCost}ms: requestId: ${requestId}`);
-            if (requestId) delete this.taskProgressTips[requestId];
+            if (requestId) {
+                delete this.taskProgressTips[requestId];
+                if (this.currentTaskId === requestId) this.currentTaskId = null;
+            }
         });
         this._app.post('/cancel/:requestId', async (req, res)=>{
             const { requestId } = req.params;
@@ -11666,9 +11692,17 @@ class PlaygroundServer {
                 error: 'requestId is required'
             });
             try {
-                if (this.taskProgressTips[requestId]) delete this.taskProgressTips[requestId];
+                if (this.currentTaskId !== requestId) return res.json({
+                    status: 'not_found',
+                    message: 'Task not found or already completed'
+                });
+                console.log(`Cancelling task: ${requestId}`);
+                await this.recreateAgent();
+                delete this.taskProgressTips[requestId];
+                this.currentTaskId = null;
                 res.json({
-                    status: 'cancelled'
+                    status: 'cancelled',
+                    message: 'Task cancelled successfully by recreating agent'
                 });
             } catch (error) {
                 const errorMessage = error instanceof Error ? error.message : 'Unknown error';
@@ -11768,6 +11802,12 @@ class PlaygroundServer {
         }
     }
     async launch(port) {
+        if (this.pageFactory && this.agentFactory) {
+            console.log('Initializing page and agent from factory functions...');
+            this.page = await this.pageFactory();
+            this.agent = this.agentFactory(this.page);
+            console.log('Page and agent initialized successfully');
+        }
         this.initializeApp();
         this.port = port || defaultPort;
         return new Promise((resolve)=>{
@@ -11807,13 +11847,28 @@ class PlaygroundServer {
         _define_property(this, "taskProgressTips", void 0);
         _define_property(this, "id", void 0);
         _define_property(this, "_initialized", false);
+        _define_property(this, "pageFactory", void 0);
+        _define_property(this, "agentFactory", void 0);
+        _define_property(this, "currentTaskId", null);
         this._app = express_default()();
         this.tmpDir = getTmpDir();
-        this.page = page;
-        this.agent = agent;
         this.staticPath = staticPath;
         this.taskProgressTips = {};
         this.id = id || utils_uuid();
+        if ('function' == typeof page) {
+            this.pageFactory = page;
+            this.page = null;
+        } else {
+            this.page = page;
+            this.pageFactory = null;
+        }
+        if ('function' == typeof agent) {
+            this.agentFactory = agent;
+            this.agent = null;
+        } else {
+            this.agent = agent;
+            this.agentFactory = null;
+        }
     }
 }
 __webpack_require__("../../node_modules/.pnpm/cors@2.8.5/node_modules/cors/lib/index.js");
@@ -12161,11 +12216,7 @@ class device_IOSDevice {
             }),
             defineActionKeyboardPress(async (param)=>{
                 const key = param.keyName;
-                if (Array.isArray(key)) {
-                    const keyToPress = key[key.length - 1];
-                    console.warn(`[iOS] Key combinations are not supported. Using last key: "${keyToPress}"`, 'Original input:', key);
-                    await this.pressKey(keyToPress);
-                } else await this.pressKey(key);
+                await this.pressKey(key);
             }),
             defineAction({
                 name: 'IOSHomeButton',
@@ -12720,17 +12771,14 @@ const main = async ()=>{
             host: 'localhost',
             port: DEFAULT_WDA_PORT
         };
-        let device;
-        let agent;
         let connected = false;
         while(!connected)try {
-            device = new device_IOSDevice({
+            const device = new device_IOSDevice({
                 wdaHost: wdaConfig.host,
                 wdaPort: wdaConfig.port
             });
             console.log(`\u{1F50C} Connecting to WebDriverAgent at ${wdaConfig.host}:${wdaConfig.port}...`);
             await device.connect();
-            agent = new IOSAgent(device);
             connected = true;
             const deviceInfo = await device.getConnectedDeviceInfo();
             console.log("\u2705 Connected to WebDriverAgent successfully!");
@@ -12782,7 +12830,16 @@ const main = async ()=>{
 `);
             else if ('configure' === action) wdaConfig = await configureWebDriverAgent();
         }
-        const playgroundServer = new PlaygroundServer(device, agent, staticDir);
+        const deviceFactory = async ()=>{
+            const newDevice = new device_IOSDevice({
+                wdaHost: wdaConfig.host,
+                wdaPort: wdaConfig.port
+            });
+            await newDevice.connect();
+            return newDevice;
+        };
+        const agentFactory = (device)=>new IOSAgent(device);
+        const playgroundServer = new PlaygroundServer(deviceFactory, agentFactory, staticDir);
         console.log("\uD83D\uDE80 Starting server...");
         const availablePlaygroundPort = await findAvailablePort(constants_PLAYGROUND_SERVER_PORT);
         if (availablePlaygroundPort !== constants_PLAYGROUND_SERVER_PORT) console.log(`\u{26A0}\u{FE0F}  Port ${constants_PLAYGROUND_SERVER_PORT} is busy, using port ${availablePlaygroundPort} instead`);

package/dist/es/index.mjs

@@ -355,11 +355,7 @@ class IOSDevice {
             }),
             defineActionKeyboardPress(async (param)=>{
                 const key = param.keyName;
-                if (Array.isArray(key)) {
-                    const keyToPress = key[key.length - 1];
-                    console.warn(`[iOS] Key combinations are not supported. Using last key: "${keyToPress}"`, 'Original input:', key);
-                    await this.pressKey(keyToPress);
-                } else await this.pressKey(key);
+                await this.pressKey(key);
             }),
             defineAction({
                 name: 'IOSHomeButton',

package/dist/lib/bin.js

@@ -11669,6 +11669,24 @@ var __webpack_exports__ = {};
             (0, external_node_fs_namespaceObject.writeFileSync)(tmpFile, context);
             return tmpFile;
         }
+        async recreateAgent() {
+            if (!this.pageFactory || !this.agentFactory) return void console.warn('Cannot recreate agent: factory functions not provided. Agent recreation is only available when using factory mode.');
+            console.log('Recreating agent to cancel current task...');
+            try {
+                if (this.agent && 'function' == typeof this.agent.destroy) await this.agent.destroy();
+                if (this.page && 'function' == typeof this.page.destroy) await this.page.destroy();
+            } catch (error) {
+                console.warn('Failed to destroy old agent/page:', error);
+            }
+            try {
+                this.page = await this.pageFactory();
+                this.agent = this.agentFactory(this.page);
+                console.log('Agent recreated successfully');
+            } catch (error) {
+                console.error('Failed to recreate agent:', error);
+                throw error;
+            }
+        }
         setupRoutes() {
             this._app.get('/status', async (req, res)=>{
                 res.send({
@@ -11745,7 +11763,12 @@ var __webpack_exports__ = {};
                 if (!type) return res.status(400).json({
                     error: 'type is required'
                 });
+                if (this.currentTaskId) return res.status(409).json({
+                    error: 'Another task is already running',
+                    currentTaskId: this.currentTaskId
+                });
                 if (requestId) {
+                    this.currentTaskId = requestId;
                     this.taskProgressTips[requestId] = '';
                     this.agent.onTaskStartTip = (tip)=>{
                         this.taskProgressTips[requestId] = tip;
@@ -11787,7 +11810,10 @@ var __webpack_exports__ = {};
                 const timeCost = Date.now() - startTime;
                 if (response.error) console.error(`handle request failed after ${timeCost}ms: requestId: ${requestId}, ${response.error}`);
                 else console.log(`handle request done after ${timeCost}ms: requestId: ${requestId}`);
-                if (requestId) delete this.taskProgressTips[requestId];
+                if (requestId) {
+                    delete this.taskProgressTips[requestId];
+                    if (this.currentTaskId === requestId) this.currentTaskId = null;
+                }
             });
             this._app.post('/cancel/:requestId', async (req, res)=>{
                 const { requestId } = req.params;
@@ -11795,9 +11821,17 @@ var __webpack_exports__ = {};
                     error: 'requestId is required'
                 });
                 try {
-                    if (this.taskProgressTips[requestId]) delete this.taskProgressTips[requestId];
+                    if (this.currentTaskId !== requestId) return res.json({
+                        status: 'not_found',
+                        message: 'Task not found or already completed'
+                    });
+                    console.log(`Cancelling task: ${requestId}`);
+                    await this.recreateAgent();
+                    delete this.taskProgressTips[requestId];
+                    this.currentTaskId = null;
                     res.json({
-                        status: 'cancelled'
+                        status: 'cancelled',
+                        message: 'Task cancelled successfully by recreating agent'
                     });
                 } catch (error) {
                     const errorMessage = error instanceof Error ? error.message : 'Unknown error';
@@ -11897,6 +11931,12 @@ var __webpack_exports__ = {};
             }
         }
         async launch(port) {
+            if (this.pageFactory && this.agentFactory) {
+                console.log('Initializing page and agent from factory functions...');
+                this.page = await this.pageFactory();
+                this.agent = this.agentFactory(this.page);
+                console.log('Page and agent initialized successfully');
+            }
             this.initializeApp();
             this.port = port || defaultPort;
             return new Promise((resolve)=>{
@@ -11936,13 +11976,28 @@ var __webpack_exports__ = {};
             _define_property(this, "taskProgressTips", void 0);
             _define_property(this, "id", void 0);
             _define_property(this, "_initialized", false);
+            _define_property(this, "pageFactory", void 0);
+            _define_property(this, "agentFactory", void 0);
+            _define_property(this, "currentTaskId", null);
             this._app = express_default()();
             this.tmpDir = (0, utils_namespaceObject.getTmpDir)();
-            this.page = page;
-            this.agent = agent;
             this.staticPath = staticPath;
             this.taskProgressTips = {};
             this.id = id || (0, shared_utils_namespaceObject.uuid)();
+            if ('function' == typeof page) {
+                this.pageFactory = page;
+                this.page = null;
+            } else {
+                this.page = page;
+                this.pageFactory = null;
+            }
+            if ('function' == typeof agent) {
+                this.agentFactory = agent;
+                this.agent = null;
+            } else {
+                this.agent = agent;
+                this.agentFactory = null;
+            }
         }
     }
     const external_node_child_process_namespaceObject = require("node:child_process");
@@ -12299,11 +12354,7 @@ var __webpack_exports__ = {};
                 }),
                 (0, device_namespaceObject.defineActionKeyboardPress)(async (param)=>{
                     const key = param.keyName;
-                    if (Array.isArray(key)) {
-                        const keyToPress = key[key.length - 1];
-                        console.warn(`[iOS] Key combinations are not supported. Using last key: "${keyToPress}"`, 'Original input:', key);
-                        await this.pressKey(keyToPress);
-                    } else await this.pressKey(key);
+                    await this.pressKey(key);
                 }),
                 (0, device_namespaceObject.defineAction)({
                     name: 'IOSHomeButton',
@@ -12860,17 +12911,14 @@ ScreenSize: ${size.width}x${size.height} (DPR: ${size.scale})
                 host: 'localhost',
                 port: constants_namespaceObject.DEFAULT_WDA_PORT
             };
-            let device;
-            let agent;
             let connected = false;
             while(!connected)try {
-                device = new device_IOSDevice({
+                const device = new device_IOSDevice({
                     wdaHost: wdaConfig.host,
                     wdaPort: wdaConfig.port
                 });
                 console.log(`\u{1F50C} Connecting to WebDriverAgent at ${wdaConfig.host}:${wdaConfig.port}...`);
                 await device.connect();
-                agent = new IOSAgent(device);
                 connected = true;
                 const deviceInfo = await device.getConnectedDeviceInfo();
                 console.log("\u2705 Connected to WebDriverAgent successfully!");
@@ -12922,7 +12970,16 @@ ScreenSize: ${size.width}x${size.height} (DPR: ${size.scale})
 `);
                 else if ('configure' === action) wdaConfig = await configureWebDriverAgent();
             }
-            const playgroundServer = new PlaygroundServer(device, agent, staticDir);
+            const deviceFactory = async ()=>{
+                const newDevice = new device_IOSDevice({
+                    wdaHost: wdaConfig.host,
+                    wdaPort: wdaConfig.port
+                });
+                await newDevice.connect();
+                return newDevice;
+            };
+            const agentFactory = (device)=>new IOSAgent(device);
+            const playgroundServer = new PlaygroundServer(deviceFactory, agentFactory, staticDir);
             console.log("\uD83D\uDE80 Starting server...");
             const availablePlaygroundPort = await findAvailablePort(constants_namespaceObject.PLAYGROUND_SERVER_PORT);
             if (availablePlaygroundPort !== constants_namespaceObject.PLAYGROUND_SERVER_PORT) console.log(`\u{26A0}\u{FE0F}  Port ${constants_namespaceObject.PLAYGROUND_SERVER_PORT} is busy, using port ${availablePlaygroundPort} instead`);

package/dist/lib/index.js

@@ -393,11 +393,7 @@ class IOSDevice {
             }),
             (0, device_namespaceObject.defineActionKeyboardPress)(async (param)=>{
                 const key = param.keyName;
-                if (Array.isArray(key)) {
-                    const keyToPress = key[key.length - 1];
-                    console.warn(`[iOS] Key combinations are not supported. Using last key: "${keyToPress}"`, 'Original input:', key);
-                    await this.pressKey(keyToPress);
-                } else await this.pressKey(key);
+                await this.pressKey(key);
             }),
             (0, device_namespaceObject.defineAction)({
                 name: 'IOSHomeButton',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/ios",
-  "version": "0.30.6-beta-20251021121032.0",
+  "version": "0.30.6-beta-20251022061949.0",
   "description": "iOS automation library for Midscene",
   "keywords": [
     "iOS UI automation",
@@ -38,9 +38,9 @@
   "dependencies": {
     "@inquirer/prompts": "^7.8.6",
     "open": "10.1.0",
-    "@midscene/core": "0.30.6-beta-20251021121032.0",
-    "@midscene/webdriver": "0.30.6-beta-20251021121032.0",
-    "@midscene/shared": "0.30.6-beta-20251021121032.0"
+    "@midscene/shared": "0.30.6-beta-20251022061949.0",
+    "@midscene/core": "0.30.6-beta-20251022061949.0",
+    "@midscene/webdriver": "0.30.6-beta-20251022061949.0"
   },
   "devDependencies": {
     "@rslib/core": "^0.11.2",
@@ -49,7 +49,7 @@
     "typescript": "^5.8.3",
     "tsx": "^4.19.2",
     "vitest": "3.0.5",
-    "@midscene/playground": "0.30.6-beta-20251021121032.0"
+    "@midscene/playground": "0.30.6-beta-20251022061949.0"
   },
   "license": "MIT",
   "scripts": {

package/static/index.html

@@ -1 +1 @@
-<!doctype html><html><head><link rel="icon" href="/favicon.ico"><title>Midscene Playground</title><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><script defer src="/static/js/lib-react.f566a9ed.js"></script><script defer src="/static/js/657.5a5fe47b.js"></script><script defer src="/static/js/index.b9367b66.js"></script><link href="/static/css/index.44466eb4.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html><head><link rel="icon" href="/favicon.ico"><title>Midscene Playground</title><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><script defer src="/static/js/lib-react.f566a9ed.js"></script><script defer src="/static/js/657.5a5fe47b.js"></script><script defer src="/static/js/index.5c3c93e4.js"></script><link href="/static/css/index.44466eb4.css" rel="stylesheet"></head><body><div id="root"></div></body></html>