@hangox/mg-cli 1.0.5 → 1.0.7

package/dist/cli.js

@@ -18,9 +18,16 @@ import { dirname, resolve, isAbsolute } from "path";
 // src/shared/constants.ts
 import { homedir } from "os";
 import { join } from "path";
-var DEFAULT_PORT = 9527;
-var PORT_RANGE_START = 9527;
-var PORT_RANGE_END = 9536;
+var IS_DEV_MODE = process.env.MG_DEV_MODE === "true";
+var PROD_DEFAULT_PORT = 9527;
+var PROD_PORT_RANGE_START = 9527;
+var PROD_PORT_RANGE_END = 9536;
+var DEV_DEFAULT_PORT = 19527;
+var DEV_PORT_RANGE_START = 19527;
+var DEV_PORT_RANGE_END = 19536;
+var DEFAULT_PORT = IS_DEV_MODE ? DEV_DEFAULT_PORT : PROD_DEFAULT_PORT;
+var PORT_RANGE_START = IS_DEV_MODE ? DEV_PORT_RANGE_START : PROD_PORT_RANGE_START;
+var PORT_RANGE_END = IS_DEV_MODE ? DEV_PORT_RANGE_END : PROD_PORT_RANGE_END;
 var PORT_SCAN_TIMEOUT = 500;
 var CONFIG_DIR = join(homedir(), ".mg-plugin");
 var SERVER_INFO_FILE = join(CONFIG_DIR, "server.json");
@@ -96,27 +103,44 @@ function parseMgpLink(link) {
     const queryString = urlPart.slice(questionMarkIndex + 1);
     const params = new URLSearchParams(queryString);
     const encodedNodeId = params.get("nodeId");
-    if (!encodedNodeId) {
+    const encodedPageId = params.get("pageId");
+    if (!encodedNodeId && !encodedPageId) {
       return null;
     }
-    const nodeId = decodeURIComponent(encodedNodeId);
-    if (!/^(\d+:\d+)(\/\d+:\d+)*$/.test(nodeId)) {
+    if (encodedNodeId && encodedPageId) {
       return null;
     }
-    const encodedNodePath = params.get("nodePath");
-    let nodePath;
-    if (encodedNodePath) {
-      const decodedNodePath = decodeURIComponent(encodedNodePath);
-      nodePath = decodedNodePath.split("/").filter(Boolean);
-      if (!nodePath.every((segment) => /^\d+:\d+$/.test(segment))) {
+    if (encodedNodeId) {
+      const nodeId = decodeURIComponent(encodedNodeId);
+      if (!/^(\d+:\d+)(\/\d+:\d+)*$/.test(nodeId)) {
         return null;
       }
+      const encodedNodePath = params.get("nodePath");
+      let nodePath;
+      if (encodedNodePath) {
+        const decodedNodePath = decodeURIComponent(encodedNodePath);
+        nodePath = decodedNodePath.split("/").filter(Boolean);
+        if (!nodePath.every((segment) => /^\d+:\d+$/.test(segment))) {
+          return null;
+        }
+      }
+      return {
+        pageUrl,
+        nodeId,
+        nodePath
+      };
     }
-    return {
-      pageUrl,
-      nodeId,
-      nodePath
-    };
+    if (encodedPageId) {
+      const pageId = decodeURIComponent(encodedPageId);
+      if (!/^\d+:\d+$/.test(pageId)) {
+        return null;
+      }
+      return {
+        pageUrl,
+        pageId
+      };
+    }
+    return null;
   } catch {
     return null;
   }
@@ -346,7 +370,7 @@ var ErrorNames = {
 var ErrorMessages = {
   ["E001" /* CONNECTION_FAILED */]: "\u65E0\u6CD5\u8FDE\u63A5\u5230 MG Server",
   ["E002" /* CONNECTION_TIMEOUT */]: "\u8FDE\u63A5\u8D85\u65F6",
-  ["E003" /* NO_PAGE_CONNECTED */]: "\u6CA1\u6709 MasterGo \u9875\u9762\u8FDE\u63A5\u5230 Server",
+  ["E003" /* NO_PAGE_CONNECTED */]: "\u6CA1\u6709 MasterGo \u9875\u9762\u8FDE\u63A5\u5230 Server\u3002\u8BF7\u5B89\u88C5 MG Plugin \u6D4F\u89C8\u5668\u6269\u5C55: https://chromewebstore.google.com/detail/mg-plugin/ddhihanlpcdneicohnglnaliefnkaeja",
   ["E004" /* PAGE_NOT_FOUND */]: "\u672A\u627E\u5230\u5339\u914D\u7684\u9875\u9762",
   ["E005" /* NODE_NOT_FOUND */]: "\u8282\u70B9\u4E0D\u5B58\u5728",
   ["E006" /* NO_SELECTION */]: "\u6CA1\u6709\u9009\u4E2D\u4EFB\u4F55\u8282\u70B9",
@@ -470,7 +494,7 @@ function createLogger(options) {
 // src/server/connection-manager.ts
 var ConnectionManager = class {
   logger;
-  /** Provider 连接（按页面 URL 索引） */
+  /** Provider 连接（按页面 URL 索引，支持同 URL 多个连接） */
   providers = /* @__PURE__ */ new Map();
   /** Consumer 连接 */
   consumers = /* @__PURE__ */ new Map();
@@ -506,7 +530,8 @@ var ConnectionManager = class {
    */
   checkHeartbeats() {
     const now = Date.now();
-    for (const [id, ws] of this.allConnections) {
+    const entries = Array.from(this.allConnections.entries());
+    for (const [id, ws] of entries) {
       const lastActive = ws.connectionInfo.lastActiveAt.getTime();
       const elapsed = now - lastActive;
       if (elapsed > HEARTBEAT_TIMEOUT) {
@@ -536,14 +561,10 @@ var ConnectionManager = class {
     managedWs.isAlive = true;
     this.allConnections.set(connectionId, managedWs);
     if (type === "provider" /* PROVIDER */ && pageUrl) {
-      const existing = this.providers.get(pageUrl);
-      if (existing) {
-        this.logger.info(`\u9875\u9762 ${pageUrl} \u5DF2\u6709\u8FDE\u63A5\uFF0C\u66FF\u6362\u4E3A\u65B0\u8FDE\u63A5`);
-        this.removeConnection(existing);
-        existing.close();
-      }
-      this.providers.set(pageUrl, managedWs);
-      this.logger.info(`Provider \u8FDE\u63A5: ${pageUrl}`);
+      const existing = this.providers.get(pageUrl) || [];
+      existing.push(managedWs);
+      this.providers.set(pageUrl, existing);
+      this.logger.info(`Provider \u8FDE\u63A5: ${pageUrl} (\u5F53\u524D\u8BE5\u9875\u9762\u8FDE\u63A5\u6570: ${existing.length})`);
     } else if (type === "consumer" /* CONSUMER */) {
       this.consumers.set(connectionId, managedWs);
       this.logger.info(`Consumer \u8FDE\u63A5: ${connectionId}`);
@@ -557,8 +578,17 @@ var ConnectionManager = class {
     const { connectionId, connectionInfo } = ws;
     this.allConnections.delete(connectionId);
     if (connectionInfo.type === "provider" /* PROVIDER */ && connectionInfo.pageUrl) {
-      this.providers.delete(connectionInfo.pageUrl);
-      this.logger.info(`Provider \u65AD\u5F00: ${connectionInfo.pageUrl}`);
+      const connections = this.providers.get(connectionInfo.pageUrl);
+      if (connections) {
+        const index = connections.findIndex((c) => c.connectionId === connectionId);
+        if (index !== -1) {
+          connections.splice(index, 1);
+          if (connections.length === 0) {
+            this.providers.delete(connectionInfo.pageUrl);
+          }
+        }
+      }
+      this.logger.info(`Provider \u65AD\u5F00: ${connectionInfo.pageUrl} (\u8FDE\u63A5ID: ${connectionId})`);
     } else if (connectionInfo.type === "consumer" /* CONSUMER */) {
       this.consumers.delete(connectionId);
       this.logger.info(`Consumer \u65AD\u5F00: ${connectionId}`);
@@ -572,31 +602,48 @@ var ConnectionManager = class {
     ws.isAlive = true;
   }
   /**
-   * 根据页面 URL 查找 Provider
+   * 根据页面 URL 查找 Provider（返回第一个可用的连接）
    */
   findProviderByPageUrl(pageUrl) {
-    return this.providers.get(pageUrl);
+    const connections = this.providers.get(pageUrl);
+    return connections?.[0];
   }
   /**
    * 获取第一个可用的 Provider
    */
   getFirstProvider() {
-    const iterator = this.providers.values();
-    const first = iterator.next();
-    return first.value;
+    const allConnections = Array.from(this.providers.values());
+    for (const connections of allConnections) {
+      if (connections.length > 0) {
+        return connections[0];
+      }
+    }
+    return void 0;
   }
   /**
    * 获取所有 Provider 信息
    */
   getAllProviders() {
-    return Array.from(this.providers.values()).map((ws) => ws.connectionInfo);
+    const result = [];
+    const allConnections = Array.from(this.providers.values());
+    for (const connections of allConnections) {
+      for (const ws of connections) {
+        result.push(ws.connectionInfo);
+      }
+    }
+    return result;
   }
   /**
    * 获取连接统计
    */
   getStats() {
+    let providerCount = 0;
+    const allConnections = Array.from(this.providers.values());
+    for (const connections of allConnections) {
+      providerCount += connections.length;
+    }
     return {
-      providers: this.providers.size,
+      providers: providerCount,
       consumers: this.consumers.size,
       total: this.allConnections.size
     };
@@ -612,7 +659,8 @@ var ConnectionManager = class {
    */
   closeAll() {
     this.stopHeartbeatCheck();
-    for (const ws of this.allConnections.values()) {
+    const allWs = Array.from(this.allConnections.values());
+    for (const ws of allWs) {
       ws.close();
     }
     this.providers.clear();
@@ -648,7 +696,7 @@ var RequestHandler = class {
     } else {
       provider = this.connectionManager.getFirstProvider();
       if (!provider) {
-        this.sendError(consumer, requestId, "E003" /* NO_PAGE_CONNECTED */, "\u6CA1\u6709\u9875\u9762\u8FDE\u63A5\u5230 Server");
+        this.sendError(consumer, requestId, "E003" /* NO_PAGE_CONNECTED */, ErrorMessages["E003" /* NO_PAGE_CONNECTED */]);
         return;
       }
     }
@@ -766,24 +814,11 @@ function getVersion() {
   try {
     const currentFile = fileURLToPath(import.meta.url);
     const currentDir = dirname3(currentFile);
-    const versionFilePaths = [
-      join2(currentDir, "..", "VERSION"),
-      // dist/xxx.js -> ../VERSION
-      join2(currentDir, "..", "..", "VERSION")
-      // src/shared/version.ts -> ../../VERSION
-    ];
-    for (const versionFilePath of versionFilePaths) {
-      if (existsSync3(versionFilePath)) {
-        const version = readFileSync2(versionFilePath, "utf-8").trim();
-        if (version) {
-          cachedVersion = version;
-          return cachedVersion;
-        }
-      }
-    }
     const packageJsonPaths = [
       join2(currentDir, "..", "package.json"),
+      // dist/xxx.js -> ../package.json
       join2(currentDir, "..", "..", "package.json")
+      // src/shared/version.ts -> ../../package.json
     ];
     for (const packageJsonPath of packageJsonPaths) {
       if (existsSync3(packageJsonPath)) {
@@ -801,7 +836,11 @@ function getVersion() {
     return cachedVersion;
   }
 }
+var DEV_VERSION = "9.9.9";
 function isVersionMatch(version1, version2) {
+  if (version1 === DEV_VERSION || version2 === DEV_VERSION) {
+    return true;
+  }
   return version1 === version2;
 }
 
@@ -1472,7 +1511,8 @@ function createServerCommand() {
         } else {
           console.log(``);
           console.log(`\u5DF2\u8FDE\u63A5\u9875\u9762: \u65E0`);
-          console.log(`\u63D0\u793A: \u8BF7\u5728 Chrome \u4E2D\u6253\u5F00 MasterGo \u9875\u9762\u5E76\u786E\u4FDD\u63D2\u4EF6\u5DF2\u542F\u7528`);
+          console.log(`\u63D0\u793A: \u8BF7\u5B89\u88C5 MG Plugin \u6D4F\u89C8\u5668\u6269\u5C55\u5E76\u5728 Chrome \u4E2D\u6253\u5F00 MasterGo \u9875\u9762`);
+          console.log(`      \u63D2\u4EF6\u5730\u5740: https://chromewebstore.google.com/detail/mg-plugin/ddhihanlpcdneicohnglnaliefnkaeja`);
         }
       } catch {
         console.log("MG Server \u72B6\u6001: \u8FD0\u884C\u4E2D \u2713");
@@ -1551,7 +1591,7 @@ import { writeFileSync as writeFileSync3 } from "fs";
 import { resolve as resolve3, dirname as dirname6 } from "path";
 import { mkdirSync as mkdirSync4 } from "fs";
 function createGetNodeByLinkCommand() {
-  return new Command3("get_node_by_link").description("\u89E3\u6790 mgp:// \u534F\u8BAE\u94FE\u63A5\u5E76\u83B7\u53D6\u8282\u70B9\u4FE1\u606F").requiredOption("--link <url>", "mgp:// \u534F\u8BAE\u94FE\u63A5").requiredOption("--output <path>", "\u8F93\u51FA JSON \u6587\u4EF6\u8DEF\u5F84").option("--maxDepth <number>", "\u904D\u5386\u6DF1\u5EA6", "1").option("--includeInvisible", "\u5305\u542B\u4E0D\u53EF\u89C1\u8282\u70B9", false).option("--raw", "\u4FDD\u7559\u539F\u59CB\u6570\u636E\uFF0C\u4E0D\u7CBE\u7B80\u9ED8\u8BA4\u503C\u5B57\u6BB5", false).option("--no-auto-start", "\u7981\u7528\u81EA\u52A8\u542F\u52A8 Server").option("--no-retry", "\u7981\u7528\u81EA\u52A8\u91CD\u8BD5").action(async (options) => {
+  return new Command3("get_node_by_link").description("\u89E3\u6790 mgp:// \u534F\u8BAE\u94FE\u63A5\u5E76\u83B7\u53D6\u8282\u70B9/\u9875\u9762\u4FE1\u606F").requiredOption("--link <url>", "mgp:// \u534F\u8BAE\u94FE\u63A5\uFF08\u652F\u6301 nodeId \u548C pageId\uFF09").requiredOption("--output <path>", "\u8F93\u51FA JSON \u6587\u4EF6\u8DEF\u5F84").option("--maxDepth <number>", "\u904D\u5386\u6DF1\u5EA6", "1").option("--includeInvisible", "\u5305\u542B\u4E0D\u53EF\u89C1\u8282\u70B9", false).option("--raw", "\u4FDD\u7559\u539F\u59CB\u6570\u636E\uFF0C\u4E0D\u7CBE\u7B80\u9ED8\u8BA4\u503C\u5B57\u6BB5", false).option("--no-auto-start", "\u7981\u7528\u81EA\u52A8\u542F\u52A8 Server").option("--no-retry", "\u7981\u7528\u81EA\u52A8\u91CD\u8BD5").action(async (options) => {
     await handleGetNodeByLink(options);
   });
 }
@@ -1560,26 +1600,43 @@ async function handleGetNodeByLink(options) {
   if (!parsed) {
     console.error(`\u9519\u8BEF [${"E010" /* INVALID_LINK */}]: \u65E0\u6548\u7684 mgp:// \u94FE\u63A5\u683C\u5F0F`);
     console.error(`\u63D0\u4F9B\u7684\u94FE\u63A5: ${options.link}`);
-    console.error(`\u671F\u671B\u683C\u5F0F: mgp://[mastergo_page_url]/nodeId`);
+    console.error(`\u671F\u671B\u683C\u5F0F:`);
+    console.error(`  \u8282\u70B9\u94FE\u63A5: mgp://[mastergo_page_url]?nodeId=[\u8282\u70B9ID]`);
+    console.error(`  \u9875\u9762\u94FE\u63A5: mgp://[mastergo_page_url]?pageId=[\u9875\u9762ID]`);
     process.exit(1);
   }
-  const { pageUrl, nodeId } = parsed;
+  const { pageUrl, nodeId, pageId } = parsed;
+  const isPageLink = !!pageId;
   const client = new MGClient({
     noAutoStart: options.noAutoStart,
     noRetry: options.noRetry
   });
   try {
     await client.connect();
-    const params = {
-      nodeId,
-      maxDepth: parseInt(options.maxDepth || "1", 10),
-      includeInvisible: options.includeInvisible || false
-    };
-    const data = await client.requestWithRetry(
-      "get_node_by_id" /* GET_NODE_BY_ID */,
-      params,
-      pageUrl
-    );
+    let data;
+    if (isPageLink) {
+      const params = {
+        pageId,
+        maxDepth: parseInt(options.maxDepth || "1", 10),
+        includeInvisible: options.includeInvisible || false
+      };
+      data = await client.requestWithRetry(
+        "get_page_by_id" /* GET_PAGE_BY_ID */,
+        params,
+        pageUrl
+      );
+    } else {
+      const params = {
+        nodeId,
+        maxDepth: parseInt(options.maxDepth || "1", 10),
+        includeInvisible: options.includeInvisible || false
+      };
+      data = await client.requestWithRetry(
+        "get_node_by_id" /* GET_NODE_BY_ID */,
+        params,
+        pageUrl
+      );
+    }
     const outputData = options.raw ? data : trimNodeDefaults(data);
     const outputPath = resolve3(options.output);
     const outputDir = dirname6(outputPath);
@@ -1591,9 +1648,15 @@ async function handleGetNodeByLink(options) {
     console.log(`\u6587\u4EF6\u8DEF\u5F84: ${outputPath}`);
     console.log(`Link: ${options.link}`);
     console.log(`\u9875\u9762 URL: ${pageUrl}`);
-    console.log(`\u8282\u70B9 ID: ${nodeId}`);
+    if (isPageLink) {
+      console.log(`\u9875\u9762 ID: ${pageId}`);
+      console.log(`\u7C7B\u578B: \u9875\u9762`);
+    } else {
+      console.log(`\u8282\u70B9 ID: ${nodeId}`);
+      console.log(`\u7C7B\u578B: \u8282\u70B9`);
+    }
     console.log(`\u6570\u636E\u5927\u5C0F: ${size.toLocaleString()} \u5B57\u7B26 (\u7EA6 ${sizeKB} KB)`);
-    console.log(`\u8282\u70B9\u6DF1\u5EA6: ${params.maxDepth}`);
+    console.log(`\u904D\u5386\u6DF1\u5EA6: ${options.maxDepth || "1"}`);
     if (!options.raw) {
       console.log(`\u6570\u636E\u6A21\u5F0F: \u7CBE\u7B80\u6A21\u5F0F (\u4F7F\u7528 --raw \u83B7\u53D6\u5B8C\u6574\u6570\u636E)`);
     }
@@ -1657,18 +1720,19 @@ async function handleGetAllNodes(options) {
 
 // src/cli/commands/export-image.ts
 import { Command as Command5 } from "commander";
-import { writeFileSync as writeFileSync5 } from "fs";
-import { resolve as resolve5, dirname as dirname8, extname } from "path";
+import { writeFileSync as writeFileSync5, unlinkSync as unlinkSync2 } from "fs";
+import { resolve as resolve5, dirname as dirname8, extname, basename } from "path";
 import { mkdirSync as mkdirSync6 } from "fs";
 import { tmpdir } from "os";
+import { vdConvert } from "vd-tool";
 function createExportImageCommand() {
-  return new Command5("export_image").description("\u5BFC\u51FA MasterGo \u8282\u70B9\u4E3A\u56FE\u7247\u6587\u4EF6\u3002\u5F3A\u70C8\u5EFA\u8BAE\u6307\u5B9A --output\uFF0C\u5426\u5219\u4FDD\u5B58\u5230\u4E34\u65F6\u76EE\u5F55\u53EF\u80FD\u88AB\u7CFB\u7EDF\u6E05\u7406").option("--output <path>", "\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84\u3002\u5F3A\u70C8\u5EFA\u8BAE\u6307\u5B9A\uFF0C\u5426\u5219\u4FDD\u5B58\u5230\u7CFB\u7EDF\u4E34\u65F6\u76EE\u5F55\u53EF\u80FD\u88AB\u6E05\u7406").option("--link <mgp-link>", "mgp:// \u534F\u8BAE\u94FE\u63A5\u3002\u4E0E --nodeId/--domain/--fileId \u4E8C\u9009\u4E00").option("--nodeId <id>", "\u8282\u70B9 ID\uFF0C\u683C\u5F0F\u5982 123:456\u3002\u4E0E --domain/--fileId \u914D\u5408\u4F7F\u7528").option("--domain <domain>", "MasterGo \u57DF\u540D\uFF0C\u9ED8\u8BA4 mastergo.netease.com", "mastergo.netease.com").option("--fileId <id>", "\u6587\u4EF6 ID\uFF08\u7EAF\u6570\u5B57\uFF09\uFF0C\u4E0E --domain \u914D\u5408\u6307\u5B9A\u76EE\u6807\u9875\u9762").option("--format <type>", "\u5BFC\u51FA\u683C\u5F0F\uFF1APNG\uFF08\u65E0\u635F\u900F\u660E\uFF09\u3001JPG\uFF08\u6709\u635F\uFF09\u3001SVG\uFF08\u77E2\u91CF\uFF09\u3001PDF\u3001WEBP", "PNG").option("--scale <number>", "\u7F29\u653E\u500D\u7387\uFF08\u5982 1\u30012\u30013\uFF09\u3002\u4E0E width/height \u4E92\u65A5").option("--width <number>", "\u56FA\u5B9A\u5BBD\u5EA6\uFF08\u50CF\u7D20\uFF09\u3002\u4E0E scale/height \u4E92\u65A5").option("--height <number>", "\u56FA\u5B9A\u9AD8\u5EA6\uFF08\u50CF\u7D20\uFF09\u3002\u4E0E scale/width \u4E92\u65A5").option("--useAbsoluteBounds", "\u4F7F\u7528\u5B8C\u6574\u5C3A\u5BF8\u3002true: \u5305\u542B\u88AB\u88C1\u526A\u90E8\u5206\uFF0Cfalse: \u53EA\u5BFC\u51FA\u53EF\u89C1\u533A\u57DF", false).option("--no-use-render-bounds", "\u4E0D\u5305\u542B\u7279\u6548\u548C\u5916\u63CF\u8FB9\u3002\u9ED8\u8BA4\u5305\u542B\u9634\u5F71\u3001\u5916\u63CF\u8FB9\u7B49").option("--no-auto-start", "\u7981\u7528\u81EA\u52A8\u542F\u52A8 Server").option("--no-retry", "\u7981\u7528\u81EA\u52A8\u91CD\u8BD5").action(async (options) => {
+  return new Command5("export_image").description("\u5BFC\u51FA MasterGo \u8282\u70B9\u4E3A\u56FE\u7247\u6587\u4EF6\u3002\u5F3A\u70C8\u5EFA\u8BAE\u6307\u5B9A --output\uFF0C\u5426\u5219\u4FDD\u5B58\u5230\u4E34\u65F6\u76EE\u5F55\u53EF\u80FD\u88AB\u7CFB\u7EDF\u6E05\u7406").option("--output <path>", "\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84\u3002\u5F3A\u70C8\u5EFA\u8BAE\u6307\u5B9A\uFF0C\u5426\u5219\u4FDD\u5B58\u5230\u7CFB\u7EDF\u4E34\u65F6\u76EE\u5F55\u53EF\u80FD\u88AB\u6E05\u7406").option("--link <mgp-link>", "mgp:// \u534F\u8BAE\u94FE\u63A5\u3002\u4E0E --nodeId/--domain/--fileId \u4E8C\u9009\u4E00").option("--nodeId <id>", "\u8282\u70B9 ID\uFF0C\u683C\u5F0F\u5982 123:456\u3002\u4E0E --domain/--fileId \u914D\u5408\u4F7F\u7528").option("--domain <domain>", "MasterGo \u57DF\u540D\uFF0C\u9ED8\u8BA4 mastergo.netease.com", "mastergo.netease.com").option("--fileId <id>", "\u6587\u4EF6 ID\uFF08\u7EAF\u6570\u5B57\uFF09\uFF0C\u4E0E --domain \u914D\u5408\u6307\u5B9A\u76EE\u6807\u9875\u9762").option("--format <type>", "\u5BFC\u51FA\u683C\u5F0F\uFF1APNG\uFF08\u65E0\u635F\u900F\u660E\uFF09\u3001JPG\uFF08\u6709\u635F\uFF09\u3001SVG\uFF08\u77E2\u91CF\uFF09\u3001PDF\u3001WEBP\u3001VECTOR\uFF08Android VectorDrawable\uFF09", "PNG").option("--scale <number>", "\u7F29\u653E\u500D\u7387\uFF08\u5982 1\u30012\u30013\uFF09\u3002\u4E0E width/height \u4E92\u65A5").option("--width <number>", "\u56FA\u5B9A\u5BBD\u5EA6\uFF08\u50CF\u7D20\uFF09\u3002\u4E0E scale/height \u4E92\u65A5").option("--height <number>", "\u56FA\u5B9A\u9AD8\u5EA6\uFF08\u50CF\u7D20\uFF09\u3002\u4E0E scale/width \u4E92\u65A5").option("--useAbsoluteBounds", "\u4F7F\u7528\u5B8C\u6574\u5C3A\u5BF8\u3002true: \u5305\u542B\u88AB\u88C1\u526A\u90E8\u5206\uFF0Cfalse: \u53EA\u5BFC\u51FA\u53EF\u89C1\u533A\u57DF", false).option("--no-use-render-bounds", "\u4E0D\u5305\u542B\u7279\u6548\u548C\u5916\u63CF\u8FB9\u3002\u9ED8\u8BA4\u5305\u542B\u9634\u5F71\u3001\u5916\u63CF\u8FB9\u7B49").option("--no-auto-start", "\u7981\u7528\u81EA\u52A8\u542F\u52A8 Server").option("--no-retry", "\u7981\u7528\u81EA\u52A8\u91CD\u8BD5").action(async (options) => {
     await handleExportImage(options);
   });
 }
 async function handleExportImage(options) {
   const format = options.format?.toUpperCase() || "PNG";
-  const validFormats = ["PNG", "JPG", "SVG", "PDF", "WEBP"];
+  const validFormats = ["PNG", "JPG", "SVG", "PDF", "WEBP", "VECTOR"];
   if (!validFormats.includes(format)) {
     console.error(`\u9519\u8BEF: \u4E0D\u652F\u6301\u7684\u683C\u5F0F "${options.format}"`);
     console.error(`\u652F\u6301\u7684\u683C\u5F0F: ${validFormats.join(", ")}`);
@@ -1687,10 +1751,11 @@ async function handleExportImage(options) {
   let nodeId;
   if (options.link) {
     const linkInfo = parseMgpLink(options.link);
-    if (!linkInfo) {
+    if (!linkInfo || !linkInfo.nodeId) {
       console.error(`\u9519\u8BEF [${"E010" /* INVALID_LINK */}]: \u65E0\u6548\u7684 mgp:// \u94FE\u63A5\u683C\u5F0F`);
       console.error(`\u63D0\u4F9B\u7684\u94FE\u63A5: ${options.link}`);
       console.error(`\u671F\u671B\u683C\u5F0F: mgp://[mastergo_page_url]?nodeId=xxx`);
+      console.error(`\u6CE8\u610F: \u6B64\u547D\u4EE4\u4E0D\u652F\u6301\u9875\u9762\u94FE\u63A5 (pageId)\uFF0C\u8BF7\u4F7F\u7528\u8282\u70B9\u94FE\u63A5 (nodeId)`);
       process.exit(1);
     }
     pageUrl = linkInfo.pageUrl;
@@ -1710,8 +1775,10 @@ async function handleExportImage(options) {
   });
   try {
     await client.connect();
+    const isVectorFormat = format === "VECTOR";
+    const requestFormat = isVectorFormat ? "SVG" : format;
     const params = {
-      format,
+      format: requestFormat,
       useAbsoluteBounds: options.useAbsoluteBounds || false,
       useRenderBounds: options.useRenderBounds !== false
     };
@@ -1747,9 +1814,38 @@ async function handleExportImage(options) {
     const outputDir = dirname8(outputPath);
     mkdirSync6(outputDir, { recursive: true });
     const buffer = Buffer.from(response.data, "base64");
-    writeFileSync5(outputPath, buffer);
-    const sizeKB = (buffer.length / 1024).toFixed(2);
-    console.log(`\u6587\u4EF6\u8DEF\u5F84: ${outputPath}`);
+    let finalPath = outputPath;
+    let finalSize = buffer.length;
+    if (isVectorFormat) {
+      const tempSvgPath = resolve5(tmpdir(), `temp_${Date.now()}.svg`);
+      writeFileSync5(tempSvgPath, buffer);
+      try {
+        const vectorOutputDir = dirname8(outputPath);
+        const convertedPath = await convertSvgToVector(tempSvgPath, vectorOutputDir);
+        const expectedOutputName = basename(tempSvgPath, ".svg") + ".xml";
+        const expectedOutputPath = resolve5(vectorOutputDir, expectedOutputName);
+        if (expectedOutputPath !== outputPath) {
+          const { renameSync, existsSync: existsSync4 } = await import("fs");
+          if (existsSync4(expectedOutputPath)) {
+            renameSync(expectedOutputPath, outputPath);
+          } else if (existsSync4(convertedPath)) {
+            renameSync(convertedPath, outputPath);
+          }
+        }
+        const { statSync } = await import("fs");
+        finalSize = statSync(outputPath).size;
+        finalPath = outputPath;
+      } finally {
+        try {
+          unlinkSync2(tempSvgPath);
+        } catch {
+        }
+      }
+    } else {
+      writeFileSync5(outputPath, buffer);
+    }
+    const sizeKB = (finalSize / 1024).toFixed(2);
+    console.log(`\u6587\u4EF6\u8DEF\u5F84: ${finalPath}`);
     if (options.link) {
       console.log(`Link: ${options.link}`);
     }
@@ -1758,8 +1854,8 @@ async function handleExportImage(options) {
     } else {
       console.log("\u8282\u70B9 ID: (\u9009\u4E2D\u7684\u8282\u70B9)");
     }
-    console.log(`\u5BFC\u51FA\u683C\u5F0F: ${format}`);
-    console.log(`\u6587\u4EF6\u5927\u5C0F: ${buffer.length.toLocaleString()} \u5B57\u8282 (\u7EA6 ${sizeKB} KB)`);
+    console.log(`\u5BFC\u51FA\u683C\u5F0F: ${format}${isVectorFormat ? " (Android VectorDrawable)" : ""}`);
+    console.log(`\u6587\u4EF6\u5927\u5C0F: ${finalSize.toLocaleString()} \u5B57\u8282 (\u7EA6 ${sizeKB} KB)`);
   } catch (error) {
     if (error instanceof MGError) {
       console.error(`\u9519\u8BEF [${error.code}]: ${error.message}`);
@@ -1777,10 +1873,35 @@ function getExtension(format) {
     JPG: ".jpg",
     SVG: ".svg",
     PDF: ".pdf",
-    WEBP: ".webp"
+    WEBP: ".webp",
+    VECTOR: ".xml"
   };
   return extensions[format];
 }
+async function convertSvgToVector(svgPath, outputDir) {
+  try {
+    const result = await vdConvert(svgPath, {
+      outDir: outputDir
+    });
+    if (result.errors && result.errors.length > 0) {
+      throw new Error(`VectorDrawable \u8F6C\u6362\u5931\u8D25: ${result.errors.join(", ")}`);
+    }
+    if (result.warnings && result.warnings.length > 0) {
+      console.log(`\u8B66\u544A: ${result.warnings.join(", ")}`);
+    }
+    return result.output;
+  } catch (error) {
+    if (error instanceof Error) {
+      if (error.message.includes("ENOENT") || error.message.includes("java")) {
+        throw new Error(
+          "VectorDrawable \u8F6C\u6362\u9700\u8981 Java 8 \u6216\u66F4\u9AD8\u7248\u672C\u3002\n\u8BF7\u5B89\u88C5 Java: https://adoptium.net/ \u6216 brew install openjdk"
+        );
+      }
+      throw error;
+    }
+    throw new Error(`VectorDrawable \u8F6C\u6362\u5931\u8D25: ${error}`);
+  }
+}
 
 // src/cli/commands/execute-code.ts
 import { Command as Command6 } from "commander";
@@ -1800,7 +1921,7 @@ async function handleExecuteCode(code, options) {
     if (!parsed) {
       console.error(`\u9519\u8BEF [${"E010" /* INVALID_LINK */}]: \u65E0\u6548\u7684 mgp:// \u94FE\u63A5\u683C\u5F0F`);
       console.error(`\u63D0\u4F9B\u7684\u94FE\u63A5: ${options.link}`);
-      console.error(`\u671F\u671B\u683C\u5F0F: mgp://[mastergo_page_url]?nodeId=xxx`);
+      console.error(`\u671F\u671B\u683C\u5F0F: mgp://[mastergo_page_url]?nodeId=xxx \u6216 mgp://[mastergo_page_url]?pageId=xxx`);
       process.exit(1);
     }
     pageUrl = parsed.pageUrl;
@@ -1905,7 +2026,7 @@ import { writeFileSync as writeFileSync7 } from "fs";
 import { resolve as resolve7, dirname as dirname10 } from "path";
 import { mkdirSync as mkdirSync8 } from "fs";
 function createGetNodeForSpaceCommand() {
-  return new Command8("get_node_for_space").description("\u83B7\u53D6\u8282\u70B9\u7684\u7A7A\u95F4\u4F4D\u7F6E\u4FE1\u606F\uFF08id\u3001name\u3001x\u3001y\u3001width\u3001height\uFF09\uFF0C\u7528\u4E8E AI \u7406\u89E3\u5143\u7D20\u5E03\u5C40\u3002\u9ED8\u8BA4\u83B7\u53D6\u6700\u6DF1\u5C42\u7EA7").option("--nodeId <id>", "\u8282\u70B9 ID\uFF0C\u683C\u5F0F\u5982 123:456\u3002\u4E0E --link \u4E8C\u9009\u4E00").option("--link <url>", "mgp:// \u534F\u8BAE\u94FE\u63A5\u3002\u4E0E --nodeId \u4E8C\u9009\u4E00").requiredOption("--output <path>", "\u8F93\u51FA JSON \u6587\u4EF6\u8DEF\u5F84").option("--domain <domain>", "MasterGo \u57DF\u540D\uFF0C\u9ED8\u8BA4 mastergo.netease.com\u3002\u4E0E --nodeId \u914D\u5408\u4F7F\u7528", "mastergo.netease.com").option("--fileId <id>", "\u6587\u4EF6 ID\uFF08\u7EAF\u6570\u5B57\uFF09\uFF0C\u4E0E --domain \u548C --nodeId \u914D\u5408\u4F7F\u7528").option("--maxDepth <number>", "\u904D\u5386\u6DF1\u5EA6\uFF0C\u9ED8\u8BA4 99\uFF08\u83B7\u53D6\u6700\u6DF1\u5C42\u7EA7\uFF09", "99").option("--includeInvisible", "\u5305\u542B\u4E0D\u53EF\u89C1\u8282\u70B9", false).option("--no-auto-start", "\u7981\u7528\u81EA\u52A8\u542F\u52A8 Server").option("--no-retry", "\u7981\u7528\u81EA\u52A8\u91CD\u8BD5").action(async (options) => {
+  return new Command8("get_node_for_space").description("\u83B7\u53D6\u8282\u70B9\u6216\u9875\u9762\u7684\u7A7A\u95F4\u4F4D\u7F6E\u4FE1\u606F\uFF08id\u3001name\u3001x\u3001y\u3001width\u3001height\uFF09\uFF0C\u7528\u4E8E AI \u7406\u89E3\u5143\u7D20\u5E03\u5C40\u3002\u9ED8\u8BA4\u83B7\u53D6\u6700\u6DF1\u5C42\u7EA7\u3002\u652F\u6301 nodeId \u548C pageId \u94FE\u63A5").option("--nodeId <id>", "\u8282\u70B9 ID\uFF0C\u683C\u5F0F\u5982 123:456\u3002\u4E0E --link \u4E8C\u9009\u4E00").option("--link <url>", "mgp:// \u534F\u8BAE\u94FE\u63A5\uFF08\u652F\u6301 nodeId \u548C pageId\uFF09\u3002\u4E0E --nodeId \u4E8C\u9009\u4E00").requiredOption("--output <path>", "\u8F93\u51FA JSON \u6587\u4EF6\u8DEF\u5F84").option("--domain <domain>", "MasterGo \u57DF\u540D\uFF0C\u9ED8\u8BA4 mastergo.netease.com\u3002\u4E0E --nodeId \u914D\u5408\u4F7F\u7528", "mastergo.netease.com").option("--fileId <id>", "\u6587\u4EF6 ID\uFF08\u7EAF\u6570\u5B57\uFF09\uFF0C\u4E0E --domain \u548C --nodeId \u914D\u5408\u4F7F\u7528").option("--maxDepth <number>", "\u904D\u5386\u6DF1\u5EA6\uFF0C\u9ED8\u8BA4 99\uFF08\u83B7\u53D6\u6700\u6DF1\u5C42\u7EA7\uFF09", "99").option("--includeInvisible", "\u5305\u542B\u4E0D\u53EF\u89C1\u8282\u70B9", false).option("--no-auto-start", "\u7981\u7528\u81EA\u52A8\u542F\u52A8 Server").option("--no-retry", "\u7981\u7528\u81EA\u52A8\u91CD\u8BD5").action(async (options) => {
     await handleGetNodeForSpace(options);
   });
 }
@@ -1920,16 +2041,27 @@ async function handleGetNodeForSpace(options) {
   }
   let pageUrl;
   let nodeId;
+  let pageId;
+  let isPageMode = false;
   if (options.link) {
     const parsed = parseMgpLink(options.link);
     if (!parsed) {
       console.error(`\u9519\u8BEF [${"E010" /* INVALID_LINK */}]: \u65E0\u6548\u7684 mgp:// \u94FE\u63A5\u683C\u5F0F`);
       console.error(`\u63D0\u4F9B\u7684\u94FE\u63A5: ${options.link}`);
-      console.error(`\u671F\u671B\u683C\u5F0F: mgp://[mastergo_page_url]?nodeId=xxx`);
+      console.error(`\u671F\u671B\u683C\u5F0F: mgp://[mastergo_page_url]?nodeId=xxx \u6216 mgp://[mastergo_page_url]?pageId=xxx`);
       process.exit(1);
     }
     pageUrl = parsed.pageUrl;
-    nodeId = parsed.nodeId;
+    if (parsed.pageId) {
+      isPageMode = true;
+      pageId = parsed.pageId;
+    } else if (parsed.nodeId) {
+      nodeId = parsed.nodeId;
+    } else {
+      console.error(`\u9519\u8BEF [${"E010" /* INVALID_LINK */}]: \u94FE\u63A5\u4E2D\u5FC5\u987B\u5305\u542B nodeId \u6216 pageId \u53C2\u6570`);
+      console.error(`\u63D0\u4F9B\u7684\u94FE\u63A5: ${options.link}`);
+      process.exit(1);
+    }
   } else {
     nodeId = options.nodeId;
     if (options.fileId) {
@@ -1943,16 +2075,32 @@ async function handleGetNodeForSpace(options) {
   });
   try {
     await client.connect();
-    const params = {
-      nodeId,
-      maxDepth: parseInt(options.maxDepth || "99", 10),
-      includeInvisible: options.includeInvisible || false
-    };
-    const data = await client.requestWithRetry(
-      "get_node_by_id" /* GET_NODE_BY_ID */,
-      params,
-      pageUrl
-    );
+    const maxDepth = parseInt(options.maxDepth || "99", 10);
+    const includeInvisible = options.includeInvisible || false;
+    let data;
+    if (isPageMode && pageId) {
+      const params = {
+        pageId,
+        maxDepth,
+        includeInvisible
+      };
+      data = await client.requestWithRetry(
+        "get_page_by_id" /* GET_PAGE_BY_ID */,
+        params,
+        pageUrl
+      );
+    } else {
+      const params = {
+        nodeId,
+        maxDepth,
+        includeInvisible
+      };
+      data = await client.requestWithRetry(
+        "get_node_by_id" /* GET_NODE_BY_ID */,
+        params,
+        pageUrl
+      );
+    }
     const spaceData = extractSpaceInfo(data);
     const outputPath = resolve7(options.output);
     const outputDir = dirname10(outputPath);
@@ -1966,9 +2114,15 @@ async function handleGetNodeForSpace(options) {
       console.log(`Link: ${options.link}`);
       console.log(`\u9875\u9762 URL: ${pageUrl}`);
     }
-    console.log(`\u8282\u70B9 ID: ${nodeId}`);
+    if (isPageMode) {
+      console.log(`\u9875\u9762 ID: ${pageId}`);
+      console.log(`\u6A21\u5F0F: \u9875\u9762\u7A7A\u95F4\u4FE1\u606F`);
+    } else {
+      console.log(`\u8282\u70B9 ID: ${nodeId}`);
+      console.log(`\u6A21\u5F0F: \u8282\u70B9\u7A7A\u95F4\u4FE1\u606F`);
+    }
     console.log(`\u6570\u636E\u5927\u5C0F: ${size.toLocaleString()} \u5B57\u7B26 (\u7EA6 ${sizeKB} KB)`);
-    console.log(`\u8282\u70B9\u6DF1\u5EA6: ${params.maxDepth}`);
+    console.log(`\u8282\u70B9\u6DF1\u5EA6: ${maxDepth}`);
     console.log(`\u6570\u636E\u6A21\u5F0F: \u7A7A\u95F4\u4FE1\u606F (\u4EC5 id, name, x, y, width, height)`);
   } catch (error) {
     if (error instanceof MGError) {