@nocobase/server 2.0.0-alpha.32 → 2.0.0-alpha.34

package/lib/app-supervisor.d.ts

@@ -8,6 +8,7 @@
  */
 /// <reference types="node" />
 import { AsyncEmitter } from '@nocobase/utils';
+import { Mutex } from 'async-mutex';
 import { EventEmitter } from 'events';
 import Application, { ApplicationOptions } from './application';
 type BootOptions = {
@@ -16,9 +17,10 @@ type BootOptions = {
     appSupervisor: AppSupervisor;
 };
 type AppBootstrapper = (bootOptions: BootOptions) => Promise<void>;
-type AppStatus = 'initializing' | 'initialized' | 'running' | 'commanding' | 'stopped' | 'error' | 'not_found';
+export type AppStatus = 'preparing' | 'initializing' | 'initialized' | 'running' | 'commanding' | 'stopped' | 'error' | 'not_found';
 export declare class AppSupervisor extends EventEmitter implements AsyncEmitter {
     private static instance;
+    private bootstrapQueue;
     runningMode: 'single' | 'multiple';
     singleAppName: string | null;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
@@ -48,7 +50,8 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     reset(): Promise<void>;
     destroy(): Promise<void>;
     setAppStatus(appName: string, status: AppStatus, options?: {}): void;
-    getMutexOfApp(appName: string): any;
+    getMutexOfApp(appName: string): Mutex;
+    private _bootStrapApp;
     bootStrapApp(appName: string, options?: {}): Promise<void>;
     getApp(appName: string, options?: {
         withOutBootStrap?: boolean;

package/lib/app-supervisor.js

@@ -47,7 +47,9 @@ var import_async_mutex = require("async-mutex");
 var import_events = require("events");
 var import_application = __toESM(require("./application"));
 var import_handler = require("./errors/handler");
+var import_p_queue = __toESM(require("p-queue"));
 const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
+  bootstrapQueue;
   runningMode = "multiple";
   singleAppName = null;
   apps = {};
@@ -64,6 +66,12 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
       this.runningMode = "single";
       this.singleAppName = process.env.STARTUP_SUBAPP;
     }
+    this.bootstrapQueue = new import_p_queue.default({
+      concurrency: process.env.SUBAPP_BOOTSTRAP_CONCURRENCY ? parseInt(process.env.SUBAPP_BOOTSTRAP_CONCURRENCY) : Infinity,
+      intervalCap: process.env.SUBAPP_BOOTSTRAP_INTERVAL_CAP ? parseInt(process.env.SUBAPP_BOOTSTRAP_INTERVAL_CAP) : Infinity,
+      interval: process.env.SUBAPP_BOOTSTRAP_INTERVAL ? parseInt(process.env.SUBAPP_BOOTSTRAP_INTERVAL) : 0,
+      timeout: 1 * 60 * 1e3
+    });
   }
   static getInstance() {
     if (!_AppSupervisor.instance) {
@@ -113,24 +121,42 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     }
     return this.appMutexes[appName];
   }
+  async _bootStrapApp(appName, options = {}) {
+    this.setAppStatus(appName, "initializing");
+    if (this.appBootstrapper) {
+      await this.appBootstrapper({
+        appSupervisor: this,
+        appName,
+        options
+      });
+    }
+    if (!this.hasApp(appName)) {
+      this.setAppStatus(appName, "not_found");
+    } else if (!this.getAppStatus(appName) || this.getAppStatus(appName) === "initializing") {
+      this.setAppStatus(appName, "initialized");
+    }
+  }
   async bootStrapApp(appName, options = {}) {
-    await this.getMutexOfApp(appName).runExclusive(async () => {
-      if (!this.hasApp(appName)) {
-        this.setAppStatus(appName, "initializing");
-        if (this.appBootstrapper) {
-          await this.appBootstrapper({
-            appSupervisor: this,
-            appName,
-            options
-          });
+    const mutex = this.getMutexOfApp(appName);
+    try {
+      await (0, import_async_mutex.tryAcquire)(mutex).runExclusive(async () => {
+        if (this.hasApp(appName) && this.getAppStatus(appName) !== "preparing") {
+          return;
         }
-        if (!this.hasApp(appName)) {
-          this.setAppStatus(appName, "not_found");
-        } else if (!this.getAppStatus(appName) || this.getAppStatus(appName) == "initializing") {
-          this.setAppStatus(appName, "initialized");
+        if (appName === "main") {
+          return this._bootStrapApp(appName, options);
         }
+        this.setAppStatus(appName, "preparing");
+        await this.bootstrapQueue.add(async () => {
+          await this._bootStrapApp(appName, options);
+        });
+      });
+    } catch (e) {
+      console.log(e);
+      if (e === import_async_mutex.E_ALREADY_LOCKED) {
+        return;
       }
-    });
+    }
   }
   async getApp(appName, options = {}) {
     if (!options.withOutBootStrap) {
@@ -170,7 +196,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     this.apps[app.name] = app;
     this.emit("afterAppAdded", app);
     if (!this.getAppStatus(app.name) || this.getAppStatus(app.name) == "not_found") {
-      this.setAppStatus(app.name, "initialized");
+      this.setAppStatus(app.name, "preparing");
     }
     return app;
   }

package/lib/application.d.ts

@@ -284,7 +284,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     setMaintainingMessage(message: string): void;
     /**
      * This method is deprecated and should not be used.
-     * Use {@link #this.version.get()} instead.
+     * Use {@link #this.getPackageVersion} instead.
      * @deprecated
      */
     getVersion(): string;

package/lib/application.js

@@ -339,7 +339,7 @@ const _Application = class _Application extends import_koa.default {
   }
   /**
    * This method is deprecated and should not be used.
-   * Use {@link #this.version.get()} instead.
+   * Use {@link #this.getPackageVersion} instead.
    * @deprecated
    */
   getVersion() {
@@ -809,7 +809,9 @@ const _Application = class _Application extends import_koa.default {
     await migrator3.afterLoad.up();
     await this.pm.repository.updateVersions();
     await this.version.update();
-    await this.emitAsync("afterUpgrade", this, options);
+    if (!options.quickstart) {
+      await this.emitAsync("afterUpgrade", this, options);
+    }
     await this.restart();
   }
   toJSON() {
@@ -936,8 +938,8 @@ const _Application = class _Application extends import_koa.default {
       plugins: plugins || []
     });
     this._telemetry = new import_telemetry.Telemetry({
-      serviceName: `nocobase-${this.name}`,
-      version: this.getVersion(),
+      appName: this.name,
+      version: this.getPackageVersion(),
       ...options.telemetry
     });
     this._authManager = new import_auth.AuthManager({

package/lib/commands/start.js

@@ -61,7 +61,7 @@ var start_default = /* @__PURE__ */ __name((app) => {
       }
     } else if (options.quickstart) {
       if (await app.isInstalled()) {
-        await app.upgrade();
+        await app.upgrade({ quickstart: true });
       } else {
         await app.install();
       }

package/lib/gateway/errors.js

@@ -70,6 +70,11 @@ const errors = {
     command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().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"),
@@ -77,12 +82,12 @@ const errors = {
   },
   APP_STOPPED: {
     status: 503,
-    message: /* @__PURE__ */ __name(({ app }) => `application ${app.name} is stopped`, "message"),
+    message: /* @__PURE__ */ __name(({ app }) => `application ${app == null ? void 0 : app.name} 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 ${app == null ? void 0 : app.name} is initialized, please refresh the page`, "message"),
     maintaining: true
   },
   APP_INITIALIZING: {

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) => {
@@ -264,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;
@@ -291,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/plugin-manager/options/resource.js

@@ -13,6 +13,8 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 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 });
@@ -34,6 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var resource_exports = {};
 __export(resource_exports, {
   default: () => resource_default
@@ -43,6 +46,33 @@ var import_utils = require("@nocobase/utils");
 var import_fs = __toESM(require("fs"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
+const _PackageUrls = class _PackageUrls {
+  static async get(packageName, version) {
+    if (!this.items[packageName]) {
+      this.items[packageName] = await this.fetch(packageName, version);
+    }
+    return this.items[packageName];
+  }
+  static async fetch(packageName, version) {
+    const PLUGIN_CLIENT_ENTRY_FILE = "dist/client/index.js";
+    const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName);
+    const r = await import_fs_extra.default.exists(pkgPath);
+    if (r) {
+      let t = "";
+      const dist = import_path.default.resolve(pkgPath, PLUGIN_CLIENT_ENTRY_FILE);
+      const distExists = await import_fs_extra.default.exists(dist);
+      if (distExists) {
+        const fsState = await import_fs_extra.default.stat(distExists ? dist : pkgPath);
+        t = `&t=${fsState.mtime.getTime()}`;
+      }
+      const url = `${process.env.APP_SERVER_BASE_URL}${process.env.PLUGIN_STATICS_PATH}${packageName}/${PLUGIN_CLIENT_ENTRY_FILE}?version=${version}${t}`;
+      return url;
+    }
+  }
+};
+__name(_PackageUrls, "PackageUrls");
+__publicField(_PackageUrls, "items", {});
+let PackageUrls = _PackageUrls;
 var resource_default = {
   name: "pm",
   actions: {
@@ -152,33 +182,26 @@ var resource_default = {
       await next();
     },
     async listEnabled(ctx, next) {
-      const pm = ctx.db.getRepository("applicationPlugins");
-      const PLUGIN_CLIENT_ENTRY_FILE = "dist/client/index.js";
-      const items = await pm.find({
-        filter: {
-          enabled: true
-        }
-      });
-      const arr = [];
-      for (const item of items) {
-        const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, item.packageName);
-        const r = await import_fs_extra.default.exists(pkgPath);
-        if (r) {
-          let t = "";
-          const dist = import_path.default.resolve(pkgPath, PLUGIN_CLIENT_ENTRY_FILE);
-          const distExists = await import_fs_extra.default.exists(dist);
-          if (distExists) {
-            const fsState = await import_fs_extra.default.stat(distExists ? dist : pkgPath);
-            t = `&t=${fsState.mtime.getTime()}`;
+      const toArr = /* @__PURE__ */ __name(async () => {
+        const pm = ctx.db.getRepository("applicationPlugins");
+        const items = await pm.find({
+          filter: {
+            enabled: true
+          }
+        });
+        const arr = [];
+        for (const item of items) {
+          const url = await PackageUrls.get(item.packageName, item.version);
+          if (url) {
+            arr.push({
+              ...item.toJSON(),
+              url
+            });
           }
-          const url = `${process.env.APP_SERVER_BASE_URL}${process.env.PLUGIN_STATICS_PATH}${item.packageName}/${PLUGIN_CLIENT_ENTRY_FILE}?version=${item.version}${t}`;
-          arr.push({
-            ...item.toJSON(),
-            url
-          });
         }
-      }
-      ctx.body = arr;
+        return arr;
+      }, "toArr");
+      ctx.body = await toArr();
       await next();
     },
     async get(ctx, next) {

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

@@ -55,13 +55,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();
@@ -79,7 +79,7 @@ const _PubSubManager = class _PubSubManager {
     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 +93,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 +101,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 +116,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": "2.0.0-alpha.32",
+  "version": "2.0.0-alpha.34",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,20 +10,20 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.0.0-alpha.32",
-    "@nocobase/actions": "2.0.0-alpha.32",
-    "@nocobase/auth": "2.0.0-alpha.32",
-    "@nocobase/cache": "2.0.0-alpha.32",
-    "@nocobase/data-source-manager": "2.0.0-alpha.32",
-    "@nocobase/database": "2.0.0-alpha.32",
-    "@nocobase/evaluators": "2.0.0-alpha.32",
-    "@nocobase/lock-manager": "2.0.0-alpha.32",
-    "@nocobase/logger": "2.0.0-alpha.32",
-    "@nocobase/resourcer": "2.0.0-alpha.32",
-    "@nocobase/sdk": "2.0.0-alpha.32",
-    "@nocobase/snowflake-id": "2.0.0-alpha.32",
-    "@nocobase/telemetry": "2.0.0-alpha.32",
-    "@nocobase/utils": "2.0.0-alpha.32",
+    "@nocobase/acl": "2.0.0-alpha.34",
+    "@nocobase/actions": "2.0.0-alpha.34",
+    "@nocobase/auth": "2.0.0-alpha.34",
+    "@nocobase/cache": "2.0.0-alpha.34",
+    "@nocobase/data-source-manager": "2.0.0-alpha.34",
+    "@nocobase/database": "2.0.0-alpha.34",
+    "@nocobase/evaluators": "2.0.0-alpha.34",
+    "@nocobase/lock-manager": "2.0.0-alpha.34",
+    "@nocobase/logger": "2.0.0-alpha.34",
+    "@nocobase/resourcer": "2.0.0-alpha.34",
+    "@nocobase/sdk": "2.0.0-alpha.34",
+    "@nocobase/snowflake-id": "2.0.0-alpha.34",
+    "@nocobase/telemetry": "2.0.0-alpha.34",
+    "@nocobase/utils": "2.0.0-alpha.34",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -49,6 +49,7 @@
     "lodash": "^4.17.21",
     "multer": "^1.4.5-lts.2",
     "nanoid": "^3.3.11",
+    "p-queue": "^6.6.2",
     "semver": "^7.7.1",
     "serve-handler": "^6.1.6",
     "ws": "^8.13.0",
@@ -59,5 +60,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "50bb60d2f42e0fc2c1cd1eee397f9c0da94084df"
+  "gitHead": "d7bda14bac775be7ef207cb25986511740b2ed70"
 }