@nocobase/server 2.1.0-alpha.21 → 2.1.0-alpha.23

package/lib/audit-manager/index.d.ts

@@ -12,6 +12,7 @@ export interface AuditLog {
     dataSource: string;
     resource: string;
     action: string;
+    requestSource?: string;
     sourceCollection?: string;
     sourceRecordUK?: string;
     targetCollection?: string;
@@ -102,6 +103,7 @@ export declare class AuditManager {
                 'x-authenticator': any;
                 'x-locale': any;
                 'x-timezone': any;
+                'x-request-source': any;
             };
         };
         response: {

package/lib/audit-manager/index.js

@@ -41,6 +41,7 @@ __export(audit_manager_exports, {
 });
 module.exports = __toCommonJS(audit_manager_exports);
 var import_stream = __toESM(require("stream"));
+const REQUEST_SOURCE_HEADER = "x-request-source";
 function isStream(obj) {
   return obj instanceof import_stream.default.Readable || obj instanceof import_stream.default.Writable || obj instanceof import_stream.default.Duplex || obj instanceof import_stream.default.Transform;
 }
@@ -201,7 +202,7 @@ const _AuditManager = class _AuditManager {
     return null;
   }
   async getDefaultMetaData(ctx) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let body = null;
     if (ctx.body) {
       if (!Buffer.isBuffer(ctx.body) && !isStream(ctx.body)) {
@@ -217,7 +218,8 @@ const _AuditManager = class _AuditManager {
         headers: {
           "x-authenticator": (_a = ctx.request) == null ? void 0 : _a.headers["x-authenticator"],
           "x-locale": (_b = ctx.request) == null ? void 0 : _b.headers["x-locale"],
-          "x-timezone": (_c = ctx.request) == null ? void 0 : _c.headers["x-timezone"]
+          "x-timezone": (_c = ctx.request) == null ? void 0 : _c.headers["x-timezone"],
+          "x-request-source": (_d = ctx.request) == null ? void 0 : _d.headers[REQUEST_SOURCE_HEADER]
         }
       },
       response: {
@@ -241,6 +243,7 @@ const _AuditManager = class _AuditManager {
       dataSource: ctx.request.header["x-data-source"] || "main",
       resource: resourceName,
       action: ctx.action.actionName,
+      requestSource: ctx.request.header[REQUEST_SOURCE_HEADER],
       userId: (_b = (_a = ctx.state) == null ? void 0 : _a.currentUser) == null ? void 0 : _b.id,
       roleName: (_c = ctx.state) == null ? void 0 : _c.currentRole,
       ip: ips.length > 0 ? ips[0] : ctx.request.ip,

package/lib/plugin-manager/options/resource.js

@@ -67,10 +67,17 @@ const _PackageUrls = class _PackageUrls {
   }
   static async get(packageName, lane = "client") {
     const cacheKey = this.getCacheKey(packageName, lane);
-    if (!this.items[cacheKey]) {
-      this.items[cacheKey] = await this.fetch(packageName, lane);
+    const cached = this.items[cacheKey];
+    if (cached) {
+      return cached;
     }
-    return this.items[cacheKey];
+    const nextUrl = await this.fetch(packageName, lane);
+    if (nextUrl == null ? void 0 : nextUrl.includes("?hash=")) {
+      this.items[cacheKey] = nextUrl;
+    } else {
+      delete this.items[cacheKey];
+    }
+    return nextUrl;
   }
   static async hasClientEntry(packageName, lane) {
     const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName);

package/lib/plugin-manager/plugin-manager.js

@@ -302,7 +302,7 @@ const _PluginManager = class _PluginManager {
       if (options == null ? void 0 : options.forceRecreate) {
         await import_fs_extra.default.rm(pluginDir, { recursive: true, force: true });
       }
-      const { PluginGenerator } = require("@nocobase/cli/src/plugin-generator");
+      const { PluginGenerator } = require("@nocobase/cli-v1/src/plugin-generator");
       const generator = new PluginGenerator({
         cwd: process.cwd(),
         args: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.0-alpha.21",
+  "version": "2.1.0-alpha.23",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,21 +10,21 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.1.0-alpha.21",
-    "@nocobase/actions": "2.1.0-alpha.21",
-    "@nocobase/ai": "2.1.0-alpha.21",
-    "@nocobase/auth": "2.1.0-alpha.21",
-    "@nocobase/cache": "2.1.0-alpha.21",
-    "@nocobase/data-source-manager": "2.1.0-alpha.21",
-    "@nocobase/database": "2.1.0-alpha.21",
-    "@nocobase/evaluators": "2.1.0-alpha.21",
-    "@nocobase/lock-manager": "2.1.0-alpha.21",
-    "@nocobase/logger": "2.1.0-alpha.21",
-    "@nocobase/resourcer": "2.1.0-alpha.21",
-    "@nocobase/sdk": "2.1.0-alpha.21",
-    "@nocobase/snowflake-id": "2.1.0-alpha.21",
-    "@nocobase/telemetry": "2.1.0-alpha.21",
-    "@nocobase/utils": "2.1.0-alpha.21",
+    "@nocobase/acl": "2.1.0-alpha.23",
+    "@nocobase/actions": "2.1.0-alpha.23",
+    "@nocobase/ai": "2.1.0-alpha.23",
+    "@nocobase/auth": "2.1.0-alpha.23",
+    "@nocobase/cache": "2.1.0-alpha.23",
+    "@nocobase/data-source-manager": "2.1.0-alpha.23",
+    "@nocobase/database": "2.1.0-alpha.23",
+    "@nocobase/evaluators": "2.1.0-alpha.23",
+    "@nocobase/lock-manager": "2.1.0-alpha.23",
+    "@nocobase/logger": "2.1.0-alpha.23",
+    "@nocobase/resourcer": "2.1.0-alpha.23",
+    "@nocobase/sdk": "2.1.0-alpha.23",
+    "@nocobase/snowflake-id": "2.1.0-alpha.23",
+    "@nocobase/telemetry": "2.1.0-alpha.23",
+    "@nocobase/utils": "2.1.0-alpha.23",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "b4c2b469f321ecaec7863a8ae371a02fe6a35aa2"
+  "gitHead": "baa19dafe25e85b680b2fea7451f202831930c1c"
 }