@nocobase/server 2.0.0-alpha.7 → 2.0.0-alpha.71

package/lib/redis-connection-manager.js

@@ -37,76 +37,170 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var redis_connection_manager_exports = {};
 __export(redis_connection_manager_exports, {
-  Redis: () => import_ioredis.default,
   RedisConnectionManager: () => RedisConnectionManager
 });
 module.exports = __toCommonJS(redis_connection_manager_exports);
-var import_ioredis = __toESM(require("ioredis"));
+var import_merge = __toESM(require("lodash/merge"));
+var import_redis = require("redis");
 const _RedisConnectionManager = class _RedisConnectionManager {
   logger;
   config;
   connections = /* @__PURE__ */ new Map();
+  connectionConfigs = /* @__PURE__ */ new Map();
+  connecting = /* @__PURE__ */ new WeakMap();
   constructor(config) {
-    this.config = config.redisConfig;
+    this.config = config.redisConfig || {};
     this.logger = config.logger;
   }
   bindEvents(conn, key, config) {
     conn.on("connect", () => {
       this.logger.info(`Redis connected`, {
         method: "getConnection",
-        key,
-        config
+        key
+      });
+    });
+    conn.on("ready", () => {
+      this.logger.trace(`Redis ready`, {
+        method: "getConnection",
+        key
       });
     });
     conn.on("error", (err) => {
       this.logger.error(err.message, {
         err,
         method: "getConnection",
-        key,
-        config
+        key
       });
     });
-    conn.on("close", () => {
+    conn.on("end", () => {
       this.logger.trace(`Redis closed`, {
         method: "getConnection",
+        key
+      });
+    });
+  }
+  mergeConfig(config) {
+    return (0, import_merge.default)({}, this.config || {}, config || {});
+  }
+  hasConnectionOptions(config) {
+    if (!config) {
+      return false;
+    }
+    return Boolean(config.connectionString || config.url || config.socket);
+  }
+  buildClientOptions(config) {
+    const { connectionString, ...rest } = config;
+    const options = { ...rest };
+    if (connectionString && !options.url) {
+      options.url = connectionString;
+    }
+    return options;
+  }
+  ensureConnected(conn, key, config) {
+    if (conn.isOpen || this.connecting.has(conn)) {
+      return;
+    }
+    const promise = conn.connect().catch((err) => {
+      this.logger.error(err.message, {
+        err,
+        method: "connect",
         key,
         config
       });
+      this.connections.delete(key);
+      this.connectionConfigs.delete(key);
+      throw err;
+    }).finally(() => {
+      this.connecting.delete(conn);
     });
+    this.connecting.set(conn, promise);
   }
   getClient(key = "default", config) {
     let conn = this.connections.get(key);
     if (conn) {
+      this.ensureConnected(conn, key, this.connectionConfigs.get(key));
       return conn;
     }
-    const cfg = config || this.config;
-    if (!cfg.connectionString) {
+    const cfg = this.mergeConfig(config);
+    if (!this.hasConnectionOptions(cfg)) {
       return null;
     }
-    conn = new import_ioredis.default(cfg.connectionString);
+    conn = (0, import_redis.createClient)(this.buildClientOptions(cfg));
     this.connections.set(key, conn);
+    this.connectionConfigs.set(key, cfg);
     this.bindEvents(conn, key, cfg);
+    this.ensureConnected(conn, key, cfg);
     return conn;
   }
   getConnection(key = "default", config) {
     return this.getClient(key, config);
   }
-  async getConnectionSync(key = "default", config) {
-    return new Promise((resolve, reject) => {
-      const conn = this.getClient(key, config);
-      if (!conn) {
-        return reject(new Error("Redis connect string is missing"));
+  async waitUntilReady(conn) {
+    if (conn.isReady) {
+      return conn;
+    }
+    const pendingConnect = this.connecting.get(conn);
+    if (pendingConnect) {
+      await pendingConnect;
+      if (conn.isReady) {
+        return conn;
       }
-      conn.once("connect", () => resolve(conn));
-      conn.once("error", reject);
+    } else if (!conn.isOpen) {
+      await conn.connect();
+      if (conn.isReady) {
+        return conn;
+      }
+    }
+    return new Promise((resolve, reject) => {
+      const cleanup = /* @__PURE__ */ __name(() => {
+        conn.off("ready", handleReady);
+        conn.off("error", handleError);
+      }, "cleanup");
+      const handleReady = /* @__PURE__ */ __name(() => {
+        cleanup();
+        resolve(conn);
+      }, "handleReady");
+      const handleError = /* @__PURE__ */ __name((err) => {
+        cleanup();
+        reject(err);
+      }, "handleError");
+      conn.once("ready", handleReady);
+      conn.once("error", handleError);
     });
   }
-  async close() {
-    for (const conn of this.connections.values()) {
-      if (!(conn == null ? void 0 : conn.status) || conn.status === "close" || conn.status === "end") {
-        continue;
-      }
+  async getConnectionSync(key = "default", config) {
+    const conn = this.getClient(key, config);
+    if (!conn) {
+      throw new Error("Redis connection configuration is missing");
+    }
+    return this.waitUntilReady(conn);
+  }
+  async closeConnection(key, conn) {
+    if (!(conn == null ? void 0 : conn.isOpen)) {
+      return;
+    }
+    try {
       await conn.quit();
+    } catch (err) {
+      this.logger.warn(`Failed to quit redis connection`, {
+        err,
+        method: "closeConnection",
+        key
+      });
+      try {
+        conn.destroy();
+      } catch (disconnectErr) {
+        this.logger.warn(`Failed to disconnect redis connection`, {
+          err: disconnectErr,
+          method: "closeConnection",
+          key
+        });
+      }
+    }
+  }
+  async close() {
+    for (const [key, conn] of this.connections.entries()) {
+      await this.closeConnection(key, conn);
     }
   }
 };
@@ -114,6 +208,5 @@ __name(_RedisConnectionManager, "RedisConnectionManager");
 let RedisConnectionManager = _RedisConnectionManager;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Redis,
   RedisConnectionManager
 });

package/lib/snowflake-id-field.d.ts

@@ -6,5 +6,6 @@
  * 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 { Database } from '@nocobase/database';
 import Application from './application';
-export declare function setupSnowflakeIdField(app: Application): void;
+export declare function setupSnowflakeIdField(app: Application, db: Database): void;

package/lib/snowflake-id-field.js

@@ -31,13 +31,13 @@ __export(snowflake_id_field_exports, {
 });
 module.exports = __toCommonJS(snowflake_id_field_exports);
 var import_database = require("@nocobase/database");
-function setupSnowflakeIdField(app) {
+function setupSnowflakeIdField(app, db) {
   const _SnowflakeIdField = class _SnowflakeIdField extends import_database.SnowflakeIdField {
   };
   __name(_SnowflakeIdField, "SnowflakeIdField");
   let SnowflakeIdField = _SnowflakeIdField;
   SnowflakeIdField.setApp(app);
-  app.db.registerFieldTypes({
+  db.registerFieldTypes({
     snowflakeId: SnowflakeIdField
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.71",
   "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.7",
-    "@nocobase/actions": "2.0.0-alpha.7",
-    "@nocobase/auth": "2.0.0-alpha.7",
-    "@nocobase/cache": "2.0.0-alpha.7",
-    "@nocobase/data-source-manager": "2.0.0-alpha.7",
-    "@nocobase/database": "2.0.0-alpha.7",
-    "@nocobase/evaluators": "2.0.0-alpha.7",
-    "@nocobase/lock-manager": "2.0.0-alpha.7",
-    "@nocobase/logger": "2.0.0-alpha.7",
-    "@nocobase/resourcer": "2.0.0-alpha.7",
-    "@nocobase/sdk": "2.0.0-alpha.7",
-    "@nocobase/snowflake-id": "2.0.0-alpha.7",
-    "@nocobase/telemetry": "2.0.0-alpha.7",
-    "@nocobase/utils": "2.0.0-alpha.7",
+    "@nocobase/acl": "2.0.0-alpha.71",
+    "@nocobase/actions": "2.0.0-alpha.71",
+    "@nocobase/auth": "2.0.0-alpha.71",
+    "@nocobase/cache": "2.0.0-alpha.71",
+    "@nocobase/data-source-manager": "2.0.0-alpha.71",
+    "@nocobase/database": "2.0.0-alpha.71",
+    "@nocobase/evaluators": "2.0.0-alpha.71",
+    "@nocobase/lock-manager": "2.0.0-alpha.71",
+    "@nocobase/logger": "2.0.0-alpha.71",
+    "@nocobase/resourcer": "2.0.0-alpha.71",
+    "@nocobase/sdk": "2.0.0-alpha.71",
+    "@nocobase/snowflake-id": "2.0.0-alpha.71",
+    "@nocobase/telemetry": "2.0.0-alpha.71",
+    "@nocobase/utils": "2.0.0-alpha.71",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -41,7 +41,6 @@
     "fs-extra": "^11.1.1",
     "i18next": "^22.4.9",
     "ini": "^4.1.1",
-    "ioredis": "^5.7.0",
     "koa": "^2.15.4",
     "koa-bodyparser": "^4.3.0",
     "koa-send": "^5.0.1",
@@ -49,6 +48,8 @@
     "lodash": "^4.17.21",
     "multer": "^1.4.5-lts.2",
     "nanoid": "^3.3.11",
+    "p-queue": "^6.6.2",
+    "redis": "^5.10.0",
     "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": "cb012f93256f534472d3ae56e075839ca1675779"
+  "gitHead": "b6fc484eb698fa12fba02dd468a04e39079b1e79"
 }

package/lib/app-supervisor.d.ts

@@ -1,69 +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.
- */
-/// <reference types="node" />
-import { AsyncEmitter } from '@nocobase/utils';
-import { EventEmitter } from 'events';
-import Application, { ApplicationOptions } from './application';
-type BootOptions = {
-    appName: string;
-    options: any;
-    appSupervisor: AppSupervisor;
-};
-type AppBootstrapper = (bootOptions: BootOptions) => Promise<void>;
-type AppStatus = 'initializing' | 'initialized' | 'running' | 'commanding' | 'stopped' | 'error' | 'not_found';
-export declare class AppSupervisor extends EventEmitter implements AsyncEmitter {
-    private static instance;
-    runningMode: 'single' | 'multiple';
-    singleAppName: string | null;
-    emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
-    apps: {
-        [appName: string]: Application;
-    };
-    lastSeenAt: Map<string, number>;
-    appErrors: {
-        [appName: string]: Error;
-    };
-    appStatus: {
-        [appName: string]: AppStatus;
-    };
-    lastMaintainingMessage: {
-        [appName: string]: string;
-    };
-    statusBeforeCommanding: {
-        [appName: string]: AppStatus;
-    };
-    private appMutexes;
-    private appBootstrapper;
-    private constructor();
-    static getInstance(): AppSupervisor;
-    setAppError(appName: string, error: Error): void;
-    hasAppError(appName: string): boolean;
-    clearAppError(appName: string): void;
-    reset(): Promise<void>;
-    destroy(): Promise<void>;
-    setAppStatus(appName: string, status: AppStatus, options?: {}): void;
-    getMutexOfApp(appName: string): any;
-    bootStrapApp(appName: string, options?: {}): Promise<void>;
-    getApp(appName: string, options?: {
-        withOutBootStrap?: boolean;
-        [key: string]: any;
-    }): Promise<Application<import("./application").DefaultState, import("./application").DefaultContext>>;
-    setAppBootstrapper(appBootstrapper: AppBootstrapper): void;
-    getAppStatus(appName: string, defaultStatus?: AppStatus): AppStatus | null;
-    bootMainApp(options: ApplicationOptions): Application<import("./application").DefaultState, import("./application").DefaultContext>;
-    hasApp(appName: string): boolean;
-    touchApp(appName: string): void;
-    addApp(app: Application): Application<import("./application").DefaultState, import("./application").DefaultContext>;
-    getAppsNames(): Promise<string[]>;
-    removeApp(appName: string): Promise<void>;
-    subApps(): Application<import("./application").DefaultState, import("./application").DefaultContext>[];
-    on(eventName: string | symbol, listener: (...args: any[]) => void): this;
-    private bindAppEvents;
-}
-export {};

package/lib/app-supervisor.js

@@ -1,299 +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 __create = Object.create;
-var __defProp = Object.defineProperty;
-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 });
-};
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var app_supervisor_exports = {};
-__export(app_supervisor_exports, {
-  AppSupervisor: () => AppSupervisor
-});
-module.exports = __toCommonJS(app_supervisor_exports);
-var import_utils = require("@nocobase/utils");
-var import_async_mutex = require("async-mutex");
-var import_events = require("events");
-var import_application = __toESM(require("./application"));
-var import_handler = require("./errors/handler");
-const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
-  runningMode = "multiple";
-  singleAppName = null;
-  apps = {};
-  lastSeenAt = /* @__PURE__ */ new Map();
-  appErrors = {};
-  appStatus = {};
-  lastMaintainingMessage = {};
-  statusBeforeCommanding = {};
-  appMutexes = {};
-  appBootstrapper = null;
-  constructor() {
-    super();
-    if (process.env.STARTUP_SUBAPP) {
-      this.runningMode = "single";
-      this.singleAppName = process.env.STARTUP_SUBAPP;
-    }
-  }
-  static getInstance() {
-    if (!_AppSupervisor.instance) {
-      _AppSupervisor.instance = new _AppSupervisor();
-    }
-    return _AppSupervisor.instance;
-  }
-  setAppError(appName, error) {
-    this.appErrors[appName] = error;
-    this.emit("appError", {
-      appName,
-      error
-    });
-  }
-  hasAppError(appName) {
-    return !!this.appErrors[appName];
-  }
-  clearAppError(appName) {
-    delete this.appErrors[appName];
-  }
-  async reset() {
-    const appNames = Object.keys(this.apps);
-    for (const appName of appNames) {
-      await this.removeApp(appName);
-    }
-    this.appBootstrapper = null;
-    this.removeAllListeners();
-  }
-  async destroy() {
-    await this.reset();
-    _AppSupervisor.instance = null;
-  }
-  setAppStatus(appName, status, options = {}) {
-    if (this.appStatus[appName] === status) {
-      return;
-    }
-    this.appStatus[appName] = status;
-    this.emit("appStatusChanged", {
-      appName,
-      status,
-      options
-    });
-  }
-  getMutexOfApp(appName) {
-    if (!this.appMutexes[appName]) {
-      this.appMutexes[appName] = new import_async_mutex.Mutex();
-    }
-    return this.appMutexes[appName];
-  }
-  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
-          });
-        }
-        if (!this.hasApp(appName)) {
-          this.setAppStatus(appName, "not_found");
-        } else if (!this.getAppStatus(appName) || this.getAppStatus(appName) == "initializing") {
-          this.setAppStatus(appName, "initialized");
-        }
-      }
-    });
-  }
-  async getApp(appName, options = {}) {
-    if (!options.withOutBootStrap) {
-      await this.bootStrapApp(appName, options);
-    }
-    return this.apps[appName];
-  }
-  setAppBootstrapper(appBootstrapper) {
-    this.appBootstrapper = appBootstrapper;
-  }
-  getAppStatus(appName, defaultStatus) {
-    const status = this.appStatus[appName];
-    if (status === void 0 && defaultStatus !== void 0) {
-      return defaultStatus;
-    }
-    return status;
-  }
-  bootMainApp(options) {
-    return new import_application.default(options);
-  }
-  hasApp(appName) {
-    return !!this.apps[appName];
-  }
-  touchApp(appName) {
-    if (!this.hasApp(appName)) {
-      return;
-    }
-    this.lastSeenAt.set(appName, Math.floor(Date.now() / 1e3));
-  }
-  // add app into supervisor
-  addApp(app) {
-    if (this.apps[app.name]) {
-      throw new Error(`app ${app.name} already exists`);
-    }
-    app.logger.info(`add app ${app.name} into supervisor`, { submodule: "supervisor", method: "addApp" });
-    this.bindAppEvents(app);
-    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");
-    }
-    return app;
-  }
-  // get registered app names
-  async getAppsNames() {
-    const apps = Object.values(this.apps);
-    return apps.map((app) => app.name);
-  }
-  async removeApp(appName) {
-    if (!this.apps[appName]) {
-      console.log(`app ${appName} not exists`);
-      return;
-    }
-    await this.apps[appName].runCommand("destroy");
-  }
-  subApps() {
-    return Object.values(this.apps).filter((app) => app.name !== "main");
-  }
-  on(eventName, listener) {
-    const listeners = this.listeners(eventName);
-    const listenerName = listener.name;
-    if (listenerName !== "") {
-      const exists = listeners.find((l) => l.name === listenerName);
-      if (exists) {
-        super.removeListener(eventName, exists);
-      }
-    }
-    return super.on(eventName, listener);
-  }
-  bindAppEvents(app) {
-    app.on("afterDestroy", () => {
-      delete this.apps[app.name];
-      delete this.appStatus[app.name];
-      delete this.appErrors[app.name];
-      delete this.lastMaintainingMessage[app.name];
-      delete this.statusBeforeCommanding[app.name];
-      this.lastSeenAt.delete(app.name);
-    });
-    app.on("maintainingMessageChanged", ({ message, maintainingStatus }) => {
-      if (this.lastMaintainingMessage[app.name] === message) {
-        return;
-      }
-      this.lastMaintainingMessage[app.name] = message;
-      const appStatus = this.getAppStatus(app.name);
-      if (!maintainingStatus && appStatus !== "running") {
-        return;
-      }
-      this.emit("appMaintainingMessageChanged", {
-        appName: app.name,
-        message,
-        status: appStatus,
-        command: appStatus == "running" ? null : maintainingStatus.command
-      });
-    });
-    app.on("__started", async (_app, options) => {
-      const { maintainingStatus, options: startOptions } = options;
-      if (maintainingStatus && [
-        "install",
-        "upgrade",
-        "refresh",
-        "restore",
-        "pm.add",
-        "pm.update",
-        "pm.enable",
-        "pm.disable",
-        "pm.remove"
-      ].includes(maintainingStatus.command.name) && !startOptions.recover) {
-        this.setAppStatus(app.name, "running", {
-          refresh: true
-        });
-      } else {
-        this.setAppStatus(app.name, "running");
-      }
-    });
-    app.on("__stopped", async () => {
-      this.setAppStatus(app.name, "stopped");
-    });
-    app.on("maintaining", (maintainingStatus) => {
-      const { status, command } = maintainingStatus;
-      switch (status) {
-        case "command_begin":
-          {
-            this.statusBeforeCommanding[app.name] = this.getAppStatus(app.name);
-            this.setAppStatus(app.name, "commanding");
-          }
-          break;
-        case "command_running":
-          break;
-        case "command_end":
-          {
-            const appStatus = this.getAppStatus(app.name);
-            this.emit("appMaintainingStatusChanged", maintainingStatus);
-            if (appStatus == "commanding") {
-              this.setAppStatus(app.name, this.statusBeforeCommanding[app.name]);
-            }
-          }
-          break;
-        case "command_error":
-          {
-            const errorLevel = (0, import_handler.getErrorLevel)(maintainingStatus.error);
-            if (errorLevel === "fatal") {
-              this.setAppError(app.name, maintainingStatus.error);
-              this.setAppStatus(app.name, "error");
-              break;
-            }
-            if (errorLevel === "warn") {
-              this.emit("appError", {
-                appName: app.name,
-                error: maintainingStatus.error
-              });
-            }
-            this.setAppStatus(app.name, this.statusBeforeCommanding[app.name]);
-          }
-          break;
-      }
-    });
-  }
-};
-__name(_AppSupervisor, "AppSupervisor");
-__publicField(_AppSupervisor, "instance");
-let AppSupervisor = _AppSupervisor;
-(0, import_utils.applyMixins)(AppSupervisor, [import_utils.AsyncEmitter]);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  AppSupervisor
-});