@lingyao037/openclaw-lingyao-cli 1.3.4 → 1.3.6

package/cli.mjs

@@ -37,23 +37,8 @@ const NC = '\x1b[0m';
  */
 function getMachineId() {
   try {
-    const interfaces = os.networkInterfaces();
-    const macSet = new Set();
-
-    for (const iface of Object.values(interfaces)) {
-      if (!iface) continue;
-      for (const alias of iface) {
-        if (!alias.internal && alias.mac && alias.mac !== '00:00:00:00:00:00') {
-          macSet.add(alias.mac);
-        }
-      }
-    }
-
-    if (macSet.size > 0) {
-      const macStr = [...macSet].sort().join('');
-      // MD5 哈希，与 orchestrator.ts 保持一致
-      return createHash('md5').update(macStr).digest('hex').substring(0, 8);
-    }
+    // hostname 在单台机器上跨重启稳定
+    return createHash('md5').update(os.hostname()).digest('hex').substring(0, 8);
   } catch (e) {
     // ignore
   }

package/dist/index.js

@@ -412,7 +412,7 @@ function createSetupAdapter() {
 }
 
 // src/orchestrator.ts
-import { hostname, networkInterfaces } from "os";
+import { hostname } from "os";
 import { createHash } from "crypto";
 
 // src/types.ts
@@ -2233,20 +2233,8 @@ var ErrorHandler = class {
 // src/orchestrator.ts
 function getMachineId() {
   try {
-    const interfaces = networkInterfaces();
-    const macSet = /* @__PURE__ */ new Set();
-    for (const iface of Object.values(interfaces)) {
-      if (!iface) continue;
-      for (const alias of iface) {
-        if (!alias.internal && alias.mac && alias.mac !== "00:00:00:00:00:00") {
-          macSet.add(alias.mac);
-        }
-      }
-    }
-    const macs = [...macSet].sort();
-    if (macs.length > 0) {
-      return createHash("md5").update(macs.join("")).digest("hex").substring(0, 8);
-    }
+    const host = hostname();
+    return createHash("md5").update(host).digest("hex").substring(0, 8);
   } catch (e) {
   }
   return Math.random().toString(36).substring(2, 10);
@@ -2273,8 +2261,30 @@ var MultiAccountOrchestrator = class {
       return;
     }
     this.runtime.logger.info(`Starting account "${accountId}"`);
-    const gatewayId = account.gatewayId ?? generateGatewayId(accountId);
     const storagePrefix = `lingyao:${accountId}`;
+    const gatewayIdKey = `${storagePrefix}:persistedGatewayId`;
+    let gatewayId = account.gatewayId;
+    if (!gatewayId) {
+      try {
+        const stored = await this.runtime.storage.get(gatewayIdKey);
+        if (stored && typeof stored === "string") {
+          gatewayId = stored;
+          this.runtime.logger.info(`Using persisted gatewayId: ${gatewayId}`);
+        }
+      } catch (e) {
+        this.runtime.logger.warn(`Failed to read persisted gatewayId`, e);
+      }
+    }
+    if (!gatewayId) {
+      gatewayId = generateGatewayId(accountId);
+      this.runtime.logger.info(`Generated new gatewayId: ${gatewayId}`);
+      try {
+        await this.runtime.storage.set(gatewayIdKey, gatewayId);
+        this.runtime.logger.info(`Persisted gatewayId: ${gatewayId}`);
+      } catch (e) {
+        this.runtime.logger.warn(`Failed to persist gatewayId`, e);
+      }
+    }
     const accountManager = new AccountManager(this.runtime);
     const probe = new Probe(this.runtime);
     const monitor = new Monitor(this.runtime);