@lark-apaas/db-schema-sync 0.1.9 → 0.1.11-alpha.0

package/dist/bin.js

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

package/dist/{chunk-QLAAPH4Z.js → chunk-KZVZNV7Y.js}

@@ -56,6 +56,7 @@ 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,
@@ -197,7 +198,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 || "",
@@ -228,9 +229,95 @@ var require_dist = __commonJS({
         };
       }
     };
+    var StaticTokenSource = class {
+      constructor(token) {
+        this.token = token;
+        if (!token) {
+          throw new Error("StaticTokenSource: token \u4E0D\u80FD\u4E3A\u7A7A");
+        }
+      }
+      getToken(_claims) {
+        return this.token;
+      }
+    };
+    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_TOKEN_ENV = "FORCE_AUTHN_TOKEN";
+    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;
@@ -238,7 +325,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}`);
@@ -250,6 +337,13 @@ 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] || "");
@@ -261,19 +355,49 @@ var require_dist = __commonJS({
         expireTimeMs,
         refreshBeforeMs: options.refreshBeforeMs
       });
+      const tokenEnv = options.tokenEnv || DEFAULT_TOKEN_ENV;
+      const platformToken = options.token ?? (process.env[tokenEnv] || "");
+      const staticTokenSource = platformToken ? new StaticTokenSource(platformToken) : null;
+      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 || {},
           ...config.platformAuth?.customClaims || {},
           access_key: accessKey
         };
-        const token = tokenManager.getToken(claims);
+        let token;
+        if (staticTokenSource) {
+          try {
+            token = staticTokenSource.getToken(claims);
+          } catch {
+            token = tokenManager.getToken(claims);
+          }
+        } else {
+          token = tokenManager.getToken(claims);
+        }
         const headers = {
           ...config.headers,
           "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
@@ -401,7 +525,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
@@ -414,12 +538,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 请求
@@ -569,6 +695,34 @@ var require_dist = __commonJS({
           return this.runResponseInterceptors(Promise.reject(httpError));
         }
       }
+      /**
+       * 注册请求 preInterceptors
+       */
+      registerRequestPreInterceptors(interceptors) {
+        if (!interceptors?.length) {
+          return;
+        }
+        for (const interceptor of interceptors) {
+          this.interceptors.request.use(
+            interceptor.onFulfilled,
+            interceptor.onRejected
+          );
+        }
+      }
+      /**
+       * 注册响应 preInterceptors
+       */
+      registerResponsePreInterceptors(interceptors) {
+        if (!interceptors?.length) {
+          return;
+        }
+        for (const interceptor of interceptors) {
+          this.interceptors.response.use(
+            interceptor.onFulfilled,
+            interceptor.onRejected
+          );
+        }
+      }
       /**
        * 执行请求拦截器链
        */
@@ -1228,12 +1382,15 @@ function escapeDoubleQuote(s) {
 
 // src/generator/mappers/primitives.ts
 var PG_CORE = "drizzle-orm/pg-core";
+function withArray(base, f) {
+  return f.isArray ? `${base}.array()` : base;
+}
 var primitiveMappers = [
   // uuid
   {
     name: "uuid",
     match: (f) => f.type === "uuid",
-    generate: (f) => `uuid("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`uuid("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "uuid", from: PG_CORE }]
   },
   // varchar (honors extraInfo.max_length from listTableView API)
@@ -1243,9 +1400,9 @@ var primitiveMappers = [
     generate: (f) => {
       const maxLength = f.extraInfo?.max_length;
       if (typeof maxLength === "number" && Number.isInteger(maxLength) && maxLength > 0) {
-        return `varchar("${escapeDoubleQuote(f.fieldName)}", { length: ${maxLength} })`;
+        return withArray(`varchar("${escapeDoubleQuote(f.fieldName)}", { length: ${maxLength} })`, f);
       }
-      return `varchar("${escapeDoubleQuote(f.fieldName)}")`;
+      return withArray(`varchar("${escapeDoubleQuote(f.fieldName)}")`, f);
     },
     imports: () => [{ name: "varchar", from: PG_CORE }]
   },
@@ -1253,105 +1410,105 @@ var primitiveMappers = [
   {
     name: "text",
     match: (f) => f.type === "text",
-    generate: (f) => `text("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`text("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "text", from: PG_CORE }]
   },
   // smallint (int2)
   {
     name: "smallint",
     match: (f) => f.type === "int2",
-    generate: (f) => `smallint("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`smallint("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "smallint", from: PG_CORE }]
   },
   // integer (int4, integer)
   {
     name: "integer",
     match: (f) => ["int4", "integer"].includes(f.type),
-    generate: (f) => `integer("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`integer("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "integer", from: PG_CORE }]
   },
   // bigint (int8, bigint)
   {
     name: "bigint",
     match: (f) => ["int8", "bigint"].includes(f.type),
-    generate: (f) => `bigint("${escapeDoubleQuote(f.fieldName)}", { mode: 'number' })`,
+    generate: (f) => withArray(`bigint("${escapeDoubleQuote(f.fieldName)}", { mode: 'number' })`, f),
     imports: () => [{ name: "bigint", from: PG_CORE }]
   },
   // real (float4, real)
   {
     name: "real",
     match: (f) => ["float4", "real"].includes(f.type),
-    generate: (f) => `real("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`real("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "real", from: PG_CORE }]
   },
   // doublePrecision (float8, double precision)
   {
     name: "doublePrecision",
     match: (f) => ["float8", "double precision"].includes(f.type),
-    generate: (f) => `doublePrecision("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`doublePrecision("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "doublePrecision", from: PG_CORE }]
   },
   // numeric (numeric, decimal)
   {
     name: "numeric",
     match: (f) => ["numeric", "decimal"].includes(f.type),
-    generate: (f) => `numeric("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`numeric("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "numeric", from: PG_CORE }]
   },
   // boolean (bool, boolean)
   {
     name: "boolean",
     match: (f) => ["bool", "boolean"].includes(f.type),
-    generate: (f) => `boolean("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`boolean("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "boolean", from: PG_CORE }]
   },
   // json
   {
     name: "json",
     match: (f) => f.type === "json",
-    generate: (f) => `json("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`json("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "json", from: PG_CORE }]
   },
   // jsonb
   {
     name: "jsonb",
     match: (f) => f.type === "jsonb",
-    generate: (f) => `jsonb("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`jsonb("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "jsonb", from: PG_CORE }]
   },
   // timestamp (without timezone) — uses drizzle-orm timestamp, not customTimestamptz
   {
     name: "timestamp",
     match: (f) => f.type === "timestamp",
-    generate: (f) => `timestamp("${escapeDoubleQuote(f.fieldName)}", { mode: 'string' })`,
+    generate: (f) => withArray(`timestamp("${escapeDoubleQuote(f.fieldName)}", { mode: 'string' })`, f),
     imports: () => [{ name: "timestamp", from: PG_CORE }]
   },
   // date
   {
     name: "date",
     match: (f) => f.type === "date",
-    generate: (f) => `date("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`date("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "date", from: PG_CORE }]
   },
   // timetz (time with time zone)
   {
     name: "timetz",
     match: (f) => f.type === "timetz",
-    generate: (f) => `time("${escapeDoubleQuote(f.fieldName)}", { withTimezone: true })`,
+    generate: (f) => withArray(`time("${escapeDoubleQuote(f.fieldName)}", { withTimezone: true })`, f),
     imports: () => [{ name: "time", from: PG_CORE }]
   },
   // time
   {
     name: "time",
     match: (f) => f.type === "time",
-    generate: (f) => `time("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`time("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "time", from: PG_CORE }]
   },
   // serial
   {
     name: "serial",
     match: (f) => f.type === "serial",
-    generate: (f) => `serial("${escapeDoubleQuote(f.fieldName)}")`,
+    generate: (f) => withArray(`serial("${escapeDoubleQuote(f.fieldName)}")`, f),
     imports: () => [{ name: "serial", from: PG_CORE }]
   }
 ];
@@ -1426,7 +1583,10 @@ function createEnumMapper(enumNameToIdentifier) {
 var fallbackMapper = {
   name: "fallback-text",
   match: () => true,
-  generate: (field) => `text("${escapeDoubleQuote(field.fieldName)}")`,
+  generate: (field) => {
+    const base = `text("${escapeDoubleQuote(field.fieldName)}")`;
+    return field.isArray ? `${base}.array()` : base;
+  },
   imports: () => [{ name: "text", from: "drizzle-orm/pg-core" }]
 };
 

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/db-schema-sync",
-  "version": "0.1.9",
+  "version": "0.1.11-alpha.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",