@nocobase/server 2.0.0-alpha.20 → 2.0.0-alpha.22

package/lib/application.d.ts

@@ -33,11 +33,11 @@ import { PubSubManager, PubSubManagerOptions } from './pub-sub-manager';
 import { SyncMessageManager } from './sync-message-manager';
 import AesEncryptor from './aes-encryptor';
 import { AuditManager } from './audit-manager';
+import { BackgroundJobManager, BackgroundJobManagerOptions } from './background-job-manager';
 import { Environment } from './environment';
-import { ServiceContainer } from './service-container';
 import { EventQueue, EventQueueOptions } from './event-queue';
-import { BackgroundJobManager, BackgroundJobManagerOptions } from './background-job-manager';
 import { RedisConfig, RedisConnectionManager } from './redis-connection-manager';
+import { ServiceContainer } from './service-container';
 import { WorkerIdAllocator } from './worker-id-allocator';
 export type PluginType = string | typeof Plugin;
 export type PluginConfiguration = PluginType | [PluginType, any];
@@ -219,7 +219,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get environment(): Environment;
     protected _cronJobManager: CronJobManager;
     get cronJobManager(): CronJobManager;
-    get mainDataSource(): SequelizeDataSource;
+    get mainDataSource(): SequelizeDataSource<import("@nocobase/data-source-manager").DatabaseIntrospector>;
     get db(): Database;
     get resourceManager(): import("@nocobase/resourcer").ResourceManager;
     /**

package/lib/application.js

@@ -50,8 +50,8 @@ var import_database = __toESM(require("@nocobase/database"));
 var import_logger = require("@nocobase/logger");
 var import_telemetry = require("@nocobase/telemetry");
 var import_lock_manager = require("@nocobase/lock-manager");
-var import_utils = require("@nocobase/utils");
 var import_snowflake_id = require("@nocobase/snowflake-id");
+var import_utils = require("@nocobase/utils");
 var import_crypto = require("crypto");
 var import_glob = __toESM(require("glob"));
 var import_koa = __toESM(require("koa"));
@@ -80,13 +80,13 @@ var import_package = __toESM(require("../package.json"));
 var import_available_action = require("./acl/available-action");
 var import_aes_encryptor = __toESM(require("./aes-encryptor"));
 var import_audit_manager = require("./audit-manager");
+var import_background_job_manager = require("./background-job-manager");
 var import_environment = require("./environment");
-var import_service_container = require("./service-container");
 var import_event_queue = require("./event-queue");
-var import_background_job_manager = require("./background-job-manager");
 var import_redis_connection_manager = require("./redis-connection-manager");
-var import_worker_id_allocator = require("./worker-id-allocator");
+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");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
@@ -777,6 +777,12 @@ const _Application = class _Application extends import_koa.default {
   }
   async upgrade(options = {}) {
     this.log.info("upgrading...");
+    const pkgVersion = this.getPackageVersion();
+    const appVersion = await this.version.get();
+    if (process.env.SKIP_SAME_VERSION_UPGRADE === "true" && pkgVersion === appVersion) {
+      this.log.info(`app is already the latest version (${appVersion})`);
+      return;
+    }
     await this.reInit();
     const migrator1 = await this.loadCoreMigrations();
     await migrator1.beforeLoad.up();

package/lib/index.d.ts

@@ -22,6 +22,7 @@ export * from './event-queue';
 export * from './background-job-manager';
 export * from './worker-id-allocator';
 export * from './redis-connection-manager';
+export * from './main-data-source';
 export declare const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
 export { appendToBuiltInPlugins, findAllPlugins, findBuiltInPlugins, findLocalPlugins, packageNameTrim, } from './plugin-manager/findPackageNames';
 export { runPluginStaticImports } from './run-plugin-static-imports';

package/lib/index.js

@@ -64,6 +64,7 @@ __reExport(src_exports, require("./event-queue"), module.exports);
 __reExport(src_exports, require("./background-job-manager"), module.exports);
 __reExport(src_exports, require("./worker-id-allocator"), 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");
 var import_run_plugin_static_imports = require("./run-plugin-static-imports");
 const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
@@ -90,5 +91,6 @@ const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
   ...require("./event-queue"),
   ...require("./background-job-manager"),
   ...require("./worker-id-allocator"),
-  ...require("./redis-connection-manager")
+  ...require("./redis-connection-manager"),
+  ...require("./main-data-source")
 });

package/lib/locale/locale.js

@@ -138,7 +138,7 @@ const _Locale = class _Locale {
         if (!packageName) {
           continue;
         }
-        const res = (0, import_resource.getResource)(packageName, lang);
+        const res = await (0, import_resource.getResource)(packageName, lang);
         if (res) {
           resources[packageName] = { ...res };
           if (packageName.includes(import__.OFFICIAL_PLUGIN_PREFIX)) {

package/lib/locale/resource.js

@@ -40,7 +40,7 @@ __export(resource_exports, {
   getResource: () => getResource
 });
 module.exports = __toCommonJS(resource_exports);
-var import_utils = require("@nocobase/utils");
+var import_promises = __toESM(require("fs/promises"));
 const arr2obj = /* @__PURE__ */ __name((items) => {
   const obj = {};
   for (const item of items) {
@@ -48,7 +48,7 @@ const arr2obj = /* @__PURE__ */ __name((items) => {
   }
   return obj;
 }, "arr2obj");
-const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true) => {
+const getResource = /* @__PURE__ */ __name(async (packageName, lang, isPlugin = true) => {
   const resources = [];
   const prefixes = [isPlugin ? "dist" : "lib"];
   if (process.env.APP_ENV !== "production") {
@@ -70,13 +70,10 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
   }
   for (const prefix of prefixes) {
     try {
-      const file = `${packageName}/${prefix}/locale/${lang}`;
+      const file = `${packageName}/${prefix}/locale/${lang}.json`;
       const f = require.resolve(file);
-      if (process.env.APP_ENV !== "production") {
-        delete require.cache[f];
-      }
-      const resource = (0, import_utils.requireModule)(file);
-      resources.push(resource);
+      const resource = await import_promises.default.readFile(f, "utf8");
+      resources.push(JSON.parse(resource));
     } catch (error) {
     }
     if (resources.length) {
@@ -84,7 +81,7 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
     }
   }
   if (resources.length === 0 && lang.replace("-", "_") !== lang) {
-    return getResource(packageName, lang.replace("-", "_"));
+    return await getResource(packageName, lang.replace("-", "_"));
   }
   return arr2obj(resources);
 }, "getResource");

package/lib/main-data-source.d.ts

@@ -6,7 +6,18 @@
  * 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 { Context } from '@nocobase/actions';
 import { DataSourceOptions, SequelizeDataSource } from '@nocobase/data-source-manager';
+type MainDataSourceStatus = 'loaded' | 'loading';
 export declare class MainDataSource extends SequelizeDataSource {
+    status: MainDataSourceStatus;
     init(options?: DataSourceOptions): void;
+    readTables(): Promise<{
+        name: string;
+    }[]>;
+    private tables2Collections;
+    loadTables(ctx: Context, tables: string[]): Promise<void>;
+    private getLoadedCollections;
+    syncFieldsFromDatabase(ctx: any, collectionNames?: string[]): Promise<void>;
 }
+export {};

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.22",
   "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.20",
-    "@nocobase/actions": "2.0.0-alpha.20",
-    "@nocobase/auth": "2.0.0-alpha.20",
-    "@nocobase/cache": "2.0.0-alpha.20",
-    "@nocobase/data-source-manager": "2.0.0-alpha.20",
-    "@nocobase/database": "2.0.0-alpha.20",
-    "@nocobase/evaluators": "2.0.0-alpha.20",
-    "@nocobase/lock-manager": "2.0.0-alpha.20",
-    "@nocobase/logger": "2.0.0-alpha.20",
-    "@nocobase/resourcer": "2.0.0-alpha.20",
-    "@nocobase/sdk": "2.0.0-alpha.20",
-    "@nocobase/snowflake-id": "2.0.0-alpha.20",
-    "@nocobase/telemetry": "2.0.0-alpha.20",
-    "@nocobase/utils": "2.0.0-alpha.20",
+    "@nocobase/acl": "2.0.0-alpha.22",
+    "@nocobase/actions": "2.0.0-alpha.22",
+    "@nocobase/auth": "2.0.0-alpha.22",
+    "@nocobase/cache": "2.0.0-alpha.22",
+    "@nocobase/data-source-manager": "2.0.0-alpha.22",
+    "@nocobase/database": "2.0.0-alpha.22",
+    "@nocobase/evaluators": "2.0.0-alpha.22",
+    "@nocobase/lock-manager": "2.0.0-alpha.22",
+    "@nocobase/logger": "2.0.0-alpha.22",
+    "@nocobase/resourcer": "2.0.0-alpha.22",
+    "@nocobase/sdk": "2.0.0-alpha.22",
+    "@nocobase/snowflake-id": "2.0.0-alpha.22",
+    "@nocobase/telemetry": "2.0.0-alpha.22",
+    "@nocobase/utils": "2.0.0-alpha.22",
     "@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": "af5ff4eaa490349420135405128da466d72ac74c"
+  "gitHead": "717bcfaa0bdeaa8026717b4309a65abdc19478f1"
 }