@hangox/mg-cli 1.0.7 → 1.0.8

package/dist/{index-DUQN5gSR.d.ts → index-DmySkKst.d.ts}

@@ -783,4 +783,4 @@ declare class RequestHandler {
     cleanupAll(): void;
 }
 
-export { type ServerOptions as $, type PongMessage as A, type BaseMessage as B, CONFIG_DIR as C, DEV_DEFAULT_PORT as D, ErrorCode as E, type ConnectionInfo as F, type GetNodeParams as G, HEARTBEAT_INTERVAL as H, IS_DEV_MODE as I, type GetPageParams as J, type GetAllNodesParams as K, LOG_DIR as L, MAX_PORT_ATTEMPTS as M, type NodeInfo as N, type ExportImageParams as O, PROD_DEFAULT_PORT as P, type OutputFormatter as Q, REQUEST_TIMEOUT as R, type ServerInfo as S, type CliOptions as T, type RGBA as U, type MgPageInfo as V, type AllPagesInfo as W, type ConnectedPageInfo as X, type ServerStatusResponse as Y, MGServer as Z, createServer as _, type SpaceNodeInfo as a, ConnectionManager as a0, type ManagedWebSocket as a1, RequestHandler as a2, Logger as a3, createLogger as a4, LogLevel as a5, type LoggerOptions as a6, PROD_PORT_RANGE_START as b, PROD_PORT_RANGE_END as c, DEV_PORT_RANGE_START as d, DEV_PORT_RANGE_END as e, DEFAULT_PORT as f, PORT_RANGE_START as g, PORT_RANGE_END as h, PORT_SCAN_TIMEOUT as i, SERVER_INFO_FILE as j, SERVER_LOG_FILE as k, HEARTBEAT_TIMEOUT as l, SERVER_START_TIMEOUT as m, RETRY_INTERVALS as n, MAX_RETRY_COUNT as o, ConnectionType as p, MessageType as q, ErrorNames as r, ErrorMessages as s, MGError as t, createError as u, type RequestMessage as v, type ResponseMessage as w, type ErrorInfo as x, type RegisterMessage as y, type PingMessage as z };
+export { type ServerOptions as $, type PongMessage as A, type BaseMessage as B, CONFIG_DIR as C, DEV_DEFAULT_PORT as D, ErrorCode as E, type ConnectionInfo as F, type GetNodeParams as G, HEARTBEAT_INTERVAL as H, IS_DEV_MODE as I, type GetPageParams as J, type GetAllNodesParams as K, LOG_DIR as L, MessageType as M, type NodeInfo as N, type ExportImageParams as O, PROD_DEFAULT_PORT as P, type OutputFormatter as Q, REQUEST_TIMEOUT as R, type ServerInfo as S, type CliOptions as T, type RGBA as U, type MgPageInfo as V, type AllPagesInfo as W, type ConnectedPageInfo as X, type ServerStatusResponse as Y, MGServer as Z, createServer as _, type SpaceNodeInfo as a, ConnectionManager as a0, type ManagedWebSocket as a1, RequestHandler as a2, Logger as a3, createLogger as a4, LogLevel as a5, type LoggerOptions as a6, PROD_PORT_RANGE_START as b, PROD_PORT_RANGE_END as c, DEV_PORT_RANGE_START as d, DEV_PORT_RANGE_END as e, DEFAULT_PORT as f, PORT_RANGE_START as g, PORT_RANGE_END as h, MAX_PORT_ATTEMPTS as i, PORT_SCAN_TIMEOUT as j, SERVER_INFO_FILE as k, SERVER_LOG_FILE as l, HEARTBEAT_TIMEOUT as m, SERVER_START_TIMEOUT as n, RETRY_INTERVALS as o, MAX_RETRY_COUNT as p, ConnectionType as q, ErrorNames as r, ErrorMessages as s, MGError as t, createError as u, type RequestMessage as v, type ResponseMessage as w, type ErrorInfo as x, type RegisterMessage as y, type PingMessage as z };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { S as ServerInfo, N as NodeInfo, a as SpaceNodeInfo } from './index-DUQN5gSR.js';
-export { W as AllPagesInfo, B as BaseMessage, C as CONFIG_DIR, T as CliOptions, X as ConnectedPageInfo, F as ConnectionInfo, a0 as ConnectionManager, p as ConnectionType, f as DEFAULT_PORT, D as DEV_DEFAULT_PORT, e as DEV_PORT_RANGE_END, d as DEV_PORT_RANGE_START, E as ErrorCode, x as ErrorInfo, s as ErrorMessages, r as ErrorNames, O as ExportImageParams, K as GetAllNodesParams, G as GetNodeParams, J as GetPageParams, H as HEARTBEAT_INTERVAL, l as HEARTBEAT_TIMEOUT, I as IS_DEV_MODE, L as LOG_DIR, a5 as LogLevel, a3 as Logger, a6 as LoggerOptions, M as MAX_PORT_ATTEMPTS, o as MAX_RETRY_COUNT, t as MGError, Z as MGServer, a1 as ManagedWebSocket, q as MessageType, V as MgPageInfo, Q as OutputFormatter, h as PORT_RANGE_END, g as PORT_RANGE_START, i as PORT_SCAN_TIMEOUT, P as PROD_DEFAULT_PORT, c as PROD_PORT_RANGE_END, b as PROD_PORT_RANGE_START, z as PingMessage, A as PongMessage, R as REQUEST_TIMEOUT, n as RETRY_INTERVALS, U as RGBA, y as RegisterMessage, a2 as RequestHandler, v as RequestMessage, w as ResponseMessage, j as SERVER_INFO_FILE, k as SERVER_LOG_FILE, m as SERVER_START_TIMEOUT, $ as ServerOptions, Y as ServerStatusResponse, u as createError, a4 as createLogger, _ as createServer } from './index-DUQN5gSR.js';
+import { S as ServerInfo, N as NodeInfo, a as SpaceNodeInfo, M as MessageType } from './index-DmySkKst.js';
+export { W as AllPagesInfo, B as BaseMessage, C as CONFIG_DIR, T as CliOptions, X as ConnectedPageInfo, F as ConnectionInfo, a0 as ConnectionManager, q as ConnectionType, f as DEFAULT_PORT, D as DEV_DEFAULT_PORT, e as DEV_PORT_RANGE_END, d as DEV_PORT_RANGE_START, E as ErrorCode, x as ErrorInfo, s as ErrorMessages, r as ErrorNames, O as ExportImageParams, K as GetAllNodesParams, G as GetNodeParams, J as GetPageParams, H as HEARTBEAT_INTERVAL, m as HEARTBEAT_TIMEOUT, I as IS_DEV_MODE, L as LOG_DIR, a5 as LogLevel, a3 as Logger, a6 as LoggerOptions, i as MAX_PORT_ATTEMPTS, p as MAX_RETRY_COUNT, t as MGError, Z as MGServer, a1 as ManagedWebSocket, V as MgPageInfo, Q as OutputFormatter, h as PORT_RANGE_END, g as PORT_RANGE_START, j as PORT_SCAN_TIMEOUT, P as PROD_DEFAULT_PORT, c as PROD_PORT_RANGE_END, b as PROD_PORT_RANGE_START, z as PingMessage, A as PongMessage, R as REQUEST_TIMEOUT, o as RETRY_INTERVALS, U as RGBA, y as RegisterMessage, a2 as RequestHandler, v as RequestMessage, w as ResponseMessage, k as SERVER_INFO_FILE, l as SERVER_LOG_FILE, n as SERVER_START_TIMEOUT, $ as ServerOptions, Y as ServerStatusResponse, u as createError, a4 as createLogger, _ as createServer } from './index-DmySkKst.js';
 import 'ws';
 
 /**
@@ -163,4 +163,53 @@ declare function trimNodeDefaults<T extends Record<string, unknown>>(node: T): T
  */
 declare function extractSpaceInfo(node: NodeInfo): SpaceNodeInfo;
 
-export { NODE_DEFAULTS, NodeInfo, ServerInfo, SpaceNodeInfo, deleteServerInfo, ensureConfigDir, ensureDir, ensureOutputDir, extractFileId, extractFileIdFromMgpLink, extractFileIdFromUrl, extractSpaceInfo, formatDuration, formatFileSize, formatLogTime, generateId, generateMgpLink, generatePageLink, getCurrentISOTime, isDesignPageUrl, isProcessRunning, killProcess, normalizePageUrl, parseMgpLink, readServerInfo, resolveOutputPath, roundToOneDecimal, trimNodeDefaults, writeServerInfo };
+/**
+ * CLI 客户端
+ * 负责连接 Server 发送请求
+ */
+
+/** 客户端选项 */
+interface ClientOptions {
+    /** 禁用自动启动 Server */
+    noAutoStart?: boolean;
+    /** 禁用重试 */
+    noRetry?: boolean;
+}
+/**
+ * MG CLI 客户端
+ */
+declare class MGClient {
+    private ws;
+    private options;
+    constructor(options?: ClientOptions);
+    /**
+     * 连接到 Server
+     */
+    connect(): Promise<void>;
+    /**
+     * 尝试连接指定端口
+     */
+    private tryConnect;
+    /**
+     * 等待 Server 就绪
+     */
+    private waitForServer;
+    /**
+     * 注册为 Consumer
+     */
+    private register;
+    /**
+     * 发送请求并等待响应
+     */
+    request<T = unknown>(type: MessageType, params?: Record<string, unknown>, pageUrl?: string): Promise<T>;
+    /**
+     * 带重试的请求
+     */
+    requestWithRetry<T = unknown>(type: MessageType, params?: Record<string, unknown>, pageUrl?: string): Promise<T>;
+    /**
+     * 关闭连接
+     */
+    close(): void;
+}
+
+export { type ClientOptions, MGClient, MessageType, NODE_DEFAULTS, NodeInfo, ServerInfo, SpaceNodeInfo, deleteServerInfo, ensureConfigDir, ensureDir, ensureOutputDir, extractFileId, extractFileIdFromMgpLink, extractFileIdFromUrl, extractSpaceInfo, formatDuration, formatFileSize, formatLogTime, generateId, generateMgpLink, generatePageLink, getCurrentISOTime, isDesignPageUrl, isProcessRunning, killProcess, normalizePageUrl, parseMgpLink, readServerInfo, resolveOutputPath, roundToOneDecimal, trimNodeDefaults, writeServerInfo };

package/dist/index.js

@@ -922,6 +922,13 @@ 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;
+}
 
 // src/server/websocket-server.ts
 var MGServer = class {
@@ -1168,6 +1175,247 @@ var MGServer = class {
 function createServer(options) {
   return new MGServer(options);
 }
+
+// src/cli/client.ts
+import WebSocket2 from "ws";
+
+// src/server/daemon.ts
+import { spawn } from "child_process";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import { dirname as dirname4, join as join3 } from "path";
+function isServerRunning() {
+  const info = readServerInfo();
+  if (!info) {
+    return { running: false, info: null };
+  }
+  if (!isProcessRunning(info.pid)) {
+    deleteServerInfo();
+    return { running: false, info: null };
+  }
+  return { running: true, info };
+}
+async function startServerDaemon(port) {
+  const { running, info } = isServerRunning();
+  if (running && info) {
+    throw new MGError(
+      "E016" /* SERVER_ALREADY_RUNNING */,
+      `Server \u5DF2\u5728\u8FD0\u884C\u4E2D (PID: ${info.pid}, \u7AEF\u53E3: ${info.port})`
+    );
+  }
+  ensureConfigDir();
+  const currentFile = fileURLToPath2(import.meta.url);
+  const currentDir = dirname4(currentFile);
+  const serverScript = join3(currentDir, "daemon-runner.js");
+  const args = ["--foreground"];
+  if (port) {
+    args.push("--port", String(port));
+  }
+  const child = spawn(process.execPath, [serverScript, ...args], {
+    detached: true,
+    stdio: "ignore",
+    env: {
+      ...process.env,
+      MG_DAEMON: "1"
+    }
+  });
+  child.unref();
+  const startTime = Date.now();
+  while (Date.now() - startTime < SERVER_START_TIMEOUT) {
+    await new Promise((resolve2) => setTimeout(resolve2, 200));
+    const { running: running2, info: info2 } = isServerRunning();
+    if (running2 && info2) {
+      return info2;
+    }
+  }
+  throw new MGError("E015" /* SERVER_START_FAILED */, "Server \u542F\u52A8\u8D85\u65F6");
+}
+
+// src/cli/client.ts
+var MGClient = class {
+  ws = null;
+  options;
+  constructor(options = {}) {
+    this.options = options;
+  }
+  /**
+   * 连接到 Server
+   */
+  async connect() {
+    const serverInfo = readServerInfo();
+    if (serverInfo) {
+      if (isProcessRunning(serverInfo.pid)) {
+        const currentVersion = getVersion();
+        if (!isVersionMatch(currentVersion, serverInfo.version)) {
+          console.warn(`\u26A0\uFE0F \u7248\u672C\u4E0D\u5339\u914D: CLI ${currentVersion} vs Server ${serverInfo.version}`);
+          console.warn("\u63D0\u793A: \u5982\u9700\u5BF9\u9F50\u7248\u672C\uFF0C\u8BF7\u624B\u52A8\u8FD0\u884C `npx -y @hangox/mg-cli@latest server restart`");
+        }
+        try {
+          await this.tryConnect(serverInfo.port);
+          return;
+        } catch {
+        }
+      }
+    }
+    for (let port = PORT_RANGE_START; port <= PORT_RANGE_END; port++) {
+      try {
+        await this.tryConnect(port);
+        return;
+      } catch {
+      }
+    }
+    if (!this.options.noAutoStart) {
+      console.log("Server \u672A\u8FD0\u884C\uFF0C\u6B63\u5728\u81EA\u52A8\u542F\u52A8...");
+      try {
+        const info = await startServerDaemon();
+        console.log(`Server \u5DF2\u542F\u52A8\uFF0C\u7AEF\u53E3: ${info.port}`);
+        await this.waitForServer(info.port);
+        return;
+      } catch (error) {
+        throw new MGError(
+          "E015" /* SERVER_START_FAILED */,
+          `\u81EA\u52A8\u542F\u52A8 Server \u5931\u8D25: ${error instanceof Error ? error.message : error}`
+        );
+      }
+    }
+    throw new MGError("E001" /* CONNECTION_FAILED */, ErrorMessages["E001" /* CONNECTION_FAILED */]);
+  }
+  /**
+   * 尝试连接指定端口
+   */
+  tryConnect(port) {
+    return new Promise((resolve2, reject) => {
+      const ws = new WebSocket2(`ws://localhost:${port}`);
+      const timer = setTimeout(() => {
+        ws.close();
+        reject(new Error("\u8FDE\u63A5\u8D85\u65F6"));
+      }, PORT_SCAN_TIMEOUT);
+      ws.on("open", () => {
+        clearTimeout(timer);
+        this.ws = ws;
+        this.register();
+        resolve2();
+      });
+      ws.on("error", (error) => {
+        clearTimeout(timer);
+        reject(error);
+      });
+    });
+  }
+  /**
+   * 等待 Server 就绪
+   */
+  async waitForServer(port) {
+    const startTime = Date.now();
+    const interval = 500;
+    while (Date.now() - startTime < SERVER_START_TIMEOUT) {
+      try {
+        await this.tryConnect(port);
+        return;
+      } catch {
+        await new Promise((r) => setTimeout(r, interval));
+      }
+    }
+    throw new Error("\u7B49\u5F85 Server \u542F\u52A8\u8D85\u65F6");
+  }
+  /**
+   * 注册为 Consumer
+   */
+  register() {
+    if (!this.ws) return;
+    const message = {
+      type: "register" /* REGISTER */,
+      data: {
+        connectionType: "consumer" /* CONSUMER */
+      },
+      timestamp: Date.now()
+    };
+    this.ws.send(JSON.stringify(message));
+  }
+  /**
+   * 发送请求并等待响应
+   */
+  async request(type, params, pageUrl) {
+    if (!this.ws) {
+      throw new MGError("E001" /* CONNECTION_FAILED */, "\u672A\u8FDE\u63A5\u5230 Server");
+    }
+    const requestId = generateId();
+    const message = {
+      id: requestId,
+      type,
+      params,
+      pageUrl,
+      timestamp: Date.now()
+    };
+    return new Promise((resolve2, reject) => {
+      const timer = setTimeout(() => {
+        reject(new MGError("E012" /* REQUEST_TIMEOUT */, ErrorMessages["E012" /* REQUEST_TIMEOUT */]));
+      }, REQUEST_TIMEOUT);
+      const messageHandler = (data) => {
+        try {
+          const response = JSON.parse(data.toString());
+          if (response.id === requestId) {
+            clearTimeout(timer);
+            this.ws?.off("message", messageHandler);
+            if (response.success) {
+              resolve2(response.data);
+            } else {
+              const error = response.error;
+              reject(
+                new MGError(
+                  error?.code || "E099" /* UNKNOWN_ERROR */,
+                  error?.message || "\u672A\u77E5\u9519\u8BEF"
+                )
+              );
+            }
+          }
+        } catch {
+        }
+      };
+      this.ws.on("message", messageHandler);
+      this.ws.send(JSON.stringify(message));
+    });
+  }
+  /**
+   * 带重试的请求
+   */
+  async requestWithRetry(type, params, pageUrl) {
+    if (this.options.noRetry) {
+      return this.request(type, params, pageUrl);
+    }
+    let lastError = null;
+    for (let attempt = 0; attempt <= MAX_RETRY_COUNT; attempt++) {
+      try {
+        return await this.request(type, params, pageUrl);
+      } catch (error) {
+        lastError = error instanceof Error ? error : new Error(String(error));
+        if (error instanceof MGError) {
+          const retryable = ["E017" /* CONNECTION_LOST */, "E012" /* REQUEST_TIMEOUT */];
+          if (!retryable.includes(error.code)) {
+            throw error;
+          }
+        }
+        if (attempt < MAX_RETRY_COUNT) {
+          const delay = RETRY_INTERVALS[attempt] || RETRY_INTERVALS[RETRY_INTERVALS.length - 1];
+          await new Promise((r) => setTimeout(r, delay));
+          try {
+            await this.connect();
+          } catch {
+          }
+        }
+      }
+    }
+    throw lastError || new MGError("E099" /* UNKNOWN_ERROR */, "\u8BF7\u6C42\u5931\u8D25");
+  }
+  /**
+   * 关闭连接
+   */
+  close() {
+    if (this.ws) {
+      this.ws.close();
+      this.ws = null;
+    }
+  }
+};
 export {
   CONFIG_DIR,
   ConnectionManager,
@@ -1187,6 +1435,7 @@ export {
   Logger,
   MAX_PORT_ATTEMPTS,
   MAX_RETRY_COUNT,
+  MGClient,
   MGError,
   MGServer,
   MessageType,