@memtensor/memos-local-openclaw-plugin 1.0.4-beta.0 → 1.0.4-beta.2

package/src/viewer/server.ts

@@ -251,6 +251,7 @@ export class ViewerServer {
       else if (p === "/api/sharing/pending-users" && req.method === "GET") this.serveSharingPendingUsers(res);
       else if (p === "/api/sharing/approve-user" && req.method === "POST") this.handleSharingApproveUser(req, res);
       else if (p === "/api/sharing/reject-user" && req.method === "POST") this.handleSharingRejectUser(req, res);
+      else if (p === "/api/sharing/retry-join" && req.method === "POST") this.handleRetryJoin(req, res);
       else if (p === "/api/sharing/search/memories" && req.method === "POST") this.handleSharingMemorySearch(req, res);
       else if (p === "/api/sharing/memories/list" && req.method === "GET") this.serveSharingMemoryList(res, url);
       else if (p === "/api/sharing/tasks/list" && req.method === "GET") this.serveSharingTaskList(res, url);
@@ -1185,7 +1186,8 @@ export class ViewerServer {
       return;
     }
 
-    if (!hasClientConfig) {
+    const hasPendingConnection = Boolean(persisted?.hubUrl && persisted?.userId && !persisted?.userToken);
+    if (!hasClientConfig && !hasPendingConnection) {
       this.jsonResponse(res, base);
       return;
     }
@@ -1193,12 +1195,23 @@ export class ViewerServer {
     try {
       const status = await getHubStatus(this.store, this.ctx.config);
       const output = { ...base, connection: { ...base.connection, ...status } } as any;
+      if (status.user?.status === "pending") {
+        output.connection.pendingApproval = true;
+      }
+      if (status.user?.status === "rejected") {
+        output.connection.rejected = true;
+      }
       if (status.connected && status.hubUrl) {
         try {
           const info = await fetch(`${status.hubUrl}/api/v1/hub/info`).then((r) => (r.ok ? r.json() : null)).catch(() => null) as any;
           output.connection.teamName = info?.teamName ?? null;
           output.connection.apiVersion = info?.apiVersion ?? null;
         } catch {}
+      } else if (status.hubUrl) {
+        try {
+          const info = await fetch(`${status.hubUrl}/api/v1/hub/info`).then((r) => (r.ok ? r.json() : null)).catch(() => null) as any;
+          output.connection.teamName = info?.teamName ?? null;
+        } catch {}
       }
       output.admin.canManageUsers = status.connected && status.user?.role === "admin";
       output.admin.rejectSupported = output.admin.canManageUsers;
@@ -1256,6 +1269,42 @@ export class ViewerServer {
     });
   }
 
+  private handleRetryJoin(req: http.IncomingMessage, res: http.ServerResponse): void {
+    this.readBody(req, async (_body) => {
+      if (!this.ctx) return this.jsonResponse(res, { ok: false, error: "sharing_unavailable" });
+      const sharing = this.ctx.config.sharing;
+      if (!sharing?.enabled || sharing.role !== "client") {
+        return this.jsonResponse(res, { ok: false, error: "not_in_client_mode" });
+      }
+      const hubAddress = sharing.client?.hubAddress ?? "";
+      const teamToken = sharing.client?.teamToken ?? "";
+      if (!hubAddress || !teamToken) {
+        return this.jsonResponse(res, { ok: false, error: "missing_hub_address_or_team_token" });
+      }
+      try {
+        const hubUrl = normalizeHubUrl(hubAddress);
+        const os = await import("os");
+        const username = os.userInfo().username || "user";
+        const hostname = os.hostname() || "unknown";
+        const result = await hubRequestJson(hubUrl, "", "/api/v1/hub/join", {
+          method: "POST",
+          body: JSON.stringify({ teamToken, username, deviceName: hostname }),
+        }) as any;
+        this.store.setClientHubConnection({
+          hubUrl,
+          userId: String(result.userId || ""),
+          username,
+          userToken: result.userToken || "",
+          role: "member",
+          connectedAt: Date.now(),
+        });
+        this.jsonResponse(res, { ok: true, status: result.status || "pending" });
+      } catch (err) {
+        this.jsonResponse(res, { ok: false, error: String(err) });
+      }
+    });
+  }
+
   private async serveSharingMemoryList(res: http.ServerResponse, url: URL): Promise<void> {
     if (!this.ctx) return this.jsonResponse(res, { memories: [], error: "sharing_unavailable" });
     try {
@@ -1395,8 +1444,8 @@ export class ViewerServer {
       try {
         const parsed = JSON.parse(body || "{}");
         const taskId = String(parsed.taskId || "");
-        const visibility = parsed.visibility === "group" ? "group" : "public";
-        const groupId = typeof parsed.groupId === "string" ? parsed.groupId : undefined;
+        const visibility = "public";
+        const groupId: string | undefined = undefined;
         const task = this.store.getTask(taskId);
         if (!task) return this.jsonResponse(res, { ok: false, error: "task_not_found" });
         const chunks = this.store.getChunksByTask(taskId);
@@ -1410,7 +1459,7 @@ export class ViewerServer {
               sourceTaskId: task.id,
               title: task.title,
               summary: task.summary,
-              groupId: visibility === "group" ? groupId ?? null : null,
+              groupId: null,
               visibility,
               createdAt: task.startedAt ?? Date.now(),
               updatedAt: task.updatedAt ?? Date.now(),
@@ -1436,7 +1485,7 @@ export class ViewerServer {
             sourceUserId: hubUserId,
             title: task.title,
             summary: task.summary,
-            groupId: visibility === "group" ? groupId ?? null : null,
+            groupId: null,
             visibility,
             createdAt: task.startedAt ?? Date.now(),
             updatedAt: task.updatedAt ?? Date.now(),
@@ -1477,8 +1526,8 @@ export class ViewerServer {
       try {
         const parsed = JSON.parse(body || "{}");
         const chunkId = String(parsed.chunkId || "");
-        const visibility = parsed.visibility === "group" ? "group" : "public";
-        const groupId = typeof parsed.groupId === "string" ? parsed.groupId : undefined;
+        const visibility = "public";
+        const groupId: string | undefined = undefined;
         const db = (this.store as any).db;
         const chunk = db.prepare("SELECT * FROM chunks WHERE id = ?").get(chunkId) as any;
         if (!chunk) return this.jsonResponse(res, { ok: false, error: "memory_not_found" });
@@ -1492,7 +1541,7 @@ export class ViewerServer {
               content: chunk.content,
               summary: chunk.summary,
               kind: chunk.kind,
-              groupId: visibility === "group" ? groupId ?? null : null,
+              groupId: null,
               visibility,
             },
           }),
@@ -1509,7 +1558,7 @@ export class ViewerServer {
             content: chunk.content,
             summary: chunk.summary ?? "",
             kind: chunk.kind,
-            groupId: visibility === "group" ? groupId ?? null : null,
+            groupId: null,
             visibility,
             createdAt: existing?.createdAt ?? now,
             updatedAt: now,
@@ -1563,8 +1612,8 @@ export class ViewerServer {
       try {
         const parsed = JSON.parse(body || "{}");
         const skillId = String(parsed.skillId || "");
-        const visibility = parsed.visibility === "group" ? "group" : "public";
-        const groupId = parsed.groupId ? String(parsed.groupId) : null;
+        const visibility = "public";
+        const groupId: string | null = null;
         const skill = this.store.getSkill(skillId);
         if (!skill) return this.jsonResponse(res, { ok: false, error: "skill_not_found" });
         const bundle = buildSkillBundleForHub(this.store, skillId);
@@ -1573,7 +1622,7 @@ export class ViewerServer {
           method: "POST",
           body: JSON.stringify({
             visibility,
-            groupId: visibility === "group" ? groupId : null,
+            groupId: null,
             metadata: bundle.metadata,
             bundle: bundle.bundle,
           }),
@@ -1588,7 +1637,7 @@ export class ViewerServer {
             name: skill.name,
             description: skill.description,
             version: skill.version,
-            groupId: visibility === "group" ? groupId : null,
+            groupId: null,
             visibility,
             bundle: JSON.stringify(bundle.bundle),
             qualityScore: skill.qualityScore,
@@ -1864,7 +1913,7 @@ export class ViewerServer {
     }
   }
 
-  private serveLocalIPs(res: http.ServerResponse): void {
+  private getLocalIPs(): string[] {
     const nets = os.networkInterfaces();
     const ips: string[] = [];
     for (const name of Object.keys(nets)) {
@@ -1874,6 +1923,11 @@ export class ViewerServer {
         }
       }
     }
+    return ips;
+  }
+
+  private serveLocalIPs(res: http.ServerResponse): void {
+    const ips = this.getLocalIPs();
     res.writeHead(200, { "Content-Type": "application/json" });
     res.end(JSON.stringify({ ips }));
   }
@@ -1942,10 +1996,30 @@ export class ViewerServer {
         if (newCfg.sharing !== undefined) {
           const existing = (config.sharing as Record<string, unknown>) || {};
           const merged = { ...existing, ...newCfg.sharing };
-          // Deep-merge capabilities so new keys don't wipe existing ones
           if (newCfg.sharing.capabilities && existing.capabilities) {
             merged.capabilities = { ...(existing.capabilities as Record<string, unknown>), ...newCfg.sharing.capabilities };
           }
+          if (merged.role === "client" && merged.client) {
+            const clientCfg = merged.client as Record<string, unknown>;
+            const addr = String(clientCfg.hubAddress || "");
+            if (addr) {
+              const localIPs = this.getLocalIPs();
+              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)) {
+                  res.writeHead(400, { "Content-Type": "application/json" });
+                  res.end(JSON.stringify({ error: "cannot_join_self" }));
+                  return;
+                }
+              } catch {}
+            }
+          }
+          if (merged.role === "hub") {
+            merged.client = { hubAddress: "", userToken: "", teamToken: "" };
+          } else if (merged.role === "client") {
+            merged.hub = { port: 18800, teamName: "", teamToken: "" };
+          }
           config.sharing = merged;
         }
 
@@ -2014,6 +2088,15 @@ export class ViewerServer {
       try {
         const { hubUrl } = JSON.parse(body);
         if (!hubUrl) { this.jsonResponse(res, { ok: false, error: "hubUrl is required" }); return; }
+        try {
+          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)) {
+            this.jsonResponse(res, { ok: false, error: "cannot_join_self" });
+            return;
+          }
+        } catch {}
         const url = hubUrl.replace(/\/+$/, "") + "/api/v1/hub/info";
         const ctrl = new AbortController();
         const timeout = setTimeout(() => ctrl.abort(), 8000);