@nocobase/server 2.0.0-alpha.9 → 2.0.0-beta.2

package/lib/gateway/errors.js

@@ -44,6 +44,15 @@ __export(errors_exports, {
 module.exports = __toCommonJS(errors_exports);
 var import_app_supervisor = require("../app-supervisor");
 var import_lodash = __toESM(require("lodash"));
+function getMaintaining(app) {
+  var _a;
+  return (_a = app == null ? void 0 : app.getMaintaining) == null ? void 0 : _a.call(app);
+}
+__name(getMaintaining, "getMaintaining");
+function getAppName(app) {
+  return (app == null ? void 0 : app.name) || "unknown";
+}
+__name(getAppName, "getAppName");
 const errors = {
   APP_NOT_FOUND: {
     status: 404,
@@ -53,6 +62,9 @@ const errors = {
   APP_ERROR: {
     status: 503,
     message: /* @__PURE__ */ __name(({ app }) => {
+      if (!(app == null ? void 0 : app.name)) {
+        return "";
+      }
       const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
       if (!error) {
         return "";
@@ -64,25 +76,36 @@ const errors = {
       return message;
     }, "message"),
     code: /* @__PURE__ */ __name(({ app }) => {
+      if (!(app == null ? void 0 : app.name)) {
+        return "APP_ERROR";
+      }
       const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
-      return error["code"] || "APP_ERROR";
+      return (error == null ? void 0 : error["code"]) || "APP_ERROR";
     }, "code"),
-    command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().command, "command"),
+    command: /* @__PURE__ */ __name(({ app }) => {
+      var _a;
+      return (_a = getMaintaining(app)) == null ? void 0 : _a.command;
+    }, "command"),
+    maintaining: true
+  },
+  APP_PREPARING: {
+    status: 503,
+    message: /* @__PURE__ */ __name(({ appName }) => `application ${appName} is preparing, please wait patiently`, "message"),
     maintaining: true
   },
   APP_STARTING: {
     status: 503,
-    message: /* @__PURE__ */ __name(({ app }) => app.maintainingMessage, "message"),
+    message: /* @__PURE__ */ __name(({ app }) => (app == null ? void 0 : app.maintainingMessage) || "", "message"),
     maintaining: true
   },
   APP_STOPPED: {
     status: 503,
-    message: /* @__PURE__ */ __name(({ app }) => `application ${app.name} is stopped`, "message"),
+    message: /* @__PURE__ */ __name(({ app }) => `application ${getAppName(app)} is stopped`, "message"),
     maintaining: true
   },
   APP_INITIALIZED: {
     status: 503,
-    message: /* @__PURE__ */ __name(({ app }) => `application ${app.name} is initialized, waiting for command`, "message"),
+    message: /* @__PURE__ */ __name(({ app }) => `application ${getAppName(app)} is initialized, waiting for command`, "message"),
     maintaining: true
   },
   APP_INITIALIZING: {
@@ -93,25 +116,40 @@ const errors = {
   COMMAND_ERROR: {
     status: 503,
     maintaining: true,
-    message: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().error.message, "message"),
-    command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().command, "command")
+    message: /* @__PURE__ */ __name(({ app }) => {
+      var _a, _b;
+      return ((_b = (_a = getMaintaining(app)) == null ? void 0 : _a.error) == null ? void 0 : _b.message) || "";
+    }, "message"),
+    command: /* @__PURE__ */ __name(({ app }) => {
+      var _a;
+      return (_a = getMaintaining(app)) == null ? void 0 : _a.command;
+    }, "command")
   },
   COMMAND_END: {
     status: 503,
     maintaining: true,
-    message: /* @__PURE__ */ __name(({ app }) => `${app.getMaintaining().command.name} running end`, "message"),
-    command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().command, "command")
+    message: /* @__PURE__ */ __name(({ app }) => {
+      var _a, _b;
+      return `${((_b = (_a = getMaintaining(app)) == null ? void 0 : _a.command) == null ? void 0 : _b.name) || "command"} running end`;
+    }, "message"),
+    command: /* @__PURE__ */ __name(({ app }) => {
+      var _a;
+      return (_a = getMaintaining(app)) == null ? void 0 : _a.command;
+    }, "command")
   },
   APP_COMMANDING: {
     status: 503,
     maintaining: true,
-    message: /* @__PURE__ */ __name(({ app, message }) => message || app.maintainingMessage, "message"),
-    command: /* @__PURE__ */ __name(({ app, command }) => command || app.getMaintaining().command, "command")
+    message: /* @__PURE__ */ __name(({ app, message }) => message || (app == null ? void 0 : app.maintainingMessage) || "", "message"),
+    command: /* @__PURE__ */ __name(({ app, command }) => {
+      var _a;
+      return command || ((_a = getMaintaining(app)) == null ? void 0 : _a.command);
+    }, "command")
   },
   APP_RUNNING: {
     status: 200,
     maintaining: false,
-    message: /* @__PURE__ */ __name(({ message, app }) => message || `application ${app.name} is running`, "message")
+    message: /* @__PURE__ */ __name(({ message, app }) => message || `application ${getAppName(app)} is running`, "message")
   },
   UNKNOWN_ERROR: {
     status: 500,

package/lib/gateway/index.d.ts

@@ -23,6 +23,12 @@ export interface IncomingRequest {
     url: string;
     headers: any;
 }
+export interface GatewayRequestContext {
+    req: IncomingMessage;
+    res: ServerResponse;
+    appName: string;
+}
+type GatewayMiddleware = (ctx: GatewayRequestContext, next: () => Promise<void>) => Promise<void> | void;
 export type AppSelector = (req: IncomingRequest) => string | Promise<string>;
 export type AppSelectorMiddleware = (ctx: AppSelectorMiddlewareContext, next: () => Promise<void>) => void;
 interface StartHttpServerOptions {
@@ -39,6 +45,7 @@ export interface AppSelectorMiddlewareContext {
 }
 export declare class Gateway extends EventEmitter {
     private static instance;
+    middlewares: Toposort<GatewayMiddleware>;
     /**
      * use main app as default app to handle request
      */
@@ -54,6 +61,7 @@ export declare class Gateway extends EventEmitter {
     private onTerminate;
     private constructor();
     static getInstance(options?: any): Gateway;
+    use(middleware: GatewayMiddleware, options?: ToposortOptions): void;
     static getIPCSocketClient(): Promise<false | IPCSocketClient>;
     destroy(): void;
     reset(): void;

package/lib/gateway/index.js

@@ -75,6 +75,7 @@ function getSocketPath() {
 }
 __name(getSocketPath, "getSocketPath");
 const _Gateway = class _Gateway extends import_events.EventEmitter {
+  middlewares;
   /**
    * use main app as default app to handle request
    */
@@ -124,6 +125,9 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
     return _Gateway.instance;
   }
+  use(middleware, options) {
+    this.middlewares.add(middleware, options);
+  }
   static async getIPCSocketClient() {
     const socketPath = getSocketPath();
     try {
@@ -139,6 +143,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     _Gateway.instance = null;
   }
   reset() {
+    this.middlewares = new import_utils.Toposort();
     this.selectorMiddlewares = new import_utils.Toposort();
     this.addAppSelectorMiddleware(
       async (ctx, next) => {
@@ -202,7 +207,15 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     res.end(JSON.stringify({ error }));
   }
   responseErrorWithCode(code, res, options) {
+    const log = this.getLogger(options.appName, res);
     const error = (0, import_errors.applyErrorWithArgs)((0, import_errors.getErrorWithCode)(code), options);
+    log.error(error.message, {
+      method: "responseErrorWithCode",
+      code,
+      error,
+      statusCode: res.statusCode,
+      appName: options.appName
+    });
     this.responseError(res, error);
   }
   async requestHandler(req, res) {
@@ -256,11 +269,15 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     if (!hasApp) {
       void import_app_supervisor.AppSupervisor.getInstance().bootStrapApp(handleApp);
     }
-    let appStatus = import_app_supervisor.AppSupervisor.getInstance().getAppStatus(handleApp, "initializing");
+    let appStatus = import_app_supervisor.AppSupervisor.getInstance().getAppStatus(handleApp, "preparing");
     if (appStatus === "not_found") {
       this.responseErrorWithCode("APP_NOT_FOUND", res, { appName: handleApp });
       return;
     }
+    if (appStatus === "preparing") {
+      this.responseErrorWithCode("APP_PREPARING", res, { appName: handleApp });
+      return;
+    }
     if (appStatus === "initializing") {
       this.responseErrorWithCode("APP_INITIALIZING", res, { appName: handleApp });
       return;
@@ -283,7 +300,14 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     if (handleApp !== "main") {
       import_app_supervisor.AppSupervisor.getInstance().touchApp(handleApp);
     }
-    app.callback()(req, res);
+    const ctx = { req, res, appName: handleApp };
+    const fn = (0, import_koa_compose.default)([
+      ...this.middlewares.nodes,
+      async (_ctx) => {
+        await app.callback()(req, res);
+      }
+    ]);
+    await fn(ctx);
   }
   getAppSelectorMiddlewares() {
     return this.selectorMiddlewares;

package/lib/gateway/ws-server.js

@@ -228,6 +228,9 @@ const _WSServer = class _WSServer extends import_events.default {
   }
   removeClientTag(clientId, tagKey) {
     const client = this.webSocketClients.get(clientId);
+    if (!client) {
+      return;
+    }
     client.tags.forEach((tag) => {
       if (tag.startsWith(`${tagKey}#`)) {
         client.tags.delete(tag);

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.database.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

@@ -19,9 +19,10 @@ 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 * from './main-data-source';
 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';