@nocobase/server 1.9.0-beta.16 → 1.9.0-beta.18

package/lib/acl/available-action.js

@@ -56,7 +56,7 @@ const availableActions = {
   update: {
     displayName: '{{t("Edit")}}',
     type: "old-data",
-    aliases: ["update", "move", "add", "set", "remove", "toggle"],
+    aliases: ["update", "move"],
     allowConfigureFields: true
   },
   destroy: {

package/lib/application.d.ts

@@ -36,7 +36,6 @@ import { AuditManager } from './audit-manager';
 import { Environment } from './environment';
 import { ServiceContainer } from './service-container';
 import { EventQueue, EventQueueOptions } from './event-queue';
-import { BackgroundJobManager, BackgroundJobManagerOptions } from './background-job-manager';
 import { RedisConfig, RedisConnectionManager } from './redis-connection-manager';
 import { WorkerIdAllocator } from './worker-id-allocator';
 export type PluginType = string | typeof Plugin;
@@ -89,7 +88,6 @@ export interface ApplicationOptions {
     auditManager?: AuditManager;
     lockManager?: LockManagerOptions;
     eventQueue?: EventQueueOptions;
-    backgroundJobManager?: BackgroundJobManagerOptions;
     /**
      * @internal
      */
@@ -190,7 +188,6 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     container: ServiceContainer;
     lockManager: LockManager;
     eventQueue: EventQueue;
-    backgroundJobManager: BackgroundJobManager;
     constructor(options: ApplicationOptions);
     private static staticCommands;
     static addCommand(callback: (app: Application) => void): void;

package/lib/application.js

@@ -83,7 +83,6 @@ var import_audit_manager = require("./audit-manager");
 var import_environment = require("./environment");
 var import_service_container = require("./service-container");
 var import_event_queue = require("./event-queue");
-var import_background_job_manager = require("./background-job-manager");
 var import_redis_connection_manager = require("./redis-connection-manager");
 var import_worker_id_allocator = require("./worker-id-allocator");
 var import_snowflake_id_field = require("./snowflake-id-field");
@@ -142,7 +141,6 @@ const _Application = class _Application extends import_koa.default {
   container = new import_service_container.ServiceContainer();
   lockManager;
   eventQueue;
-  backgroundJobManager;
   static addCommand(callback) {
     this.staticCommands.push(callback);
   }
@@ -911,7 +909,6 @@ const _Application = class _Application extends import_koa.default {
     this.pubSubManager = (0, import_pub_sub_manager.createPubSubManager)(this, options.pubSubManager);
     this.syncMessageManager = new import_sync_message_manager.SyncMessageManager(this, options.syncMessageManager);
     this.eventQueue = new import_event_queue.EventQueue(this, options.eventQueue);
-    this.backgroundJobManager = new import_background_job_manager.BackgroundJobManager(this, options.backgroundJobManager);
     this.lockManager = new import_lock_manager.LockManager({
       defaultAdapter: process.env.LOCK_ADAPTER_DEFAULT,
       ...options.lockManager

package/lib/commands/index.js

@@ -53,6 +53,7 @@ var import_start = __toESM(require("./start"));
 var import_stop = __toESM(require("./stop"));
 var import_upgrade = __toESM(require("./upgrade"));
 var import_console = __toESM(require("./console"));
+var import_repair = __toESM(require("./repair"));
 /* istanbul ignore file -- @preserve */
 function registerCli(app) {
   (0, import_console.default)(app);
@@ -68,6 +69,7 @@ function registerCli(app) {
   (0, import_destroy.default)(app);
   (0, import_start.default)(app);
   (0, import_refresh.default)(app);
+  (0, import_repair.default)(app);
   app.command("build").argument("[packages...]");
   app.command("clean");
   app.command("dev").usage("[options]").option("-p, --port [port]").option("--client").option("--server");

package/lib/commands/repair.d.ts

@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import Application from '../application';
+declare const _default: (app: Application) => void;
+export default _default;

package/lib/commands/repair.js

@@ -0,0 +1,43 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var repair_exports = {};
+__export(repair_exports, {
+  default: () => repair_default
+});
+module.exports = __toCommonJS(repair_exports);
+var repair_default = /* @__PURE__ */ __name((app) => {
+  app.command("repair").auth().preload().action(async (options) => {
+    app.log.info("start repair data...");
+    const Collection = app.db.getCollection("collections");
+    if (Collection) {
+      await Collection.repository.setApp(app);
+      await Collection.repository.load();
+    }
+    await app.emitAsync("repair", options);
+  });
+}, "default");

package/lib/event-queue.d.ts

@@ -23,6 +23,12 @@ export type QueueEventOptions = {
      */
     interval?: number;
     concurrency?: number;
+    /**
+     * Shared across multiple applications.
+     * Will not use app prefix for channel name.
+     * @experimental
+     */
+    shared?: boolean;
     idle(): boolean;
     process: QueueCallback;
 };
@@ -84,7 +90,7 @@ export declare class EventQueue {
     protected events: Map<string, QueueEventOptions>;
     get channelPrefix(): string;
     constructor(app: Application, options?: EventQueueOptions);
-    getFullChannel(channel: string): string;
+    getFullChannel(channel: string, shared?: boolean): string;
     setAdapter<A extends IEventQueueAdapter>(adapter: A): void;
     isConnected(): boolean;
     connect(): Promise<void>;

package/lib/event-queue.js

@@ -270,16 +270,14 @@ const _EventQueue = class _EventQueue {
   constructor(app, options = {}) {
     this.app = app;
     this.options = options;
-    if (app.serving()) {
-      this.setAdapter(new MemoryEventQueueAdapter({ appName: this.app.name, logger: this.app.logger }));
-      app.on("afterStart", async () => {
-        await this.connect();
-      });
-      app.on("beforeStop", async () => {
-        app.logger.info("[queue] gracefully shutting down...");
-        await this.close();
-      });
-    }
+    this.setAdapter(new MemoryEventQueueAdapter({ appName: this.app.name, logger: this.app.logger }));
+    app.on("afterStart", async () => {
+      await this.connect();
+    });
+    app.on("afterStop", async () => {
+      app.logger.info("[queue] gracefully shutting down...");
+      await this.close();
+    });
   }
   adapter;
   events = /* @__PURE__ */ new Map();
@@ -287,7 +285,10 @@ const _EventQueue = class _EventQueue {
     var _a;
     return (_a = this.options) == null ? void 0 : _a.channelPrefix;
   }
-  getFullChannel(channel) {
+  getFullChannel(channel, shared = false) {
+    if (shared) {
+      return [this.channelPrefix, channel].filter(Boolean).join(".");
+    }
     return [this.app.name, this.channelPrefix, channel].filter(Boolean).join(".");
   }
   setAdapter(adapter) {
@@ -303,14 +304,10 @@ const _EventQueue = class _EventQueue {
     if (!this.adapter) {
       throw new Error("no adapter set, cannot connect");
     }
-    if (!this.app.serving()) {
-      this.app.logger.warn("app is not serving, will not connect to event queue");
-      return;
-    }
     await this.adapter.connect();
     this.app.logger.debug(`connected to adapter, using memory? ${this.adapter instanceof MemoryEventQueueAdapter}`);
     for (const [channel, event] of this.events.entries()) {
-      this.adapter.subscribe(this.getFullChannel(channel), event);
+      this.adapter.subscribe(this.getFullChannel(channel, event.shared), event);
     }
   }
   async close() {
@@ -318,8 +315,8 @@ const _EventQueue = class _EventQueue {
       return;
     }
     await this.adapter.close();
-    for (const channel of this.events.keys()) {
-      this.adapter.unsubscribe(this.getFullChannel(channel));
+    for (const [channel, event] of this.events.entries()) {
+      this.adapter.unsubscribe(this.getFullChannel(channel, event.shared));
     }
   }
   subscribe(channel, options) {
@@ -329,16 +326,17 @@ const _EventQueue = class _EventQueue {
     }
     this.events.set(channel, options);
     if (this.isConnected()) {
-      this.adapter.subscribe(this.getFullChannel(channel), options);
+      this.adapter.subscribe(this.getFullChannel(channel, options.shared), this.events.get(channel));
     }
   }
   unsubscribe(channel) {
+    var _a;
     if (!this.events.has(channel)) {
       return;
     }
     this.events.delete(channel);
     if (this.isConnected()) {
-      this.adapter.unsubscribe(this.getFullChannel(channel));
+      this.adapter.unsubscribe(this.getFullChannel(channel, (_a = this.events.get(channel)) == null ? void 0 : _a.shared));
     }
   }
   async publish(channel, message, options = {}) {
@@ -348,7 +346,11 @@ const _EventQueue = class _EventQueue {
     if (!this.isConnected()) {
       throw new Error("event queue not connected, cannot publish");
     }
-    const c = this.getFullChannel(channel);
+    const event = this.events.get(channel);
+    if (!event) {
+      throw new Error(`event queue not subscribed on channel "${channel}", cannot publish`);
+    }
+    const c = this.getFullChannel(channel, event.shared);
     this.app.logger.debug(`event queue publishing to channel(${c})`, { message });
     await this.adapter.publish(c, message, {
       timeout: QUEUE_DEFAULT_ACK_TIMEOUT,

package/lib/helper.d.ts

@@ -17,3 +17,362 @@ export declare const getCommandFullName: (command: Command) => string;
 export declare const tsxRerunning: () => Promise<void>;
 export declare const enablePerfHooks: (app: Application) => void;
 export declare function getBodyLimit(): string;
+export declare function createContextVariablesScope(ctx: any): {
+    timezone: any;
+    now: string;
+    getField: (path: any) => any;
+    vars: {
+        ctx: {
+            state: any;
+        };
+        $system: {
+            now: string;
+        };
+        $date: {
+            now: string;
+            today: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            yesterday: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            tomorrow: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            last7Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next7Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            last30Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next30Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            last90Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next90Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+        };
+        $nDate: {
+            now: string;
+            today: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            yesterday: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            tomorrow: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            last7Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next7Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            last30Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next30Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            last90Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next90Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+        };
+        $user: ({ fields }: {
+            fields: any;
+        }) => Promise<any>;
+        $nRole: any;
+    };
+};

package/lib/helper.js

@@ -38,6 +38,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var helper_exports = {};
 __export(helper_exports, {
   createAppProxy: () => createAppProxy,
+  createContextVariablesScope: () => createContextVariablesScope,
   createI18n: () => createI18n,
   createResourcer: () => createResourcer,
   enablePerfHooks: () => enablePerfHooks,
@@ -193,9 +194,66 @@ function getBodyLimit() {
   return process.env.REQUEST_BODY_LIMIT || "10mb";
 }
 __name(getBodyLimit, "getBodyLimit");
+function getUser(ctx) {
+  return async ({ fields }) => {
+    var _a, _b;
+    const userFields = fields.filter((f) => f && ctx.db.getFieldByPath("users." + f));
+    (_a = ctx.logger) == null ? void 0 : _a.info("filter-parse: ", { userFields });
+    if (!ctx.state.currentUser) {
+      return;
+    }
+    if (!userFields.length) {
+      return;
+    }
+    const user = await ctx.db.getRepository("users").findOne({
+      filterByTk: ctx.state.currentUser.id,
+      fields: userFields
+    });
+    (_b = ctx.logger) == null ? void 0 : _b.info("filter-parse: ", {
+      $user: user == null ? void 0 : user.toJSON()
+    });
+    return user;
+  };
+}
+__name(getUser, "getUser");
+function isNumeric(str) {
+  if (typeof str === "number") return true;
+  if (typeof str != "string") return false;
+  return !isNaN(str) && !isNaN(parseFloat(str));
+}
+__name(isNumeric, "isNumeric");
+function createContextVariablesScope(ctx) {
+  const state = JSON.parse(JSON.stringify(ctx.state));
+  return {
+    timezone: ctx.get("x-timezone"),
+    now: (/* @__PURE__ */ new Date()).toISOString(),
+    getField: /* @__PURE__ */ __name((path) => {
+      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
+      const { resourceName } = ctx.action;
+      return ctx.db.getFieldByPath(`${resourceName}.${fieldPath}`);
+    }, "getField"),
+    vars: {
+      ctx: {
+        state
+      },
+      // @deprecated
+      $system: {
+        now: (/* @__PURE__ */ new Date()).toISOString()
+      },
+      // @deprecated
+      $date: (0, import_utils.getDateVars)(),
+      // 新的命名方式，防止和 formily 内置变量冲突
+      $nDate: (0, import_utils.getDateVars)(),
+      $user: getUser(ctx),
+      $nRole: ctx.state.currentRole === "__union__" ? ctx.state.currentRoles : ctx.state.currentRole
+    }
+  };
+}
+__name(createContextVariablesScope, "createContextVariablesScope");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createAppProxy,
+  createContextVariablesScope,
   createI18n,
   createResourcer,
   enablePerfHooks,

package/lib/index.d.ts

@@ -18,9 +18,9 @@ export * from './plugin';
 export * from './plugin-manager';
 export * from './pub-sub-manager';
 export * from './event-queue';
-export * from './background-job-manager';
 export * from './worker-id-allocator';
 export * from './redis-connection-manager';
 export declare const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
 export { appendToBuiltInPlugins, findAllPlugins, findBuiltInPlugins, findLocalPlugins, packageNameTrim, } from './plugin-manager/findPackageNames';
 export { runPluginStaticImports } from './run-plugin-static-imports';
+export { createContextVariablesScope } from './helper';

package/lib/index.js

@@ -39,6 +39,7 @@ var src_exports = {};
 __export(src_exports, {
   OFFICIAL_PLUGIN_PREFIX: () => OFFICIAL_PLUGIN_PREFIX,
   appendToBuiltInPlugins: () => import_findPackageNames.appendToBuiltInPlugins,
+  createContextVariablesScope: () => import_helper.createContextVariablesScope,
   default: () => import_application.Application,
   findAllPlugins: () => import_findPackageNames.findAllPlugins,
   findBuiltInPlugins: () => import_findPackageNames.findBuiltInPlugins,
@@ -60,16 +61,17 @@ __reExport(src_exports, require("./plugin"), module.exports);
 __reExport(src_exports, require("./plugin-manager"), module.exports);
 __reExport(src_exports, require("./pub-sub-manager"), module.exports);
 __reExport(src_exports, require("./event-queue"), module.exports);
-__reExport(src_exports, require("./background-job-manager"), module.exports);
 __reExport(src_exports, require("./worker-id-allocator"), module.exports);
 __reExport(src_exports, require("./redis-connection-manager"), module.exports);
 var import_findPackageNames = require("./plugin-manager/findPackageNames");
 var import_run_plugin_static_imports = require("./run-plugin-static-imports");
+var import_helper = require("./helper");
 const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   OFFICIAL_PLUGIN_PREFIX,
   appendToBuiltInPlugins,
+  createContextVariablesScope,
   findAllPlugins,
   findBuiltInPlugins,
   findLocalPlugins,
@@ -86,7 +88,6 @@ const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
   ...require("./plugin-manager"),
   ...require("./pub-sub-manager"),
   ...require("./event-queue"),
-  ...require("./background-job-manager"),
   ...require("./worker-id-allocator"),
   ...require("./redis-connection-manager")
 });

package/lib/middlewares/parse-variables.js

@@ -31,60 +31,13 @@ __export(parse_variables_exports, {
 });
 module.exports = __toCommonJS(parse_variables_exports);
 var import_utils = require("@nocobase/utils");
-function getUser(ctx) {
-  return async ({ fields }) => {
-    var _a, _b;
-    const userFields = fields.filter((f) => f && ctx.db.getFieldByPath("users." + f));
-    (_a = ctx.logger) == null ? void 0 : _a.info("filter-parse: ", { userFields });
-    if (!ctx.state.currentUser) {
-      return;
-    }
-    if (!userFields.length) {
-      return;
-    }
-    const user = await ctx.db.getRepository("users").findOne({
-      filterByTk: ctx.state.currentUser.id,
-      fields: userFields
-    });
-    (_b = ctx.logger) == null ? void 0 : _b.info("filter-parse: ", {
-      $user: user == null ? void 0 : user.toJSON()
-    });
-    return user;
-  };
-}
-__name(getUser, "getUser");
-function isNumeric(str) {
-  if (typeof str === "number") return true;
-  if (typeof str != "string") return false;
-  return !isNaN(str) && !isNaN(parseFloat(str));
-}
-__name(isNumeric, "isNumeric");
+var import_helper = require("../helper");
 async function parseVariables(ctx, next) {
   const filter = ctx.action.params.filter;
   if (!filter) {
     return next();
   }
-  ctx.action.params.filter = await (0, import_utils.parseFilter)(filter, {
-    timezone: ctx.get("x-timezone"),
-    now: (/* @__PURE__ */ new Date()).toISOString(),
-    getField: /* @__PURE__ */ __name((path) => {
-      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
-      const { resourceName } = ctx.action;
-      return ctx.db.getFieldByPath(`${resourceName}.${fieldPath}`);
-    }, "getField"),
-    vars: {
-      // @deprecated
-      $system: {
-        now: (/* @__PURE__ */ new Date()).toISOString()
-      },
-      // @deprecated
-      $date: (0, import_utils.getDateVars)(),
-      // 新的命名方式，防止和 formily 内置变量冲突
-      $nDate: (0, import_utils.getDateVars)(),
-      $user: getUser(ctx),
-      $nRole: ctx.state.currentRole === "__union__" ? ctx.state.currentRoles : ctx.state.currentRole
-    }
-  });
+  ctx.action.params.filter = await (0, import_utils.parseFilter)(filter, (0, import_helper.createContextVariablesScope)(ctx));
   await next();
 }
 __name(parseVariables, "parseVariables");

package/lib/pub-sub-manager/pub-sub-manager.d.ts

@@ -17,8 +17,8 @@ export declare class PubSubManager {
     protected adapter: IPubSubAdapter;
     protected handlerManager: HandlerManager;
     constructor(app: Application, options?: PubSubManagerOptions);
-    get channelPrefix(): string;
     setAdapter(adapter: IPubSubAdapter): void;
+    getFullChannel(channel: string): string;
     isConnected(): Promise<boolean>;
     connect(): Promise<void>;
     close(): Promise<any>;

package/lib/pub-sub-manager/pub-sub-manager.js

@@ -35,14 +35,12 @@ var import_utils = require("@nocobase/utils");
 var import_handler_manager = require("./handler-manager");
 const createPubSubManager = /* @__PURE__ */ __name((app, options) => {
   const pubSubManager = new PubSubManager(app, options);
-  if (app.serving()) {
-    app.on("afterStart", async () => {
-      await pubSubManager.connect();
-    });
-    app.on("afterStop", async () => {
-      await pubSubManager.close();
-    });
-  }
+  app.on("afterStart", async () => {
+    await pubSubManager.connect();
+  });
+  app.on("afterStop", async () => {
+    await pubSubManager.close();
+  });
   return pubSubManager;
 }, "createPubSubManager");
 const _PubSubManager = class _PubSubManager {
@@ -55,13 +53,13 @@ const _PubSubManager = class _PubSubManager {
   publisherId;
   adapter;
   handlerManager;
-  get channelPrefix() {
-    var _a;
-    return ((_a = this.options) == null ? void 0 : _a.channelPrefix) ? `${this.options.channelPrefix}.` : "";
-  }
   setAdapter(adapter) {
     this.adapter = adapter;
   }
+  getFullChannel(channel) {
+    var _a;
+    return [this.app.name, (_a = this.options) == null ? void 0 : _a.channelPrefix, channel].filter(Boolean).join(".");
+  }
   async isConnected() {
     if (this.adapter) {
       return this.adapter.isConnected();
@@ -72,14 +70,10 @@ const _PubSubManager = class _PubSubManager {
     if (!this.adapter) {
       return;
     }
-    if (!this.app.serving()) {
-      this.app.logger.warn("app is not serving, will not connect to event queue");
-      return;
-    }
     await this.adapter.connect();
     await this.handlerManager.each(async (channel, headler) => {
       this.app.logger.debug(`[PubSubManager] subscribe ${channel} added before connected`);
-      await this.adapter.subscribe(`${this.channelPrefix}${channel}`, headler);
+      await this.adapter.subscribe(this.getFullChannel(channel), headler);
     });
   }
   async close() {
@@ -93,7 +87,7 @@ const _PubSubManager = class _PubSubManager {
     const handler = this.handlerManager.set(channel, callback, options);
     if (await this.isConnected()) {
       this.app.logger.debug(`[PubSubManager] subscribe ${channel} added after connected`);
-      await this.adapter.subscribe(`${this.channelPrefix}${channel}`, handler);
+      await this.adapter.subscribe(this.getFullChannel(channel), handler);
     }
   }
   async unsubscribe(channel, callback) {
@@ -101,7 +95,7 @@ const _PubSubManager = class _PubSubManager {
     if (!this.adapter || !handler) {
       return;
     }
-    return this.adapter.unsubscribe(`${this.channelPrefix}${channel}`, handler);
+    return this.adapter.unsubscribe(this.getFullChannel(channel), handler);
   }
   async publish(channel, message, options) {
     var _a;
@@ -116,7 +110,7 @@ const _PubSubManager = class _PubSubManager {
       ...options,
       message
     });
-    await this.adapter.publish(`${this.channelPrefix}${channel}`, wrappedMessage);
+    await this.adapter.publish(this.getFullChannel(channel), wrappedMessage);
     this.app.logger.trace(`[PubSubManager] published message to channel ${channel}`);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.9.0-beta.16",
+  "version": "1.9.0-beta.18",
   "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": "1.9.0-beta.16",
-    "@nocobase/actions": "1.9.0-beta.16",
-    "@nocobase/auth": "1.9.0-beta.16",
-    "@nocobase/cache": "1.9.0-beta.16",
-    "@nocobase/data-source-manager": "1.9.0-beta.16",
-    "@nocobase/database": "1.9.0-beta.16",
-    "@nocobase/evaluators": "1.9.0-beta.16",
-    "@nocobase/lock-manager": "1.9.0-beta.16",
-    "@nocobase/logger": "1.9.0-beta.16",
-    "@nocobase/resourcer": "1.9.0-beta.16",
-    "@nocobase/sdk": "1.9.0-beta.16",
-    "@nocobase/snowflake-id": "1.9.0-beta.16",
-    "@nocobase/telemetry": "1.9.0-beta.16",
-    "@nocobase/utils": "1.9.0-beta.16",
+    "@nocobase/acl": "1.9.0-beta.18",
+    "@nocobase/actions": "1.9.0-beta.18",
+    "@nocobase/auth": "1.9.0-beta.18",
+    "@nocobase/cache": "1.9.0-beta.18",
+    "@nocobase/data-source-manager": "1.9.0-beta.18",
+    "@nocobase/database": "1.9.0-beta.18",
+    "@nocobase/evaluators": "1.9.0-beta.18",
+    "@nocobase/lock-manager": "1.9.0-beta.18",
+    "@nocobase/logger": "1.9.0-beta.18",
+    "@nocobase/resourcer": "1.9.0-beta.18",
+    "@nocobase/sdk": "1.9.0-beta.18",
+    "@nocobase/snowflake-id": "1.9.0-beta.18",
+    "@nocobase/telemetry": "1.9.0-beta.18",
+    "@nocobase/utils": "1.9.0-beta.18",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -59,5 +59,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "ff9b917d27840cc08e3f60d02384504ae0e35995"
+  "gitHead": "1c211ab8c30d9442c38d07e2ebef2c2935e0fbac"
 }

package/lib/background-job-manager.d.ts

@@ -1,40 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import Application from './application';
-import { QueueEventOptions, QueueMessageOptions } from './event-queue';
-export interface BackgroundJobManagerOptions {
-    channel?: string;
-}
-type BackgroundJobEventOptions = Pick<QueueEventOptions, 'process' | 'idle'>;
-declare class BackgroundJobManager {
-    private app;
-    private options;
-    static DEFAULT_CHANNEL: string;
-    private subscriptions;
-    private processing;
-    private get channel();
-    private onAfterStart;
-    private onBeforeStop;
-    private process;
-    constructor(app: Application, options?: BackgroundJobManagerOptions);
-    private get idle();
-    /**
-     * 订阅指定主题的任务处理器
-     * @param options 订阅选项
-     */
-    subscribe(topic: string, options: BackgroundJobEventOptions): void;
-    /**
-     * 取消订阅指定主题
-     * @param topic 主题名称
-     */
-    unsubscribe(topic: string): void;
-    publish(topic: string, payload: any, options?: QueueMessageOptions): Promise<void>;
-}
-export { BackgroundJobManager };
-export default BackgroundJobManager;

package/lib/background-job-manager.js

@@ -1,111 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var background_job_manager_exports = {};
-__export(background_job_manager_exports, {
-  BackgroundJobManager: () => BackgroundJobManager,
-  default: () => background_job_manager_default
-});
-module.exports = __toCommonJS(background_job_manager_exports);
-const _BackgroundJobManager = class _BackgroundJobManager {
-  constructor(app, options = {}) {
-    this.app = app;
-    this.options = options;
-    this.app.on("afterStart", this.onAfterStart);
-    this.app.on("beforeStop", this.onBeforeStop);
-  }
-  subscriptions = /* @__PURE__ */ new Map();
-  // topic -> handler
-  processing = null;
-  get channel() {
-    return this.options.channel ?? _BackgroundJobManager.DEFAULT_CHANNEL;
-  }
-  onAfterStart = /* @__PURE__ */ __name(() => {
-    this.app.eventQueue.subscribe(this.channel, {
-      idle: /* @__PURE__ */ __name(() => this.idle, "idle"),
-      process: this.process
-    });
-  }, "onAfterStart");
-  onBeforeStop = /* @__PURE__ */ __name(() => {
-    this.app.eventQueue.unsubscribe(this.channel);
-  }, "onBeforeStop");
-  process = /* @__PURE__ */ __name(async ({ topic, payload }, options) => {
-    const event = this.subscriptions.get(topic);
-    if (!event) {
-      this.app.logger.warn(`No handler found for topic: ${topic}, event skipped.`);
-      return;
-    }
-    this.processing = event.process(payload, options);
-    try {
-      await this.processing;
-      this.app.logger.debug(`Completed background job ${topic}:${options.id}`);
-    } catch (error) {
-      this.app.logger.error(`Failed to process background job ${topic}:${options.id}`, error);
-      throw error;
-    } finally {
-      this.processing = null;
-    }
-  }, "process");
-  get idle() {
-    return !this.processing && [...this.subscriptions.values()].every((event) => event.idle());
-  }
-  /**
-   * 订阅指定主题的任务处理器
-   * @param options 订阅选项
-   */
-  subscribe(topic, options) {
-    if (this.subscriptions.has(topic)) {
-      this.app.logger.warn(`Topic "${topic}" already has a handler, skip...`);
-      return;
-    }
-    this.subscriptions.set(topic, options);
-    this.app.logger.debug(`Subscribed to background job topic: ${topic}`);
-  }
-  /**
-   * 取消订阅指定主题
-   * @param topic 主题名称
-   */
-  unsubscribe(topic) {
-    if (this.subscriptions.has(topic)) {
-      this.subscriptions.delete(topic);
-      this.app.logger.debug(`Unsubscribed from background job topic: ${topic}`);
-    }
-  }
-  async publish(topic, payload, options) {
-    await this.app.eventQueue.publish(this.channel, { topic, payload }, options);
-  }
-};
-__name(_BackgroundJobManager, "BackgroundJobManager");
-__publicField(_BackgroundJobManager, "DEFAULT_CHANNEL", "background-jobs");
-let BackgroundJobManager = _BackgroundJobManager;
-var background_job_manager_default = BackgroundJobManager;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BackgroundJobManager
-});