@midscene/cli 0.14.3 → 0.14.4-beta-20250415065130.0

package/dist/es/index.js

@@ -13955,7 +13955,7 @@ Usage: $0 [options] <path-to-yaml-script-file-or-directory>`
       default: false,
       description: "Keep the browser window open after the script finishes. This is useful when debugging, but will consume more resources"
     }
-  }).version("version", "Show version number", "0.14.3").help().wrap(yargs_default().terminalWidth());
+  }).version("version", "Show version number", "0.14.4-beta-20250415065130.0").help().wrap(yargs_default().terminalWidth());
   const argv = await args.argv;
   return {
     path: argv._[0],
@@ -14600,6 +14600,7 @@ function getRenderedRowCount(contents, stream2) {
 
 // src/yaml-runner.ts
 import assert from "assert";
+import { agentFromAdbDevice } from "@midscene/android";
 import { AgentOverChromeBridge } from "@midscene/web/bridge-mode";
 import { puppeteerAgentForTarget } from "@midscene/web/puppeteer";
 var launchServer = async (dir) => {
@@ -14626,60 +14627,86 @@ async function playYamlFiles(files, options) {
     };
     const player = new ScriptPlayer(script, async (target) => {
       const freeFn = [];
-      let localServer;
-      let urlToVisit;
-      if (target.serve) {
-        assert(typeof target.url === "string", "url is required in serve mode");
-        localServer = await launchServer(target.serve);
-        const serverAddress = localServer.server.address();
-        freeFn.push({
-          name: "local_server",
-          fn: () => localServer?.server.close()
+      const webTarget = script.web || script.target;
+      if (webTarget) {
+        if (script.target) {
+          console.warn(
+            "target is deprecated, please use web instead. See https://midscenejs.com/automate-with-scripts-in-yaml for more information. Sorry for the inconvenience."
+          );
+        }
+        let localServer;
+        let urlToVisit;
+        if (webTarget.serve) {
+          assert(
+            typeof webTarget.url === "string",
+            "url is required in serve mode"
+          );
+          localServer = await launchServer(webTarget.serve);
+          const serverAddress = localServer.server.address();
+          freeFn.push({
+            name: "local_server",
+            fn: () => localServer?.server.close()
+          });
+          if (webTarget.url.startsWith("/")) {
+            urlToVisit = `http://${serverAddress?.address}:${serverAddress?.port}${webTarget.url}`;
+          } else {
+            urlToVisit = `http://${serverAddress?.address}:${serverAddress?.port}/${webTarget.url}`;
+          }
+          webTarget.url = urlToVisit;
+        }
+        if (!webTarget.bridgeMode) {
+          const { agent: agent2, freeFn: newFreeFn } = await puppeteerAgentForTarget(
+            webTarget,
+            preference
+          );
+          freeFn.push(...newFreeFn);
+          return { agent: agent2, freeFn };
+        }
+        assert(
+          webTarget.bridgeMode === "newTabWithUrl" || webTarget.bridgeMode === "currentTab",
+          `bridgeMode config value must be either "newTabWithUrl" or "currentTab", but got ${webTarget.bridgeMode}`
+        );
+        if (webTarget.userAgent || webTarget.viewportWidth || webTarget.viewportHeight || webTarget.viewportScale || webTarget.waitForNetworkIdle || webTarget.cookie) {
+          console.warn(
+            "puppeteer options (userAgent, viewportWidth, viewportHeight, viewportScale, waitForNetworkIdle, cookie) are not supported in bridge mode. They will be ignored."
+          );
+        }
+        const agent = new AgentOverChromeBridge({
+          closeNewTabsAfterDisconnect: webTarget.closeNewTabsAfterDisconnect,
+          cacheId: fileName
         });
-        if (target.url.startsWith("/")) {
-          urlToVisit = `http://${serverAddress?.address}:${serverAddress?.port}${target.url}`;
+        if (webTarget.bridgeMode === "newTabWithUrl") {
+          await agent.connectNewTabWithUrl(webTarget.url);
         } else {
-          urlToVisit = `http://${serverAddress?.address}:${serverAddress?.port}/${target.url}`;
+          if (webTarget.url) {
+            console.warn(
+              'url will be ignored in bridge mode with "currentTab"'
+            );
+          }
+          await agent.connectCurrentTab();
         }
-        target.url = urlToVisit;
+        freeFn.push({
+          name: "destroy_agent_over_chrome_bridge",
+          fn: () => agent.destroy()
+        });
+        return {
+          agent,
+          freeFn
+        };
       }
-      if (!target.bridgeMode) {
-        const { agent: agent2, freeFn: newFreeFn } = await puppeteerAgentForTarget(
-          target,
-          preference
-        );
-        freeFn.push(...newFreeFn);
-        return { agent: agent2, freeFn };
+      if (script.android) {
+        const androidTarget = script.android;
+        const agent = await agentFromAdbDevice(androidTarget.deviceId);
+        await agent.launch(androidTarget.launch);
+        freeFn.push({
+          name: "destroy_android_agent",
+          fn: () => agent.destroy()
+        });
+        return { agent, freeFn };
       }
-      assert(
-        target.bridgeMode === "newTabWithUrl" || target.bridgeMode === "currentTab",
-        `bridgeMode config value must be either "newTabWithUrl" or "currentTab", but got ${target.bridgeMode}`
+      throw new Error(
+        'No valid target configuration found in the yaml script, should be either "web" or "android"'
       );
-      if (target.userAgent || target.viewportWidth || target.viewportHeight || target.viewportScale || target.waitForNetworkIdle || target.cookie) {
-        console.warn(
-          "puppeteer options (userAgent, viewportWidth, viewportHeight, viewportScale, waitForNetworkIdle, cookie) are not supported in bridge mode. They will be ignored."
-        );
-      }
-      const agent = new AgentOverChromeBridge({
-        closeNewTabsAfterDisconnect: target.closeNewTabsAfterDisconnect,
-        cacheId: fileName
-      });
-      if (target.bridgeMode === "newTabWithUrl") {
-        await agent.connectNewTabWithUrl(target.url);
-      } else {
-        if (target.url) {
-          console.warn('url will be ignored in bridge mode with "currentTab"');
-        }
-        await agent.connectCurrentTab();
-      }
-      freeFn.push({
-        name: "destroy_agent_over_chrome_bridge",
-        fn: () => agent.destroy()
-      });
-      return {
-        agent,
-        freeFn
-      };
     });
     fileContextList.push({ file, player });
   }