@nocobase/server 1.9.0-beta.9 → 2.0.0-alpha.3

package/lib/aes-encryptor.js

@@ -53,25 +53,25 @@ const _AesEncryptor = class _AesEncryptor {
     this.key = key;
   }
   async encrypt(text) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       try {
         const iv = import_crypto.default.randomBytes(16);
         const cipher = import_crypto.default.createCipheriv("aes-256-cbc", this.key, iv);
         const encrypted = Buffer.concat([cipher.update(Buffer.from(text, "utf8")), cipher.final()]);
-        resolve(iv.toString("hex") + encrypted.toString("hex"));
+        resolve2(iv.toString("hex") + encrypted.toString("hex"));
       } catch (error) {
         reject(error);
       }
     });
   }
   async decrypt(encryptedText) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       try {
         const iv = Buffer.from(encryptedText.slice(0, 32), "hex");
         const encrypted = Buffer.from(encryptedText.slice(32), "hex");
         const decipher = import_crypto.default.createDecipheriv("aes-256-cbc", this.key, iv);
         const decrypted = Buffer.concat([decipher.update(encrypted), decipher.final()]);
-        resolve(decrypted.toString("utf8"));
+        resolve2(decrypted.toString("utf8"));
       } catch (error) {
         reject(error);
       }
@@ -109,11 +109,9 @@ const _AesEncryptor = class _AesEncryptor {
     return appKeyPath;
   }
   static async create(app) {
-    let key = process.env.APP_AES_SECRET_KEY;
-    if (!key) {
-      const keyPath = await this.getKeyPath(app.name);
-      key = await _AesEncryptor.getOrGenerateKey(keyPath);
-    }
+    const KEY_PATH = process.env.APP_AES_SECRET_KEY_PATH;
+    const keyPath = KEY_PATH ? (0, import_path.resolve)(process.cwd(), KEY_PATH) : await this.getKeyPath(app.name);
+    const key = await _AesEncryptor.getOrGenerateKey(keyPath);
     return new _AesEncryptor(key);
   }
 };

package/lib/gateway/index.d.ts

@@ -8,14 +8,17 @@
  */
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { SystemLogger } from '@nocobase/logger';
 import { Registry, Toposort, ToposortOptions } from '@nocobase/utils';
 import { EventEmitter } from 'events';
 import http, { IncomingMessage, ServerResponse } from 'http';
-import { ApplicationOptions } from '../application';
+import { ApplicationOptions, Application } from '../application';
 import { IPCSocketClient } from './ipc-socket-client';
 import { IPCSocketServer } from './ipc-socket-server';
 import { WSServer } from './ws-server';
+import { Duplex } from 'node:stream';
 export interface IncomingRequest {
     url: string;
     headers: any;
@@ -47,6 +50,8 @@ export declare class Gateway extends EventEmitter {
     private port;
     private host;
     private socketPath;
+    private terminating;
+    private onTerminate;
     private constructor();
     static getInstance(options?: any): Gateway;
     static getIPCSocketClient(): Promise<false | IPCSocketClient>;
@@ -76,5 +81,11 @@ export declare class Gateway extends EventEmitter {
     tryConnectToIPCServer(): Promise<false | IPCSocketClient>;
     getIPCSocketClient(): Promise<IPCSocketClient>;
     close(): void;
+    private static requestHandlers;
+    static registerRequestHandler(handler: (req: IncomingRequest, res: ServerResponse, app: Application) => boolean | void): void;
+    static unregisterRequestHandler(handler: (req: IncomingRequest, res: ServerResponse, app: Application) => boolean | void): void;
+    private static wsServers;
+    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

@@ -86,10 +86,37 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   port = import_node_process.default.env.APP_PORT ? parseInt(import_node_process.default.env.APP_PORT) : null;
   host = "0.0.0.0";
   socketPath = (0, import_path.resolve)(import_node_process.default.cwd(), "storage", "gateway.sock");
+  terminating = false;
+  onTerminate = /* @__PURE__ */ __name(async (signal) => {
+    var _a;
+    if (this.terminating) {
+      return;
+    }
+    this.terminating = true;
+    const supervisor = import_app_supervisor.AppSupervisor.getInstance();
+    const apps = Object.values(supervisor.apps || {});
+    try {
+      for (const app of apps) {
+        try {
+          await app.destroy({ signal });
+        } catch (error) {
+          const logger = (app == null ? void 0 : app.log) ?? console;
+          (_a = logger.error) == null ? void 0 : _a.call(logger, error);
+        }
+      }
+      await supervisor.destroy();
+    } catch (error) {
+      console.error("Failed to shutdown applications gracefully", error);
+    } finally {
+      this.destroy();
+    }
+  }, "onTerminate");
   constructor() {
     super();
     this.reset();
     this.socketPath = getSocketPath();
+    import_node_process.default.once("SIGTERM", this.onTerminate);
+    import_node_process.default.once("SIGINT", this.onTerminate);
   }
   static getInstance(options = {}) {
     if (!_Gateway.instance) {
@@ -106,6 +133,8 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
   }
   destroy() {
+    import_node_process.default.off("SIGTERM", this.onTerminate);
+    import_node_process.default.off("SIGINT", this.onTerminate);
     this.reset();
     _Gateway.instance = null;
   }
@@ -137,6 +166,10 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       this.ipcSocketServer.close();
       this.ipcSocketServer = null;
     }
+    if (this.wsServer) {
+      this.wsServer.close();
+      this.wsServer = null;
+    }
   }
   addAppSelectorMiddleware(middleware, options) {
     if (this.selectorMiddlewares.nodes.some((existingFunc) => existingFunc.toString() === middleware.toString())) {
@@ -360,9 +393,29 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       console.log("gateway port is not set, http server will not start");
       return;
     }
-    this.server = import_http.default.createServer(this.getCallback());
+    this.server = import_http.default.createServer(async (req, res) => {
+      const appInstance = await import_app_supervisor.AppSupervisor.getInstance().getApp("main");
+      for (const handler2 of _Gateway.requestHandlers) {
+        try {
+          const result = await handler2(req, res, appInstance);
+          if (result !== false) {
+            return;
+          }
+        } catch (error) {
+          console.error("gateway request handler error:", error);
+        }
+      }
+      this.getCallback()(req, res);
+    });
     this.wsServer = new import_ws_server.WSServer();
-    this.server.on("upgrade", (request, socket, head) => {
+    this.server.on("upgrade", async (request, socket, head) => {
+      const appInstance = await import_app_supervisor.AppSupervisor.getInstance().getApp("main");
+      for (const handle of _Gateway.wsServers) {
+        const result = await handle(request, socket, head, appInstance);
+        if (result !== false) {
+          return;
+        }
+      }
       const { pathname } = (0, import_url.parse)(request.url);
       if (pathname === import_node_process.default.env.WS_PATH) {
         this.wsServer.wss.handleUpgrade(request, socket, head, (ws) => {
@@ -395,9 +448,23 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     (_a = this.server) == null ? void 0 : _a.close();
     (_b = this.wsServer) == null ? void 0 : _b.close();
   }
+  static registerRequestHandler(handler2) {
+    _Gateway.requestHandlers.push(handler2);
+  }
+  static unregisterRequestHandler(handler2) {
+    _Gateway.requestHandlers = _Gateway.requestHandlers.filter((h) => h !== handler2);
+  }
+  static registerWsHandler(wsServer) {
+    _Gateway.wsServers.push(wsServer);
+  }
+  static unregisterWsHandler(wsServer) {
+    _Gateway.wsServers = _Gateway.wsServers.filter((ws) => ws !== wsServer);
+  }
 };
 __name(_Gateway, "Gateway");
 __publicField(_Gateway, "instance");
+__publicField(_Gateway, "requestHandlers", []);
+__publicField(_Gateway, "wsServers", []);
 let Gateway = _Gateway;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/index.d.ts

@@ -9,6 +9,7 @@
 export * from './aes-encryptor';
 export * from './app-supervisor';
 export * from './application';
+export * from './gateway/ws-server';
 export { Application as default } from './application';
 export * from './audit-manager';
 export * from './gateway';

package/lib/index.js

@@ -51,6 +51,7 @@ module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./aes-encryptor"), module.exports);
 __reExport(src_exports, require("./app-supervisor"), module.exports);
 __reExport(src_exports, require("./application"), module.exports);
+__reExport(src_exports, require("./gateway/ws-server"), module.exports);
 var import_application = require("./application");
 __reExport(src_exports, require("./audit-manager"), module.exports);
 __reExport(src_exports, require("./gateway"), module.exports);
@@ -79,6 +80,7 @@ const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
   ...require("./aes-encryptor"),
   ...require("./app-supervisor"),
   ...require("./application"),
+  ...require("./gateway/ws-server"),
   ...require("./audit-manager"),
   ...require("./gateway"),
   ...require("./migration"),

package/lib/locale/resource.js

@@ -59,6 +59,13 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
       }
     } catch (error) {
     }
+    try {
+      require.resolve("@nocobase/flow-engine/src");
+      if (packageName === "@nocobase/plugin-flow-engine") {
+        packageName = "@nocobase/flow-engine";
+      }
+    } catch (error) {
+    }
     prefixes.unshift("src");
   }
   for (const prefix of prefixes) {

package/lib/plugin.js

@@ -130,7 +130,11 @@ const _Plugin = class _Plugin {
     if (!this.name) {
       throw new Error(`plugin name invalid`);
     }
-    await this.app.syncMessageManager.publish(this.name, message, options);
+    try {
+      await this.app.syncMessageManager.publish(this.name, message, options);
+    } catch (err) {
+      this.log.error(err);
+    }
   }
   /**
    * @deprecated

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.9.0-beta.9",
+  "version": "2.0.0-alpha.3",
   "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.9",
-    "@nocobase/actions": "1.9.0-beta.9",
-    "@nocobase/auth": "1.9.0-beta.9",
-    "@nocobase/cache": "1.9.0-beta.9",
-    "@nocobase/data-source-manager": "1.9.0-beta.9",
-    "@nocobase/database": "1.9.0-beta.9",
-    "@nocobase/evaluators": "1.9.0-beta.9",
-    "@nocobase/lock-manager": "1.9.0-beta.9",
-    "@nocobase/logger": "1.9.0-beta.9",
-    "@nocobase/resourcer": "1.9.0-beta.9",
-    "@nocobase/sdk": "1.9.0-beta.9",
-    "@nocobase/snowflake-id": "1.9.0-beta.9",
-    "@nocobase/telemetry": "1.9.0-beta.9",
-    "@nocobase/utils": "1.9.0-beta.9",
+    "@nocobase/acl": "2.0.0-alpha.3",
+    "@nocobase/actions": "2.0.0-alpha.3",
+    "@nocobase/auth": "2.0.0-alpha.3",
+    "@nocobase/cache": "2.0.0-alpha.3",
+    "@nocobase/data-source-manager": "2.0.0-alpha.3",
+    "@nocobase/database": "2.0.0-alpha.3",
+    "@nocobase/evaluators": "2.0.0-alpha.3",
+    "@nocobase/lock-manager": "2.0.0-alpha.3",
+    "@nocobase/logger": "2.0.0-alpha.3",
+    "@nocobase/resourcer": "2.0.0-alpha.3",
+    "@nocobase/sdk": "2.0.0-alpha.3",
+    "@nocobase/snowflake-id": "2.0.0-alpha.3",
+    "@nocobase/telemetry": "2.0.0-alpha.3",
+    "@nocobase/utils": "2.0.0-alpha.3",
     "@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": "b44464f1d1bbc96022d0f622e0a2f1d7e8d7142f"
+  "gitHead": "8efc23aa78058d871e98a91419f3c4a61762cc15"
 }