connectbase-client 0.10.13 → 0.11.0

package/dist/cli.js

@@ -113,6 +113,8 @@ var BINARY_EXTENSIONS = /* @__PURE__ */ new Set([
 ]);
 function loadConfig() {
   const config = {
+    publicKey: process.env.CONNECTBASE_PUBLIC_KEY ?? process.env.CONNECTBASE_API_KEY,
+    secretKey: process.env.CONNECTBASE_SECRET_KEY,
     apiKey: process.env.CONNECTBASE_API_KEY,
     storageId: process.env.CONNECTBASE_STORAGE_ID,
     baseUrl: process.env.CONNECTBASE_BASE_URL || DEFAULT_BASE_URL
@@ -121,8 +123,16 @@ function loadConfig() {
   if (fs.existsSync(rcPath)) {
     try {
       const rcContent = JSON.parse(fs.readFileSync(rcPath, "utf-8"));
-      if (rcContent.apiKey) config.apiKey = rcContent.apiKey;
+      if (rcContent.publicKey) config.publicKey = rcContent.publicKey;
       if (rcContent.secretKey) config.secretKey = rcContent.secretKey;
+      if (rcContent.apiKey && !config.publicKey && !config.secretKey) {
+        if (rcContent.apiKey.startsWith("cb_sk_")) {
+          config.secretKey = rcContent.apiKey;
+        } else {
+          config.publicKey = rcContent.apiKey;
+        }
+      }
+      if (rcContent.apiKey) config.apiKey = rcContent.apiKey;
       if (rcContent.storageId) config.storageId = rcContent.storageId;
       if (rcContent.baseUrl) config.baseUrl = rcContent.baseUrl;
       if (rcContent.deployDir) config.deployDir = rcContent.deployDir;
@@ -256,7 +266,7 @@ async function deploy(directory, config, isDev = false) {
       url,
       "POST",
       {
-        "X-API-Key": config.apiKey
+        "X-Public-Key": config.publicKey ?? config.apiKey
       },
       JSON.stringify({
         files: files.map((f) => ({
@@ -496,7 +506,7 @@ ${colors.dim}\uC778\uC99D \uBC29\uC2DD\uC744 \uC120\uD0DD\uD558\uC138\uC694:${co
     const appsRes = await makeRequest(
       `${DEFAULT_BASE_URL}/v1/public/cli/apps`,
       "GET",
-      { "X-API-Key": secretKey }
+      { "X-Public-Key": secretKey }
     );
     if (appsRes.status === 401) {
       error("Secret Key\uAC00 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uCF58\uC194\uC5D0\uC11C \uD0A4\uB97C \uD655\uC778\uD558\uC138\uC694");
@@ -525,7 +535,7 @@ ${colors.blue}?${colors.reset} \uC120\uD0DD (\uBC88\uD638): `);
         const newKeyRes = await makeRequest(
           `${DEFAULT_BASE_URL}/v1/public/cli/apps/${appId}/api-keys/public`,
           "POST",
-          { "X-API-Key": secretKey },
+          { "X-Public-Key": secretKey },
           JSON.stringify({})
         );
         if (newKeyRes.status === 201) {
@@ -544,7 +554,7 @@ ${colors.blue}?${colors.reset} \uC120\uD0DD (\uBC88\uD638): `);
       const createRes = await makeRequest(
         `${DEFAULT_BASE_URL}/v1/public/cli/apps`,
         "POST",
-        { "X-API-Key": secretKey },
+        { "X-Public-Key": secretKey },
         JSON.stringify({ name: appName })
       );
       if (createRes.status === 402) {
@@ -574,14 +584,14 @@ ${colors.blue}?${colors.reset} \uC120\uD0DD (\uBC88\uD638): `);
       process.exit(1);
     }
   }
-  const apiKeyForSdk = publicKey || secretKey;
+  const publicKeyForSdk = publicKey || secretKey;
   let storageId = "";
   try {
     info("\uC6F9 \uC2A4\uD1A0\uB9AC\uC9C0 \uC870\uD68C \uC911...");
     const listRes = await makeRequest(
       `${DEFAULT_BASE_URL}/v1/public/storages/webs`,
       "GET",
-      { "X-API-Key": apiKeyForSdk }
+      { "X-Public-Key": publicKeyForSdk }
     );
     if (listRes.status === 200) {
       const listData = listRes.data;
@@ -608,7 +618,7 @@ ${colors.blue}?${colors.reset} \uC120\uD0DD (\uBC88\uD638): `);
         const createRes = await makeRequest(
           `${DEFAULT_BASE_URL}/v1/public/storages/webs`,
           "POST",
-          { "X-API-Key": apiKeyForSdk },
+          { "X-Public-Key": publicKeyForSdk },
           JSON.stringify({ name })
         );
         if (createRes.status !== 200) {
@@ -635,7 +645,7 @@ ${colors.blue}?${colors.reset} \uC120\uD0DD (\uBC88\uD638): `);
   const defaultDir = detectBuildDir();
   const deployDir = await prompt(`${colors.blue}?${colors.reset} \uBC30\uD3EC \uB514\uB809\uD1A0\uB9AC (${defaultDir}): `) || defaultDir;
   const config = {
-    apiKey: publicKey || "",
+    publicKey: publicKey || "",
     storageId,
     deployDir
   };
@@ -646,7 +656,7 @@ ${colors.blue}?${colors.reset} \uC120\uD0DD (\uBC88\uD638): `);
   success(".connectbaserc \uC0DD\uC131 \uC644\uB8CC");
   addToGitignore(".connectbaserc");
   addDeployScript(deployDir);
-  await setupClaudeCode(apiKeyForSdk, secretKey, projectRoot);
+  await setupClaudeCode(publicKeyForSdk, secretKey, projectRoot);
   log(`
 ${colors.green}\uCD08\uAE30\uD654 \uC644\uB8CC!${colors.reset}
 `);
@@ -751,7 +761,7 @@ function detectMonorepo(gitRoot) {
   }
   return result;
 }
-async function downloadDocs(apiKey, templates, baseDir) {
+async function downloadDocs(publicKey, templates, baseDir) {
   if (!baseDir) {
     baseDir = getProjectRoot();
   }
@@ -775,7 +785,7 @@ async function downloadDocs(apiKey, templates, baseDir) {
   try {
     const templateParam = templates.join(",");
     const res = await makeRequest(
-      `${DEFAULT_BASE_URL}/v1/storages/webs/claude-md?template=${encodeURIComponent(templateParam)}&format=sections&api_key=${encodeURIComponent(apiKey)}`,
+      `${DEFAULT_BASE_URL}/v1/storages/webs/claude-md?template=${encodeURIComponent(templateParam)}&format=sections&public_key=${encodeURIComponent(publicKey)}`,
       "GET",
       {}
     );
@@ -955,9 +965,9 @@ ${colors.dim}\uC778\uC99D \uBC29\uC2DD\uC744 \uC120\uD0DD\uD558\uC138\uC694:${co
   log(`
 ${colors.dim}Claude Code\uC5D0\uC11C ConnectBase MCP \uB3C4\uAD6C\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.${colors.reset}`);
 }
-async function setupClaudeCode(apiKey, secretKey, projectRoot) {
+async function setupClaudeCode(publicKey, secretKey, projectRoot) {
   const root = projectRoot || getProjectRoot();
-  await downloadDocs(apiKey, void 0, root);
+  await downloadDocs(publicKey, void 0, root);
   await setupMcp(secretKey);
 }
 function createWsTextFrame(payload) {
@@ -1074,7 +1084,7 @@ function getTunnelServerUrl(baseUrl) {
   }
   return baseUrl.replace(/:\d+/, ":8090");
 }
-async function resolveAppForTunnel(apiKey, baseUrl, appIdOption) {
+async function resolveAppForTunnel(secretKey, baseUrl, appIdOption) {
   if (appIdOption) {
     return appIdOption;
   }
@@ -1084,7 +1094,7 @@ async function resolveAppForTunnel(apiKey, baseUrl, appIdOption) {
     const appsRes = await makeRequest(
       `${baseUrl}/v1/public/cli/apps`,
       "GET",
-      { "X-API-Key": apiKey }
+      { "X-Public-Key": secretKey }
     );
     if (appsRes.status === 401) {
       error("Secret Key\uAC00 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uCF58\uC194\uC5D0\uC11C \uD0A4\uB97C \uD655\uC778\uD558\uC138\uC694");
@@ -1125,7 +1135,7 @@ ${colors.blue}?${colors.reset} \uC571 \uC120\uD0DD (\uBC88\uD638): `);
   const createRes = await makeRequest(
     `${baseUrl}/v1/public/cli/apps`,
     "POST",
-    { "X-API-Key": apiKey },
+    { "X-Public-Key": secretKey },
     JSON.stringify({ name: appName })
   );
   if (createRes.status === 402) {
@@ -1142,7 +1152,7 @@ ${colors.blue}?${colors.reset} \uC571 \uC120\uD0DD (\uBC88\uD638): `);
   return createData.app_id;
 }
 async function startTunnel(port, config, tunnelOpts) {
-  const tunnelKey = config.secretKey || (config.apiKey?.startsWith("cb_sk_") ? config.apiKey : "");
+  let tunnelKey = config.secretKey || (config.apiKey?.startsWith("cb_sk_") ? config.apiKey : "");
   if (!tunnelKey) {
     info("Secret Key\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. \uBE0C\uB77C\uC6B0\uC800 \uB85C\uADF8\uC778\uC73C\uB85C \uBC1C\uAE09\uD569\uB2C8\uB2E4...");
     try {
@@ -1159,14 +1169,15 @@ async function startTunnel(port, config, tunnelOpts) {
       fs.writeFileSync(rcPath2, JSON.stringify(rcData, null, 2) + "\n");
       addToGitignore(".connectbaserc");
       success("Secret Key \uBC1C\uAE09 \uBC0F \uC800\uC7A5 \uC644\uB8CC");
-      config.apiKey = sk;
+      tunnelKey = sk;
+      config.secretKey = sk;
     } catch (err) {
       error(`\uC778\uC99D \uC2E4\uD328: ${err instanceof Error ? err.message : err}`);
       info("-k \uC635\uC158\uC73C\uB85C Secret Key\uB97C \uC9C1\uC811 \uC804\uB2EC\uD560 \uC218\uB3C4 \uC788\uC2B5\uB2C8\uB2E4");
       process.exit(1);
     }
   } else {
-    config.apiKey = tunnelKey;
+    config.secretKey = tunnelKey;
   }
   const rcPath = path.join(process.cwd(), ".connectbaserc");
   let savedAppId = tunnelOpts?.appId || "";
@@ -1177,7 +1188,7 @@ async function startTunnel(port, config, tunnelOpts) {
     } catch {
     }
   }
-  const appId = await resolveAppForTunnel(config.apiKey, config.baseUrl, savedAppId);
+  const appId = await resolveAppForTunnel(tunnelKey, config.baseUrl, savedAppId);
   try {
     let rcData = {};
     if (fs.existsSync(rcPath)) {
@@ -1195,7 +1206,7 @@ async function startTunnel(port, config, tunnelOpts) {
   const tunnelServerUrl = getTunnelServerUrl(config.baseUrl);
   const parsedUrl = new URL(tunnelServerUrl);
   const isHttps = parsedUrl.protocol === "https:";
-  let wsPath = `/v1/tunnel/connect?app_id=${encodeURIComponent(appId)}`;
+  let wsPath = `/v1/tunnel/connect?app_id=${encodeURIComponent(appId)}&local_port=${port}`;
   if (tunnelOpts?.timeout) {
     wsPath += `&timeout=${tunnelOpts.timeout}`;
   }
@@ -1242,7 +1253,7 @@ ${colors.cyan}ConnectBase Tunnel${colors.reset}`);
         "Connection": "Upgrade",
         "Sec-WebSocket-Key": wsKey,
         "Sec-WebSocket-Version": "13",
-        "Authorization": `Bearer ${config.apiKey}`
+        "Authorization": `Bearer ${config.secretKey ?? config.apiKey}`
       }
     };
     const req = lib.request(reqOptions);
@@ -1519,13 +1530,16 @@ ${colors.yellow}\uBE60\uB978 \uC2DC\uC791:${colors.reset}
   npx connectbase tunnel 7860 --timeout 300 --max-body 50
 
 ${colors.yellow}\uD658\uACBD\uBCC0\uC218:${colors.reset}
-  CONNECTBASE_API_KEY       API Key
+  CONNECTBASE_PUBLIC_KEY    Public Key (cb_pk_*)
+  CONNECTBASE_SECRET_KEY    Secret Key (cb_sk_*, \uD130\uB110\uC6A9)
+  CONNECTBASE_API_KEY       (deprecated) \uB808\uAC70\uC2DC \u2014 publicKey \uB610\uB294 secretKey \uB85C \uC0AC\uC6A9
   CONNECTBASE_STORAGE_ID    \uC2A4\uD1A0\uB9AC\uC9C0 ID
   CONNECTBASE_BASE_URL      \uC11C\uBC84 URL
 
 ${colors.yellow}\uC124\uC815 \uD30C\uC77C (.connectbaserc):${colors.reset}
   {
-    "apiKey": "your-api-key",
+    "publicKey": "cb_pk_...",
+    "secretKey": "cb_sk_...",
     "storageId": "your-storage-id",
     "deployDir": "./dist"
   }
@@ -1541,8 +1555,10 @@ function parseArgs(args) {
     const arg = args[i];
     if (arg === "-s" || arg === "--storage") {
       result.options.storageId = args[++i];
-    } else if (arg === "-k" || arg === "--api-key") {
-      result.options.apiKey = args[++i];
+    } else if (arg === "-k" || arg === "--public-key" || arg === "--api-key") {
+      result.options.publicKey = args[++i];
+    } else if (arg === "--secret-key") {
+      result.options.secretKey = args[++i];
     } else if (arg === "-u" || arg === "--base-url") {
       result.options.baseUrl = args[++i];
     } else if (arg === "-t" || arg === "--timeout") {
@@ -1580,28 +1596,30 @@ async function main() {
   }
   const fileConfig = loadConfig();
   const config = {
-    apiKey: parsed.options.apiKey || fileConfig.apiKey,
+    publicKey: parsed.options.publicKey || fileConfig.publicKey,
+    secretKey: parsed.options.secretKey || fileConfig.secretKey,
+    apiKey: fileConfig.apiKey,
     storageId: parsed.options.storageId || fileConfig.storageId,
     baseUrl: parsed.options.baseUrl || fileConfig.baseUrl || DEFAULT_BASE_URL
   };
   if (parsed.command === "init") {
     await init();
   } else if (parsed.command === "docs") {
-    let docsApiKey = config.apiKey;
-    if (!docsApiKey) {
-      docsApiKey = await prompt(`${colors.blue}?${colors.reset} API Key: `);
-      if (!docsApiKey) {
-        error("API Key\uB294 \uD544\uC218\uC785\uB2C8\uB2E4");
+    let docsPublicKey = config.publicKey ?? config.apiKey;
+    if (!docsPublicKey) {
+      docsPublicKey = await prompt(`${colors.blue}?${colors.reset} Public Key: `);
+      if (!docsPublicKey) {
+        error("Public Key\uB294 \uD544\uC218\uC785\uB2C8\uB2E4");
         process.exit(1);
       }
     }
-    await downloadDocs(docsApiKey);
+    await downloadDocs(docsPublicKey);
   } else if (parsed.command === "mcp") {
     await setupMcp();
   } else if (parsed.command === "deploy") {
     const directory = parsed.args[0] || fileConfig.deployDir || ".";
-    if (!config.apiKey) {
-      error('API Key\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4. "npx connectbase-client init"\uC73C\uB85C \uC124\uC815\uD558\uAC70\uB098 -k \uC635\uC158\uC744 \uC0AC\uC6A9\uD558\uC138\uC694');
+    if (!config.publicKey && !config.apiKey) {
+      error('Public Key\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4. "npx connectbase-client init"\uC73C\uB85C \uC124\uC815\uD558\uAC70\uB098 -k \uC635\uC158\uC744 \uC0AC\uC6A9\uD558\uC138\uC694');
       process.exit(1);
     }
     if (!config.storageId) {