@memtensor/memos-local-openclaw-plugin 1.0.4-beta.9 → 1.0.5

package/dist/hub/server.js

@@ -93,18 +93,32 @@ class HubServer {
                 res.end(JSON.stringify({ error: message }));
             }
         });
+        const MAX_PORT_RETRIES = 3;
+        let hubPort = this.port;
         await new Promise((resolve, reject) => {
+            let retries = 0;
             const onError = (err) => {
-                this.server?.off("listening", onListening);
-                reject(err);
+                if (err.code === "EADDRINUSE" && retries < MAX_PORT_RETRIES) {
+                    retries++;
+                    hubPort = this.port + retries;
+                    this.opts.log.warn(`Hub port ${hubPort - 1} in use, trying ${hubPort}`);
+                    this.server.listen(hubPort, "0.0.0.0");
+                }
+                else {
+                    this.server?.off("listening", onListening);
+                    reject(err);
+                }
             };
             const onListening = () => {
                 this.server?.off("error", onError);
+                if (hubPort !== this.port) {
+                    this.opts.log.info(`Hub started on fallback port ${hubPort} (configured: ${this.port})`);
+                }
                 resolve();
             };
-            this.server.once("error", onError);
+            this.server.on("error", onError);
             this.server.once("listening", onListening);
-            this.server.listen(this.port, "0.0.0.0");
+            this.server.listen(hubPort, "0.0.0.0");
         });
         const bootstrap = this.userManager.ensureBootstrapAdmin(this.authSecret, "admin", this.authState.bootstrapAdminUserId, this.authState.bootstrapAdminToken);
         if (bootstrap.token) {
@@ -115,7 +129,7 @@ class HubServer {
         }
         this.initOnlineTracking();
         this.offlineCheckTimer = setInterval(() => this.checkOfflineUsers(), HubServer.OFFLINE_CHECK_INTERVAL_MS);
-        return `http://127.0.0.1:${this.port}`;
+        return `http://127.0.0.1:${hubPort}`;
     }
     async stop() {
         if (this.offlineCheckTimer) {
@@ -124,12 +138,32 @@ class HubServer {
         }
         if (!this.server)
             return;
+        try {
+            const activeUsers = this.opts.store.listHubUsers("active");
+            const ownerId = this.authState.bootstrapAdminUserId || "";
+            for (const u of activeUsers) {
+                if (u.id === ownerId)
+                    continue;
+                try {
+                    this.opts.store.insertHubNotification({
+                        id: (0, crypto_1.randomUUID)(), userId: u.id, type: "hub_shutdown",
+                        resource: "system", title: `Team server "${this.teamName}" has been shut down by the admin.`,
+                    });
+                }
+                catch { /* best-effort */ }
+            }
+        }
+        catch { /* best-effort */ }
         const server = this.server;
         this.server = undefined;
         await new Promise((resolve) => server.close(() => resolve()));
     }
     get port() {
-        return this.opts.config.sharing?.hub?.port ?? 18800;
+        const configured = this.opts.config.sharing?.hub?.port;
+        const derived = this.opts.defaultHubPort;
+        if (derived && (!configured || configured === 18800))
+            return derived;
+        return configured ?? 18800;
     }
     get teamName() {
         return this.opts.config.sharing?.hub?.teamName ?? "";
@@ -173,6 +207,20 @@ class HubServer {
             this.opts.log.warn(`hub: embedding shared chunks failed: ${err}`);
         });
     }
+    embedSkillAsync(skillId, name, description, sourceUserId, sourceSkillId) {
+        const embedder = this.opts.embedder;
+        if (!embedder)
+            return;
+        const text = `${name}: ${description}`;
+        embedder.embed([text]).then((vectors) => {
+            if (vectors[0]) {
+                this.opts.store.upsertHubSkillEmbedding(skillId, Array.from(vectors[0]), sourceUserId, sourceSkillId);
+                this.opts.log.info(`hub: embedded shared skill ${skillId}`);
+            }
+        }).catch((err) => {
+            this.opts.log.warn(`hub: embedding shared skill failed: ${err}`);
+        });
+    }
     embedMemoryAsync(memoryId, summary, content) {
         const embedder = this.opts.embedder;
         if (!embedder)
@@ -207,8 +255,14 @@ class HubServer {
                 || req.headers["x-client-ip"]?.trim()
                 || req.headers["x-forwarded-for"]?.split(",")[0]?.trim()
                 || req.socket.remoteAddress || "";
-            const existingUsers = this.opts.store.listHubUsers();
-            const existingUser = existingUsers.find(u => u.username === username);
+            const identityKey = typeof body.identityKey === "string" ? body.identityKey.trim() : "";
+            let existingUser = identityKey
+                ? this.userManager.findByIdentityKey(identityKey)
+                : null;
+            if (!existingUser) {
+                const existingUsers = this.opts.store.listHubUsers();
+                existingUser = existingUsers.find(u => u.username === username && u.status !== "left" && u.status !== "removed") ?? null;
+            }
             if (existingUser) {
                 try {
                     this.opts.store.updateHubUserActivity(existingUser.id, joinIp);
@@ -217,25 +271,45 @@ class HubServer {
                 if (existingUser.status === "active") {
                     const token = (0, auth_1.issueUserToken)({ userId: existingUser.id, username: existingUser.username, role: existingUser.role, status: "active" }, this.authSecret);
                     this.userManager.approveUser(existingUser.id, token);
-                    return this.json(res, 200, { status: "active", userId: existingUser.id, userToken: token });
+                    if (identityKey && !existingUser.identityKey) {
+                        this.opts.store.upsertHubUser({ ...existingUser, identityKey });
+                    }
+                    return this.json(res, 200, { status: "active", userId: existingUser.id, userToken: token, identityKey: existingUser.identityKey || identityKey });
                 }
                 if (existingUser.status === "pending") {
                     this.notifyAdmins("user_join_request", "user", username, "", { dedup: true });
-                    return this.json(res, 200, { status: "pending", userId: existingUser.id });
+                    return this.json(res, 200, { status: "pending", userId: existingUser.id, identityKey: existingUser.identityKey || identityKey });
                 }
                 if (existingUser.status === "rejected") {
                     if (body.reapply === true) {
                         this.userManager.resetToPending(existingUser.id);
                         this.notifyAdmins("user_join_request", "user", username, "");
                         this.opts.log.info(`Hub: rejected user "${username}" (${existingUser.id}) re-applied, reset to pending`);
-                        return this.json(res, 200, { status: "pending", userId: existingUser.id });
+                        return this.json(res, 200, { status: "pending", userId: existingUser.id, identityKey: existingUser.identityKey || identityKey });
                     }
                     return this.json(res, 200, { status: "rejected", userId: existingUser.id });
                 }
+                if (existingUser.status === "removed") {
+                    this.userManager.rejoinUser(existingUser.id);
+                    this.notifyAdmins("user_join_request", "user", username, "", { dedup: true });
+                    this.opts.log.info(`Hub: removed user "${username}" (${existingUser.id}) re-applied via rejoin, reset to pending`);
+                    return this.json(res, 200, { status: "pending", userId: existingUser.id, identityKey: existingUser.identityKey || identityKey });
+                }
+                if (existingUser.status === "left") {
+                    this.userManager.rejoinUser(existingUser.id);
+                    this.notifyAdmins("user_join_request", "user", username, "", { dedup: true });
+                    this.opts.log.info(`Hub: left user "${username}" (${existingUser.id}) re-applied via rejoin, reset to pending`);
+                    return this.json(res, 200, { status: "pending", userId: existingUser.id, identityKey: existingUser.identityKey || identityKey });
+                }
+                if (existingUser.status === "blocked") {
+                    return this.json(res, 200, { status: "blocked", userId: existingUser.id });
+                }
             }
+            const generatedIdentityKey = identityKey || (0, crypto_1.randomUUID)();
             const user = this.userManager.createPendingUser({
                 username,
                 deviceName: typeof body.deviceName === "string" ? body.deviceName : undefined,
+                identityKey: generatedIdentityKey,
             });
             try {
                 this.opts.store.updateHubUserActivity(user.id, joinIp);
@@ -243,7 +317,7 @@ class HubServer {
             catch { /* best-effort */ }
             this.opts.log.info(`Hub: user "${username}" (${user.id}) registered as pending, awaiting admin approval`);
             this.notifyAdmins("user_join_request", "user", username, "");
-            return this.json(res, 200, { status: "pending", userId: user.id });
+            return this.json(res, 200, { status: "pending", userId: user.id, identityKey: generatedIdentityKey });
         }
         if (req.method === "POST" && routePath === "/api/v1/hub/registration-status") {
             const body = await this.readJson(req);
@@ -262,12 +336,39 @@ class HubServer {
             if (user.status === "rejected") {
                 return this.json(res, 200, { status: "rejected" });
             }
+            if (user.status === "blocked") {
+                return this.json(res, 200, { status: "blocked" });
+            }
+            if (user.status === "left") {
+                return this.json(res, 200, { status: "left" });
+            }
+            if (user.status === "removed") {
+                return this.json(res, 200, { status: "removed" });
+            }
             if (user.status === "active") {
                 const token = (0, auth_1.issueUserToken)({ userId: user.id, username: user.username, role: user.role, status: user.status }, this.authSecret);
+                this.userManager.approveUser(user.id, token);
                 return this.json(res, 200, { status: "active", userToken: token });
             }
             return this.json(res, 200, { status: user.status });
         }
+        if (req.method === "POST" && routePath === "/api/v1/hub/withdraw-pending") {
+            const body = await this.readJson(req);
+            if (!body || body.teamToken !== this.teamToken) {
+                return this.json(res, 403, { error: "invalid_team_token" });
+            }
+            const userId = String(body.userId || "");
+            if (!userId)
+                return this.json(res, 400, { error: "missing_user_id" });
+            const user = this.opts.store.getHubUser(userId);
+            if (!user)
+                return this.json(res, 200, { ok: true });
+            if (user.status === "pending") {
+                this.userManager.markUserLeft(userId);
+                this.opts.log.info(`Hub: user "${user.username}" (${userId}) withdrew pending application`);
+            }
+            return this.json(res, 200, { ok: true });
+        }
         // All endpoints below require authentication + rate limiting
         const auth = this.authenticate(req);
         if (!auth)
@@ -280,13 +381,10 @@ class HubServer {
             return this.json(res, 200, { ok: true });
         }
         if (req.method === "POST" && routePath === "/api/v1/hub/leave") {
-            try {
-                this.opts.store.updateHubUserActivity(auth.userId, "", 0);
-            }
-            catch { /* best-effort */ }
+            this.userManager.markUserLeft(auth.userId);
             this.knownOnlineUsers.delete(auth.userId);
-            this.notifyAdmins("user_offline", "user", auth.username, auth.userId);
-            this.opts.log.info(`Hub: user "${auth.username}" (${auth.userId}) left voluntarily`);
+            this.notifyAdmins("user_left", "user", auth.username, auth.userId);
+            this.opts.log.info(`Hub: user "${auth.username}" (${auth.userId}) left voluntarily, status set to "left"`);
             return this.json(res, 200, { ok: true });
         }
         if (req.method === "GET" && routePath === "/api/v1/hub/me") {
@@ -312,6 +410,10 @@ class HubServer {
             const ttlMs = updated.role === "admin" ? 3650 * 24 * 60 * 60 * 1000 : undefined;
             const newToken = (0, auth_1.issueUserToken)({ userId: updated.id, username: newUsername, role: updated.role, status: updated.status }, this.authSecret, ttlMs);
             this.userManager.approveUser(updated.id, newToken);
+            if (updated.id === this.authState.bootstrapAdminUserId) {
+                this.authState.bootstrapAdminToken = newToken;
+                this.saveAuthState();
+            }
             this.opts.log.info(`Hub: user "${auth.userId}" renamed to "${newUsername}"`);
             return this.json(res, 200, { ok: true, username: newUsername, userToken: newToken });
         }
@@ -324,12 +426,21 @@ class HubServer {
             if (auth.role !== "admin")
                 return this.json(res, 403, { error: "forbidden" });
             const body = await this.readJson(req);
-            const token = (0, auth_1.issueUserToken)({ userId: String(body.userId), username: String(body.username || ""), role: "member", status: "active" }, this.authSecret);
-            const approved = this.userManager.approveUser(String(body.userId), token);
+            const userId = String(body.userId);
+            const username = String(body.username || "");
+            const token = (0, auth_1.issueUserToken)({ userId, username, role: "member", status: "active" }, this.authSecret);
+            const approved = this.userManager.approveUser(userId, token);
             if (!approved)
                 return this.json(res, 404, { error: "not_found" });
             try {
-                this.opts.store.updateHubUserActivity(String(body.userId), "");
+                this.opts.store.updateHubUserActivity(userId, "");
+            }
+            catch { /* best-effort */ }
+            try {
+                this.opts.store.insertHubNotification({
+                    id: (0, crypto_1.randomUUID)(), userId, type: "membership_approved",
+                    resource: "user", title: `Your request to join team "${this.teamName}" has been approved. Welcome!`,
+                });
             }
             catch { /* best-effort */ }
             return this.json(res, 200, { status: "active", token });
@@ -338,9 +449,17 @@ class HubServer {
             if (auth.role !== "admin")
                 return this.json(res, 403, { error: "forbidden" });
             const body = await this.readJson(req);
-            const rejected = this.userManager.rejectUser(String(body.userId));
+            const userId = String(body.userId);
+            const rejected = this.userManager.rejectUser(userId);
             if (!rejected)
                 return this.json(res, 404, { error: "not_found" });
+            try {
+                this.opts.store.insertHubNotification({
+                    id: (0, crypto_1.randomUUID)(), userId, type: "membership_rejected",
+                    resource: "user", title: `Your request to join team "${this.teamName}" has been declined.`,
+                });
+            }
+            catch { /* best-effort */ }
             return this.json(res, 200, { status: "rejected" });
         }
         if (req.method === "GET" && routePath === "/api/v1/hub/admin/users") {
@@ -379,6 +498,14 @@ class HubServer {
             const updatedUser = { ...user, role: newRole };
             this.opts.store.upsertHubUser(updatedUser);
             this.opts.log.info(`Hub: admin "${auth.userId}" changed role of "${userId}" to "${newRole}"`);
+            try {
+                const notifType = newRole === "admin" ? "role_promoted" : "role_demoted";
+                this.opts.store.insertHubNotification({
+                    id: (0, crypto_1.randomUUID)(), userId, type: notifType,
+                    resource: "user", title: `Your role in team "${this.teamName}" has been changed to ${newRole}.`,
+                });
+            }
+            catch { /* best-effort */ }
             return this.json(res, 200, { ok: true, role: newRole });
         }
         if (req.method === "POST" && routePath === "/api/v1/hub/admin/rename-user") {
@@ -402,6 +529,10 @@ class HubServer {
             const updated = this.opts.store.getHubUser(userId);
             const finalUser = { ...updated, username: newUsername };
             this.opts.store.upsertHubUser(finalUser);
+            if (userId === this.authState.bootstrapAdminUserId) {
+                this.authState.bootstrapAdminToken = newToken;
+                this.saveAuthState();
+            }
             this.opts.log.info(`Hub: admin "${auth.userId}" renamed user "${userId}" to "${newUsername}"`);
             return this.json(res, 200, { ok: true, username: newUsername });
         }
@@ -416,10 +547,18 @@ class HubServer {
                 return this.json(res, 400, { error: "cannot_remove_self" });
             if (userId === this.authState.bootstrapAdminUserId)
                 return this.json(res, 403, { error: "cannot_remove_owner", message: "The hub owner cannot be removed" });
+            try {
+                this.opts.store.insertHubNotification({
+                    id: (0, crypto_1.randomUUID)(), userId, type: "membership_removed",
+                    resource: "user", title: `You have been removed from team "${this.teamName}" by the admin.`,
+                });
+            }
+            catch { /* best-effort */ }
             const cleanResources = body?.cleanResources === true;
             const deleted = this.opts.store.deleteHubUser(userId, cleanResources);
             if (!deleted)
                 return this.json(res, 404, { error: "not_found" });
+            this.knownOnlineUsers.delete(userId);
             this.opts.log.info(`Hub: admin "${auth.userId}" removed user "${userId}" (cleanResources=${cleanResources})`);
             return this.json(res, 200, { ok: true });
         }
@@ -611,19 +750,73 @@ class HubServer {
             return this.json(res, 200, { hits, meta: { totalCandidates: hits.length, searchedGroups: [], includedPublic: true } });
         }
         if (req.method === "GET" && routePath === "/api/v1/hub/skills") {
-            const hits = this.opts.store.searchHubSkills(String(url.searchParams.get("query") || ""), {
+            const skillQuery = String(url.searchParams.get("query") || "");
+            const skillMaxResults = Number(url.searchParams.get("maxResults") || 10);
+            const ftsSkillHits = this.opts.store.searchHubSkills(skillQuery, {
                 userId: auth.userId,
-                maxResults: Number(url.searchParams.get("maxResults") || 10),
-            }).map(({ hit }) => ({
-                skillId: hit.id,
-                name: hit.name,
-                description: hit.description,
-                version: hit.version,
-                visibility: hit.visibility,
-                groupName: hit.group_name,
-                ownerName: hit.owner_name || "unknown",
-                qualityScore: hit.quality_score,
-            }));
+                maxResults: skillMaxResults * 2,
+            });
+            let mergedSkillIds;
+            if (this.opts.embedder && skillQuery) {
+                try {
+                    const [queryVec] = await this.opts.embedder.embed([skillQuery]);
+                    if (queryVec) {
+                        const skillEmbs = this.opts.store.getVisibleHubSkillEmbeddings();
+                        const cosineSim = (vec) => {
+                            let dot = 0, nA = 0, nB = 0;
+                            for (let i = 0; i < queryVec.length && i < vec.length; i++) {
+                                dot += queryVec[i] * vec[i];
+                                nA += queryVec[i] * queryVec[i];
+                                nB += vec[i] * vec[i];
+                            }
+                            return nA > 0 && nB > 0 ? dot / (Math.sqrt(nA) * Math.sqrt(nB)) : 0;
+                        };
+                        const vecScored = skillEmbs
+                            .map(e => ({ id: e.skillId, score: cosineSim(e.vector) }))
+                            .filter(e => e.score > 0.3)
+                            .sort((a, b) => b.score - a.score)
+                            .slice(0, skillMaxResults * 2);
+                        const K = 60;
+                        const rrfScores = new Map();
+                        ftsSkillHits.forEach(({ hit }, idx) => {
+                            rrfScores.set(hit.id, (rrfScores.get(hit.id) ?? 0) + 1 / (K + idx + 1));
+                        });
+                        vecScored.forEach(({ id }, idx) => {
+                            rrfScores.set(id, (rrfScores.get(id) ?? 0) + 1 / (K + idx + 1));
+                        });
+                        mergedSkillIds = [...rrfScores.entries()].sort((a, b) => b[1] - a[1]).slice(0, skillMaxResults).map(([id]) => id);
+                    }
+                    else {
+                        mergedSkillIds = ftsSkillHits.slice(0, skillMaxResults).map(({ hit }) => hit.id);
+                    }
+                }
+                catch {
+                    mergedSkillIds = ftsSkillHits.slice(0, skillMaxResults).map(({ hit }) => hit.id);
+                }
+            }
+            else {
+                mergedSkillIds = ftsSkillHits.slice(0, skillMaxResults).map(({ hit }) => hit.id);
+            }
+            const ftsSkillMap = new Map(ftsSkillHits.map(({ hit }) => [hit.id, hit]));
+            const hits = mergedSkillIds.map(id => {
+                const hit = ftsSkillMap.get(id);
+                if (hit) {
+                    return {
+                        skillId: hit.id, name: hit.name, description: hit.description,
+                        version: hit.version, visibility: hit.visibility, groupName: hit.group_name,
+                        ownerName: hit.owner_name || "unknown", ownerStatus: hit.owner_status || "",
+                        qualityScore: hit.quality_score,
+                    };
+                }
+                const skill = this.opts.store.getHubSkillById(id);
+                if (!skill)
+                    return null;
+                return {
+                    skillId: skill.id, name: skill.name, description: skill.description,
+                    version: skill.version, visibility: skill.visibility, groupName: "",
+                    ownerName: "unknown", ownerStatus: "", qualityScore: skill.qualityScore,
+                };
+            }).filter(Boolean);
             return this.json(res, 200, { hits });
         }
         if (req.method === "POST" && routePath === "/api/v1/hub/skills/publish") {
@@ -649,6 +842,7 @@ class HubServer {
                 createdAt: existing?.createdAt ?? Date.now(),
                 updatedAt: Date.now(),
             });
+            this.embedSkillAsync(skillId, String(metadata.name || sourceSkillId), String(metadata.description || ""), auth.userId, sourceSkillId);
             if (!existing) {
                 this.notifyAdmins("resource_shared", "skill", String(metadata.name || sourceSkillId), auth.userId);
             }
@@ -771,7 +965,18 @@ class HubServer {
             if (!deleted)
                 return this.json(res, 404, { error: "not_found" });
             if (memInfo) {
-                this.opts.store.insertHubNotification({ id: (0, crypto_1.randomUUID)(), userId: memInfo.sourceUserId, type: "resource_removed", resource: "memory", title: memInfo.summary || memInfo.id });
+                const payload = JSON.stringify({
+                    memoryId,
+                    sourceChunkId: memInfo.sourceChunkId,
+                });
+                this.opts.store.insertHubNotification({
+                    id: (0, crypto_1.randomUUID)(),
+                    userId: memInfo.sourceUserId,
+                    type: "resource_removed",
+                    resource: "memory",
+                    title: memInfo.summary || memInfo.id,
+                    message: payload,
+                });
             }
             return this.json(res, 200, { ok: true });
         }