Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

fix(ok): clear stale isSynced after forced socket close (PRD-8487) (#4025)

serafin-garciaa8dae21809c8
diff --git a/.changeset/half-open-socket-sync-status.md b/.changeset/half-open-socket-sync-status.md
new file mode 100644
index 000000000..c8e13688c
--- /dev/null
+++ b/.changeset/half-open-socket-sync-status.md
@@ -0,0 +1,13 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+The sync indicator recovers after a sleep, a Wi-Fi change, or a VPN flap.
+
+When a laptop sleeps or the network switches underneath you, the socket to the local server can die without the operating system ever reporting it closed. Open Knowledge notices the silence and reconnects on its own, and every edit made after that really was reaching the server. What did not recover was the claim about it: the status stayed short of "synced" for the rest of the session, and the "your edits aren't reaching the server" warning stayed on screen with no way to dismiss it. The only way out was to close and reopen the window.
+
+Both now clear as soon as the reconnect finishes. The warning is replaced by "Reconnected", which fades on its own, and the indicator returns to synced.
+
+Two quieter consequences of the same stuck state are fixed with it. Returning to a background tab flushes pending edits again rather than skipping the document, and reopening a document keeps the connection that was already working instead of tearing it down and building a new one.
+
+One behaviour to expect: a document that is still opening when the connection resets now shows "Connection dropped" with a Retry button, the same as any other dropped connection, instead of waiting in silence.
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
index 3793b78ff..9e7dbca9c 100644
--- a/THIRD_PARTY_NOTICES.md
+++ b/THIRD_PARTY_NOTICES.md
@@ -6688,6 +6688,7 @@ The following MIT-licensed packages are patched in this repository via pnpm's `p
| Package | Patch file |
| --- | --- |
| `@handlewithcare/[email protected]` | `patches/@handlewithcare%[email protected]` |
+| `@hocuspocus/[email protected]` | `patches/@hocuspocus%[email protected]` |
| `@lingui/[email protected]` | `patches/@lingui%[email protected]` |
| `@pierre/[email protected]` | `patches/@pierre%[email protected]` |
| `@pierre/[email protected]` | `patches/@pierre%[email protected]` |
diff --git a/knip.config.ts b/knip.config.ts
index ee740611a..cb7d232fe 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -126,7 +126,9 @@ export default {
'packages/server': {
entry: ['src/**/*.test.ts', 'src/parse-worker.ts'],
project: 'src/**',
- ignoreDependencies: ['@types/shell-quote'],
+ ignoreDependencies: [
+ '@types/shell-quote',
+ ],
},
'packages/cli': {
entry: ['src/**/*.test.ts', 'scripts/*.ts', 'tests/**/*.ts', 'src/parse-worker.ts'],
diff --git a/packages/app/src/editor/extensions/source-dirty-fold-atomicity.dom.test.tsx b/packages/app/src/editor/extensions/source-dirty-fold-atomicity.dom.test.tsx
index 9e043d02b..3a15d1233 100644
--- a/packages/app/src/editor/extensions/source-dirty-fold-atomicity.dom.test.tsx
+++ b/packages/app/src/editor/extensions/source-dirty-fold-atomicity.dom.test.tsx
@@ -1,3 +1,4 @@
+
import { sharedExtensions as coreExtensions, MarkdownManager } from '@inkeep/open-knowledge-core';
import { type ObserverDispatchKind, setupServerObservers } from '@inkeep/open-knowledge-server';
import { cleanup } from '@testing-library/react';
diff --git a/packages/app/src/editor/provider-pool.test.ts b/packages/app/src/editor/provider-pool.test.ts
index fad926d80..5d99e5002 100644
--- a/packages/app/src/editor/provider-pool.test.ts
+++ b/packages/app/src/editor/provider-pool.test.ts
@@ -2492,6 +2492,52 @@ describe('ProviderPool syncPromise lifecycle integration (F15)', () => {
expect(sendTokenSpy).not.toHaveBeenCalled();
});
+ test('the client-minted forced close never triggers a reauth', async () => {
+ pool = new ProviderPool(3, DUMMY_WS);
+ const entry = pool.open('doc1');
+ if (!entry || entry.kind !== 'active') throw new Error('expected an active entry');
+ const sendTokenSpy = vi
+ .spyOn(entry.provider, 'sendToken')
+ .mockImplementation(() => Promise.resolve());
+
+ for (let i = 0; i < 15; i++) {
+ entry.provider.emit('close', { event: { code: 4408, reason: 'forced', wasClean: false } });
+ await Promise.resolve();
+ await Promise.resolve();
+ }
+
+ expect(sendTokenSpy).not.toHaveBeenCalled();
+ expect(entry.serverDrivenCloseReauthAttempts).toBe(0);
+ });
+
+ test('a 4408 the client did not mint still reauths', async () => {
+ pool = new ProviderPool(3, DUMMY_WS);
+ const entry = pool.open('doc1');
+ if (!entry) throw new Error('expected entry');
+ const sendTokenSpy = vi
+ .spyOn(entry.provider, 'sendToken')
+ .mockImplementation(() => Promise.resolve());
+
+ entry.provider.emit('close', {
+ event: { code: 4408, reason: 'Connection Timeout', wasClean: true },
+ });
+ await Promise.resolve();
+ await Promise.resolve();
+
+ expect(sendTokenSpy).toHaveBeenCalledTimes(1);
+ });
+
+ test('a forced close while a mount gate is pending rejects it', async () => {
+ pool = new ProviderPool(3, DUMMY_WS);
+ const entry = pool.open('doc1');
+ if (!entry) throw new Error('expected entry');
+ const gate = syncPromise('doc1', entry.provider);
+
+ entry.provider.emit('close', { event: { code: 4408, reason: 'forced', wasClean: false } });
+
+ await expect(gate).rejects.toBeInstanceOf(PreSyncDisconnectError);
+ });
+
test('a successful sync resets the server-driven-close reauth ceiling', async () => {
pool = new ProviderPool(3, DUMMY_WS);
const entry = pool.open('doc1');
diff --git a/packages/app/src/editor/provider-pool.ts b/packages/app/src/editor/provider-pool.ts
index 84e27ed99..a0bc32d4c 100644
--- a/packages/app/src/editor/provider-pool.ts
+++ b/packages/app/src/editor/provider-pool.ts
@@ -72,6 +72,9 @@ const IDLE_SERVER_RESTART_RECOVERY: ServerRestartRecoveryState = Object.freeze({
const SERVER_DRIVEN_CLOSE_REAUTH_CEILING = 5;
+const FORCED_CLOSE_CODE = 4408;
+const FORCED_CLOSE_REASON = 'forced';
+
interface PoolEntryBase {
provider: HocuspocusProvider;
docName: string;
@@ -1182,6 +1185,15 @@ export class ProviderPool {
const onServerDrivenClose = ({ event }: { event?: { code?: number; reason?: string } }) => {
if (entry.kind !== 'active' || this.entries.get(docName) !== entry) return;
if (!event?.reason) return;
+ if (event.code === FORCED_CLOSE_CODE && event.reason === FORCED_CLOSE_REASON) {
+ this.emitStructuredClientBreadcrumb({
+ event: 'ok-provider-half-open-forced-close',
+ docName,
+ code: event.code,
+ reason: event.reason,
+ });
+ return;
+ }
if (entry.serverDrivenCloseReauthInFlight) return;
if (entry.serverDrivenCloseReauthAttempts >= SERVER_DRIVEN_CLOSE_REAUTH_CEILING) {
if (entry.serverDrivenCloseReauthAttempts === SERVER_DRIVEN_CLOSE_REAUTH_CEILING) {
diff --git a/packages/app/src/editor/sync-promise.ts b/packages/app/src/editor/sync-promise.ts
index 1fb2ac941..a59be4472 100644
--- a/packages/app/src/editor/sync-promise.ts
+++ b/packages/app/src/editor/sync-promise.ts
@@ -262,17 +262,23 @@ export function syncPromise(docName: string, provider: HocuspocusProvider): Prom
}
};
- const onClose = (_data: onCloseParameters) => {
+ const onClose = ({ event }: onCloseParameters) => {
const entry = cache.get(docName);
if (!entry || entry.settled) return;
entry.settled = true;
const error = new PreSyncDisconnectError(docName);
- console.warn(`[syncPromise] ${docName} rejected: ${error.message}`);
+ const closeCode = event?.code ?? null;
+ const closeReason = event?.reason ?? null;
+ console.warn(
+ `[syncPromise] ${docName} rejected: ${error.message} (close ${closeCode ?? '<none>'} "${closeReason ?? ''}")`,
+ );
const closeMountId = getMountId(docName);
mark('ok/sync/reject', {
docName,
mountId: closeMountId,
reason: 'pre-sync-disconnect',
+ closeCode,
+ closeReason,
});
detach(entry);
if (!hasPendingEntries()) uninstallVisibilityHandler();
diff --git a/packages/app/src/hocuspocus-provider-patch.test.ts b/packages/app/src/hocuspocus-provider-patch.test.ts
new file mode 100644
index 000000000..5509e62bf
--- /dev/null
+++ b/packages/app/src/hocuspocus-provider-patch.test.ts
@@ -0,0 +1,136 @@
+import { readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { HocuspocusProvider } from '@hocuspocus/provider';
+import { describe, expect, test } from 'vitest';
+
+const PACKAGE_NAME = '@hocuspocus/provider';
+const PATCH_FILE = '@hocuspocus%[email protected]';
+const PATCHED_VERSION = '4.0.0-rc.1';
+
+const PATCH_MARKER = 'OK patch: forced-close emits close.';
+
+const UPSTREAM_DIRECT_ONCLOSE = /this\.onClose\(\s*\{/;
+
+const FORCED_BRANCH_OPENER = 'this.closeTries > 2';
+
+const FORCED_BRANCH_CLOSER = '} else';
+
+const FORCED_BRANCH_WINDOW = 1200;
+
+const PATCHED_ARTIFACTS = [
+ { label: 'ESM bundle', relativePath: ['dist', 'hocuspocus-provider.esm.js'] },
+ { label: 'CJS bundle', relativePath: ['dist', 'hocuspocus-provider.cjs'] },
+ { label: 'TypeScript source', relativePath: ['src', 'HocuspocusProviderWebsocket.ts'] },
+] as const;
+
+function repoRoot(): string {
+ return join(import.meta.dirname, '..', '..', '..');
+}
+
+function installedPackageDir(): string {
+ const resolved = import.meta.resolve(PACKAGE_NAME);
+ let dir = dirname(resolved.startsWith('file:') ? fileURLToPath(resolved) : resolved);
+
+ while (true) {
+ try {
+ const pkg = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8')) as { name?: string };
+ if (pkg.name === PACKAGE_NAME) return dir;
+ } catch (err) {
+ if ((err as NodeJS.ErrnoException)?.code !== 'ENOENT') throw err;
+ }
+ const parent = dirname(dir);
+ if (parent === dir) break;
+ dir = parent;
+ }
+
+ throw new Error(`Could not resolve the installed directory for ${PACKAGE_NAME}`);
+}
+
+function forcedCloseBranch(source: string, label: string): string {
+ const start = source.indexOf(FORCED_BRANCH_OPENER);
+ if (start === -1) {
+ throw new Error(
+ `Could not find the forced-close branch (\`${FORCED_BRANCH_OPENER}\`) in ${label}. ` +
+ `Upstream has probably restructured \`checkConnection\` — re-port ` +
+ `patches/${PATCH_FILE} and update this test's matchers.`,
+ );
+ }
+ const fallbackEnd = start + FORCED_BRANCH_WINDOW;
+ const closer = source.indexOf(FORCED_BRANCH_CLOSER, start);
+ const end = closer === -1 || closer > fallbackEnd ? fallbackEnd : closer;
+ return source.slice(start, end);
+}
+
+describe('@hocuspocus/provider forced-close patch verification', () => {
+ test('the direct-onClose matcher matches the upstream shape it guards against', () => {
+ const upstreamSource = 'this.onClose({\n\t\t\t\tevent: {\n\t\t\t\t\tcode: 4408,';
+ const upstreamDist = 'this.onClose({ event: {\n\t\t\t\tcode: 4408,';
+
+ expect(upstreamSource).toMatch(UPSTREAM_DIRECT_ONCLOSE);
+ expect(upstreamDist).toMatch(UPSTREAM_DIRECT_ONCLOSE);
+
+ expect('this.emit("close", { event: {').not.toMatch(UPSTREAM_DIRECT_ONCLOSE);
+ });
+
+ test('the patch is registered in pnpm-workspace.yaml patchedDependencies', () => {
+ const workspaceYaml = readFileSync(join(repoRoot(), 'pnpm-workspace.yaml'), 'utf8');
+ const block = workspaceYaml.match(/^patchedDependencies:\n((?:[ \t]+\S.*\n?)+)/m);
+ expect(block).not.toBeNull();
+
+ const patched: Record<string, string> = {};
+ for (const line of (block?.[1] ?? '').split('\n')) {
+ const entry = line.match(/^\s+(['"]?)(.+?)\1:\s+(\S+)\s*$/);
+ if (entry) patched[entry[2]] = entry[3];
+ }
+
+ expect(patched[`${PACKAGE_NAME}@${PATCHED_VERSION}`]).toBe(`patches/${PATCH_FILE}`);
+ });
+
+ test('the patch file on disk touches every shipped artifact', () => {
+ const patchContent = readFileSync(join(repoRoot(), 'patches', PATCH_FILE), 'utf8');
+
+ for (const artifact of PATCHED_ARTIFACTS) {
+ const path = artifact.relativePath.join('/');
+ expect(patchContent, `${path} missing from the patch file`).toContain(path);
+ }
+ expect(patchContent).toContain(PATCH_MARKER);
+ expect(patchContent).toContain('this.emit("close"');
+ });
+
+ for (const artifact of PATCHED_ARTIFACTS) {
+ describe(artifact.label, () => {
+ test('the forced-close branch emits close instead of calling onClose', () => {
+ const path = join(installedPackageDir(), ...artifact.relativePath);
+ const branch = forcedCloseBranch(readFileSync(path, 'utf8'), path);
+
+ expect(branch).toContain(PATCH_MARKER);
+ expect(branch).toContain('this.emit("close"');
+ expect(branch).not.toMatch(UPSTREAM_DIRECT_ONCLOSE);
+
+ expect(branch).toContain('4408');
+ expect(branch).toContain('"forced"');
+ });
+ });
+ }
+
+ test('the synced setter emits only on the false-to-true edge', () => {
+ const provider = new HocuspocusProvider({
+ url: 'ws://localhost:1/collab',
+ name: `edge-gate-${Date.now()}`,
+ autoConnect: false,
+ });
+ try {
+ const seen: unknown[] = [];
+ provider.on('synced', (payload: unknown) => seen.push(payload));
+ provider.synced = true;
+ provider.synced = true;
+ provider.synced = false;
+ expect(seen).toEqual([{ state: true }]);
+ } finally {
+ try {
+ provider.destroy();
+ } catch {}
+ }
+ });
+});
diff --git a/packages/app/src/presence/use-sync-status.dom.test.tsx b/packages/app/src/presence/use-sync-status.dom.test.tsx
new file mode 100644
index 000000000..a0b209ae5
--- /dev/null
+++ b/packages/app/src/presence/use-sync-status.dom.test.tsx
@@ -0,0 +1,133 @@
+import { randomUUID } from 'node:crypto';
+import { render, screen, waitFor } from '@testing-library/react';
+import { afterAll, afterEach, beforeAll, expect, test, vi } from 'vitest';
+import WS from 'ws';
+
+const DOM_WAIT = { timeout: 15_000, interval: 25 } as const;
+
+interface ToastCall {
+ kind: 'warning' | 'success';
+ message: string;
+ duration: number | undefined;
+}
+
+const toastLog: ToastCall[] = [];
+const dismiss = vi.fn();
+
+vi.mock('sonner', () => ({
+ toast: {
+ warning: (message: unknown, options?: { duration?: number }) => {
+ toastLog.push({ kind: 'warning', message: String(message), duration: options?.duration });
+ },
+ success: (message: unknown, options?: { duration?: number }) => {
+ toastLog.push({ kind: 'success', message: String(message), duration: options?.duration });
+ },
+ dismiss: (...args: unknown[]) => dismiss(...args),
+ error: () => {},
+ },
+}));
+vi.mock('@/lib/relaunch-store', () => ({ useRelaunchInFlight: () => false }));
+
+import { ProviderPool } from '@/editor/provider-pool';
+import {
+ driveHalfOpenForcedClose,
+ makeTransportProof,
+ socketStatus,
+ waitForTransport,
+} from '../../tests/half-open-forced-close.test-helper';
+import {
+ createTestServer,
+ seedPoolServerInstanceId,
+ type TestServer,
+} from '../../tests/integration/test-harness';
+import { useSyncStatus } from './use-sync-status';
+import { useSyncToasts } from './use-sync-toasts';
+
+beforeAll(() => {
+ vi.stubGlobal('WebSocket', WS);
+});
+
+afterAll(() => {
+ vi.unstubAllGlobals();
+});
+
+let cleanup: (() => Promise<void>) | null = null;
+
+afterEach(async () => {
+ const run = cleanup;
+ cleanup = null;
+ await run?.();
+ toastLog.length = 0;
+ dismiss.mockClear();
+});
+
+function SyncStatusProbe({
+ provider,
+ docName,
+}: {
+ provider: Parameters<typeof useSyncStatus>[0];
+ docName: string;
+}) {
+ const status = useSyncStatus(provider);
+ useSyncToasts(status, docName);
+ return <output data-testid="sync-status">{status}</output>;
+}
+
+const shownStatus = () => screen.getByTestId('sync-status').textContent;
+
+const standingToast = () => toastLog.at(-1);
+
+interface Arranged {
+ proveTransportIsSyncing: () => Promise<void>;
+}
+
+async function arrangeForcedCloseAndReconnect(): Promise<Arranged> {
+ const server: TestServer = await createTestServer();
+ const pool = new ProviderPool(3, `${server.wsUrl}/collab`);
+ const docName = `forced-close-${randomUUID()}`;
+
+ cleanup = async () => {
+ pool.dispose();
+ await server.cleanup();
+ };
+
+ await seedPoolServerInstanceId(server, pool);
+ const entry = pool.open(docName);
+ if (entry === null || entry.kind !== 'active') throw new Error('expected an active pool entry');
+ const provider = entry.provider;
+
+ const proveTransportIsSyncing = makeTransportProof(server, provider, docName, DOM_WAIT.timeout);
+
+ render(<SyncStatusProbe provider={provider} docName={docName} />);
+ await waitForTransport('the first sync', () => provider.isSynced, DOM_WAIT.timeout);
+ await waitFor(() => expect(shownStatus()).toBe('synced'), DOM_WAIT);
+ await proveTransportIsSyncing();
+
+ driveHalfOpenForcedClose(provider);
+ await waitForTransport(
+ 'the socket to reconnect',
+ () => socketStatus(provider) === 'connected',
+ DOM_WAIT.timeout,
+ );
+ await proveTransportIsSyncing();
+
+ return { proveTransportIsSyncing };
+}
+
+test('the editor reads synced again once the transport re-handshakes', async () => {
+ await arrangeForcedCloseAndReconnect();
+
+ await waitFor(() => expect(shownStatus()).toBe('synced'), DOM_WAIT);
+});
+
+test('the outage toast is retired once edits are reaching the server again', async () => {
+ const { proveTransportIsSyncing } = await arrangeForcedCloseAndReconnect();
+
+ await proveTransportIsSyncing();
+ await waitFor(() => expect(standingToast()?.kind).toBe('success'), DOM_WAIT);
+
+ expect(
+ toastLog.some((t) => t.kind === 'warning' && t.duration === Number.POSITIVE_INFINITY),
+ ).toBe(true);
+ expect(standingToast()?.duration).toBe(3000);
+});
diff --git a/packages/app/tests/dom/input-rule-atom-ranges.dom.test.tsx b/packages/app/tests/dom/input-rule-atom-ranges.dom.test.tsx
index f81d64a77..65162a22f 100644
--- a/packages/app/tests/dom/input-rule-atom-ranges.dom.test.tsx
+++ b/packages/app/tests/dom/input-rule-atom-ranges.dom.test.tsx
@@ -1,3 +1,4 @@
+
import { cleanup } from '@testing-library/react';
import { Editor, getSchema } from '@tiptap/core';
import type { MarkType, Node as PMNode } from '@tiptap/pm/model';
diff --git a/packages/app/tests/dom/jsx-interior-input-rule-suppression.dom.test.tsx b/packages/app/tests/dom/jsx-interior-input-rule-suppression.dom.test.tsx
index c4c510031..c5b8ad023 100644
--- a/packages/app/tests/dom/jsx-interior-input-rule-suppression.dom.test.tsx
+++ b/packages/app/tests/dom/jsx-interior-input-rule-suppression.dom.test.tsx
@@ -1,3 +1,4 @@
+
import { cleanup } from '@testing-library/react';
import { Editor, type JSONContent } from '@tiptap/core';
import type { Node as PMNode } from '@tiptap/pm/model';
diff --git a/packages/app/tests/dom/plain-text-clipboard.dom.test.tsx b/packages/app/tests/dom/plain-text-clipboard.dom.test.tsx
index 931aaa880..65b32f4b3 100644
--- a/packages/app/tests/dom/plain-text-clipboard.dom.test.tsx
+++ b/packages/app/tests/dom/plain-text-clipboard.dom.test.tsx
@@ -1,3 +1,4 @@
+
import { cleanup } from '@testing-library/react';
import { Editor } from '@tiptap/core';
import type { Node as PMNode } from '@tiptap/pm/model';
diff --git a/packages/app/tests/dom/serializer-seam-rederive.dom.test.tsx b/packages/app/tests/dom/serializer-seam-rederive.dom.test.tsx
index c9744993d..2ab40357a 100644
--- a/packages/app/tests/dom/serializer-seam-rederive.dom.test.tsx
+++ b/packages/app/tests/dom/serializer-seam-rederive.dom.test.tsx
@@ -1,3 +1,4 @@
+
import { MarkdownManager, stripFrontmatter } from '@inkeep/open-knowledge-core';
import { cleanup } from '@testing-library/react';
import { Editor, type JSONContent } from '@tiptap/core';
diff --git a/packages/app/tests/dom/task-list-input-rule.dom.test.tsx b/packages/app/tests/dom/task-list-input-rule.dom.test.tsx
index e01856aac..1db8b25a9 100644
--- a/packages/app/tests/dom/task-list-input-rule.dom.test.tsx
+++ b/packages/app/tests/dom/task-list-input-rule.dom.test.tsx
@@ -1,3 +1,4 @@
+
import { cleanup } from '@testing-library/react';
import type { Editor } from '@tiptap/core';
import type { Node as PMNode } from '@tiptap/pm/model';
diff --git a/packages/app/tests/dom/underline-round-trip.dom.test.tsx b/packages/app/tests/dom/underline-round-trip.dom.test.tsx
index f0bea3f33..652d75f43 100644
--- a/packages/app/tests/dom/underline-round-trip.dom.test.tsx
+++ b/packages/app/tests/dom/underline-round-trip.dom.test.tsx
@@ -1,3 +1,4 @@
+
import { MarkdownManager, sharedExtensions, stripFrontmatter } from '@inkeep/open-knowledge-core';
import { cleanup } from '@testing-library/react';
import { Editor, getSchema, type JSONContent } from '@tiptap/core';
diff --git a/packages/app/tests/half-open-forced-close.test-helper.ts b/packages/app/tests/half-open-forced-close.test-helper.ts
new file mode 100644
index 000000000..2d6fc6875
--- /dev/null
+++ b/packages/app/tests/half-open-forced-close.test-helper.ts
@@ -0,0 +1,59 @@
+import { randomUUID } from 'node:crypto';
+import type { HocuspocusProvider, WebSocketStatus } from '@hocuspocus/provider';
+import { pollUntil, type TestServer } from './integration/test-harness';
+
+const PROBE_KEY = 'forced-close-probe';
+
+const STAGE_TIMEOUT_MS = 8_000;
+
+export function socketStatus(provider: HocuspocusProvider): WebSocketStatus {
+ return provider.configuration.websocketProvider.status;
+}
+
+export async function waitForTransport(
+ what: string,
+ predicate: () => boolean,
+ timeoutMs = STAGE_TIMEOUT_MS,
+): Promise<void> {
+ await pollUntil(predicate, timeoutMs, 25, what);
+}
+
+export function makeTransportProof(
+ server: TestServer,
+ provider: HocuspocusProvider,
+ docName: string,
+ timeoutMs: number = STAGE_TIMEOUT_MS,
+): () => Promise<void> {
+ return async () => {
+ const marker = `alive-${randomUUID()}`;
+ provider.document.getText(PROBE_KEY).insert(0, marker);
+ await waitForTransport(
+ `the server to receive ${marker}`,
+ () => {
+ const serverDoc = server.instance.hocuspocus.documents.get(docName);
+ return serverDoc?.getText(PROBE_KEY).toString().includes(marker) ?? false;
+ },
+ timeoutMs,
+ );
+ };
+}
+
+export function driveHalfOpenForcedClose(provider: HocuspocusProvider): void {
+ const socket = provider.configuration.websocketProvider;
+ if (socket.status !== 'connected') {
+ throw new Error(`expected a connected socket to force-close, got "${socket.status}"`);
+ }
+ socket.lastMessageReceived = Date.now() - (socket.configuration.messageReconnectTimeout + 1_000);
+ socket.checkConnection();
+ socket.checkConnection();
+ socket.checkConnection();
+ if (socket.status === 'connected') {
+ throw new Error(
+ 'the forced-close branch did not reach the socket teardown, so every test built ' +
+ 'on this helper is now arranging nothing. Two upstream causes to check: ' +
+ '`checkConnection` has changed shape, or `HocuspocusProviderWebsocket` no longer ' +
+ 'subscribes its own `onClose` to `close` in its constructor, which is what makes ' +
+ 'the patched `emit("close")` run that teardown.',
+ );
+ }
+}
diff --git a/packages/app/tests/integration/api-error-envelope/create-folder.test.ts b/packages/app/tests/integration/api-error-envelope/create-folder.test.ts
index 49257d365..079b42e9a 100644
--- a/packages/app/tests/integration/api-error-envelope/create-folder.test.ts
+++ b/packages/app/tests/integration/api-error-envelope/create-folder.test.ts
@@ -1,3 +1,4 @@
+
import { CreateFolderSuccessSchema, ProblemDetailsSchema } from '@inkeep/open-knowledge-core';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import { HARNESS_BOOT_TIMEOUT_MS } from '../harness-boot-timeout';
diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
index 8a60e5826..a28cc2b18 100644
--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
@@ -1,3 +1,4 @@
+
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
index 6fcdc23f2..4fc2c11f9 100644
--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { normalizeBridge } from '@inkeep/open-knowledge-core';
import { updateYFragment } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/integration/interior-edit-freshness.test.ts b/packages/app/tests/integration/interior-edit-freshness.test.ts
index 40b5cdfd6..9f2f6feb6 100644
--- a/packages/app/tests/integration/interior-edit-freshness.test.ts
+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
index 93666af70..2a085742b 100644
--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/producer-guard-wiring.test.ts b/packages/app/tests/integration/producer-guard-wiring.test.ts
index 867598d34..878d5196b 100644
--- a/packages/app/tests/integration/producer-guard-wiring.test.ts
+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/provider-pool-forced-close-reauth.test.ts b/packages/app/tests/integration/provider-pool-forced-close-reauth.test.ts
new file mode 100644
index 000000000..3de75f289
--- /dev/null
+++ b/packages/app/tests/integration/provider-pool-forced-close-reauth.test.ts
@@ -0,0 +1,62 @@
+import { randomUUID } from 'node:crypto';
+import { afterEach, expect, test, vi } from 'vitest';
+import { ProviderPool } from '@/editor/provider-pool';
+import {
+ driveHalfOpenForcedClose,
+ makeTransportProof,
+ socketStatus,
+ waitForTransport,
+} from '../half-open-forced-close.test-helper';
+import { createTestServer, seedPoolServerInstanceId, type TestServer } from './test-harness';
+
+const REAUTH_BREADCRUMB = 'ok-provider-server-driven-close-reauth';
+
+const DECLINE_BREADCRUMB = 'ok-provider-half-open-forced-close';
+
+let cleanup: (() => Promise<void>) | null = null;
+
+afterEach(async () => {
+ const run = cleanup;
+ cleanup = null;
+ await run?.();
+ vi.restoreAllMocks();
+});
+
+test('the transport reset does not read as a server-driven doc close', async () => {
+ const server: TestServer = await createTestServer();
+ const pool = new ProviderPool(3, `${server.wsUrl}/collab`);
+ const docName = `forced-close-reauth-${randomUUID()}`;
+
+ cleanup = async () => {
+ pool.dispose();
+ await server.cleanup();
+ };
+
+ await seedPoolServerInstanceId(server, pool);
+ const entry = pool.open(docName);
+ if (entry === null || entry.kind !== 'active') throw new Error('expected an active pool entry');
+ const provider = entry.provider;
+
+ await waitForTransport('the first sync', () => entry.syncState === 'synced');
+
+ const proveTransportIsSyncing = makeTransportProof(server, provider, docName);
+ await proveTransportIsSyncing();
+
+ const infoSpy = vi.spyOn(console, 'info');
+ const warnSpy = vi.spyOn(console, 'warn');
+
+ driveHalfOpenForcedClose(provider);
+
+ const attemptsAtClose = entry.serverDrivenCloseReauthAttempts;
+
+ await waitForTransport('the socket to reconnect', () => socketStatus(provider) === 'connected');
+ await proveTransportIsSyncing();
+
+ const lines = [...infoSpy.mock.calls, ...warnSpy.mock.calls].map((args) =>
+ args.map((arg) => String(arg)).join(' '),
+ );
+
+ expect(attemptsAtClose).toBe(0);
+ expect(lines.filter((line) => line.includes(REAUTH_BREADCRUMB))).toEqual([]);
+ expect(lines.filter((line) => line.includes(DECLINE_BREADCRUMB))).toHaveLength(1);
+});
diff --git a/packages/app/tests/integration/provider-pool-forced-close.test.ts b/packages/app/tests/integration/provider-pool-forced-close.test.ts
new file mode 100644
index 000000000..4aac8c849
--- /dev/null
+++ b/packages/app/tests/integration/provider-pool-forced-close.test.ts
@@ -0,0 +1,91 @@
+import { randomUUID } from 'node:crypto';
+import { afterEach, expect, test } from 'vitest';
+import { ProviderPool } from '@/editor/provider-pool';
+import {
+ driveHalfOpenForcedClose,
+ makeTransportProof,
+ socketStatus,
+ waitForTransport,
+} from '../half-open-forced-close.test-helper';
+import { createTestServer, seedPoolServerInstanceId, type TestServer } from './test-harness';
+
+type ActiveEntry = Extract<NonNullable<ReturnType<ProviderPool['open']>>, { kind: 'active' }>;
+
+let cleanup: (() => Promise<void>) | null = null;
+
+afterEach(async () => {
+ const run = cleanup;
+ cleanup = null;
+ await run?.();
+});
+
+interface Arranged {
+ entry: ActiveEntry;
+ pool: ProviderPool;
+ docName: string;
+ proveTransportIsSyncing: () => Promise<void>;
+}
+
+async function arrangeForcedCloseAndReconnect(): Promise<Arranged> {
+ const server: TestServer = await createTestServer();
+ const pool = new ProviderPool(3, `${server.wsUrl}/collab`);
+ const docName = `forced-close-${randomUUID()}`;
+
+ cleanup = async () => {
+ pool.dispose();
+ await server.cleanup();
+ };
+
+ await seedPoolServerInstanceId(server, pool);
+ const entry = pool.open(docName);
+ if (entry === null || entry.kind !== 'active') throw new Error('expected an active pool entry');
+
+ await waitForTransport('the first sync', () => entry.syncState === 'synced');
+
+ const proveTransportIsSyncing = makeTransportProof(server, entry.provider, docName);
+ await proveTransportIsSyncing();
+
+ driveHalfOpenForcedClose(entry.provider);
+ await waitForTransport(
+ 'the socket to reconnect',
+ () => socketStatus(entry.provider) === 'connected',
+ );
+ await proveTransportIsSyncing();
+
+ return { entry, pool, docName, proveTransportIsSyncing };
+}
+
+test('the entry reads synced again once the transport re-handshakes', async () => {
+ const { entry } = await arrangeForcedCloseAndReconnect();
+
+ expect(entry.syncState).toBe('synced');
+});
+
+test('a re-synced entry still flushes on the visibility resync', async () => {
+ const { entry, pool, proveTransportIsSyncing } = await arrangeForcedCloseAndReconnect();
+ const provider = entry.provider;
+
+ await waitForTransport('the reconnected provider to settle', () => !provider.hasUnsyncedChanges);
+ let flushed = false;
+ const onUnsyncedChanges = () => {
+ flushed = true;
+ };
+ provider.on('unsyncedChanges', onUnsyncedChanges);
+ flushed = false;
+ pool.resyncOnVisible();
+ provider.off('unsyncedChanges', onUnsyncedChanges);
+
+ expect(flushed).toBe(true);
+ await proveTransportIsSyncing();
+});
+
+test('re-opening the doc keeps the provider that is still syncing', async () => {
+ const { entry, pool, docName, proveTransportIsSyncing } = await arrangeForcedCloseAndReconnect();
+ const provider = entry.provider;
+
+ await waitForTransport('the reconnected provider to settle', () => !provider.hasUnsyncedChanges);
+ const reopened = pool.open(docName);
+
+ expect(reopened?.provider).toBe(provider);
+ await proveTransportIsSyncing();
+});
diff --git a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
index 0970ac12f..4ada3cf26 100644
--- a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
+++ b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
@@ -1,3 +1,4 @@
+
import { randomUUID } from 'node:crypto';
import { afterEach, describe, expect, test } from 'vitest';
import { agentWriteMd, createTestServer, type TestServer } from './test-harness';
diff --git a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
index b632185e1..cbe2b705f 100644
--- a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
+++ b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
@@ -1,3 +1,4 @@
+
import { execFileSync } from 'node:child_process';
import { randomUUID } from 'node:crypto';
import { join } from 'node:path';
diff --git a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
index c530ce4ba..89bc9b4d9 100644
--- a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
+++ b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
@@ -1,3 +1,4 @@
+
import { randomUUID } from 'node:crypto';
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
import type * as Y from 'yjs';
diff --git a/packages/app/tests/integration/sync-promise-forced-close.test.ts b/packages/app/tests/integration/sync-promise-forced-close.test.ts
new file mode 100644
index 000000000..e99301051
--- /dev/null
+++ b/packages/app/tests/integration/sync-promise-forced-close.test.ts
@@ -0,0 +1,69 @@
+import { randomUUID } from 'node:crypto';
+import { afterEach, expect, test } from 'vitest';
+import { ProviderPool } from '@/editor/provider-pool';
+import { invalidateSyncPromise, syncPromise, syncPromiseHasResolved } from '@/editor/sync-promise';
+import {
+ driveHalfOpenForcedClose,
+ makeTransportProof,
+ socketStatus,
+ waitForTransport,
+} from '../half-open-forced-close.test-helper';
+import { createTestServer, seedPoolServerInstanceId, type TestServer } from './test-harness';
+
+let cleanup: (() => Promise<void>) | null = null;
+
+afterEach(async () => {
+ const run = cleanup;
+ cleanup = null;
+ await run?.();
+});
+
+interface Arranged {
+ provider: Parameters<typeof syncPromise>[1];
+ docName: string;
+ proveTransportIsSyncing: () => Promise<void>;
+}
+
+async function arrangeSyncedDoc(): Promise<Arranged> {
+ const server: TestServer = await createTestServer();
+ const pool = new ProviderPool(3, `${server.wsUrl}/collab`);
+ const docName = `sync-gate-forced-close-${randomUUID()}`;
+
+ cleanup = async () => {
+ invalidateSyncPromise(docName);
+ pool.dispose();
+ await server.cleanup();
+ };
+
+ await seedPoolServerInstanceId(server, pool);
+ const entry = pool.open(docName);
+ if (entry === null || entry.kind !== 'active') throw new Error('expected an active pool entry');
+ const provider = entry.provider;
+
+ await waitForTransport('the first sync', () => entry.syncState === 'synced');
+
+ const proveTransportIsSyncing = makeTransportProof(server, provider, docName);
+ await proveTransportIsSyncing();
+
+ return { provider, docName, proveTransportIsSyncing };
+}
+
+test('the mount gate reports synced only while the transport actually is', async () => {
+ const { provider, docName, proveTransportIsSyncing } = await arrangeSyncedDoc();
+
+ await syncPromise(docName, provider);
+ expect(syncPromiseHasResolved(docName)).toBe(true);
+
+ invalidateSyncPromise(docName);
+
+ driveHalfOpenForcedClose(provider);
+
+ const remountGate = syncPromise(docName, provider);
+ expect(syncPromiseHasResolved(docName)).toBe(false);
+
+ await waitForTransport('the socket to reconnect', () => socketStatus(provider) === 'connected');
+ await proveTransportIsSyncing();
+
+ await remountGate;
+ expect(syncPromiseHasResolved(docName)).toBe(true);
+});
diff --git a/packages/app/tests/integration/test-harness.ts b/packages/app/tests/integration/test-harness.ts
index ae57f7ee3..2a8f71b12 100644
--- a/packages/app/tests/integration/test-harness.ts
+++ b/packages/app/tests/integration/test-harness.ts
@@ -631,13 +631,18 @@ export async function pollUntil(
condition: () => boolean | Promise<boolean>,
timeoutMs = 5000,
intervalMs = 100,
+ what?: string,
): Promise<void> {
const start = Date.now();
while (Date.now() - start < timeoutMs) {
if (await condition()) return;
await wait(intervalMs);
}
- throw new Error(`pollUntil timed out after ${timeoutMs}ms`);
+ throw new Error(
+ what === undefined
+ ? `pollUntil timed out after ${timeoutMs}ms`
+ : `pollUntil timed out after ${timeoutMs}ms waiting for ${what}`,
+ );
}
export async function awaitFileWatcherIndexed(
diff --git a/packages/app/tests/integration/undo-after-rollback.test.ts b/packages/app/tests/integration/undo-after-rollback.test.ts
index d3767adc9..a78aeb0e4 100644
--- a/packages/app/tests/integration/undo-after-rollback.test.ts
+++ b/packages/app/tests/integration/undo-after-rollback.test.ts
@@ -1,3 +1,4 @@
+
import { ROLLBACK_ORIGIN } from '@inkeep/open-knowledge-server';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-recycle-reset.test.ts b/packages/app/tests/integration/undo-recycle-reset.test.ts
index be1a29fbc..39e64a221 100644
--- a/packages/app/tests/integration/undo-recycle-reset.test.ts
+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts
@@ -1,3 +1,4 @@
+
import { writeFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/undo-rederive-survival.test.ts b/packages/app/tests/integration/undo-rederive-survival.test.ts
index 7935e35f8..9ddcd0730 100644
--- a/packages/app/tests/integration/undo-rederive-survival.test.ts
+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts
@@ -1,3 +1,4 @@
+
import { prependFrontmatter } from '@inkeep/open-knowledge-core';
import { Plugin, PluginKey } from '@tiptap/pm/state';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/meta/half-open-forced-close-helper.test.ts b/packages/app/tests/meta/half-open-forced-close-helper.test.ts
new file mode 100644
index 000000000..0e2a9cb82
--- /dev/null
+++ b/packages/app/tests/meta/half-open-forced-close-helper.test.ts
@@ -0,0 +1,24 @@
+import { describe, expect, test } from 'vitest';
+import { waitForTransport } from '../half-open-forced-close.test-helper';
+
+describe('waitForTransport', () => {
+ test('a fault inside the predicate reaches the caller unchanged', async () => {
+ const fault = new TypeError("Cannot read properties of undefined (reading 'documents')");
+
+ await expect(
+ waitForTransport(
+ 'the server to receive a marker',
+ () => {
+ throw fault;
+ },
+ 5_000,
+ ),
+ ).rejects.toBe(fault);
+ });
+
+ test('a genuine stall names the stage that hung', async () => {
+ await expect(waitForTransport('the socket to reconnect', () => false, 60)).rejects.toThrow(
+ /the socket to reconnect/,
+ );
+ });
+});
diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json
index 9d4d29089..98ee597e2 100644
--- a/packages/app/tsconfig.json
+++ b/packages/app/tsconfig.json
@@ -17,6 +17,21 @@
"@/*": ["./src/*"]
}
},
- "include": ["src", "*.ts", "tests/stress/fixtures"],
+ // `tests/half-open-forced-close.test-helper.ts` is in the program on purpose:
+ // it reads `@hocuspocus/provider` internals that four suites arrange through,
+ // so a bump that renames one of them has to fail here as one compile error
+ // rather than at runtime inside four unrelated-looking test files.
+ //
+ // What that include actually pulls in is the helper PLUS its import closure,
+ // notably `tests/integration/test-harness.ts`, because TypeScript follows
+ // imports and `exclude` only filters the `*.test.ts`/`*.test.tsx` entry
+ // points. That is the deliberate cost of typechecking the helper, not an
+ // oversight. Naming further files here is a separate change.
+ "include": [
+ "src",
+ "*.ts",
+ "tests/stress/fixtures",
+ "tests/half-open-forced-close.test-helper.ts"
+ ],
"exclude": ["node_modules", "dist", "**/*.test.ts", "**/*.test.tsx"]
}
diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.ts
index f4cc8a286..2a597ec3d 100644
--- a/packages/core/src/bridge/compose.ts
+++ b/packages/core/src/bridge/compose.ts
@@ -1,3 +1,4 @@
+
import { prependFrontmatter, stripFrontmatter } from '../extensions/frontmatter.ts';
export type ComposeAdjustment = 'none' | 'body' | 'frontmatter' | 'unresolved';
diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.ts
index 8fb428b90..01ef76a9f 100644
--- a/packages/core/src/bridge/doc-boundary-space.ts
+++ b/packages/core/src/bridge/doc-boundary-space.ts
@@ -1,3 +1,4 @@
+
import { FRONTMATTER_RE, stripFrontmatter } from '../extensions/frontmatter.ts';
import { carriedEdgeEmpties, type DocEdgeEmpties } from '../markdown/doc-edge-blank-runs.ts';
diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.ts
index bfbd5a2e8..20a68d2a1 100644
--- a/packages/core/src/markdown/comment-promoter.ts
+++ b/packages/core/src/markdown/comment-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Paragraph, PhrasingContent, Root, RootContent, Text } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/fixtures/index.ts b/packages/core/src/markdown/fixtures/index.ts
index 00f5771ee..6931623c7 100644
--- a/packages/core/src/markdown/fixtures/index.ts
+++ b/packages/core/src/markdown/fixtures/index.ts
@@ -1,3 +1,4 @@
+
import { readFileSync } from 'node:fs';
import { dirname, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
@@ -8,6 +9,7 @@ function fixturePath(...segments: string[]): string {
return resolve(FIXTURES_DIR, ...segments);
}
+
interface GfmExample {
section: string;
markdown: string;
@@ -17,6 +19,7 @@ export function loadGfmExamples(): GfmExample[] {
return JSON.parse(readFileSync(fixturePath('gfm', 'examples.json'), 'utf8')) as GfmExample[];
}
+
interface MdxCrashEntry {
id: string;
input: string;
@@ -68,6 +71,7 @@ export function loadLargeEmbedFixtures(): LargeEmbedFixture[] {
) as LargeEmbedFixture[];
}
+
export function loadPrd6955Before(): string {
return readFileSync(fixturePath('regression', 'prd-6955-before.md'), 'utf8');
}
@@ -76,6 +80,7 @@ export function loadPrd6955CorruptedTriplicated(): string {
return readFileSync(fixturePath('regression', 'prd-6955-corrupted-triplicated.md'), 'utf8');
}
+
export interface NgPinnedCase {
id: string;
name: string;
@@ -92,6 +97,7 @@ export function loadNgPinnedCases(): NgPinnedCase[] {
) as NgPinnedCase[];
}
+
export function loadLargeRealistic(): string {
return readFileSync(fixturePath('perf', 'large-realistic.md'), 'utf8');
}
diff --git a/packages/core/src/markdown/fixtures/perf/generate.ts b/packages/core/src/markdown/fixtures/perf/generate.ts
index 8b1eb8519..daa3ef82b 100644
--- a/packages/core/src/markdown/fixtures/perf/generate.ts
+++ b/packages/core/src/markdown/fixtures/perf/generate.ts
@@ -1,3 +1,4 @@
+
import { writeFileSync } from 'node:fs';
import { dirname, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
@@ -10,6 +11,7 @@ const BASELINE_ONLY_COUNTS = [500, 2500] as const;
const SEED = 0xf1de1117;
+
function mulberry32(seed: number): () => number {
let a = seed >>> 0;
return () => {
@@ -36,6 +38,7 @@ function pickWeighted<T>(rand: () => number, items: readonly [T, number][]): T {
return items[items.length - 1][0];
}
+
const WORDS = [
'lorem',
'ipsum',
@@ -153,6 +156,7 @@ function mdxBlock(rand: () => number): string {
return `<${name}>\n\n${sentence(rand)}\n\n</${name}>`;
}
+
type BlockKind = 'paragraph' | 'heading' | 'list' | 'code' | 'table' | 'mdx';
const MIX: readonly [BlockKind, number][] = [
@@ -191,6 +195,7 @@ function generateDocument(blockCount: number, seed: number): string {
return `${blocks.join('\n\n')}\n`;
}
+
function main(): void {
for (const count of [...BLOCK_COUNTS, ...BASELINE_ONLY_COUNTS]) {
const doc = generateDocument(count, SEED);
diff --git a/packages/core/src/markdown/image-promoter.ts b/packages/core/src/markdown/image-promoter.ts
index 706fa9afb..994eb6917 100644
--- a/packages/core/src/markdown/image-promoter.ts
+++ b/packages/core/src/markdown/image-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Image, Paragraph, Root } from 'mdast';
import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
import { visit } from 'unist-util-visit';
diff --git a/packages/core/src/markdown/math-promoter.ts b/packages/core/src/markdown/math-promoter.ts
index a5b511f25..bd79424c7 100644
--- a/packages/core/src/markdown/math-promoter.ts
+++ b/packages/core/src/markdown/math-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Code, Root } from 'mdast';
import type { Math as MdastMath } from 'mdast-util-math';
import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.ts
index bfd7e3109..fa3cfcd86 100644
--- a/packages/core/src/markdown/merged-walker.ts
+++ b/packages/core/src/markdown/merged-walker.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Parent, Root } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/safe-url.ts b/packages/core/src/markdown/safe-url.ts
index 4d3250d3a..8be632ba4 100644
--- a/packages/core/src/markdown/safe-url.ts
+++ b/packages/core/src/markdown/safe-url.ts
@@ -1,3 +1,4 @@
+
export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;
const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');
diff --git a/packages/server/src/checkpoint-retention-tie.test.ts b/packages/server/src/checkpoint-retention-tie.test.ts
index 8a5d82998..0a43a2773 100644
--- a/packages/server/src/checkpoint-retention-tie.test.ts
+++ b/packages/server/src/checkpoint-retention-tie.test.ts
@@ -1,3 +1,4 @@
+
import { execFileSync } from 'node:child_process';
import { mkdirSync, mkdtempSync, rmSync } from 'node:fs';
import { tmpdir } from 'node:os';
diff --git a/packages/server/src/qa-degradation-matrix.test.ts b/packages/server/src/qa-degradation-matrix.test.ts
index 84e3e5297..00bb6efe7 100644
--- a/packages/server/src/qa-degradation-matrix.test.ts
+++ b/packages/server/src/qa-degradation-matrix.test.ts
@@ -1,3 +1,4 @@
+
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import type * as Y from 'yjs';
import { createBridgeDeriveLossReporter } from './bridge-loss-detector.ts';
diff --git a/packages/server/src/qa-gc-budget-isolation.test.ts b/packages/server/src/qa-gc-budget-isolation.test.ts
index a800ca9f3..b65c4693e 100644
--- a/packages/server/src/qa-gc-budget-isolation.test.ts
+++ b/packages/server/src/qa-gc-budget-isolation.test.ts
@@ -1,3 +1,4 @@
+
import { mkdirSync, mkdtempSync, rmSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join, resolve } from 'node:path';
diff --git a/packages/server/src/qa-watcher-intake-lens.test.ts b/packages/server/src/qa-watcher-intake-lens.test.ts
index 2337e6c3c..4669d1b98 100644
--- a/packages/server/src/qa-watcher-intake-lens.test.ts
+++ b/packages/server/src/qa-watcher-intake-lens.test.ts
@@ -1,3 +1,4 @@
+
import { Hocuspocus } from '@hocuspocus/server';
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import * as Y from 'yjs';
diff --git a/patches/@hocuspocus%[email protected] b/patches/@hocuspocus%[email protected]
new file mode 100644
index 000000000..b5720cec5
--- /dev/null
+++ b/patches/@hocuspocus%[email protected]
@@ -0,0 +1,53 @@
+diff --git a/dist/hocuspocus-provider.cjs b/dist/hocuspocus-provider.cjs
+index cf5602474c793441b87de30417191d98eb83c7e3..5517ae5a0e444eca0b77fe12f9792075ae275478 100644
+--- a/dist/hocuspocus-provider.cjs
++++ b/dist/hocuspocus-provider.cjs
+@@ -1361,7 +1361,8 @@ var HocuspocusProviderWebsocket = class HocuspocusProviderWebsocket extends Even
+ if (this.configuration.messageReconnectTimeout >= getUnixTime() - this.lastMessageReceived) return;
+ this.closeTries += 1;
+ if (this.closeTries > 2) {
+- this.onClose({ event: {
++ // OK patch: forced-close emits close. See src/HocuspocusProviderWebsocket.ts for why.
++ this.emit("close", { event: {
+ code: 4408,
+ reason: "forced"
+ } });
+diff --git a/dist/hocuspocus-provider.esm.js b/dist/hocuspocus-provider.esm.js
+index f51bb321df577ba21a218f2cd7c98cd29f2a12c5..da9f17abb54a9f8bae975a3953a9bf30e51d73ca 100644
+--- a/dist/hocuspocus-provider.esm.js
++++ b/dist/hocuspocus-provider.esm.js
+@@ -1332,7 +1332,8 @@ var HocuspocusProviderWebsocket = class HocuspocusProviderWebsocket extends Even
+ if (this.configuration.messageReconnectTimeout >= getUnixTime() - this.lastMessageReceived) return;
+ this.closeTries += 1;
+ if (this.closeTries > 2) {
+- this.onClose({ event: {
++ // OK patch: forced-close emits close. See src/HocuspocusProviderWebsocket.ts for why.
++ this.emit("close", { event: {
+ code: 4408,
+ reason: "forced"
+ } });
+diff --git a/src/HocuspocusProviderWebsocket.ts b/src/HocuspocusProviderWebsocket.ts
+index 770670c06bcd41e5d5941e5ceeb97cecdb933961..b75471d435c764d840ecabed5a6b864b7691b29e 100644
+--- a/src/HocuspocusProviderWebsocket.ts
++++ b/src/HocuspocusProviderWebsocket.ts
+@@ -470,7 +470,19 @@ export class HocuspocusProviderWebsocket extends EventEmitter {
+ this.closeTries += 1;
+ // https://bugs.webkit.org/show_bug.cgi?id=247943
+ if (this.closeTries > 2) {
+- this.onClose({
++ // OK patch: forced-close emits close.
++ // This branch stands in for a socket close the platform failed to
++ // report, so it has to produce the same emission a real close does.
++ // Calling `onClose` directly runs this websocket's own teardown but
++ // never emits `close`, and `HocuspocusProvider.onClose` (the only
++ // writer of `synced = false`) is subscribed to `close`. Without the
++ // emission `isSynced` stays true across the teardown, and because the
++ // setter is edge-gated the reconnect's SyncStep2 writes true over
++ // true. The transport drop stays observable (status and disconnect
++ // fire either way); what no consumer can learn is that the DOCUMENT
++ // went out of sync. Emitting keeps this websocket's own teardown
++ // ahead of every attached provider's handler, as on a native close.
++ this.emit("close", {
+ event: {
+ code: 4408,
+ reason: "forced",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 086800027..3b2f3d3ef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -147,6 +147,9 @@ patchedDependencies:
'@handlewithcare/[email protected]':
hash: a6b60cc8640e04973be2c8123e0dbd73156b54388a57cd2b76191c2fd8ac2865
path: patches/@handlewithcare%[email protected]
+ '@hocuspocus/[email protected]':
+ hash: 3e4275acfde912e2ad1bfb9a78db31a311e239d733af8a78dc6b3038343287fd
+ path: patches/@hocuspocus%[email protected]
'@lingui/[email protected]':
hash: 126db40cb2224e90abf5f063d3aa005eb1bc84796d77216d5a9e52d5cd28a656
path: patches/@lingui%[email protected]
@@ -416,7 +419,7 @@ importers:
version: 5.2.8
'@hocuspocus/provider':
specifier: 4.0.0-rc.1
+ version: 4.0.0-rc.1(patch_hash=3e4275acfde912e2ad1bfb9a78db31a311e239d733af8a78dc6b3038343287fd)([email protected]([email protected]))([email protected])
'@hookform/resolvers':
specifier: ^5.0.0
@@ -12756,7 +12759,7 @@ snapshots:
dependencies:
lib0: 0.2.117
+ '@hocuspocus/[email protected](patch_hash=3e4275acfde912e2ad1bfb9a78db31a311e239d733af8a78dc6b3038343287fd)([email protected]([email protected]))([email protected])':
dependencies:
'@hocuspocus/common': 4.3.0
'@lifeomic/attempt': 3.1.0
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index b12f70015..7e62efdda 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -254,6 +254,7 @@ overrides:
react-lite-youtube-embed: 3.5.1
patchedDependencies:
'@handlewithcare/[email protected]': patches/@handlewithcare%[email protected]
+ '@hocuspocus/[email protected]': patches/@hocuspocus%[email protected]
'@lingui/[email protected]': patches/@lingui%[email protected]
'@pierre/[email protected]': patches/@pierre%[email protected]
'@pierre/[email protected]': patches/@pierre%[email protected]
diff --git a/turbo.json b/turbo.json
index 7a8d1dcbc..c373fc48b 100644
--- a/turbo.json
+++ b/turbo.json
@@ -2,7 +2,9 @@
"$schema": "https://turbo.build/schema.json",
"globalDependencies": [
"test-support/fixtures/share-url-v1-v2.json",
- "test-support/fixtures/codex-legacy-warning-envelopes.json"
+ "test-support/fixtures/codex-legacy-warning-envelopes.json",
+ "pnpm-workspace.yaml",
+ "patches/*.patch"
],
"tasks": {
"build": {
@@ -103,6 +105,8 @@
"src/**/*.tsx",
"tests/dom/**/*.ts",
"tests/dom/**/*.tsx",
+ "tests/*.test-helper.ts",
+ "tests/integration/test-harness.ts",
"vitest.dom.config.ts",
"vitest.config.ts",
"vite.dedupe.ts",