@memtensor/memos-local-openclaw-plugin 1.0.4-beta.10 → 1.0.4-beta.12

package/src/viewer/server.ts

@@ -1232,7 +1232,7 @@ export class ViewerServer {
               body: JSON.stringify({ memory: { sourceChunkId: refreshedChunk.id, role: refreshedChunk.role, content: refreshedChunk.content, summary: refreshedChunk.summary, kind: refreshedChunk.kind, groupId: null, visibility: "public" } }),
             });
             if (!isLocalShared) this.store.markMemorySharedLocally(chunkId);
-            if (hubClient.userId) {
+            if (hubClient.userId && this.ctx?.config?.sharing?.role === "hub") {
               const existing = this.store.getHubMemoryBySource(hubClient.userId, chunkId);
               this.store.upsertHubMemory({
                 id: (response as any)?.memoryId ?? existing?.id ?? crypto.randomUUID(),
@@ -1780,7 +1780,8 @@ export class ViewerServer {
         localIPs.push("127.0.0.1", "localhost", "0.0.0.0");
         try {
           const u = new URL(hubUrl);
-          if (localIPs.includes(u.hostname)) {
+          const targetPort = u.port || (u.protocol === "https:" ? "443" : "80");
+          if (localIPs.includes(u.hostname) && targetPort === String(this.port)) {
             return this.jsonResponse(res, { ok: false, error: "cannot_join_self" });
           }
         } catch {}
@@ -1788,10 +1789,13 @@ export class ViewerServer {
         const nickname = sharing.client?.nickname;
         const username = nickname || os.userInfo().username || "user";
         const hostname = os.hostname() || "unknown";
+        const persisted = this.store.getClientHubConnection();
+        const existingIdentityKey = persisted?.identityKey || "";
         const result = await hubRequestJson(hubUrl, "", "/api/v1/hub/join", {
           method: "POST",
-          body: JSON.stringify({ teamToken, username, deviceName: hostname, reapply: true }),
+          body: JSON.stringify({ teamToken, username, deviceName: hostname, reapply: true, identityKey: existingIdentityKey }),
         }) as any;
+        const returnedIdentityKey = String(result.identityKey || existingIdentityKey || "");
         this.store.setClientHubConnection({
           hubUrl,
           userId: String(result.userId || ""),
@@ -1799,6 +1803,8 @@ export class ViewerServer {
           userToken: result.userToken || "",
           role: "member",
           connectedAt: Date.now(),
+          identityKey: returnedIdentityKey,
+          lastKnownStatus: result.status || "",
         });
         this.jsonResponse(res, { ok: true, status: result.status || "pending" });
       } catch (err) {
@@ -2074,14 +2080,13 @@ export class ViewerServer {
             },
           }),
         });
-        const hubUserId = hubClient.userId;
-        if (hubUserId) {
+        if (hubClient.userId && this.ctx?.config?.sharing?.role === "hub") {
           const now = Date.now();
-          const existing = this.store.getHubMemoryBySource(hubUserId, chunk.id);
+          const existing = this.store.getHubMemoryBySource(hubClient.userId, chunk.id);
           this.store.upsertHubMemory({
             id: (response as any)?.memoryId ?? existing?.id ?? crypto.randomUUID(),
             sourceChunkId: chunk.id,
-            sourceUserId: hubUserId,
+            sourceUserId: hubClient.userId,
             role: chunk.role,
             content: chunk.content,
             summary: chunk.summary ?? "",
@@ -2592,7 +2597,8 @@ export class ViewerServer {
               localIPs.push("127.0.0.1", "localhost", "0.0.0.0");
               try {
                 const u = new URL(addr.startsWith("http") ? addr : `http://${addr}`);
-                if (localIPs.includes(u.hostname)) {
+                const targetPort = u.port || (u.protocol === "https:" ? "443" : "80");
+                if (localIPs.includes(u.hostname) && targetPort === String(this.port)) {
                   res.writeHead(400, { "Content-Type": "application/json" });
                   res.end(JSON.stringify({ error: "cannot_join_self" }));
                   return;
@@ -2618,17 +2624,22 @@ export class ViewerServer {
           const isClient = newEnabled && newRole === "client";
           if (wasClient && !isClient) {
             this.notifyHubLeave();
-            this.store.clearClientHubConnection();
-            this.log.info("Cleared client hub connection (sharing disabled or role changed)");
+            const oldConn = this.store.getClientHubConnection();
+            if (oldConn) {
+              this.store.setClientHubConnection({ ...oldConn, userToken: "", lastKnownStatus: "left" });
+            }
+            this.log.info("Client hub connection token cleared (sharing disabled or role changed), identity preserved");
           }
 
-          // Detect switching to a different Hub while still in client mode
           if (wasClient && isClient) {
             const newClientAddr = String((merged.client as Record<string, unknown>)?.hubAddress || "");
             if (newClientAddr && oldClientHubAddress && normalizeHubUrl(newClientAddr) !== normalizeHubUrl(oldClientHubAddress)) {
               this.notifyHubLeave();
-              this.store.clearClientHubConnection();
-              this.log.info("Cleared client hub connection (switched to different Hub)");
+              const oldConn = this.store.getClientHubConnection();
+              if (oldConn) {
+                this.store.setClientHubConnection({ ...oldConn, hubUrl: normalizeHubUrl(newClientAddr), userToken: "", lastKnownStatus: "hub_changed" });
+              }
+              this.log.info("Client hub connection token cleared (switched to different Hub), identity preserved");
             }
           }
 
@@ -2645,9 +2656,11 @@ export class ViewerServer {
         this.log.info("Plugin config updated via Viewer");
         this.stopHubHeartbeat();
 
-        // When switching to client mode, immediately send join request
+        // When switching to client mode or re-enabling sharing as client, send join request
         const finalSharing = config.sharing as Record<string, unknown> | undefined;
-        if (finalSharing?.role === "client" && oldSharingRole !== "client") {
+        const nowClient = Boolean(finalSharing?.enabled) && finalSharing?.role === "client";
+        const previouslyClient = oldSharingEnabled && oldSharingRole === "client";
+        if (nowClient && !previouslyClient) {
           this.autoJoinOnSave(finalSharing).catch(e => this.log.warn(`Auto-join on save failed: ${e}`));
         }
 
@@ -2670,10 +2683,13 @@ export class ViewerServer {
     const nickname = String(clientCfg?.nickname || "");
     const username = nickname || os.userInfo().username || "user";
     const hostname = os.hostname() || "unknown";
+    const persisted = this.store.getClientHubConnection();
+    const existingIdentityKey = persisted?.identityKey || "";
     const result = await hubRequestJson(hubUrl, "", "/api/v1/hub/join", {
       method: "POST",
-      body: JSON.stringify({ teamToken, username, deviceName: hostname }),
+      body: JSON.stringify({ teamToken, username, deviceName: hostname, identityKey: existingIdentityKey }),
     }) as any;
+    const returnedIdentityKey = String(result.identityKey || existingIdentityKey || "");
     this.store.setClientHubConnection({
       hubUrl,
       userId: String(result.userId || ""),
@@ -2681,6 +2697,8 @@ export class ViewerServer {
       userToken: result.userToken || "",
       role: "member",
       connectedAt: Date.now(),
+      identityKey: returnedIdentityKey,
+      lastKnownStatus: result.status || "",
     });
     this.log.info(`Auto-join on save: status=${result.status}, userId=${result.userId}`);
     if (result.userToken) {
@@ -2768,10 +2786,10 @@ export class ViewerServer {
               this.log.warn(`Failed to update hub-auth.json: ${e}`);
             }
           } else {
-            const persisted = this.store.getClientHubConnection();
-            if (persisted) {
+            const persistedConn = this.store.getClientHubConnection();
+            if (persistedConn) {
               this.store.setClientHubConnection({
-                ...persisted,
+                ...persistedConn,
                 username: result.username,
                 userToken: result.userToken,
               });
@@ -2798,7 +2816,8 @@ export class ViewerServer {
           const localIPs = this.getLocalIPs();
           localIPs.push("127.0.0.1", "localhost", "0.0.0.0");
           const parsed = new URL(hubUrl.startsWith("http") ? hubUrl : `http://${hubUrl}`);
-          if (localIPs.includes(parsed.hostname)) {
+          const targetPort = parsed.port || (parsed.protocol === "https:" ? "443" : "80");
+          if (localIPs.includes(parsed.hostname) && targetPort === String(this.port)) {
             this.jsonResponse(res, { ok: false, error: "cannot_join_self" });
             return;
           }