@nocobase/server 0.14.0-alpha.2 → 0.14.0-alpha.4

package/lib/app-command.d.ts

@@ -0,0 +1,8 @@
+import { Command } from 'commander';
+export declare class AppCommand extends Command {
+    private _handleByIPCServer;
+    ipc(): this;
+    isHandleByIPCServer(): boolean;
+    createCommand(name?: string): AppCommand;
+    parseHandleByIPCServer(argv: any, parseOptions?: any): Boolean;
+}

package/lib/app-command.js

@@ -0,0 +1,59 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var app_command_exports = {};
+__export(app_command_exports, {
+  AppCommand: () => AppCommand
+});
+module.exports = __toCommonJS(app_command_exports);
+var import_commander = require("commander");
+const _AppCommand = class _AppCommand extends import_commander.Command {
+  _handleByIPCServer = false;
+  ipc() {
+    this._handleByIPCServer = true;
+    return this;
+  }
+  isHandleByIPCServer() {
+    return this._handleByIPCServer;
+  }
+  createCommand(name) {
+    return new _AppCommand(name);
+  }
+  parseHandleByIPCServer(argv, parseOptions) {
+    const userArgs = this._prepareUserArgs(argv, parseOptions);
+    if (userArgs[0] === "nocobase") {
+      userArgs.shift();
+    }
+    let lastCommand = this;
+    for (const arg of userArgs) {
+      const subCommand = lastCommand._findCommand(arg);
+      if (subCommand) {
+        lastCommand = subCommand;
+      } else {
+        break;
+      }
+    }
+    return lastCommand && lastCommand.isHandleByIPCServer();
+  }
+};
+__name(_AppCommand, "AppCommand");
+let AppCommand = _AppCommand;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AppCommand
+});

package/lib/application.d.ts

@@ -16,6 +16,7 @@ import { ApplicationVersion } from './helpers/application-version';
 import { Locale } from './locale';
 import { Plugin } from './plugin';
 import { InstallOptions, PluginManager } from './plugin-manager';
+import { AppCommand } from './app-command';
 export type PluginType = string | typeof Plugin;
 export type PluginConfiguration = PluginType | [PluginType, any];
 export interface ResourcerOptions {
@@ -97,8 +98,8 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get resourcer(): Resourcer;
     protected _cache: Cache;
     get cache(): Cache;
-    protected _cli: Command;
-    get cli(): Command;
+    protected _cli: AppCommand;
+    get cli(): AppCommand;
     protected _i18n: i18n;
     get i18n(): i18n;
     protected _pm: PluginManager;
@@ -124,18 +125,18 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     collection(options: CollectionOptions): import("@nocobase/database").Collection<any, any>;
     resource(options: ResourceOptions): import("@nocobase/resourcer").Resource;
     actions(handlers: any, options?: ActionsOptions): void;
-    command(name: string, desc?: string, opts?: CommandOptions): Command;
+    command(name: string, desc?: string, opts?: CommandOptions): AppCommand;
     findCommand(name: string): Command;
     load(options?: any): Promise<void>;
     reload(options?: any): Promise<void>;
     getPlugin<P extends Plugin>(name: string | typeof Plugin): P;
-    parse(argv?: string[]): Promise<Command>;
+    parse(argv?: string[]): Promise<AppCommand>;
     authenticate(): Promise<void>;
-    runCommand(command: string, ...args: any[]): Promise<Command>;
-    createCli(): Command;
+    runCommand(command: string, ...args: any[]): Promise<AppCommand>;
+    createCli(): AppCommand;
     runAsCLI(argv?: string[], options?: ParseOptions & {
         throwError?: boolean;
-    }): Promise<Command>;
+    }): Promise<AppCommand>;
     start(options?: StartOptions): Promise<void>;
     emitStartedEvent(): Promise<void>;
     isStarted(): Promise<boolean>;

package/lib/application.js

@@ -39,7 +39,6 @@ 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_commander = require("commander");
 var import_koa = __toESM(require("koa"));
 var import_koa_compose = __toESM(require("koa-compose"));
 var import_lodash = __toESM(require("lodash"));
@@ -51,6 +50,7 @@ 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");
+var import_app_command = require("./app-command");
 const packageJson = require("../package.json");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
@@ -236,7 +236,7 @@ const _Application = class _Application extends import_koa.default {
       return;
     }
     this._authenticated = true;
-    await this.db.auth({ retry: 30 });
+    await this.db.auth();
     await this.dbVersionCheck({ exit: true });
     await this.db.prepare();
   }
@@ -244,7 +244,7 @@ const _Application = class _Application extends import_koa.default {
     return await this.runAsCLI([command, ...args], { from: "user" });
   }
   createCli() {
-    const command = new import_commander.Command("nocobase").usage("[command] [options]").hook("preAction", async (_, actionCommand) => {
+    const command = new import_app_command.AppCommand("nocobase").usage("[command] [options]").hook("preAction", async (_, actionCommand) => {
       this._actionCommand = actionCommand;
       this.activatedCommand = {
         name: (0, import_helper.getCommandFullName)(actionCommand)
@@ -283,6 +283,7 @@ const _Application = class _Application extends import_koa.default {
       });
       return command;
     } catch (error) {
+      console.log({ error });
       if (!this.activatedCommand) {
         this.activatedCommand = {
           name: "unknown"
@@ -299,11 +300,16 @@ const _Application = class _Application extends import_koa.default {
     } finally {
       const _actionCommand = this._actionCommand;
       if (_actionCommand) {
+        const options2 = _actionCommand["options"];
         _actionCommand["_optionValues"] = {};
         _actionCommand["_optionValueSources"] = {};
+        _actionCommand["options"] = [];
+        for (const option of options2) {
+          _actionCommand.addOption(option);
+        }
       }
-      this.activatedCommand = null;
       this._actionCommand = null;
+      this.activatedCommand = null;
     }
   }
   async start(options = {}) {

package/lib/commands/install.js

@@ -22,7 +22,7 @@ __export(install_exports, {
 });
 module.exports = __toCommonJS(install_exports);
 var install_default = /* @__PURE__ */ __name((app) => {
-  app.command("install").option("-f, --force").option("-c, --clean").action(async (...cliArgs) => {
+  app.command("install").ipc().option("-f, --force").option("-c, --clean").action(async (...cliArgs) => {
     const [opts] = cliArgs;
     await app.install({
       cliArgs,

package/lib/commands/pm.js

@@ -35,18 +35,17 @@ var import_lodash = __toESM(require("lodash"));
 var import_plugin_command_error = require("../errors/plugin-command-error");
 var pm_default = /* @__PURE__ */ __name((app) => {
   const pm = app.command("pm");
-  pm.command("create").arguments("plugin").action(async (plugin) => {
+  pm.command("create").ipc().arguments("plugin").action(async (plugin) => {
     await app.pm.create(plugin);
   });
-  pm.command("add").argument("<pkg>").option("--registry [registry]").option("--auth-token [authToken]").option("--version [version]").action(async (name, options, cli) => {
-    console.log("pm.add", name, options);
+  pm.command("add").ipc().argument("<pkg>").option("--registry [registry]").option("--auth-token [authToken]").option("--version [version]").action(async (name, options, cli) => {
     try {
       await app.pm.addViaCLI(name, import_lodash.default.cloneDeep(options));
     } catch (error) {
       throw new import_plugin_command_error.PluginCommandError(`Failed to add plugin: ${error.message}`);
     }
   });
-  pm.command("update").argument("<packageName>").option("--path [path]").option("--url [url]").option("--registry [registry]").option("--auth-token [authToken]").option("--version [version]").action(async (packageName, options) => {
+  pm.command("update").ipc().argument("<packageName>").option("--path [path]").option("--url [url]").option("--registry [registry]").option("--auth-token [authToken]").option("--version [version]").action(async (packageName, options) => {
     try {
       await app.pm.update({
         ...options,
@@ -56,21 +55,21 @@ var pm_default = /* @__PURE__ */ __name((app) => {
       throw new import_plugin_command_error.PluginCommandError(`Failed to update plugin: ${error.message}`);
     }
   });
-  pm.command("enable").arguments("<plugins...>").action(async (plugins) => {
+  pm.command("enable").ipc().arguments("<plugins...>").action(async (plugins) => {
     try {
       await app.pm.enable(plugins);
     } catch (error) {
       throw new import_plugin_command_error.PluginCommandError(`Failed to enable plugin: ${error.message}`);
     }
   });
-  pm.command("disable").arguments("<plugins...>").action(async (plugins) => {
+  pm.command("disable").ipc().arguments("<plugins...>").action(async (plugins) => {
     try {
       await app.pm.disable(plugins);
     } catch (error) {
       throw new import_plugin_command_error.PluginCommandError(`Failed to disable plugin: ${error.message}`);
     }
   });
-  pm.command("remove").arguments("<plugins...>").action(async (plugins) => {
+  pm.command("remove").ipc().arguments("<plugins...>").action(async (plugins) => {
     await app.pm.remove(plugins);
   });
 }, "default");

package/lib/commands/restart.js

@@ -22,7 +22,7 @@ __export(restart_exports, {
 });
 module.exports = __toCommonJS(restart_exports);
 var restart_default = /* @__PURE__ */ __name((app) => {
-  app.command("restart").action(async (...cliArgs) => {
+  app.command("restart").ipc().action(async (...cliArgs) => {
     await app.restart({
       cliArgs
     });

package/lib/commands/stop.js

@@ -22,7 +22,7 @@ __export(stop_exports, {
 });
 module.exports = __toCommonJS(stop_exports);
 var stop_default = /* @__PURE__ */ __name((app) => {
-  app.command("stop").action(async (...cliArgs) => {
+  app.command("stop").ipc().action(async (...cliArgs) => {
     await app.stop({
       cliArgs
     });

package/lib/commands/upgrade.js

@@ -33,7 +33,7 @@ __export(upgrade_exports, {
 module.exports = __toCommonJS(upgrade_exports);
 var import_chalk = __toESM(require("chalk"));
 var upgrade_default = /* @__PURE__ */ __name((app) => {
-  app.command("upgrade").action(async (...cliArgs) => {
+  app.command("upgrade").ipc().action(async (...cliArgs) => {
     const [opts] = cliArgs;
     console.log("upgrading...");
     await app.upgrade();

package/lib/gateway/index.js

@@ -201,9 +201,11 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     } else if (!this.isHelp()) {
       ipcClient = await this.tryConnectToIPCServer();
       if (ipcClient) {
-        await ipcClient.write({ type: "passCliArgv", payload: { argv: process.argv } });
+        const response = await ipcClient.write({ type: "passCliArgv", payload: { argv: process.argv } });
         ipcClient.close();
-        return;
+        if (response.type !== "error" || response.payload.message !== "Not handle by ipc server") {
+          return;
+        }
       }
     }
     if (isStart || !ipcClient) {

package/lib/gateway/ipc-socket-server.d.ts

@@ -7,6 +7,6 @@ export declare class IPCSocketServer {
     static handleClientMessage({ type, payload }: {
         type: any;
         payload: any;
-    }): Promise<import("commander").Command>;
+    }): Promise<import("../app-command").AppCommand>;
     close(): void;
 }

package/lib/gateway/ipc-socket-server.js

@@ -82,6 +82,12 @@ const _IPCSocketServer = class _IPCSocketServer {
     if (type === "passCliArgv") {
       const argv = payload.argv;
       const mainApp = await import_app_supervisor.AppSupervisor.getInstance().getApp("main");
+      const cli = mainApp.cli;
+      if (!cli.parseHandleByIPCServer(argv, {
+        from: "node"
+      })) {
+        throw new Error("Not handle by ipc server");
+      }
       return mainApp.runAsCLI(argv, {
         from: "node",
         throwError: true

package/lib/locale/locale.js

@@ -23,7 +23,6 @@ __export(locale_exports, {
 module.exports = __toCommonJS(locale_exports);
 var import_cache = require("@nocobase/cache");
 var import_utils = require("@nocobase/utils");
-var import_plugin_manager = require("../plugin-manager");
 var import_resource = require("./resource");
 const _Locale = class _Locale {
   app;
@@ -75,11 +74,19 @@ const _Locale = class _Locale {
     return await this.wrapCache(`locale:resources:${lang}`, () => this.getResources(lang));
   }
   getResources(lang) {
+    var _a;
     const resources = {};
     const names = this.app.pm.getAliases();
     for (const name of names) {
       try {
-        const packageName = import_plugin_manager.PluginManager.getPackageName(name);
+        const p = this.app.pm.get(name);
+        if (!p) {
+          continue;
+        }
+        const packageName = (_a = p.options) == null ? void 0 : _a.packageName;
+        if (!packageName) {
+          continue;
+        }
         const res = (0, import_resource.getResource)(packageName, lang);
         if (res) {
           resources[name] = { ...res };

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

@@ -34,7 +34,6 @@ var import_utils = require("@nocobase/utils");
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_clientStaticUtils = require("../clientStaticUtils");
-var import_plugin_manager = __toESM(require("../plugin-manager"));
 var resource_default = {
   name: "pm",
   actions: {
@@ -154,11 +153,9 @@ var resource_default = {
       });
       ctx.body = items.map((item) => {
         try {
-          const packageName = import_plugin_manager.default.getPackageName(item.name);
           return {
             ...item.toJSON(),
-            packageName,
-            url: (0, import_clientStaticUtils.getExposeUrl)(packageName, PLUGIN_CLIENT_ENTRY_FILE)
+            url: (0, import_clientStaticUtils.getExposeUrl)(item.packageName, PLUGIN_CLIENT_ENTRY_FILE)
           };
         } catch {
           return false;

package/lib/swagger/index.json

@@ -107,8 +107,12 @@
         "name": "filter",
         "in": "query",
         "description": "filter items",
-        "schema": {
-          "type": "object"
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object"
+            }
+          }
         }
       },
       "sort": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.14.0-alpha.2",
+  "version": "0.14.0-alpha.4",
   "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.14.0-alpha.2",
-    "@nocobase/actions": "0.14.0-alpha.2",
-    "@nocobase/auth": "0.14.0-alpha.2",
-    "@nocobase/cache": "0.14.0-alpha.2",
-    "@nocobase/database": "0.14.0-alpha.2",
-    "@nocobase/evaluators": "0.14.0-alpha.2",
-    "@nocobase/logger": "0.14.0-alpha.2",
-    "@nocobase/resourcer": "0.14.0-alpha.2",
-    "@nocobase/sdk": "0.14.0-alpha.2",
-    "@nocobase/utils": "0.14.0-alpha.2",
+    "@nocobase/acl": "0.14.0-alpha.4",
+    "@nocobase/actions": "0.14.0-alpha.4",
+    "@nocobase/auth": "0.14.0-alpha.4",
+    "@nocobase/cache": "0.14.0-alpha.4",
+    "@nocobase/database": "0.14.0-alpha.4",
+    "@nocobase/evaluators": "0.14.0-alpha.4",
+    "@nocobase/logger": "0.14.0-alpha.4",
+    "@nocobase/resourcer": "0.14.0-alpha.4",
+    "@nocobase/sdk": "0.14.0-alpha.4",
+    "@nocobase/utils": "0.14.0-alpha.4",
     "@types/decompress": "4.2.4",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -51,5 +51,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "ea841d4a1e8c37aa77b4fbae6a6a4937e2aa3c0a"
+  "gitHead": "e2aab7863bbdfd76afc7164272b275e868ac59c0"
 }