@nocobase/plugin-license 2.1.0-beta.33 → 2.1.0-beta.35

package/dist/externalVersion.js

@@ -9,17 +9,17 @@
 
 module.exports = {
   "react": "18.2.0",
-  "@nocobase/client": "2.1.0-beta.33",
+  "@nocobase/client": "2.1.0-beta.35",
   "antd": "5.24.2",
   "ahooks": "3.7.8",
   "@ant-design/icons": "5.6.1",
   "@formily/react": "2.3.7",
   "@nocobase/license-kit": "0.3.8",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "2.1.0-beta.33",
+  "@nocobase/server": "2.1.0-beta.35",
   "lodash": "4.18.1",
-  "@nocobase/utils": "2.1.0-beta.33",
+  "@nocobase/utils": "2.1.0-beta.35",
   "koa": "3.2.0",
   "axios": "1.7.7",
-  "@nocobase/logger": "2.1.0-beta.33"
+  "@nocobase/logger": "2.1.0-beta.35"
 };

package/dist/server/utils/instance.d.ts

@@ -7,5 +7,5 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export declare function getInstanceId(): Promise<string>;
-export declare function createInstanceId(force?: boolean): Promise<unknown>;
+export declare function createInstanceId(force?: boolean): Promise<string>;
 export declare function isLicenseKeyExists(): Promise<boolean>;

package/dist/server/utils/instance.js

@@ -42,30 +42,35 @@ __export(instance_exports, {
 });
 module.exports = __toCommonJS(instance_exports);
 var import_fs = __toESM(require("fs"));
-var import_path = __toESM(require("path"));
 var import_utils = require("@nocobase/utils");
-var import_child_process = require("child_process");
+var import_license_kit = require("@nocobase/license-kit");
 async function getInstanceId() {
-  const dir = (0, import_utils.storagePathJoin)(".license");
-  const filePath = import_path.default.resolve(dir, "instance-id");
+  const filePath = (0, import_utils.storagePathJoin)(".license", "instance-id");
   await createInstanceId(true);
-  const id = import_fs.default.readFileSync(filePath, "utf-8");
-  return id;
+  const id = await import_fs.default.promises.readFile(filePath, "utf-8");
+  return id.trim();
 }
 async function createInstanceId(force = false) {
-  return new Promise((resolve, reject) => {
-    (0, import_child_process.exec)(`yarn nocobase generate-instance-id ${force ? "--force" : ""}`, (err, stdout, stderr) => {
-      if (err) {
-        reject(err);
-        return;
+  const dir = (0, import_utils.storagePathJoin)(".license");
+  const filePath = (0, import_utils.storagePathJoin)(".license", "instance-id");
+  if (!force) {
+    try {
+      const existing = await import_fs.default.promises.readFile(filePath, "utf-8");
+      const normalized = existing.trim();
+      if (normalized) {
+        return normalized;
       }
-      resolve(stdout);
-    });
-  });
+    } catch (e) {
+    }
+  }
+  await import_fs.default.promises.mkdir(dir, { recursive: true });
+  const instanceId = String(await (0, import_license_kit.getInstanceIdAsync)()).trim();
+  await import_fs.default.promises.writeFile(filePath, `${instanceId}
+`);
+  return instanceId;
 }
 async function isLicenseKeyExists() {
-  const dir = (0, import_utils.storagePathJoin)(".license");
-  const filePath = import_path.default.resolve(dir, "license-key");
+  const filePath = (0, import_utils.storagePathJoin)(".license", "license-key");
   return import_fs.default.existsSync(filePath);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-license",
-  "version": "2.1.0-beta.33",
+  "version": "2.1.0-beta.35",
   "main": "dist/server/index.js",
   "displayName": "License settings",
   "displayName.ru-RU": "Настройки лицензии",
@@ -17,5 +17,5 @@
     "ts:env": "tsc -p tsconfig.env.json"
   },
   "license": "Apache-2.0",
-  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72"
+  "gitHead": "74310d8b9e9581fcde14b5a93d12b41ddb5bb325"
 }