@optima-chat/browser-cli 0.18.0 → 0.18.1

package/dist/index.js

@@ -4,6 +4,9 @@
 import { createRequire } from "module";
 import { Command } from "commander";
 
+// src/api.ts
+import { createHash } from "crypto";
+
 // src/config.ts
 import { readFileSync, existsSync } from "fs";
 import { join } from "path";
@@ -77,26 +80,41 @@ function getCurrentEnv() {
   }
   return "development";
 }
+function resolveToken(required) {
+  for (const key of ["BROWSER_TOKEN", "OPTIMA_TOKEN"]) {
+    const value = process.env[key]?.trim();
+    if (value) return { token: value, source: key, required };
+  }
+  const noEnv = "\u672A\u8BBE\u7F6E BROWSER_TOKEN / OPTIMA_TOKEN";
+  const file = readOptimaToken();
+  if (!file?.access_token) {
+    return { token: null, source: null, required, missingReason: `${noEnv}\uFF0C~/.optima/token.json \u4E0D\u5B58\u5728\u6216\u6CA1\u6709 access_token` };
+  }
+  const expiresAt = typeof file.expires_at === "number" && Number.isFinite(file.expires_at) ? file.expires_at : void 0;
+  if (expiresAt !== void 0 && expiresAt <= Date.now()) {
+    return {
+      token: null,
+      source: null,
+      required,
+      missingReason: `${noEnv}\uFF0C~/.optima/token.json \u7684\u7968\u5DF2\u4E8E ${new Date(expiresAt).toISOString()} \u8FC7\u671F`
+    };
+  }
+  return { token: file.access_token, source: "token.json", expiresAt, required };
+}
 function loadConfig() {
   const apiUrlOverride = process.env.BROWSER_API_URL;
   const env = apiUrlOverride ? void 0 : getCurrentEnv();
   const apiUrl = apiUrlOverride ?? ENV_CONFIG[env].apiUrl;
-  let token = process.env.BROWSER_TOKEN || null;
-  if (!token) {
-    const optimaToken = readOptimaToken();
-    if (optimaToken?.access_token) {
-      token = optimaToken.access_token;
-    }
-  }
+  const auth = resolveToken(env !== void 0 && env !== "development");
   return {
     apiUrl,
-    token,
+    auth,
     env
   };
 }
 var config = loadConfig();
 var BROWSER_API_URL = config.apiUrl;
-var ACCESS_TOKEN = config.token;
+var AUTH = config.auth;
 
 // src/api.ts
 var BrowserAPIError = class extends Error {
@@ -117,15 +135,34 @@ function toAPIError(status, statusText, body) {
   }
   return new BrowserAPIError(status, "unknown", `HTTP ${status}: ${statusText}`);
 }
+function authHeader() {
+  if (AUTH.token) return { Authorization: `Bearer ${AUTH.token}` };
+  if (AUTH.required) {
+    throw new Error(`\u65E0\u53EF\u7528\u51ED\u8BC1\uFF1A${AUTH.missingReason}\u3002\u8FD9\u662F Optima \u5E73\u53F0\u51ED\u8BC1\uFF0C\u4E0E\u5E97\u94FA/\u6D4F\u89C8\u5668\u7684\u767B\u5F55\u65E0\u5173\u3002`);
+  }
+  return {};
+}
+function withAuthContext(err) {
+  if (err.statusCode !== 401) return err;
+  if (!AUTH.token) {
+    err.message += `\uFF08\u672A\u5E26\u51ED\u8BC1\uFF1A${AUTH.missingReason}\uFF09`;
+    return err;
+  }
+  const fp = createHash("sha256").update(AUTH.token).digest("hex").slice(0, 12);
+  const exp = AUTH.expiresAt !== void 0 ? `\uFF0Cexpires_at=${new Date(AUTH.expiresAt).toISOString()}` : "";
+  err.message += `\uFF08\u51ED\u8BC1\u6765\u6E90 ${AUTH.source}${exp}\uFF0Cfp=${fp}\uFF09`;
+  return err;
+}
 async function request(path, options = {}) {
   const url = `${BROWSER_API_URL}${path}`;
+  const auth = authHeader();
   let response;
   try {
     response = await fetch(url, {
       ...options,
       headers: {
         "Content-Type": "application/json",
-        ...ACCESS_TOKEN ? { Authorization: `Bearer ${ACCESS_TOKEN}` } : {},
+        ...auth,
         ...options.headers
       }
     });
@@ -139,13 +176,13 @@ async function request(path, options = {}) {
     try {
       body = await response.json();
     } catch {
-      throw new BrowserAPIError(
+      throw withAuthContext(new BrowserAPIError(
         response.status,
         "unknown",
         `HTTP ${response.status}: ${response.statusText}`
-      );
+      ));
     }
-    throw toAPIError(response.status, response.statusText, body);
+    throw withAuthContext(toAPIError(response.status, response.statusText, body));
   }
   if (response.status === 204) {
     return void 0;
@@ -154,12 +191,11 @@ async function request(path, options = {}) {
 }
 async function requestBinary(path) {
   const url = `${BROWSER_API_URL}${path}`;
+  const auth = authHeader();
   let response;
   try {
     response = await fetch(url, {
-      headers: {
-        ...ACCESS_TOKEN ? { Authorization: `Bearer ${ACCESS_TOKEN}` } : {}
-      }
+      headers: auth
     });
   } catch {
     throw new Error(
@@ -171,13 +207,13 @@ async function requestBinary(path) {
     try {
       body = await response.json();
     } catch {
-      throw new BrowserAPIError(
+      throw withAuthContext(new BrowserAPIError(
         response.status,
         "unknown",
         `HTTP ${response.status}: ${response.statusText}`
-      );
+      ));
     }
-    throw toAPIError(response.status, response.statusText, body);
+    throw withAuthContext(toAPIError(response.status, response.statusText, body));
   }
   const arrayBuffer = await response.arrayBuffer();
   return Buffer.from(arrayBuffer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optima-chat/browser-cli",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {