@nocobase/server 2.0.0-beta.2 → 2.0.0-beta.20

package/lib/event-queue.d.ts

@@ -15,6 +15,7 @@ export type QueueCallbackOptions = {
     id?: string;
     retried?: number;
     signal?: AbortSignal;
+    queueOptions?: QueueMessageOptions;
 };
 export type QueueCallback = (message: any, options: QueueCallbackOptions) => Promise<void>;
 export type QueueEventOptions = {

package/lib/event-queue.js

@@ -245,7 +245,8 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     return (async () => event.process(content, {
       id,
       retried,
-      signal: AbortSignal.timeout(timeout)
+      signal: AbortSignal.timeout(timeout),
+      queueOptions: message.options
     }))().then(() => {
       logger.debug(`memory queue (${channel}) consumed message (${id})`);
     }).catch((ex) => {

package/lib/helper.js

@@ -76,6 +76,25 @@ function createResourcer(options) {
   return new import_resourcer.Resourcer({ ...options.resourcer });
 }
 __name(createResourcer, "createResourcer");
+function resolveCorsOrigin(ctx) {
+  const origin = ctx.get("origin");
+  const disallowNoOrigin = process.env.CORS_DISALLOW_NO_ORIGIN === "true";
+  const whitelistString = process.env.CORS_ORIGIN_WHITELIST;
+  if (!origin && disallowNoOrigin) {
+    return false;
+  }
+  if (!whitelistString) {
+    return origin;
+  }
+  const whitelist = new Set(
+    whitelistString.split(",").map((item) => item.trim()).filter(Boolean)
+  );
+  if (whitelist.has(origin)) {
+    return origin;
+  }
+  return false;
+}
+__name(resolveCorsOrigin, "resolveCorsOrigin");
 function registerMiddlewares(app, options) {
   var _a;
   app.use(
@@ -90,9 +109,7 @@ function registerMiddlewares(app, options) {
   app.use(
     (0, import_cors.default)({
       exposeHeaders: ["content-disposition"],
-      origin(ctx) {
-        return ctx.get("origin");
-      },
+      origin: resolveCorsOrigin,
       ...options.cors
     }),
     {

package/lib/plugin-manager/deps.js

@@ -41,7 +41,7 @@ const deps = {
   umzug: "3.x",
   "async-mutex": "0.5.x",
   "@formulajs/formulajs": "4.x",
-  mathjs: "10.x",
+  mathjs: "15.x",
   winston: "3.x",
   "winston-daily-rotate-file": "4.x",
   koa: "2.x",

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

@@ -47,13 +47,13 @@ var import_fs = __toESM(require("fs"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
 const _PackageUrls = class _PackageUrls {
-  static async get(packageName, version) {
+  static async get(packageName) {
     if (!this.items[packageName]) {
-      this.items[packageName] = await this.fetch(packageName, version);
+      this.items[packageName] = await this.fetch(packageName);
     }
     return this.items[packageName];
   }
-  static async fetch(packageName, version) {
+  static async fetch(packageName) {
     const PLUGIN_CLIENT_ENTRY_FILE = "dist/client/index.js";
     const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName);
     const r = await import_fs_extra.default.exists(pkgPath);
@@ -63,9 +63,10 @@ const _PackageUrls = class _PackageUrls {
       const distExists = await import_fs_extra.default.exists(dist);
       if (distExists) {
         const fsState = await import_fs_extra.default.stat(distExists ? dist : pkgPath);
-        t = `&t=${fsState.mtime.getTime()}`;
+        t = `?t=${fsState.mtime.getTime()}`;
       }
-      const url = `${process.env.APP_SERVER_BASE_URL}${process.env.PLUGIN_STATICS_PATH}${packageName}/${PLUGIN_CLIENT_ENTRY_FILE}?version=${version}${t}`;
+      const cdnBaseUrl = process.env.CDN_BASE_URL.replace(/\/+$/, "");
+      const url = `${cdnBaseUrl}${"/static/plugins/"}${packageName}/${PLUGIN_CLIENT_ENTRY_FILE}${t}`;
       return url;
     }
   }
@@ -191,10 +192,13 @@ var resource_default = {
         });
         const arr = [];
         for (const item of items) {
-          const url = await PackageUrls.get(item.packageName, item.version);
+          const url = await PackageUrls.get(item.packageName);
+          const { name, packageName, options } = item.toJSON();
           if (url) {
             arr.push({
-              ...item.toJSON(),
+              name,
+              packageName,
+              options,
               url
             });
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.20",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,20 +10,20 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.0.0-beta.2",
-    "@nocobase/actions": "2.0.0-beta.2",
-    "@nocobase/auth": "2.0.0-beta.2",
-    "@nocobase/cache": "2.0.0-beta.2",
-    "@nocobase/data-source-manager": "2.0.0-beta.2",
-    "@nocobase/database": "2.0.0-beta.2",
-    "@nocobase/evaluators": "2.0.0-beta.2",
-    "@nocobase/lock-manager": "2.0.0-beta.2",
-    "@nocobase/logger": "2.0.0-beta.2",
-    "@nocobase/resourcer": "2.0.0-beta.2",
-    "@nocobase/sdk": "2.0.0-beta.2",
-    "@nocobase/snowflake-id": "2.0.0-beta.2",
-    "@nocobase/telemetry": "2.0.0-beta.2",
-    "@nocobase/utils": "2.0.0-beta.2",
+    "@nocobase/acl": "2.0.0-beta.20",
+    "@nocobase/actions": "2.0.0-beta.20",
+    "@nocobase/auth": "2.0.0-beta.20",
+    "@nocobase/cache": "2.0.0-beta.20",
+    "@nocobase/data-source-manager": "2.0.0-beta.20",
+    "@nocobase/database": "2.0.0-beta.20",
+    "@nocobase/evaluators": "2.0.0-beta.20",
+    "@nocobase/lock-manager": "2.0.0-beta.20",
+    "@nocobase/logger": "2.0.0-beta.20",
+    "@nocobase/resourcer": "2.0.0-beta.20",
+    "@nocobase/sdk": "2.0.0-beta.20",
+    "@nocobase/snowflake-id": "2.0.0-beta.20",
+    "@nocobase/telemetry": "2.0.0-beta.20",
+    "@nocobase/utils": "2.0.0-beta.20",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -60,5 +60,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "b77a33ee933ae6e09d2d5dce017ca15d8552d57b"
+  "gitHead": "f4ab788fc6c17915157617026dfbba6f0d78eaac"
 }