@rsdoctor/utils 1.5.15 → 1.5.17

package/dist/common/global-config.d.cts

@@ -7,13 +7,34 @@
  *     builder1: portNumber,
  *     builder2: portNumber,
  *   },
- *   port: portNumber // The port of the last builder is used by default
+ *   socketUrlList: {
+ *     builder1: socketUrl,
+ *     builder2: socketUrl,
+ *   },
+ *   port: portNumber, // The port of the last builder is used by default
+ *   socketUrl: socketUrl, // The socket URL of the last builder is used by default
  * }
  *
  * @param {number} port - The port number to write.
  * @param {string} [builderName] - The name of the builder.
+ * @param {string} [socketToken] - The socket token of the builder.
  */
-export declare function writeMcpPort(port: number, builderName?: string): void;
+export interface McpConfig {
+    portList: Record<string, number>;
+    port: number;
+    socketUrlList?: Record<string, string>;
+    socketUrl?: string;
+}
+export declare function readMcpConfig(): McpConfig | undefined;
+export declare function getMcpServerInfo(builderName?: string): {
+    port?: number;
+    socketUrl?: string;
+};
+export declare function getMcpServerInfoByPort(port: number): {
+    port?: number;
+    socketUrl?: string;
+};
+export declare function writeMcpPort(port: number, builderName?: string, socketToken?: string): void;
 /**
  * @description Gets the path to the mcp.json file.
  * @returns {string} The path to the mcp.json file.

package/dist/common/global-config.d.ts

@@ -7,13 +7,34 @@
  *     builder1: portNumber,
  *     builder2: portNumber,
  *   },
- *   port: portNumber // The port of the last builder is used by default
+ *   socketUrlList: {
+ *     builder1: socketUrl,
+ *     builder2: socketUrl,
+ *   },
+ *   port: portNumber, // The port of the last builder is used by default
+ *   socketUrl: socketUrl, // The socket URL of the last builder is used by default
  * }
  *
  * @param {number} port - The port number to write.
  * @param {string} [builderName] - The name of the builder.
+ * @param {string} [socketToken] - The socket token of the builder.
  */
-export declare function writeMcpPort(port: number, builderName?: string): void;
+export interface McpConfig {
+    portList: Record<string, number>;
+    port: number;
+    socketUrlList?: Record<string, string>;
+    socketUrl?: string;
+}
+export declare function readMcpConfig(): McpConfig | undefined;
+export declare function getMcpServerInfo(builderName?: string): {
+    port?: number;
+    socketUrl?: string;
+};
+export declare function getMcpServerInfoByPort(port: number): {
+    port?: number;
+    socketUrl?: string;
+};
+export declare function writeMcpPort(port: number, builderName?: string, socketToken?: string): void;
 /**
  * @description Gets the path to the mcp.json file.
  * @returns {string} The path to the mcp.json file.

package/dist/common.cjs

@@ -504,6 +504,9 @@ for(var __rspack_i in (()=>{
     var global_config_namespaceObject = {};
     __webpack_require__.r(global_config_namespaceObject), __webpack_require__.d(global_config_namespaceObject, {
         getMcpConfigPath: ()=>getMcpConfigPath,
+        getMcpServerInfo: ()=>getMcpServerInfo,
+        getMcpServerInfoByPort: ()=>getMcpServerInfoByPort,
+        readMcpConfig: ()=>readMcpConfig,
         writeMcpPort: ()=>writeMcpPort
     });
     var common_summary = __webpack_require__("./src/common/summary.ts"), common_crypto = __webpack_require__("./src/common/crypto.ts"), algorithm = __webpack_require__("./src/common/algorithm.ts"), external_path_ = __webpack_require__("path"), external_path_default = __webpack_require__.n(external_path_);
@@ -1499,21 +1502,56 @@ for(var __rspack_i in (()=>{
         };
     };
     var external_fs_ = __webpack_require__("fs"), external_fs_default = __webpack_require__.n(external_fs_), external_os_ = __webpack_require__("os"), external_os_default = __webpack_require__.n(external_os_);
-    function writeMcpPort(port, builderName) {
+    function readMcpConfig() {
+        let mcpPortFilePath = getMcpConfigPath();
+        if (external_fs_default().existsSync(mcpPortFilePath)) try {
+            return JSON.parse(external_fs_default().readFileSync(mcpPortFilePath, 'utf8'));
+        } catch (error) {
+            logger.logger.debug('Failed to parse mcp.json', error);
+            return;
+        }
+    }
+    function getMcpServerInfo(builderName) {
+        let mcpJson = readMcpConfig();
+        if (!mcpJson) return {};
+        if (builderName) {
+            let port = mcpJson.portList?.[builderName], socketUrl = mcpJson.socketUrlList?.[builderName];
+            if (port || socketUrl) return {
+                port,
+                socketUrl
+            };
+        }
+        return {
+            port: mcpJson.port,
+            socketUrl: mcpJson.socketUrl
+        };
+    }
+    function getMcpServerInfoByPort(port) {
+        let mcpJson = readMcpConfig();
+        if (!mcpJson) return {};
+        let builderName = Object.entries(mcpJson.portList || {}).find(([, builderPort])=>builderPort === port)?.[0];
+        return builderName ? {
+            port,
+            socketUrl: mcpJson.socketUrlList?.[builderName]
+        } : mcpJson.port === port ? {
+            port,
+            socketUrl: mcpJson.socketUrl
+        } : {
+            port
+        };
+    }
+    function writeMcpPort(port, builderName, socketToken) {
         let homeDir = external_os_default().homedir(), rsdoctorDir = external_path_default().join(homeDir, '.cache/rsdoctor'), mcpPortFilePath = external_path_default().join(rsdoctorDir, 'mcp.json');
         external_fs_default().existsSync(rsdoctorDir) || external_fs_default().mkdirSync(rsdoctorDir, {
             recursive: !0
         });
-        let mcpJson = {
+        let builderKey = builderName || 'builder', socketUrl = function(port, socketToken) {
+            if (port && socketToken) return `ws://localhost:${port}?token=${encodeURIComponent(socketToken)}`;
+        }(port, socketToken), mcpJson = readMcpConfig() ?? {
             portList: {},
             port: 0
         };
-        if (external_fs_default().existsSync(mcpPortFilePath)) try {
-            mcpJson = JSON.parse(external_fs_default().readFileSync(mcpPortFilePath, 'utf8'));
-        } catch (error) {
-            logger.logger.debug('Failed to parse mcp.json', error);
-        }
-        mcpJson.portList || (mcpJson.portList = {}), mcpJson.portList[builderName || 'builder'] = port, mcpJson.port = port, external_fs_default().writeFileSync(mcpPortFilePath, JSON.stringify(mcpJson, null, 2), 'utf8');
+        mcpJson.portList || (mcpJson.portList = {}), mcpJson.portList[builderKey] = port, mcpJson.socketUrlList || (mcpJson.socketUrlList = {}), socketUrl ? (mcpJson.socketUrlList[builderKey] = socketUrl, mcpJson.socketUrl = socketUrl) : (delete mcpJson.socketUrlList[builderKey], delete mcpJson.socketUrl), mcpJson.port = port, socketUrl && (mcpJson.socketUrlList || (mcpJson.socketUrlList = {}), mcpJson.socketUrlList[builderName || 'builder'] = socketUrl, mcpJson.socketUrl = socketUrl), external_fs_default().writeFileSync(mcpPortFilePath, JSON.stringify(mcpJson, null, 2), 'utf8');
     }
     function getMcpConfigPath() {
         let homeDir = external_os_default().homedir(), rsdoctorDir = external_path_default().join(homeDir, '.cache/rsdoctor');

package/dist/common.js

@@ -48,6 +48,9 @@ __webpack_require__.r(file_namespaceObject), __webpack_require__.d(file_namespac
 var global_config_namespaceObject = {};
 __webpack_require__.r(global_config_namespaceObject), __webpack_require__.d(global_config_namespaceObject, {
     getMcpConfigPath: ()=>getMcpConfigPath,
+    getMcpServerInfo: ()=>getMcpServerInfo,
+    getMcpServerInfoByPort: ()=>getMcpServerInfoByPort,
+    readMcpConfig: ()=>readMcpConfig,
     writeMcpPort: ()=>writeMcpPort
 });
 var graph_namespaceObject = {};
@@ -1280,21 +1283,56 @@ let PACKAGE_SLUG = /[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*/, MODULE_PATH_PACKAGES
         version: path && name && path.match(RegExp(`${name}@([\\d.]+)`))?.flat().slice(1)?.[0] || ''
     };
 };
-function writeMcpPort(port, builderName) {
+function readMcpConfig() {
+    let mcpPortFilePath = getMcpConfigPath();
+    if (fs.existsSync(mcpPortFilePath)) try {
+        return JSON.parse(fs.readFileSync(mcpPortFilePath, 'utf8'));
+    } catch (error) {
+        rsdoctorLogger.debug('Failed to parse mcp.json', error);
+        return;
+    }
+}
+function getMcpServerInfo(builderName) {
+    let mcpJson = readMcpConfig();
+    if (!mcpJson) return {};
+    if (builderName) {
+        let port = mcpJson.portList?.[builderName], socketUrl = mcpJson.socketUrlList?.[builderName];
+        if (port || socketUrl) return {
+            port,
+            socketUrl
+        };
+    }
+    return {
+        port: mcpJson.port,
+        socketUrl: mcpJson.socketUrl
+    };
+}
+function getMcpServerInfoByPort(port) {
+    let mcpJson = readMcpConfig();
+    if (!mcpJson) return {};
+    let builderName = Object.entries(mcpJson.portList || {}).find(([, builderPort])=>builderPort === port)?.[0];
+    return builderName ? {
+        port,
+        socketUrl: mcpJson.socketUrlList?.[builderName]
+    } : mcpJson.port === port ? {
+        port,
+        socketUrl: mcpJson.socketUrl
+    } : {
+        port
+    };
+}
+function writeMcpPort(port, builderName, socketToken) {
     let homeDir = os.homedir(), rsdoctorDir = path_0.join(homeDir, '.cache/rsdoctor'), mcpPortFilePath = path_0.join(rsdoctorDir, 'mcp.json');
     fs.existsSync(rsdoctorDir) || fs.mkdirSync(rsdoctorDir, {
         recursive: !0
     });
-    let mcpJson = {
+    let builderKey = builderName || 'builder', socketUrl = function(port, socketToken) {
+        if (port && socketToken) return `ws://localhost:${port}?token=${encodeURIComponent(socketToken)}`;
+    }(port, socketToken), mcpJson = readMcpConfig() ?? {
         portList: {},
         port: 0
     };
-    if (fs.existsSync(mcpPortFilePath)) try {
-        mcpJson = JSON.parse(fs.readFileSync(mcpPortFilePath, 'utf8'));
-    } catch (error) {
-        rsdoctorLogger.debug('Failed to parse mcp.json', error);
-    }
-    mcpJson.portList || (mcpJson.portList = {}), mcpJson.portList[builderName || 'builder'] = port, mcpJson.port = port, fs.writeFileSync(mcpPortFilePath, JSON.stringify(mcpJson, null, 2), 'utf8');
+    mcpJson.portList || (mcpJson.portList = {}), mcpJson.portList[builderKey] = port, mcpJson.socketUrlList || (mcpJson.socketUrlList = {}), socketUrl ? (mcpJson.socketUrlList[builderKey] = socketUrl, mcpJson.socketUrl = socketUrl) : (delete mcpJson.socketUrlList[builderKey], delete mcpJson.socketUrl), mcpJson.port = port, socketUrl && (mcpJson.socketUrlList || (mcpJson.socketUrlList = {}), mcpJson.socketUrlList[builderName || 'builder'] = socketUrl, mcpJson.socketUrl = socketUrl), fs.writeFileSync(mcpPortFilePath, JSON.stringify(mcpJson, null, 2), 'utf8');
 }
 function getMcpConfigPath() {
     let homeDir = os.homedir(), rsdoctorDir = path_0.join(homeDir, '.cache/rsdoctor');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/utils",
-  "version": "1.5.15",
+  "version": "1.5.17",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -101,7 +101,7 @@
     "picocolors": "^1.1.1",
     "rslog": "^2.1.2",
     "strip-ansi": "^6.0.1",
-    "@rsdoctor/types": "1.5.15"
+    "@rsdoctor/types": "1.5.17"
   },
   "devDependencies": {
     "@types/babel__code-frame": "7.27.0",