@nocobase/server 2.1.0-alpha.17 → 2.1.0-alpha.19

package/lib/aes-encryptor.js

@@ -44,6 +44,7 @@ module.exports = __toCommonJS(aes_encryptor_exports);
 var import_crypto = __toESM(require("crypto"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
+var import_utils = require("@nocobase/utils");
 const _AesEncryptor = class _AesEncryptor {
   key;
   constructor(key) {
@@ -99,12 +100,12 @@ const _AesEncryptor = class _AesEncryptor {
     }
   }
   static async getKeyPath(appName) {
-    const appKeyPath = import_path.default.resolve(process.cwd(), "storage", "apps", appName, "aes_key.dat");
+    const appKeyPath = (0, import_utils.storagePathJoin)("apps", appName, "aes_key.dat");
     const appKeyExists = await import_fs_extra.default.exists(appKeyPath);
     if (appKeyExists) {
       return appKeyPath;
     }
-    const envKeyPath = import_path.default.resolve(process.cwd(), "storage", "environment-variables", appName, "aes_key.dat");
+    const envKeyPath = (0, import_utils.storagePathJoin)("environment-variables", appName, "aes_key.dat");
     const envKeyExists = await import_fs_extra.default.exists(envKeyPath);
     if (envKeyExists) {
       return envKeyPath;

package/lib/ai/create-docs-index.js

@@ -43,10 +43,11 @@ module.exports = __toCommonJS(create_docs_index_exports);
 var import_fast_glob = __toESM(require("fast-glob"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
+var import_utils = require("@nocobase/utils");
 var import_ai = require("@nocobase/ai");
 var import_findPackageNames = require("../plugin-manager/findPackageNames");
 var import_plugin_manager = require("../plugin-manager");
-const DOCS_STORAGE_DIR = import_path.default.resolve(process.cwd(), "storage/ai/docs");
+const DOCS_STORAGE_DIR = (0, import_utils.storagePathJoin)("ai", "docs");
 const REFERENCE_START = "<!-- docs:references:start -->";
 const REFERENCE_END = "<!-- docs:references:end -->";
 const SPLIT_REFERENCE_START = "<!-- docs:splits:start -->";

package/lib/commands/create-migration.js

@@ -76,6 +76,6 @@ export default class extends Migration {
 `;
     await import_fs.default.promises.mkdir((0, import_path.dirname)(filename), { recursive: true });
     await import_fs.default.promises.writeFile(filename, data, "utf8");
-    app.log.info(`migration file in ${filename}`);
+    console.log(`migration file in ${filename}`);
   });
 }, "default");

package/lib/commands/start.js

@@ -41,14 +41,14 @@ __export(start_exports, {
 });
 module.exports = __toCommonJS(start_exports);
 var import_fs_extra = __toESM(require("fs-extra"));
-var import_path = require("path");
+var import_utils = require("@nocobase/utils");
 var import_create_docs_index = require("../ai/create-docs-index");
 var import_application_not_install = require("../errors/application-not-install");
 /* istanbul ignore file -- @preserve */
 var start_default = /* @__PURE__ */ __name((app) => {
   app.command("start").auth().option("--db-sync").option("--quickstart").action(async (...cliArgs) => {
     const [options] = cliArgs;
-    const file = (0, import_path.resolve)(process.cwd(), "storage/.upgrading");
+    const file = (0, import_utils.storagePathJoin)(".upgrading");
     const upgrading = await import_fs_extra.default.exists(file);
     if (upgrading) {
       if (!process.env.VITEST) {

package/lib/event-queue.js

@@ -71,7 +71,7 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     return null;
   }
   get storagePath() {
-    return import_path.default.resolve(process.cwd(), "storage", "apps", this.options.appName, "event-queue.json");
+    return (0, import_utils.storagePathJoin)("apps", this.options.appName, "event-queue.json");
   }
   listen = /* @__PURE__ */ __name((channel) => {
     if (!this.connected) {

package/lib/gateway/index.js

@@ -56,6 +56,7 @@ var import_fs = __toESM(require("fs"));
 var import_http = __toESM(require("http"));
 var import_koa_compose = __toESM(require("koa-compose"));
 var import_node_util = require("node:util");
+var import_node_os = require("node:os");
 var import_path = require("path");
 var import_qs = __toESM(require("qs"));
 var import_serve_handler = __toESM(require("serve-handler"));
@@ -77,11 +78,14 @@ function normalizeBasePath(path = "") {
 }
 __name(normalizeBasePath, "normalizeBasePath");
 function getSocketPath() {
-  const { SOCKET_PATH } = import_node_process.default.env;
-  if ((0, import_path.isAbsolute)(SOCKET_PATH)) {
-    return SOCKET_PATH;
+  const socketPath = import_node_process.default.env.SOCKET_PATH;
+  if (socketPath) {
+    return (0, import_path.isAbsolute)(socketPath) ? socketPath : (0, import_path.resolve)(import_node_process.default.cwd(), socketPath);
   }
-  return (0, import_path.resolve)(import_node_process.default.cwd(), SOCKET_PATH);
+  if (import_node_process.default.env.NOCOBASE_RUNNING_IN_DOCKER === "true") {
+    return (0, import_path.resolve)((0, import_node_os.homedir)(), ".nocobase", "gateway.sock");
+  }
+  return (0, import_utils.storagePathJoin)("gateway.sock");
 }
 __name(getSocketPath, "getSocketPath");
 const _Gateway = class _Gateway extends import_events.EventEmitter {
@@ -96,7 +100,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   loggers = new import_utils.Registry();
   port = import_node_process.default.env.APP_PORT ? parseInt(import_node_process.default.env.APP_PORT) : null;
   host = "0.0.0.0";
-  socketPath = (0, import_path.resolve)(import_node_process.default.cwd(), "storage", "gateway.sock");
+  socketPath = getSocketPath();
   v2IndexTemplateCache = null;
   terminating = false;
   onTerminate = /* @__PURE__ */ __name(async (signal) => {
@@ -129,7 +133,6 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   constructor() {
     super();
     this.reset();
-    this.socketPath = getSocketPath();
     import_node_process.default.once("SIGTERM", this.onTerminate);
     import_node_process.default.once("SIGINT", this.onTerminate);
   }

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

@@ -143,6 +143,9 @@ var resource_default = {
   name: "pm",
   actions: {
     async add(ctx, next) {
+      if (process.env.DISABLE_PM_ADD === "true") {
+        ctx.throw(403, "The current environment does not allow adding plugins online");
+      }
       const app = ctx.app;
       const { values = {} } = ctx.action.params;
       if (values == null ? void 0 : values.packageName) {
@@ -158,12 +161,12 @@ var resource_default = {
         }
         app.runAsCLI(["pm", "add", values.packageName, ...args], { from: "user" });
       } else if (ctx.file) {
-        const tmpDir = import_path.default.resolve(process.cwd(), "storage", "tmp");
+        const tmpDir = (0, import_utils.storagePathJoin)("tmp");
         try {
           await import_fs.default.promises.mkdir(tmpDir, { recursive: true });
         } catch (error) {
         }
-        const tempFile = import_path.default.join(process.cwd(), "storage/tmp", (0, import_utils.uid)() + import_path.default.extname(ctx.file.originalname));
+        const tempFile = import_path.default.join(tmpDir, (0, import_utils.uid)() + import_path.default.extname(ctx.file.originalname));
         await import_fs.default.promises.writeFile(tempFile, ctx.file.buffer, "binary");
         app.runAsCLI(["pm", "add", tempFile], { from: "user" });
       } else if (values.compressedFileUrl) {
@@ -173,6 +176,9 @@ var resource_default = {
       await next();
     },
     async update(ctx, next) {
+      if (process.env.DISABLE_PM_ADD === "true") {
+        ctx.throw(403, "The current environment does not allow adding plugins online");
+      }
       const app = ctx.app;
       const values = ctx.action.params.values || {};
       const args = [];
@@ -187,12 +193,12 @@ var resource_default = {
       }
       if (ctx.file) {
         values.packageName = ctx.request.body.packageName;
-        const tmpDir = import_path.default.resolve(process.cwd(), "storage", "tmp");
+        const tmpDir = (0, import_utils.storagePathJoin)("tmp");
         try {
           await import_fs.default.promises.mkdir(tmpDir, { recursive: true });
         } catch (error) {
         }
-        const tempFile = import_path.default.join(process.cwd(), "storage/tmp", (0, import_utils.uid)() + import_path.default.extname(ctx.file.originalname));
+        const tempFile = import_path.default.join(tmpDir, (0, import_utils.uid)() + import_path.default.extname(ctx.file.originalname));
         await import_fs.default.promises.writeFile(tempFile, ctx.file.buffer, "binary");
         values.compressedFileUrl = tempFile;
       }

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

@@ -775,7 +775,7 @@ const _PluginManager = class _PluginManager {
       if (process.env.VITEST) {
         return;
       }
-      const file = (0, import_path.resolve)(process.cwd(), "storage/.upgrading");
+      const file = (0, import_utils.storagePathJoin)(".upgrading");
       this.app.log.debug("pending upgrade");
       await import_fs_extra.default.writeFile(file, "upgrading");
     }, "writeFile");
@@ -860,7 +860,7 @@ const _PluginManager = class _PluginManager {
         });
         return;
       }
-      const file = (0, import_path.resolve)(process.cwd(), "storage/app-upgrading");
+      const file = (0, import_utils.storagePathJoin)("app-upgrading");
       await import_fs_extra.default.writeFile(file, "", "utf-8");
       await (0, import_helper.tsxRerunning)();
       await (0, import_execa.default)("yarn", ["nocobase", "pm2-restart"], {

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

@@ -17,7 +17,6 @@ import Application from '../application';
  * getTempDir() => '/tmp/nocobase'
  */
 export declare function getTempDir(): Promise<string>;
-export declare function getPluginStoragePath(): string;
 export declare function getLocalPluginPackagesPathArr(): string[];
 export declare function getStoragePluginDir(packageName: string): string;
 export declare function getLocalPluginDir(packageDirBasename: string): string;

package/lib/plugin-manager/utils.js

@@ -59,7 +59,6 @@ __export(utils_exports, {
   getPackagesFromFiles: () => getPackagesFromFiles,
   getPluginBasePath: () => getPluginBasePath,
   getPluginInfoByNpm: () => getPluginInfoByNpm,
-  getPluginStoragePath: () => getPluginStoragePath,
   getServerPackages: () => getServerPackages,
   getStoragePluginDir: () => getStoragePluginDir,
   getTempDir: () => getTempDir,
@@ -97,11 +96,6 @@ async function getTempDir() {
   return import_path.default.join(temporaryDirectory, import_constants.APP_NAME);
 }
 __name(getTempDir, "getTempDir");
-function getPluginStoragePath() {
-  const pluginStoragePath = process.env.PLUGIN_STORAGE_PATH || import_constants.DEFAULT_PLUGIN_STORAGE_PATH;
-  return import_path.default.isAbsolute(pluginStoragePath) ? pluginStoragePath : import_path.default.join(process.cwd(), pluginStoragePath);
-}
-__name(getPluginStoragePath, "getPluginStoragePath");
 function getLocalPluginPackagesPathArr() {
   const pluginPackagesPathArr = process.env.PLUGIN_PATH || import_constants.DEFAULT_PLUGIN_PATH;
   return pluginPackagesPathArr.split(",").map((pluginPackagesPath) => {
@@ -111,7 +105,7 @@ function getLocalPluginPackagesPathArr() {
 }
 __name(getLocalPluginPackagesPathArr, "getLocalPluginPackagesPathArr");
 function getStoragePluginDir(packageName) {
-  const pluginStoragePath = getPluginStoragePath();
+  const pluginStoragePath = (0, import_utils.resolvePluginStoragePath)();
   return import_path.default.join(pluginStoragePath, packageName);
 }
 __name(getStoragePluginDir, "getStoragePluginDir");
@@ -579,7 +573,6 @@ __name(pmListSummary, "pmListSummary");
   getPackagesFromFiles,
   getPluginBasePath,
   getPluginInfoByNpm,
-  getPluginStoragePath,
   getServerPackages,
   getStoragePluginDir,
   getTempDir,

package/lib/plugin.js

@@ -293,7 +293,7 @@ const _Plugin = class _Plugin {
         ...await (0, import_utils2.checkAndGetCompatible)(packageName),
         lastUpdated: (await import_fs.default.promises.stat(file)).ctime,
         file,
-        updatable: file.startsWith(process.env.PLUGIN_STORAGE_PATH)
+        updatable: file.startsWith((0, import_utils.resolvePluginStoragePath)())
       };
     }
     return results;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.0-alpha.17",
+  "version": "2.1.0-alpha.19",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,21 +10,21 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.1.0-alpha.17",
-    "@nocobase/actions": "2.1.0-alpha.17",
-    "@nocobase/ai": "2.1.0-alpha.17",
-    "@nocobase/auth": "2.1.0-alpha.17",
-    "@nocobase/cache": "2.1.0-alpha.17",
-    "@nocobase/data-source-manager": "2.1.0-alpha.17",
-    "@nocobase/database": "2.1.0-alpha.17",
-    "@nocobase/evaluators": "2.1.0-alpha.17",
-    "@nocobase/lock-manager": "2.1.0-alpha.17",
-    "@nocobase/logger": "2.1.0-alpha.17",
-    "@nocobase/resourcer": "2.1.0-alpha.17",
-    "@nocobase/sdk": "2.1.0-alpha.17",
-    "@nocobase/snowflake-id": "2.1.0-alpha.17",
-    "@nocobase/telemetry": "2.1.0-alpha.17",
-    "@nocobase/utils": "2.1.0-alpha.17",
+    "@nocobase/acl": "2.1.0-alpha.19",
+    "@nocobase/actions": "2.1.0-alpha.19",
+    "@nocobase/ai": "2.1.0-alpha.19",
+    "@nocobase/auth": "2.1.0-alpha.19",
+    "@nocobase/cache": "2.1.0-alpha.19",
+    "@nocobase/data-source-manager": "2.1.0-alpha.19",
+    "@nocobase/database": "2.1.0-alpha.19",
+    "@nocobase/evaluators": "2.1.0-alpha.19",
+    "@nocobase/lock-manager": "2.1.0-alpha.19",
+    "@nocobase/logger": "2.1.0-alpha.19",
+    "@nocobase/resourcer": "2.1.0-alpha.19",
+    "@nocobase/sdk": "2.1.0-alpha.19",
+    "@nocobase/snowflake-id": "2.1.0-alpha.19",
+    "@nocobase/telemetry": "2.1.0-alpha.19",
+    "@nocobase/utils": "2.1.0-alpha.19",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "586cb00f56557e66168b9720d0e0193a1b752067"
+  "gitHead": "3d13700360eac1c0f9dbf6a5f167ed396a294a3c"
 }