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

package/lib/main-data-source.js

@@ -32,6 +32,7 @@ __export(main_data_source_exports, {
 module.exports = __toCommonJS(main_data_source_exports);
 var import_data_source_manager = require("@nocobase/data-source-manager");
 const _MainDataSource = class _MainDataSource extends import_data_source_manager.SequelizeDataSource {
+  status = "loaded";
   init(options = {}) {
     const { acl, resourceManager, database } = options;
     this.acl = acl;
@@ -48,6 +49,133 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
       this.resourceManager.use(this.acl.middleware(), { group: "acl", after: "auth" });
     }
   }
+  async readTables() {
+    const allTables = await this.introspector.getTableList();
+    const existsCollections = this.collectionManager.db.collections;
+    const existsTables = Array.from(existsCollections.values()).map(
+      (collection) => collection.model.tableName
+    );
+    const diffTables = allTables.filter((table) => !existsTables.includes(table));
+    return diffTables.map((name) => ({ name }));
+  }
+  async tables2Collections(tableNames) {
+    const db = this.collectionManager.db;
+    const results = await Promise.all(
+      tableNames.map(async (tableName) => {
+        let tableInfo;
+        if (typeof tableName === "string") {
+          tableInfo = { tableName };
+          if (db.options.schema) {
+            tableInfo.schema = db.options.schema;
+          }
+        } else {
+          tableInfo = tableName;
+        }
+        try {
+          return await this.introspector.getCollection({ tableInfo });
+        } catch (e) {
+          if (e.message.includes("No description found for")) {
+            return null;
+          }
+          throw e;
+        }
+      })
+    );
+    return results.filter(Boolean);
+  }
+  async loadTables(ctx, tables) {
+    const repo = this.collectionManager.db.getRepository("collections");
+    const existsCollections = this.collectionManager.db.collections;
+    const existsTables = Array.from(existsCollections.values()).map(
+      (collection) => collection.model.tableName
+    );
+    const toAddTables = tables.filter((table) => !existsTables.includes(table));
+    if (toAddTables.length) {
+      try {
+        this.status = "loading";
+        const results = await this.tables2Collections(toAddTables);
+        const values = results.map((result) => ({
+          ...result,
+          underscored: false
+        }));
+        await repo.create({ values, context: ctx });
+      } catch (e) {
+        throw e;
+      } finally {
+        this.status = "loaded";
+      }
+    }
+  }
+  async getLoadedCollections(filter) {
+    const db = this.collectionManager.db;
+    const loadedCollections = await db.getRepository("collections").find({
+      appends: ["fields"],
+      filter: {
+        hidden: false,
+        ...filter
+      }
+    });
+    const collections = loadedCollections.filter((collection) => {
+      var _a;
+      return ((_a = collection.options) == null ? void 0 : _a.from) !== "db2cm";
+    });
+    const loadedData = {};
+    for (const collection of collections) {
+      const c = db.getCollection(collection.name);
+      loadedData[c.tableName()] = {
+        ...collection.toJSON(),
+        fields: collection.fields.map((field) => {
+          const f = c.getField(field.name);
+          return {
+            columnName: f == null ? void 0 : f.columnName(),
+            ...field.toJSON()
+          };
+        })
+      };
+    }
+    return loadedData;
+  }
+  async syncFieldsFromDatabase(ctx, collectionNames) {
+    let filter = {};
+    if (collectionNames == null ? void 0 : collectionNames.length) {
+      filter = {
+        name: collectionNames
+      };
+    }
+    const db = this.collectionManager.db;
+    const loadedCollections = await this.getLoadedCollections(filter);
+    const tableNames = Object.values(loadedCollections).map(({ name }) => {
+      const collection = db.getCollection(name);
+      return collection.getTableNameWithSchema();
+    });
+    let collections = [];
+    try {
+      collections = await this.tables2Collections(tableNames);
+    } catch (err) {
+      ctx.log.error(err);
+    }
+    const toLoadCollections = this.mergeWithLoadedCollections(collections, loadedCollections);
+    for (const values of toLoadCollections) {
+      const existsFields = loadedCollections[values.tableName].fields;
+      const deletedFields = existsFields.filter((field) => !values.fields.find((f) => f.name === field.name));
+      await db.sequelize.transaction(async (transaction) => {
+        for (const field of deletedFields) {
+          await db.getRepository("fields").destroy({
+            filterByTk: field.key,
+            context: ctx,
+            transaction
+          });
+        }
+        await db.getRepository("collections").update({
+          filterByTk: values.name,
+          values,
+          updateAssociationValues: ["fields"],
+          context: ctx,
+          transaction
+        });
+      });
+    }
+  }
 };
 __name(_MainDataSource, "MainDataSource");
 let MainDataSource = _MainDataSource;

package/lib/middlewares/data-template.js

@@ -126,12 +126,7 @@ const traverseJSON = /* @__PURE__ */ __name((data, options) => {
         include: subInclude
       });
     } else if (field.type === "belongsTo") {
-      result[key] = traverseJSON(data[key], {
-        collection: collection.db.getCollection(field.target),
-        // exclude: [field.foreignKey],
-        include: subInclude,
-        excludePk: false
-      });
+      result[key] = data[key];
     } else if (field.type === "belongsToMany") {
       result[key] = traverseBelongsToMany(data[key], {
         collection: collection.db.getCollection(field.target),

package/lib/middlewares/parse-variables.js

@@ -31,60 +31,13 @@ __export(parse_variables_exports, {
 });
 module.exports = __toCommonJS(parse_variables_exports);
 var import_utils = require("@nocobase/utils");
-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");
+var import_helper = require("../helper");
 async function parseVariables(ctx, next) {
   const filter = ctx.action.params.filter;
   if (!filter) {
     return next();
   }
-  ctx.action.params.filter = await (0, import_utils.parseFilter)(filter, {
-    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.db.getFieldByPath(`${resourceName}.${fieldPath}`);
-    }, "getField"),
-    vars: {
-      // @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
-    }
-  });
+  ctx.action.params.filter = await (0, import_utils.parseFilter)(filter, (0, import_helper.createContextVariablesScope)(ctx));
   await next();
 }
 __name(parseVariables, "parseVariables");

package/lib/plugin-manager/deps.js

@@ -41,7 +41,7 @@ const deps = {
   umzug: "3.x",
   "async-mutex": "0.5.x",
   "@formulajs/formulajs": "4.x",
-  mathjs: "10.x",
+  mathjs: "15.x",
   winston: "3.x",
   "winston-daily-rotate-file": "4.x",
   koa: "2.x",
@@ -76,6 +76,6 @@ const deps = {
   lodash: "4.x",
   "china-division": "2.x",
   cronstrue: "2.x",
-  "@nocobase/license-kit": "0.2.x"
+  "@nocobase/license-kit": "0.3.x"
 };
 var deps_default = deps;

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,34 @@ 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) {
+    if (!this.items[packageName]) {
+      this.items[packageName] = await this.fetch(packageName);
+    }
+    return this.items[packageName];
+  }
+  static async fetch(packageName) {
+    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 cdnBaseUrl = process.env.CDN_BASE_URL.replace(/\/+$/, "");
+      const url = `${cdnBaseUrl}${"/static/plugins/"}${packageName}/${PLUGIN_CLIENT_ENTRY_FILE}${t}`;
+      return url;
+    }
+  }
+};
+__name(_PackageUrls, "PackageUrls");
+__publicField(_PackageUrls, "items", {});
+let PackageUrls = _PackageUrls;
 var resource_default = {
   name: "pm",
   actions: {
@@ -152,33 +183,29 @@ 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);
+          const { name, packageName, options } = item.toJSON();
+          if (url) {
+            arr.push({
+              name,
+              packageName,
+              options,
+              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/plugin-manager/plugin-manager.d.ts

@@ -112,6 +112,7 @@ export declare class PluginManager {
         removeDir?: boolean;
         force?: boolean;
     }): Promise<void>;
+    pull(urlOrName: string | string[], options?: PluginData, emitStartedEvent?: boolean): Promise<void>;
     /**
      * @internal
      */

package/lib/plugin-manager/plugin-manager.js

@@ -90,7 +90,7 @@ const _PluginManager = class _PluginManager {
       namespace: "core/pm",
       directory: (0, import_path.resolve)(__dirname, "../migrations")
     });
-    this.app.resourcer.use(import_middleware.uploadMiddleware);
+    this.app.resourceManager.use(import_middleware.uploadMiddleware, { tag: "upload", after: "acl" });
   }
   /**
    * @internal
@@ -718,6 +718,41 @@ const _PluginManager = class _PluginManager {
       await removeDir();
     }
   }
+  async pull(urlOrName, options, emitStartedEvent = true) {
+    if (Array.isArray(urlOrName)) {
+      for (const packageName of urlOrName) {
+        await this.addViaCLI(packageName, import_lodash.default.omit(options, "name"), false);
+      }
+      return;
+    }
+    if ((0, import_utils.isURL)(urlOrName)) {
+      await this.addByCompressedFileUrl(
+        {
+          ...options,
+          compressedFileUrl: urlOrName
+        },
+        emitStartedEvent
+      );
+    } else if (await import_fs_extra.default.exists(urlOrName)) {
+      await this.addByCompressedFileUrl(
+        {
+          ...options,
+          compressedFileUrl: urlOrName
+        },
+        emitStartedEvent
+      );
+    } else if (options == null ? void 0 : options.registry) {
+      const { name, packageName } = await _PluginManager.parseName(urlOrName);
+      options["name"] = name;
+      await this.addByNpm(
+        {
+          ...options,
+          packageName
+        },
+        emitStartedEvent
+      );
+    }
+  }
   /**
    * @internal
    */

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

@@ -35,14 +35,12 @@ var import_utils = require("@nocobase/utils");
 var import_handler_manager = require("./handler-manager");
 const createPubSubManager = /* @__PURE__ */ __name((app, options) => {
   const pubSubManager = new PubSubManager(app, options);
-  if (app.serving()) {
-    app.on("afterStart", async () => {
-      await pubSubManager.connect();
-    });
-    app.on("afterStop", async () => {
-      await pubSubManager.close();
-    });
-  }
+  app.on("afterStart", async () => {
+    await pubSubManager.connect();
+  });
+  app.on("afterStop", async () => {
+    await pubSubManager.close();
+  });
   return pubSubManager;
 }, "createPubSubManager");
 const _PubSubManager = class _PubSubManager {
@@ -55,13 +53,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();
@@ -72,14 +70,10 @@ const _PubSubManager = class _PubSubManager {
     if (!this.adapter) {
       return;
     }
-    if (!this.app.serving()) {
-      this.app.logger.warn("app is not serving, will not connect to event queue");
-      return;
-    }
     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 +87,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 +95,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 +110,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/lib/redis-connection-manager.d.ts

@@ -6,23 +6,33 @@
  * 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 Redis from 'ioredis';
 import { Logger } from '@nocobase/logger';
-export { Redis };
-export interface RedisConfig {
-    connectionString: string;
+import { createClient } from 'redis';
+type RedisClientOptions = NonNullable<Parameters<typeof createClient>[0]>;
+export type Redis = ReturnType<typeof createClient>;
+export interface RedisConfig extends RedisClientOptions {
+    connectionString?: string;
 }
 export declare class RedisConnectionManager {
     private logger;
     private config;
     private connections;
+    private connectionConfigs;
+    private connecting;
     constructor(config: {
-        redisConfig: RedisConfig;
+        redisConfig?: RedisConfig;
         logger: Logger;
     });
     private bindEvents;
+    private mergeConfig;
+    private hasConnectionOptions;
+    private buildClientOptions;
+    private ensureConnected;
     private getClient;
     getConnection(key?: string, config?: RedisConfig): Redis | null;
+    private waitUntilReady;
     getConnectionSync(key?: string, config?: RedisConfig): Promise<Redis>;
+    private closeConnection;
     close(): Promise<void>;
 }
+export {};