Skip to content

fix(viewer): singleton guard prevents port drift on reactivation #1453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kagura-agent wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(viewer): singleton guard prevents port drift on reactivation #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/memos-local-openclaw/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ import { MEMORY_GUIDE_SKILL_MD } from "./src/skill/bundled-memory-guide";
import { Telemetry } from "./src/telemetry";


// Module-level singleton tracking for viewer/hub to prevent port drift on re-registration
let _previousViewer: ViewerServer | null = null;
let _previousHubServer: HubServer | null = null;
let _previousStore: import('./src/storage/sqlite').SqliteStore | null = null;

/** Remove near-duplicate hits based on summary word overlap (>70%). Keeps first (highest-scored) hit. */
function deduplicateHits<T extends { summary: string }>(hits: T[]): T[] {
const kept: T[] = [];
Expand Down Expand Up @@ -2324,6 +2329,20 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,

const derivedHubPort = gatewayPort + 11;

// Cleanup previous instances to prevent port drift (issue #1430)
if (_previousViewer) {
try { _previousViewer.stop(); } catch (e) { api.logger.warn(`memos-local: previous viewer cleanup: ${e}`); }
_previousViewer = null;
}
if (_previousHubServer) {
try { _previousHubServer.stop(); } catch (e) { api.logger.warn(`memos-local: previous hub cleanup: ${e}`); }
_previousHubServer = null;
}
if (_previousStore) {
try { _previousStore.close(); } catch (e) { api.logger.warn(`memos-local: previous store cleanup: ${e}`); }
_previousStore = null;
}

const viewer = new ViewerServer({
store,
embedder,
Expand All @@ -2337,6 +2356,10 @@ Groups: ${groupNames.length > 0 ? groupNames.join(", ") : "(none)"}`,
? new HubServer({ store, log: ctx.log, config: ctx.config, dataDir: stateDir, embedder, defaultHubPort: derivedHubPort })
: null;

_previousViewer = viewer;
_previousHubServer = hubServer;
_previousStore = store;

// ─── Service lifecycle ───

let serviceStarted = false;
Expand Down
11 changes: 8 additions & 3 deletions apps/memos-local-openclaw/src/viewer/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,18 @@ export class ViewerServer {
}
}

stop(): void {
stop(): Promise<void> {
this.stopHubHeartbeat();
this.stopNotifPoll();
for (const c of this.notifSSEClients) { try { c.end(); } catch {} }
this.notifSSEClients = [];
this.server?.close();
this.server = null;
if (!this.server) return Promise.resolve();
return new Promise<void>((resolve) => {
this.server!.close(() => {
this.server = null;
resolve();
});
});
}

getResetToken(): string {
Expand Down