connectbase-client 0.13.0 → 0.14.0

package/dist/cli.js

@@ -26,6 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // src/cli.ts
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
+var os = __toESM(require("os"));
 var crypto = __toESM(require("crypto"));
 var https = __toESM(require("https"));
 var http = __toESM(require("http"));
@@ -355,11 +356,11 @@ function getProjectRoot() {
 var CONSOLE_URL = DEFAULT_BASE_URL.replace("api.", "");
 function openBrowser(url) {
   const { exec } = require("child_process");
-  const platform = process.platform;
+  const platform2 = process.platform;
   let command;
-  if (platform === "darwin") {
+  if (platform2 === "darwin") {
     command = `open "${url}"`;
-  } else if (platform === "win32") {
+  } else if (platform2 === "win32") {
     command = `start "" "${url}"`;
   } else {
     command = `xdg-open "${url}"`;
@@ -1146,6 +1147,68 @@ ${colors.blue}?${colors.reset} \uC571 \uC120\uD0DD (\uBC88\uD638): `);
   success(`\uC571 \uC0DD\uC131 \uC644\uB8CC: ${createData.app_name}`);
   return createData.app_id;
 }
+function getTunnelLockDir() {
+  const platform2 = os.platform();
+  if (platform2 === "darwin") {
+    return path.join(os.homedir(), "Library", "Application Support", "connectbase", "tunnel-locks");
+  } else if (platform2 === "win32") {
+    return path.join(process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local"), "connectbase", "tunnel-locks");
+  }
+  const stateHome = process.env.XDG_STATE_HOME || path.join(os.homedir(), ".local", "state");
+  return path.join(stateHome, "connectbase", "tunnel-locks");
+}
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (e) {
+    return e.code === "EPERM";
+  }
+}
+function acquireTunnelLock(appID, port, force) {
+  const lockDir = getTunnelLockDir();
+  fs.mkdirSync(lockDir, { recursive: true });
+  const lockPath = path.join(lockDir, `${appID}-${port}.lock`);
+  const lockData = {
+    pid: process.pid,
+    startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    appID,
+    port,
+    host: os.hostname(),
+    version: VERSION
+  };
+  if (!force) {
+    try {
+      const fd = fs.openSync(lockPath, "wx");
+      fs.writeSync(fd, JSON.stringify(lockData, null, 2));
+      fs.closeSync(fd);
+      return lockPath;
+    } catch (e) {
+      if (e.code !== "EEXIST") {
+        warn(`lockfile \uC0DD\uC131 \uC2E4\uD328: ${e.message}`);
+        return null;
+      }
+    }
+    try {
+      const existing = JSON.parse(fs.readFileSync(lockPath, "utf-8"));
+      if (isProcessAlive(existing.pid)) {
+        error(`\uC774\uBBF8 \uC2E4\uD589 \uC911\uC778 \uD130\uB110\uC774 \uC788\uC2B5\uB2C8\uB2E4: PID ${existing.pid}, \uC2DC\uC791 ${existing.startedAt}, \uD638\uC2A4\uD2B8 ${existing.host}`);
+        info("\uC911\uBCF5 \uC2E4\uD589\uC744 \uBB34\uC2DC\uD558\uB824\uBA74 --force \uC635\uC158\uC744 \uC0AC\uC6A9\uD558\uC138\uC694");
+        process.exit(2);
+      }
+      warn(`stale lockfile \uBC1C\uACAC (PID ${existing.pid} \uC885\uB8CC\uB428), \uB36E\uC5B4\uC501\uB2C8\uB2E4`);
+    } catch {
+    }
+  }
+  fs.writeFileSync(lockPath, JSON.stringify(lockData, null, 2));
+  return lockPath;
+}
+function releaseTunnelLock(lockPath) {
+  try {
+    fs.unlinkSync(lockPath);
+  } catch {
+  }
+}
 async function startTunnel(port, config, tunnelOpts) {
   let tunnelKey = config.secretKey || (config.publicKey?.startsWith("cb_sk_") ? config.publicKey : "");
   if (!tunnelKey) {
@@ -1198,6 +1261,7 @@ async function startTunnel(port, config, tunnelOpts) {
     }
   } catch {
   }
+  const lockPath = acquireTunnelLock(appId, port, tunnelOpts?.force ?? false);
   const tunnelServerUrl = getTunnelServerUrl(config.baseUrl);
   const parsedUrl = new URL(tunnelServerUrl);
   const isHttps = parsedUrl.protocol === "https:";
@@ -1212,8 +1276,17 @@ async function startTunnel(port, config, tunnelOpts) {
   const maxReconnectAttempts = 10;
   let shouldReconnect = true;
   let socket = null;
+  let lockReleased = false;
+  const releaseLock = () => {
+    if (lockPath && !lockReleased) {
+      lockReleased = true;
+      releaseTunnelLock(lockPath);
+    }
+  };
+  process.on("exit", releaseLock);
   const cleanup = () => {
     shouldReconnect = false;
+    releaseLock();
     if (socket) {
       try {
         socket.write(createWsCloseFrame(1e3));
@@ -1344,7 +1417,13 @@ ${colors.dim}Ctrl+C\uB85C \uC885\uB8CC${colors.reset}
         forwardRequest(msg, sock, localPort);
         break;
       case "tunnel_error":
-        error(`\uD130\uB110 \uC5D0\uB7EC: ${msg.message}`);
+        if (msg.code === "replaced") {
+          error(`\u26A0  \uB2E4\uB978 \uC138\uC158\uC774 \uAC19\uC740 \uC571+\uD3EC\uD2B8(${appId}:${localPort})\uB85C \uC5F0\uACB0\uB418\uC5B4 \uC774 \uC138\uC158\uC774 \uC885\uB8CC\uB429\uB2C8\uB2E4. \uB3D9\uC77C \uBA38\uC2E0\uC5D0\uC11C \uB450 \uBC88 \uC2E4\uD589\uD558\uC9C0 \uB9C8\uC138\uC694.`);
+          shouldReconnect = false;
+          setTimeout(() => process.exit(1), 500);
+        } else {
+          error(`\uD130\uB110 \uC5D0\uB7EC: ${msg.error || msg.message || "\uC54C \uC218 \uC5C6\uB294 \uC5D0\uB7EC"}`);
+        }
         break;
       case "ping":
         sock.write(createWsTextFrame(JSON.stringify({ type: "pong" })));
@@ -1497,6 +1576,7 @@ ${colors.yellow}\uC635\uC158:${colors.reset}
   -u, --base-url <url>  \uC11C\uBC84 URL (\uAE30\uBCF8: ${DEFAULT_BASE_URL})
   -t, --timeout <sec>   \uD130\uB110 \uC694\uCCAD \uD0C0\uC784\uC544\uC6C3 (\uCD08, tunnel \uC804\uC6A9)
   --max-body <MB>       \uD130\uB110 \uCD5C\uB300 \uBC14\uB514 \uD06C\uAE30 (MB, tunnel \uC804\uC6A9)
+  --force               \uD130\uB110 lockfile \uBB34\uC2DC (\uC911\uBCF5 \uC2E4\uD589 \uAC15\uC81C, tunnel \uC804\uC6A9)
   -d, --dev             Dev \uD658\uACBD\uC5D0 \uBC30\uD3EC (deploy \uC804\uC6A9)
   (docs, mcp\uB294 \uBAA8\uB178\uB808\uD3EC\uB97C \uC790\uB3D9 \uAC10\uC9C0\uD558\uC5EC \uD504\uB85C\uC81D\uD2B8 \uB8E8\uD2B8\uC5D0 \uC0DD\uC131)
   -h, --help            \uB3C4\uC6C0\uB9D0 \uD45C\uC2DC
@@ -1562,6 +1642,8 @@ function parseArgs(args) {
       result.options.maxBody = args[++i];
     } else if (arg === "-a" || arg === "--app") {
       result.options.appId = args[++i];
+    } else if (arg === "--force") {
+      result.options.force = "true";
     } else if (arg === "-d" || arg === "--dev") {
       result.options.dev = "true";
     } else if (arg === "-h" || arg === "--help") {
@@ -1645,6 +1727,9 @@ async function main() {
     if (parsed.options.appId) {
       tunnelOpts.appId = parsed.options.appId;
     }
+    if (parsed.options.force === "true") {
+      tunnelOpts.force = true;
+    }
     await startTunnel(port, config, tunnelOpts);
   } else {
     error(`\uC54C \uC218 \uC5C6\uB294 \uBA85\uB839\uC5B4: ${parsed.command}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "connectbase-client",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Connect Base JavaScript/TypeScript SDK for browser and Node.js",
   "repository": {
     "type": "git",