@nocobase/server 2.1.0-alpha.12 → 2.1.0-alpha.14

package/lib/acl/available-action.js

@@ -50,7 +50,7 @@ const availableActions = {
   view: {
     displayName: '{{t("View")}}',
     type: "old-data",
-    aliases: ["get", "list"],
+    aliases: ["get", "list", "query"],
     allowConfigureFields: true
   },
   update: {

package/lib/app-supervisor/index.js

@@ -47,6 +47,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_utils = require("@nocobase/utils");
 var import_events = require("events");
 var import_application = __toESM(require("../application"));
+var import_worker_mode = require("../worker-mode");
 var import_main_only_adapter = require("./main-only-adapter");
 var import_handler = require("../errors/handler");
 var import_condition_registry = require("./condition-registry");
@@ -288,6 +289,10 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     return this.discoveryAdapter.getAppStatus(appName, defaultStatus);
   }
   async setAppStatus(appName, status, options = {}) {
+    if ((0, import_worker_mode.isTransient)()) {
+      this.logger.debug("App running as worker, status will not be set", { appName, status });
+      return;
+    }
     this.logger.debug("Setting app status", { appName, status });
     return this.discoveryAdapter.setAppStatus(appName, status, options);
   }
@@ -329,7 +334,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
       };
     }
     const app = new import_application.default(options);
-    if (hook ?? app.serving()) {
+    if (hook ?? !(0, import_worker_mode.isTransient)()) {
       app.on("afterStart", async () => {
         await this.sendSyncMessage(mainApp, {
           type: "app:started",
@@ -356,6 +361,9 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     this.registerCommandHandler(app);
     app.on("afterStart", async (app2) => {
       var _a, _b;
+      if ((0, import_worker_mode.isTransient)()) {
+        return;
+      }
       await app2.syncMessageManager.subscribe(
         "app_supervisor:sync",
         async (message) => {
@@ -390,6 +398,9 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
       }
     });
     app.on("afterDestroy", async (app2) => {
+      if ((0, import_worker_mode.isTransient)()) {
+        return;
+      }
       await this.unregisterEnvironment();
     });
     return app;
@@ -586,7 +597,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     return super.on(eventName, listener);
   }
   bindAppEvents(app) {
-    if (!app.serving()) {
+    if ((0, import_worker_mode.isTransient)()) {
       return;
     }
     app.on("afterDestroy", async () => {

package/lib/application.d.ts

@@ -270,8 +270,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     protected _aesEncryptor: AesEncryptor;
     get aesEncryptor(): AesEncryptor;
     /**
-     * Check if the application is serving as a specific worker.
-     * @experimental
+     * @deprecated use {@link serving} from './worker-mode' instead.
      */
     serving(key?: string): boolean;
     /**

package/lib/application.js

@@ -87,6 +87,7 @@ var import_redis_connection_manager = require("./redis-connection-manager");
 var import_service_container = require("./service-container");
 var import_snowflake_id_field = require("./snowflake-id-field");
 var import_worker_id_allocator = require("./worker-id-allocator");
+var import_worker_mode = require("./worker-mode");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
@@ -282,32 +283,10 @@ const _Application = class _Application extends import_koa.default {
     return this._aesEncryptor;
   }
   /**
-   * Check if the application is serving as a specific worker.
-   * @experimental
+   * @deprecated use {@link serving} from './worker-mode' instead.
    */
   serving(key) {
-    const { WORKER_MODE = "" } = process.env;
-    if (!WORKER_MODE) {
-      return true;
-    }
-    if (WORKER_MODE === "-") {
-      return false;
-    }
-    const topics = WORKER_MODE.trim().split(",");
-    if (key) {
-      if (WORKER_MODE === "*") {
-        return true;
-      }
-      if (topics.includes(key)) {
-        return true;
-      }
-      return false;
-    } else {
-      if (topics.includes("!")) {
-        return true;
-      }
-      return false;
-    }
+    return (0, import_worker_mode.serving)(key);
   }
   /**
    * @internal

package/lib/gateway/index.d.ts

@@ -19,6 +19,7 @@ import { IPCSocketClient } from './ipc-socket-client';
 import { IPCSocketServer } from './ipc-socket-server';
 import { WSServer } from './ws-server';
 import { Duplex } from 'node:stream';
+export { getHost, getHostname } from './utils';
 export interface IncomingRequest {
     url: string;
     headers: any;
@@ -40,7 +41,7 @@ interface RunOptions {
     mainAppOptions: ApplicationOptions;
 }
 export interface AppSelectorMiddlewareContext {
-    req: IncomingRequest;
+    req: IncomingMessage | IncomingRequest;
     resolvedAppName: string | null;
 }
 export declare class Gateway extends EventEmitter {
@@ -86,7 +87,7 @@ export declare class Gateway extends EventEmitter {
     private renderV2IndexHtml;
     requestHandler(req: IncomingMessage, res: ServerResponse): Promise<void>;
     getAppSelectorMiddlewares(): Toposort<AppSelectorMiddleware>;
-    getRequestHandleAppName(req: IncomingRequest): Promise<string>;
+    getRequestHandleAppName(req: IncomingMessage | IncomingRequest): Promise<string>;
     getCallback(): any;
     watch(): Promise<void>;
     run(options: RunOptions): Promise<void>;
@@ -106,4 +107,3 @@ export declare class Gateway extends EventEmitter {
     static registerWsHandler(wsServer: (req: IncomingMessage, socket: Duplex, head: Buffer, app: Application) => boolean | void): void;
     static unregisterWsHandler(wsServer: (req: IncomingMessage, socket: Duplex, head: Buffer, app: Application) => boolean | void): void;
 }
-export {};

package/lib/gateway/index.js

@@ -39,7 +39,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var gateway_exports = {};
 __export(gateway_exports, {
-  Gateway: () => Gateway
+  Gateway: () => Gateway,
+  getHost: () => import_utils4.getHost,
+  getHostname: () => import_utils4.getHostname
 });
 module.exports = __toCommonJS(gateway_exports);
 var import_logger = require("@nocobase/logger");
@@ -67,6 +69,7 @@ var import_utils3 = require("./utils");
 var import_ws_server = require("./ws-server");
 var import_node_worker_threads = require("node:worker_threads");
 var import_node_process = __toESM(require("node:process"));
+var import_utils4 = require("./utils");
 const compress = (0, import_node_util.promisify)((0, import_compression.default)());
 function normalizeBasePath(path = "") {
   const normalized = path.replace(/\/+/g, "/").replace(/\/$/, "");
@@ -164,12 +167,12 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
         const appName = (_a = import_qs.default.parse(parsedUrl.query)) == null ? void 0 : _a.__appName;
         const apiBasePath = normalizeBasePath(import_node_process.default.env.API_BASE_PATH || "/api");
         const appPathPrefix = `${apiBasePath}/__app/`;
-        if (appName) {
-          ctx.resolvedAppName = appName;
-        }
         if (req.headers["x-app"]) {
           ctx.resolvedAppName = req.headers["x-app"];
         }
+        if (appName) {
+          ctx.resolvedAppName = appName;
+        }
         if ((_b = parsedUrl.pathname) == null ? void 0 : _b.startsWith(appPathPrefix)) {
           const restPath = parsedUrl.pathname.slice(appPathPrefix.length);
           const [pathAppName, ...segments] = restPath.split("/");
@@ -655,5 +658,7 @@ __publicField(_Gateway, "wsServers", []);
 let Gateway = _Gateway;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Gateway
+  Gateway,
+  getHost,
+  getHostname
 });

package/lib/gateway/utils.d.ts

@@ -6,7 +6,12 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+/// <reference types="node" />
+import { IncomingMessage } from 'http';
+import { IncomingRequest } from '.';
 export declare function resolvePublicPath(appPublicPath?: string): string;
 export declare function resolveV2PublicPath(appPublicPath?: string): string;
 export declare function rewriteV2AssetPublicPath(html: string, assetPublicPath: string): string;
 export declare function injectRuntimeScript(html: string, runtimeScript: string): string;
+export declare function getHost(req: IncomingMessage | IncomingRequest): any;
+export declare function getHostname(req: IncomingMessage | IncomingRequest): any;

package/lib/gateway/utils.js

@@ -27,6 +27,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  getHost: () => getHost,
+  getHostname: () => getHostname,
   injectRuntimeScript: () => injectRuntimeScript,
   resolvePublicPath: () => resolvePublicPath,
   resolveV2PublicPath: () => resolveV2PublicPath,
@@ -75,8 +77,37 @@ ${moduleScriptMatch[0]}`);
 ${html}`;
 }
 __name(injectRuntimeScript, "injectRuntimeScript");
+function splitCommaSeparatedValues(value, limit) {
+  return value.split(",", limit).map((v) => v.trim());
+}
+__name(splitCommaSeparatedValues, "splitCommaSeparatedValues");
+function getHost(req) {
+  let host = req.headers["x-forwarded-host"];
+  if (!host) {
+    host = req.headers[":authority"] || req.headers["host"];
+  }
+  if (!host) return "";
+  host = splitCommaSeparatedValues(host, 1)[0];
+  if (host.includes("@")) {
+    try {
+      host = new URL(`http://${host}`).host;
+    } catch (e) {
+      return "";
+    }
+  }
+  return host;
+}
+__name(getHost, "getHost");
+function getHostname(req) {
+  const host = getHost(req);
+  if (!host) return "";
+  return host.split(":", 1)[0];
+}
+__name(getHostname, "getHostname");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getHost,
+  getHostname,
   injectRuntimeScript,
   resolvePublicPath,
   resolveV2PublicPath,

package/lib/index.d.ts

@@ -20,6 +20,7 @@ export * from './plugin-manager';
 export * from './pub-sub-manager';
 export * from './event-queue';
 export * from './worker-id-allocator';
+export * from './worker-mode';
 export * from './redis-connection-manager';
 export * from './main-data-source';
 export declare const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";

package/lib/index.js

@@ -63,6 +63,7 @@ __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("./worker-id-allocator"), module.exports);
+__reExport(src_exports, require("./worker-mode"), module.exports);
 __reExport(src_exports, require("./redis-connection-manager"), module.exports);
 __reExport(src_exports, require("./main-data-source"), module.exports);
 var import_findPackageNames = require("./plugin-manager/findPackageNames");
@@ -92,6 +93,7 @@ const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
   ...require("./pub-sub-manager"),
   ...require("./event-queue"),
   ...require("./worker-id-allocator"),
+  ...require("./worker-mode"),
   ...require("./redis-connection-manager"),
   ...require("./main-data-source")
 });

package/lib/plugin-manager/deps.js

@@ -76,6 +76,7 @@ const deps = {
   lodash: "4.x",
   "china-division": "2.x",
   cronstrue: "2.x",
-  "@nocobase/license-kit": "0.3.x"
+  "@nocobase/license-kit": "0.3.x",
+  joi: "17.x"
 };
 var deps_default = deps;

package/lib/plugin.js

@@ -234,6 +234,7 @@ const _Plugin = class _Plugin {
           "**/ai-employees/*/index.ts",
           "**/ai-employees/*.js",
           "**/ai-employees/*/index.js",
+          "**/ai-employees/*/prompt.md",
           "!**/ai-employees/**/*.d.ts"
         ]
       },

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

@@ -29,6 +29,7 @@ export declare class HandlerManager {
     set(channel: string, callback: any, options: PubSubManagerSubscribeOptions): (wrappedMessage: any) => Promise<void>;
     get(channel: string, callback: any): any;
     delete(channel: string, callback: any): any;
+    cancelPendingDebounce(): void;
     reset(): void;
     each(callback: any): Promise<void>;
 }

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

@@ -129,7 +129,18 @@ const _HandlerManager = class _HandlerManager {
     headlerMap.delete(callback);
     return headler;
   }
+  cancelPendingDebounce() {
+    if (this.uniqueMessageHandlers) {
+      for (const handler of this.uniqueMessageHandlers.values()) {
+        if (typeof (handler == null ? void 0 : handler.cancel) === "function") {
+          handler.cancel();
+        }
+      }
+      this.uniqueMessageHandlers.clear();
+    }
+  }
   reset() {
+    this.cancelPendingDebounce();
     this.handlers = /* @__PURE__ */ new Map();
     this.uniqueMessageHandlers = /* @__PURE__ */ new Map();
   }

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

@@ -77,6 +77,7 @@ const _PubSubManager = class _PubSubManager {
     });
   }
   async close() {
+    this.handlerManager.cancelPendingDebounce();
     if (!this.adapter) {
       return;
     }

package/lib/sync-message-manager.js

@@ -40,7 +40,14 @@ const _SyncMessageManager = class _SyncMessageManager {
       if (!plugin.name) {
         return;
       }
-      await this.subscribe(plugin.name, plugin.handleSyncMessage.bind(plugin));
+      if (typeof plugin.handleSyncMessage === "function") {
+        await this.subscribe(plugin.name, async (...args) => {
+          if (app.stopped || app.db.closed()) {
+            return;
+          }
+          return plugin.handleSyncMessage(...args);
+        });
+      }
     });
   }
   versionManager;

package/lib/worker-mode.d.ts

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ */
+/**
+ * Check if the application is running in transient mode (WORKER_MODE === '-'),
+ * which means it is a short-lived subprocess spawned to execute a command and then exit.
+ * @experimental
+ */
+export declare function isTransient(): boolean;
+/**
+ * Check if the application is serving as a specific worker.
+ * @experimental
+ */
+export declare function serving(key?: string): boolean;

package/lib/worker-mode.js

@@ -0,0 +1,67 @@
+/**
+ * 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 worker_mode_exports = {};
+__export(worker_mode_exports, {
+  isTransient: () => isTransient,
+  serving: () => serving
+});
+module.exports = __toCommonJS(worker_mode_exports);
+function isTransient() {
+  return process.env.WORKER_MODE === "-";
+}
+__name(isTransient, "isTransient");
+function serving(key) {
+  const { WORKER_MODE = "" } = process.env;
+  if (!WORKER_MODE) {
+    return true;
+  }
+  if (WORKER_MODE === "-") {
+    return false;
+  }
+  const topics = WORKER_MODE.trim().split(",");
+  if (key) {
+    if (WORKER_MODE === "*") {
+      return true;
+    }
+    if (topics.includes(key)) {
+      return true;
+    }
+    return false;
+  } else {
+    if (topics.includes("!")) {
+      return true;
+    }
+    return false;
+  }
+}
+__name(serving, "serving");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isTransient,
+  serving
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.0-alpha.12",
+  "version": "2.1.0-alpha.14",
   "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.12",
-    "@nocobase/actions": "2.1.0-alpha.12",
-    "@nocobase/ai": "2.1.0-alpha.12",
-    "@nocobase/auth": "2.1.0-alpha.12",
-    "@nocobase/cache": "2.1.0-alpha.12",
-    "@nocobase/data-source-manager": "2.1.0-alpha.12",
-    "@nocobase/database": "2.1.0-alpha.12",
-    "@nocobase/evaluators": "2.1.0-alpha.12",
-    "@nocobase/lock-manager": "2.1.0-alpha.12",
-    "@nocobase/logger": "2.1.0-alpha.12",
-    "@nocobase/resourcer": "2.1.0-alpha.12",
-    "@nocobase/sdk": "2.1.0-alpha.12",
-    "@nocobase/snowflake-id": "2.1.0-alpha.12",
-    "@nocobase/telemetry": "2.1.0-alpha.12",
-    "@nocobase/utils": "2.1.0-alpha.12",
+    "@nocobase/acl": "2.1.0-alpha.14",
+    "@nocobase/actions": "2.1.0-alpha.14",
+    "@nocobase/ai": "2.1.0-alpha.14",
+    "@nocobase/auth": "2.1.0-alpha.14",
+    "@nocobase/cache": "2.1.0-alpha.14",
+    "@nocobase/data-source-manager": "2.1.0-alpha.14",
+    "@nocobase/database": "2.1.0-alpha.14",
+    "@nocobase/evaluators": "2.1.0-alpha.14",
+    "@nocobase/lock-manager": "2.1.0-alpha.14",
+    "@nocobase/logger": "2.1.0-alpha.14",
+    "@nocobase/resourcer": "2.1.0-alpha.14",
+    "@nocobase/sdk": "2.1.0-alpha.14",
+    "@nocobase/snowflake-id": "2.1.0-alpha.14",
+    "@nocobase/telemetry": "2.1.0-alpha.14",
+    "@nocobase/utils": "2.1.0-alpha.14",
     "@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": "f12c4a75470590b1670ce54510b96ef94c2cd7a2"
+  "gitHead": "d8735b541de0ff9557bba704de49c799b4962672"
 }