@lark-apaas/db-schema-sync 0.1.2 → 0.1.3-alpha.1

package/dist/bin.js

@@ -6,7 +6,7 @@ import {
   __toESM,
   generateSchema,
   resolveEnvOptions
-} from "./chunk-OFEXLJ35.js";
+} from "./chunk-BLUXGT2D.js";
 
 // node_modules/dotenv/package.json
 var require_package = __commonJS({

package/dist/{chunk-OFEXLJ35.js → chunk-BLUXGT2D.js}

@@ -31,9 +31,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../../node_modules/@lark-apaas/http-client/dist/index.js
+// ../../server/http-client/dist/index.js
 var require_dist = __commonJS({
-  "../../../node_modules/@lark-apaas/http-client/dist/index.js"(exports, module) {
+  "../../server/http-client/dist/index.js"(exports, module) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -56,7 +56,6 @@ var require_dist = __commonJS({
     __export(index_exports, {
       DEFAULT_CLOCK_TOLERANCE_SEC: () => DEFAULT_CLOCK_TOLERANCE_SEC,
       DEFAULT_JWT_EXPIRE_TIME_MS: () => DEFAULT_JWT_EXPIRE_TIME_MS,
-      FileTokenProvider: () => FileTokenProvider,
       HttpClient: () => HttpClient2,
       HttpError: () => HttpError,
       generateJWTToken: () => generateJWTToken,
@@ -198,7 +197,7 @@ var require_dist = __commonJS({
       getCacheKey(claims) {
         const parts = [
           claims.access_key,
-          claims.tenant_id?.toString() || "",
+          claims.tenant_id || "",
           claims.user_id || "",
           claims.app_id || "",
           claims.app_env || "",
@@ -229,80 +228,12 @@ var require_dist = __commonJS({
         };
       }
     };
-    var import_fs = __require("fs");
-    var DEFAULT_REFRESH_BEFORE_MS = 5 * 60 * 1e3;
-    var DEFAULT_TOKEN_PATHS = [
-      "/home/gem/workspace/.force/openclaw/miaoda-provider-key"
-    ];
-    var FileTokenProvider = class {
-      cache = /* @__PURE__ */ new Map();
-      paths;
-      refreshBeforeMs;
-      constructor(config) {
-        this.paths = config?.paths ?? DEFAULT_TOKEN_PATHS;
-        this.refreshBeforeMs = config?.refreshBeforeMs ?? DEFAULT_REFRESH_BEFORE_MS;
-      }
-      /**
-       * 获取 token，按路径优先级依次尝试
-       *
-       * 1. 缓存有效且不在刷新窗口 → 直接返回
-       * 2. 进入刷新窗口 → 重读文件，更新缓存
-       * 3. 文件未更新但缓存未过期 → 仍返回旧缓存
-       * 4. 所有路径均无有效 token → 返回 null
-       */
-      getToken() {
-        const now = Date.now();
-        for (const filePath of this.paths) {
-          const cached = this.cache.get(filePath);
-          if (cached && cached.expiresAtMs - now > this.refreshBeforeMs) {
-            return { token: cached.token, accessKey: cached.accessKey };
-          }
-          const result = this.readAndParse(filePath);
-          if (result) {
-            this.cache.set(filePath, result);
-            if (result.expiresAtMs > now) {
-              return { token: result.token, accessKey: result.accessKey };
-            }
-          }
-          if (cached && cached.expiresAtMs > now) {
-            return { token: cached.token, accessKey: cached.accessKey };
-          }
-        }
-        return null;
-      }
-      clearCache() {
-        this.cache.clear();
-      }
-      readAndParse(filePath) {
-        try {
-          const token = (0, import_fs.readFileSync)(filePath, "utf-8").trim();
-          if (!token) return null;
-          const payload = this.decodePayload(token);
-          if (!payload?.exp) return null;
-          return {
-            token,
-            accessKey: payload.access_key ?? "",
-            expiresAtMs: payload.exp * 1e3
-          };
-        } catch {
-          return null;
-        }
-      }
-      decodePayload(token) {
-        try {
-          const segments = token.split(".");
-          if (segments.length !== 3) return null;
-          const padLength = (4 - (segments[1].length % 4 || 4)) % 4;
-          const padded = `${segments[1]}${"=".repeat(padLength)}`.replace(/-/g, "+").replace(/_/g, "/");
-          return JSON.parse(Buffer.from(padded, "base64").toString("utf8"));
-        } catch {
-          return null;
-        }
-      }
-    };
     var DEFAULT_DOMAIN_ENV = "FORCE_AUTHN_INNERAPI_DOMAIN";
     var DEFAULT_ACCESS_KEY_ENV = "FORCE_AUTHN_ACCESS_KEY";
     var DEFAULT_SECRET_KEY_ENV = "FORCE_AUTHN_ACCESS_SECRET";
+    var DEFAULT_ADMIN_DOMAIN_ENV = "MIAODA_DEV_INNER_DOMAIN_WITH_PREFIX";
+    var DEFAULT_CLIENT_TOKEN_ENV = "MIAODA_AUTHN_CODE";
+    var MIAODA_CLIENT_TOKEN_HEADER = "X-Miaoda-Client-Token";
     function resolvePlatformBaseURL(options) {
       if (!options?.enabled) {
         return options?.baseURL;
@@ -310,7 +241,7 @@ var require_dist = __commonJS({
       if (options.baseURL) {
         return options.baseURL;
       }
-      const envName = options.domainEnv || DEFAULT_DOMAIN_ENV;
+      const envName = options.adminInnerApi ? options.adminDomainEnv || DEFAULT_ADMIN_DOMAIN_ENV : options.domainEnv || DEFAULT_DOMAIN_ENV;
       const domain = process.env[envName];
       if (!domain) {
         throw new Error(`\u5E73\u53F0\u6A21\u5F0F\u9700\u8981\u57FA\u7840\u57DF\u540D\uFF0C\u8BF7\u8BBE\u7F6E\u73AF\u5883\u53D8\u91CF ${envName}`);
@@ -322,13 +253,6 @@ var require_dist = __commonJS({
         return void 0;
       }
       ensureNoAccessKeyOverride("platform.defaultClaims", options.defaultClaims);
-      let fileTokenProvider;
-      if (options.tokenProvider?.type === "file") {
-        fileTokenProvider = new FileTokenProvider({
-          paths: options.tokenProvider.paths,
-          refreshBeforeMs: options.refreshBeforeMs
-        });
-      }
       const accessKeyEnv = options.accessKeyEnv || DEFAULT_ACCESS_KEY_ENV;
       const secretKeyEnv = options.secretKeyEnv || DEFAULT_SECRET_KEY_ENV;
       const accessKey = options.accessKey ?? (process.env[accessKeyEnv] || "");
@@ -340,18 +264,8 @@ var require_dist = __commonJS({
         expireTimeMs,
         refreshBeforeMs: options.refreshBeforeMs
       });
+      const clientTokenEnv = options.clientTokenEnv || DEFAULT_CLIENT_TOKEN_ENV;
       interceptors.request.use((config) => {
-        if (fileTokenProvider) {
-          const fileToken = fileTokenProvider.getToken();
-          if (fileToken) {
-            const headers2 = {
-              ...config.headers,
-              "Authorization": `Bearer ${fileToken.token}`,
-              "x-api-key": fileToken.accessKey
-            };
-            return { ...config, headers: headers2 };
-          }
-        }
         ensureNoAccessKeyOverride("request.platformAuth.customClaims", config.platformAuth?.customClaims);
         const claims = {
           ...options.defaultClaims || {},
@@ -364,6 +278,12 @@ var require_dist = __commonJS({
           "Authorization": `Bearer ${token}`,
           "x-api-key": accessKey
         };
+        if (options.adminInnerApi) {
+          const clientToken = process.env[clientTokenEnv];
+          if (clientToken) {
+            headers[MIAODA_CLIENT_TOKEN_HEADER] = clientToken;
+          }
+        }
         return {
           ...config,
           headers
@@ -491,7 +411,7 @@ var require_dist = __commonJS({
         response: new InterceptorManager()
       };
       constructor(config) {
-        const { platform, security, ...restConfig } = config || {};
+        const { platform, security, preInterceptors, ...restConfig } = config || {};
         this.defaultConfig = {
           timeout: 5e3,
           ...restConfig
@@ -504,12 +424,14 @@ var require_dist = __commonJS({
           strictMode,
           ...security
         };
+        this.registerRequestPreInterceptors(preInterceptors?.request);
         if (platform?.enabled) {
           if (!this.defaultConfig.baseURL) {
             this.defaultConfig.baseURL = resolvePlatformBaseURL(platform);
           }
           registerPlatformPlugin(this.interceptors, platform);
         }
+        this.registerResponsePreInterceptors(preInterceptors?.response);
       }
       /**
        * GET 请求
@@ -659,6 +581,31 @@ var require_dist = __commonJS({
           return this.runResponseInterceptors(Promise.reject(httpError));
         }
       }
+      /**
+       * 执行请求拦截器链
+       */
+      registerRequestPreInterceptors(interceptors) {
+        if (!interceptors?.length) {
+          return;
+        }
+        for (const interceptor of interceptors) {
+          this.interceptors.request.use(
+            interceptor.onFulfilled,
+            interceptor.onRejected
+          );
+        }
+      }
+      registerResponsePreInterceptors(interceptors) {
+        if (!interceptors?.length) {
+          return;
+        }
+        for (const interceptor of interceptors) {
+          this.interceptors.response.use(
+            interceptor.onFulfilled,
+            interceptor.onRejected
+          );
+        }
+      }
       /**
        * 执行请求拦截器链
        */

package/dist/index.js

@@ -5,7 +5,7 @@ import {
   generateSchemaFromData,
   normalizeApiResponse,
   resolveEnvOptions
-} from "./chunk-OFEXLJ35.js";
+} from "./chunk-BLUXGT2D.js";
 export {
   generateSchema,
   generateSchemaCode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/db-schema-sync",
-  "version": "0.1.2",
+  "version": "0.1.3-alpha.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@lark-apaas/http-client": "^0.1.5",
+    "@lark-apaas/http-client": "0.1.6-alpha.1",
     "dotenv": "^17.3.1",
     "tiny-pinyin": "^1.3.2"
   },