@nocobase/server 0.17.0-alpha.7 → 0.18.0-alpha.1

package/lib/application.d.ts

@@ -108,8 +108,8 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     protected _cacheManager: CacheManager;
     get cacheManager(): CacheManager;
     protected _cache: Cache;
-    set cache(cache: Cache);
     get cache(): Cache;
+    set cache(cache: Cache);
     protected _cli: AppCommand;
     get cli(): AppCommand;
     protected _i18n: i18n;
@@ -131,7 +131,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     getMaintaining(): MaintainingCommandStatus;
     setMaintaining(_maintainingCommandStatus: MaintainingCommandStatus): void;
     setMaintainingMessage(message: string): void;
-    getVersion(): any;
+    getVersion(): string;
     plugin<O = any>(pluginClass: any, options?: O): void;
     use<NewStateT = {}, NewContextT = {}>(middleware: Koa.Middleware<StateT & NewStateT, ContextT & NewContextT>, options?: ToposortOptions): this;
     callback(): (req: IncomingMessage, res: ServerResponse) => any;

package/lib/application.js

@@ -37,7 +37,6 @@ var import_auth = require("@nocobase/auth");
 var import_database = __toESM(require("@nocobase/database"));
 var import_logger = require("@nocobase/logger");
 var import_utils = require("@nocobase/utils");
-var import_chalk = __toESM(require("chalk"));
 var import_koa = __toESM(require("koa"));
 var import_koa_compose = __toESM(require("koa-compose"));
 var import_lodash = __toESM(require("lodash"));
@@ -52,7 +51,8 @@ var import_helper = require("./helper");
 var import_application_version = require("./helpers/application-version");
 var import_locale = require("./locale");
 var import_plugin_manager = require("./plugin-manager");
-const packageJson = require("../package.json");
+var import_package = __toESM(require("../package.json"));
+var import_chalk = __toESM(require("chalk"));
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
@@ -105,12 +105,12 @@ const _Application = class _Application extends import_koa.default {
     return this._cacheManager;
   }
   _cache;
-  set cache(cache) {
-    this._cache = cache;
-  }
   get cache() {
     return this._cache;
   }
+  set cache(cache) {
+    this._cache = cache;
+  }
   _cli;
   get cli() {
     return this._cli;
@@ -171,7 +171,7 @@ const _Application = class _Application extends import_koa.default {
     });
   }
   getVersion() {
-    return packageJson.version;
+    return import_package.default.version;
   }
   plugin(pluginClass, options) {
     this.log.debug(`add plugin ${pluginClass.name}`);

package/lib/gateway/ws-server.js

@@ -32,7 +32,7 @@ __export(ws_server_exports, {
 });
 module.exports = __toCommonJS(ws_server_exports);
 var import_gateway = require("../gateway");
-var import_ws = __toESM(require("ws"));
+var import_ws = require("ws");
 var import_nanoid = require("nanoid");
 var import_app_supervisor = require("../app-supervisor");
 var import_errors = require("./errors");
@@ -46,7 +46,7 @@ const _WSServer = class _WSServer {
   wss;
   webSocketClients = /* @__PURE__ */ new Map();
   constructor() {
-    this.wss = new import_ws.default.Server({ noServer: true });
+    this.wss = new import_ws.WebSocketServer({ noServer: true });
     this.wss.on("connection", (ws, request) => {
       const client = this.addNewConnection(ws, request);
       console.log(`new client connected ${ws.id}`);

package/lib/index.d.ts

@@ -4,6 +4,5 @@ export * as middlewares from './middlewares';
 export * from './migration';
 export * from './plugin';
 export * from './plugin-manager';
-export * from './read-config';
 export * from './gateway';
 export * from './app-supervisor';

package/lib/index.js

@@ -38,7 +38,6 @@ var middlewares = __toESM(require("./middlewares"));
 __reExport(src_exports, require("./migration"), module.exports);
 __reExport(src_exports, require("./plugin"), module.exports);
 __reExport(src_exports, require("./plugin-manager"), module.exports);
-__reExport(src_exports, require("./read-config"), module.exports);
 __reExport(src_exports, require("./gateway"), module.exports);
 __reExport(src_exports, require("./app-supervisor"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
@@ -48,7 +47,6 @@ __reExport(src_exports, require("./app-supervisor"), module.exports);
   ...require("./migration"),
   ...require("./plugin"),
   ...require("./plugin-manager"),
-  ...require("./read-config"),
   ...require("./gateway"),
   ...require("./app-supervisor")
 });

package/lib/locale/locale.js

@@ -96,7 +96,10 @@ const _Locale = class _Locale {
         }
         const res = (0, import_resource.getResource)(packageName, lang);
         if (res) {
-          resources[name] = { ...res };
+          resources[packageName] = { ...res };
+          if (name !== packageName) {
+            resources[name] = { ...res };
+          }
         }
       } catch (err) {
       }

package/lib/plugin-manager/plugin-manager.d.ts

@@ -20,18 +20,18 @@ export declare class PluginManager {
     options: PluginManagerOptions;
     app: Application;
     collection: Collection;
-    _repository: PluginManagerRepository;
     pluginInstances: Map<typeof Plugin, Plugin<any>>;
     pluginAliases: Map<string, Plugin<any>>;
     server: net.Server;
     constructor(options: PluginManagerOptions);
+    _repository: PluginManagerRepository;
     get repository(): PluginManagerRepository;
-    static getPackageJson(packageName: string): any;
-    static getPackageName(name: string): string;
+    static getPackageJson(packageName: string): Promise<any>;
+    static getPackageName(name: string): Promise<string>;
     static getPluginPkgPrefix(): string[];
     static findPackage(name: string): Promise<string>;
     static clearCache(packageName: string): void;
-    static resolvePlugin(pluginName: string | typeof Plugin, isUpgrade?: boolean, isPkg?: boolean): any;
+    static resolvePlugin(pluginName: string | typeof Plugin, isUpgrade?: boolean, isPkg?: boolean): Promise<any>;
     addPreset(plugin: string | typeof Plugin, options?: any): void;
     getPlugins(): Map<typeof Plugin, Plugin<any>>;
     getAliases(): IterableIterator<string>;
@@ -46,7 +46,6 @@ export declare class PluginManager {
     enable(name: string | string[]): Promise<void>;
     disable(name: string | string[]): Promise<void>;
     remove(name: string | string[]): Promise<void>;
-    protected initPresetPlugins(): Promise<void>;
     loadOne(plugin: Plugin): Promise<void>;
     addViaCLI(urlOrName: string, options?: PluginData): Promise<void>;
     addByNpm(options: {
@@ -75,5 +74,6 @@ export declare class PluginManager {
     getNameByPackageName(packageName: string): string;
     list(options?: any): Promise<any[]>;
     getNpmVersionList(name: string): Promise<string[]>;
+    protected initPresetPlugins(): Promise<void>;
 }
 export default PluginManager;

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

@@ -36,6 +36,7 @@ module.exports = __toCommonJS(plugin_manager_exports);
 var import_utils = require("@nocobase/utils");
 var import_plugin_symlink = require("@nocobase/utils/plugin-symlink");
 var import_execa = __toESM(require("execa"));
+var import_fs = __toESM(require("fs"));
 var import_lodash = __toESM(require("lodash"));
 var import_path = require("path");
 var import_helper = require("../helper");
@@ -72,21 +73,23 @@ const _PluginManager = class _PluginManager {
   }
   app;
   collection;
-  _repository;
   pluginInstances = /* @__PURE__ */ new Map();
   pluginAliases = /* @__PURE__ */ new Map();
   server;
+  _repository;
   get repository() {
     return this.app.db.getRepository("applicationPlugins");
   }
-  static getPackageJson(packageName) {
-    return (0, import_utils2.requireNoCache)(`${packageName}/package.json`);
+  static async getPackageJson(packageName) {
+    const file = await import_fs.default.promises.realpath((0, import_path.resolve)(process.env.NODE_MODULES_PATH, packageName, "package.json"));
+    const data = await import_fs.default.promises.readFile(file, { encoding: "utf-8" });
+    return JSON.parse(data);
   }
-  static getPackageName(name) {
+  static async getPackageName(name) {
     const prefixes = this.getPluginPkgPrefix();
     for (const prefix of prefixes) {
       try {
-        require.resolve(`${prefix}${name}`);
+        await import(`${prefix}${name}`);
         return `${prefix}${name}`;
       } catch (error) {
         continue;
@@ -130,11 +133,11 @@ const _PluginManager = class _PluginManager {
       }
     });
   }
-  static resolvePlugin(pluginName, isUpgrade = false, isPkg = false) {
+  static async resolvePlugin(pluginName, isUpgrade = false, isPkg = false) {
     if (typeof pluginName === "string") {
-      const packageName = isPkg ? pluginName : this.getPackageName(pluginName);
+      const packageName = isPkg ? pluginName : await this.getPackageName(pluginName);
       this.clearCache(packageName);
-      return (0, import_utils2.requireModule)(packageName);
+      return await (0, import_utils.importModule)(packageName);
     } else {
       return pluginName;
     }
@@ -207,11 +210,11 @@ const _PluginManager = class _PluginManager {
     }
     try {
       if (typeof plugin === "string" && options.name && !options.packageName) {
-        const packageName = _PluginManager.getPackageName(options.name);
+        const packageName = await _PluginManager.getPackageName(options.name);
         options["packageName"] = packageName;
       }
       if (options.packageName) {
-        const packageJson = _PluginManager.getPackageJson(options.packageName);
+        const packageJson = await _PluginManager.getPackageJson(options.packageName);
         options["packageJson"] = packageJson;
         options["version"] = packageJson.version;
       }
@@ -221,7 +224,7 @@ const _PluginManager = class _PluginManager {
     this.app.log.debug(`adding plugin [${options.name}]...`);
     let P;
     try {
-      P = _PluginManager.resolvePlugin(options.packageName || plugin, isUpgrade, !!options.packageName);
+      P = await _PluginManager.resolvePlugin(options.packageName || plugin, isUpgrade, !!options.packageName);
     } catch (error) {
       this.app.log.warn("plugin not found", error);
       return;
@@ -479,12 +482,6 @@ const _PluginManager = class _PluginManager {
     }
     await this.app.emitStartedEvent();
   }
-  async initPresetPlugins() {
-    for (const plugin of this.options.plugins) {
-      const [p, opts = {}] = Array.isArray(plugin) ? plugin : [plugin];
-      await this.add(p, { enabled: true, isPreset: true, ...opts });
-    }
-  }
   async loadOne(plugin) {
     this.app.setMaintainingMessage(`loading plugin ${plugin.name}...`);
     if (plugin.state.loaded || !plugin.enabled) {
@@ -653,6 +650,12 @@ const _PluginManager = class _PluginManager {
     const npmInfo = await (0, import_utils2.getNpmInfo)(plugin.options.packageName, plugin.options.registry, plugin.options.authToken);
     return Object.keys(npmInfo.versions);
   }
+  async initPresetPlugins() {
+    for (const plugin of this.options.plugins) {
+      const [p, opts = {}] = Array.isArray(plugin) ? plugin : [plugin];
+      await this.add(p, { enabled: true, isPreset: true, ...opts });
+    }
+  }
 };
 __name(_PluginManager, "PluginManager");
 let PluginManager = _PluginManager;

package/lib/plugin-manager/utils.d.ts

@@ -69,8 +69,8 @@ export declare function removePluginPackage(packageName: string): Promise<[void,
  * @example
  * getPackageJson('dayjs') => { name: 'dayjs', version: '1.0.0', ... }
  */
-export declare function getPackageJson(pluginName: string): any;
-export declare function getPackageJsonByLocalPath(localPath: string): any;
+export declare function getPackageJson(pluginName: string): Promise<any>;
+export declare function getPackageJsonByLocalPath(localPath: string): Promise<any>;
 export declare function updatePluginByCompressedFileUrl(options: Partial<Pick<PluginData, 'compressedFileUrl' | 'packageName' | 'authToken'>>): Promise<{
     packageName: any;
     packageDir: string;
@@ -78,7 +78,8 @@ export declare function updatePluginByCompressedFileUrl(options: Partial<Pick<Pl
 }>;
 export declare function getNewVersion(plugin: PluginData): Promise<string | false>;
 export declare function removeRequireCache(fileOrPackageName: string): void;
-export declare function requireNoCache(fileOrPackageName: string): any;
+export declare function requireNoCache(fileOrPackageName: string): Promise<any>;
+export declare function readJSONFileContent(filePath: string): Promise<any>;
 export declare function requireModule(m: any): any;
 export declare function isNotBuiltinModule(packageName: string): boolean;
 export declare const isValidPackageName: (str: string) => boolean;

package/lib/plugin-manager/utils.js

@@ -55,6 +55,7 @@ __export(utils_exports, {
   getTempDir: () => getTempDir,
   isNotBuiltinModule: () => isNotBuiltinModule,
   isValidPackageName: () => isValidPackageName,
+  readJSONFileContent: () => readJSONFileContent,
   removePluginPackage: () => removePluginPackage,
   removeRequireCache: () => removeRequireCache,
   removeTmpDir: () => removeTmpDir,
@@ -74,9 +75,9 @@ var import_module = require("module");
 var import_os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
 var import_semver = __toESM(require("semver"));
+var import_clientStaticUtils = require("./clientStaticUtils");
 var import_constants = require("./constants");
 var import_deps = __toESM(require("./deps"));
-var import_clientStaticUtils = require("./clientStaticUtils");
 async function getTempDir() {
   const temporaryDirectory = await import_fs_extra.default.realpath(import_os.default.tmpdir());
   return import_path.default.join(temporaryDirectory, import_constants.APP_NAME);
@@ -209,7 +210,7 @@ async function downloadAndUnzipToTempDir(fileUrl, authToken) {
     await removeTmpDir(tempFile, tempPackageContentDir);
     throw new Error(`decompress ${fileUrl} failed`);
   }
-  const packageJson = requireNoCache(packageJsonPath);
+  const packageJson = await readJSONFileContent(packageJsonPath);
   const mainFile = import_path.default.join(tempPackageContentDir, packageJson.main);
   if (!import_fs_extra.default.existsSync(mainFile)) {
     await removeTmpDir(tempFile, tempPackageContentDir);
@@ -303,16 +304,18 @@ function removePluginPackage(packageName) {
   return Promise.all([import_fs_extra.default.remove(packageDir), import_fs_extra.default.remove(nodeModulesPluginDir)]);
 }
 __name(removePluginPackage, "removePluginPackage");
-function getPackageJson(pluginName) {
+async function getPackageJson(pluginName) {
   const packageDir = getStoragePluginDir(pluginName);
-  return getPackageJsonByLocalPath(packageDir);
+  return await getPackageJsonByLocalPath(packageDir);
 }
 __name(getPackageJson, "getPackageJson");
-function getPackageJsonByLocalPath(localPath) {
+async function getPackageJsonByLocalPath(localPath) {
   if (!import_fs_extra.default.existsSync(localPath)) {
     return null;
   } else {
-    return requireNoCache(import_path.default.join(localPath, "package.json"));
+    const fullPath = import_path.default.join(localPath, "package.json");
+    const data = await import_fs_extra.default.promises.readFile(fullPath, { encoding: "utf-8" });
+    return JSON.parse(data);
   }
 }
 __name(getPackageJsonByLocalPath, "getPackageJsonByLocalPath");
@@ -353,11 +356,15 @@ function removeRequireCache(fileOrPackageName) {
   delete require.cache[fileOrPackageName];
 }
 __name(removeRequireCache, "removeRequireCache");
-function requireNoCache(fileOrPackageName) {
-  removeRequireCache(fileOrPackageName);
-  return require(fileOrPackageName);
+async function requireNoCache(fileOrPackageName) {
+  return await (0, import_utils.importModule)(fileOrPackageName);
 }
 __name(requireNoCache, "requireNoCache");
+async function readJSONFileContent(filePath) {
+  const data = await import_fs_extra.default.promises.readFile(filePath, { encoding: "utf-8" });
+  return JSON.parse(data);
+}
+__name(readJSONFileContent, "readJSONFileContent");
 function requireModule(m) {
   if (typeof m === "string") {
     m = require(m);
@@ -368,13 +375,13 @@ function requireModule(m) {
   return m.__esModule ? m.default : m;
 }
 __name(requireModule, "requireModule");
-function getExternalVersionFromDistFile(packageName) {
+async function getExternalVersionFromDistFile(packageName) {
   const { exists, filePath } = (0, import_clientStaticUtils.getPackageFilePathWithExistCheck)(packageName, "dist/externalVersion.js");
   if (!exists) {
     return false;
   }
   try {
-    return requireNoCache(filePath);
+    return await requireNoCache(filePath);
   } catch (e) {
     console.error(e);
     return false;
@@ -439,7 +446,7 @@ __name(getExternalVersionFromSource, "getExternalVersionFromSource");
 async function getCompatible(packageName) {
   let externalVersion;
   if (!process.env.IS_DEV_CMD) {
-    const res = getExternalVersionFromDistFile(packageName);
+    const res = await getExternalVersionFromDistFile(packageName);
     if (!res) {
       return false;
     } else {
@@ -514,6 +521,7 @@ __name(checkAndGetCompatible, "checkAndGetCompatible");
   getTempDir,
   isNotBuiltinModule,
   isValidPackageName,
+  readJSONFileContent,
   removePluginPackage,
   removeRequireCache,
   removeTmpDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.17.0-alpha.7",
+  "version": "0.18.0-alpha.1",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,16 +10,16 @@
     "@koa/cors": "^3.1.0",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.17.0-alpha.7",
-    "@nocobase/actions": "0.17.0-alpha.7",
-    "@nocobase/auth": "0.17.0-alpha.7",
-    "@nocobase/cache": "0.17.0-alpha.7",
-    "@nocobase/database": "0.17.0-alpha.7",
-    "@nocobase/evaluators": "0.17.0-alpha.7",
-    "@nocobase/logger": "0.17.0-alpha.7",
-    "@nocobase/resourcer": "0.17.0-alpha.7",
-    "@nocobase/sdk": "0.17.0-alpha.7",
-    "@nocobase/utils": "0.17.0-alpha.7",
+    "@nocobase/acl": "0.18.0-alpha.1",
+    "@nocobase/actions": "0.18.0-alpha.1",
+    "@nocobase/auth": "0.18.0-alpha.1",
+    "@nocobase/cache": "0.18.0-alpha.1",
+    "@nocobase/database": "0.18.0-alpha.1",
+    "@nocobase/evaluators": "0.18.0-alpha.1",
+    "@nocobase/logger": "0.18.0-alpha.1",
+    "@nocobase/resourcer": "0.18.0-alpha.1",
+    "@nocobase/sdk": "0.18.0-alpha.1",
+    "@nocobase/utils": "0.18.0-alpha.1",
     "@types/decompress": "4.2.4",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -52,5 +52,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "91377a3abd1124f79fb3819f2d0e80905e091a32"
+  "gitHead": "0f5f1c0a37dc397a9dc4c8eec0c4ec20fd8107b0"
 }

package/lib/read-config.d.ts

@@ -1,8 +0,0 @@
-export declare function readConfig(dir: string): Promise<{}>;
-export declare class ConfigurationRepository {
-    protected items: Map<string, any>;
-    get(key: string, defaultValue?: any): any;
-    set(key: string, value: any): Map<string, any>;
-    toObject(): {};
-}
-export declare function loadConfiguration(configurationDir: string, repository: ConfigurationRepository): Promise<void>;

package/lib/read-config.js

@@ -1,91 +0,0 @@
-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 __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 read_config_exports = {};
-__export(read_config_exports, {
-  ConfigurationRepository: () => ConfigurationRepository,
-  loadConfiguration: () => loadConfiguration,
-  readConfig: () => readConfig
-});
-module.exports = __toCommonJS(read_config_exports);
-var import_lodash = __toESM(require("lodash"));
-var import_fs = __toESM(require("fs"));
-var import_path = __toESM(require("path"));
-async function readConfig(dir) {
-  const repository = new ConfigurationRepository();
-  await loadConfiguration(dir, repository);
-  return repository.toObject();
-}
-__name(readConfig, "readConfig");
-const _ConfigurationRepository = class _ConfigurationRepository {
-  items = /* @__PURE__ */ new Map();
-  get(key, defaultValue = void 0) {
-    if (this.items.has(key)) {
-      return this.items.get(key);
-    }
-    return defaultValue;
-  }
-  set(key, value) {
-    return this.items.set(key, value);
-  }
-  toObject() {
-    const result = {};
-    for (const [key, value] of this.items.entries()) {
-      import_lodash.default.set(result, key, value);
-    }
-    return result;
-  }
-};
-__name(_ConfigurationRepository, "ConfigurationRepository");
-let ConfigurationRepository = _ConfigurationRepository;
-async function loadConfiguration(configurationDir, repository) {
-  const getConfigurationFiles = /* @__PURE__ */ __name(async (dir, prefix = []) => {
-    const files = await import_fs.default.promises.readdir(dir, { withFileTypes: true });
-    for (const file of files) {
-      if (file.isDirectory()) {
-        await getConfigurationFiles(import_path.default.join(dir, file.name), [...prefix, file.name]);
-      } else {
-        if (!["ts", "js"].includes(file.name.split(".").slice(1).join("."))) {
-          continue;
-        }
-        const filePath = import_path.default.join(dir, file.name);
-        const keyName = import_path.default.parse(filePath).name;
-        const configuration = require(filePath).default;
-        repository.set([...prefix, keyName].join("."), configuration);
-      }
-    }
-  }, "getConfigurationFiles");
-  await getConfigurationFiles(configurationDir);
-}
-__name(loadConfiguration, "loadConfiguration");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ConfigurationRepository,
-  loadConfiguration,
-  readConfig
-});