@terreno/rtk 0.13.3 → 0.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/authSlice.test.js +2 -10
- package/dist/authSlice.test.js.map +1 -1
- package/dist/authSliceNative.test.js +11 -3
- package/dist/authSliceNative.test.js.map +1 -1
- package/dist/betterAuthSlice.test.js +1 -25
- package/dist/betterAuthSlice.test.js.map +1 -1
- package/dist/constants.d.ts +3 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +11 -3
- package/dist/constants.js.map +1 -1
- package/dist/constants.test.js +44 -2
- package/dist/constants.test.js.map +1 -1
- package/dist/emptyApi.d.ts +2 -0
- package/dist/emptyApi.d.ts.map +1 -1
- package/dist/emptyApi.js +5 -0
- package/dist/emptyApi.js.map +1 -1
- package/dist/index.d.ts +8 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -0
- package/dist/index.js.map +1 -1
- package/dist/isolated/constants.isolated.js +7 -1
- package/dist/isolated/constants.isolated.js.map +1 -1
- package/dist/isolated/offlineMiddleware.isolated.d.ts +2 -0
- package/dist/isolated/offlineMiddleware.isolated.d.ts.map +1 -0
- package/dist/isolated/offlineMiddleware.isolated.js +516 -0
- package/dist/isolated/offlineMiddleware.isolated.js.map +1 -0
- package/dist/isolated/offlineMiddleware.native.isolated.d.ts +2 -0
- package/dist/isolated/offlineMiddleware.native.isolated.d.ts.map +1 -0
- package/dist/isolated/offlineMiddleware.native.isolated.js +70 -0
- package/dist/isolated/offlineMiddleware.native.isolated.js.map +1 -0
- package/dist/isolated/useUpgradeCheck.mobile.isolated.d.ts +2 -0
- package/dist/isolated/useUpgradeCheck.mobile.isolated.d.ts.map +1 -0
- package/dist/{useUpgradeCheck.mobile.test.js → isolated/useUpgradeCheck.mobile.isolated.js} +13 -5
- package/dist/isolated/useUpgradeCheck.mobile.isolated.js.map +1 -0
- package/dist/isolated/useUpgradeCheck.web.isolated.d.ts +2 -0
- package/dist/isolated/useUpgradeCheck.web.isolated.d.ts.map +1 -0
- package/dist/{useUpgradeCheck.test.js → isolated/useUpgradeCheck.web.isolated.js} +37 -7
- package/dist/isolated/useUpgradeCheck.web.isolated.js.map +1 -0
- package/dist/mongooseSlice.test.js +1 -1
- package/dist/mongooseSlice.test.js.map +1 -1
- package/dist/offlineGate.d.ts +8 -0
- package/dist/offlineGate.d.ts.map +1 -0
- package/dist/offlineGate.js +20 -0
- package/dist/offlineGate.js.map +1 -0
- package/dist/offlineGate.test.d.ts +2 -0
- package/dist/offlineGate.test.d.ts.map +1 -0
- package/dist/offlineGate.test.js +46 -0
- package/dist/offlineGate.test.js.map +1 -0
- package/dist/offlineMiddleware.d.ts +46 -0
- package/dist/offlineMiddleware.d.ts.map +1 -0
- package/dist/offlineMiddleware.js +591 -0
- package/dist/offlineMiddleware.js.map +1 -0
- package/dist/offlineMiddleware.test.d.ts +2 -0
- package/dist/offlineMiddleware.test.d.ts.map +1 -0
- package/dist/offlineMiddleware.test.js +145 -0
- package/dist/offlineMiddleware.test.js.map +1 -0
- package/dist/offlineSlice.d.ts +232 -0
- package/dist/offlineSlice.d.ts.map +1 -0
- package/dist/offlineSlice.js +65 -0
- package/dist/offlineSlice.js.map +1 -0
- package/dist/offlineSlice.test.d.ts +2 -0
- package/dist/offlineSlice.test.d.ts.map +1 -0
- package/dist/offlineSlice.test.js +153 -0
- package/dist/offlineSlice.test.js.map +1 -0
- package/dist/realtime.d.ts +123 -0
- package/dist/realtime.d.ts.map +1 -0
- package/dist/realtime.js +299 -0
- package/dist/realtime.js.map +1 -0
- package/dist/realtime.test.d.ts +2 -0
- package/dist/realtime.test.d.ts.map +1 -0
- package/dist/realtime.test.js +339 -0
- package/dist/realtime.test.js.map +1 -0
- package/dist/socket.d.ts.map +1 -1
- package/dist/socket.js +29 -28
- package/dist/socket.js.map +1 -1
- package/dist/sync.d.ts +35 -0
- package/dist/sync.d.ts.map +1 -0
- package/dist/sync.js +205 -0
- package/dist/sync.js.map +1 -0
- package/dist/tagGenerator.d.ts +20 -1
- package/dist/tagGenerator.d.ts.map +1 -1
- package/dist/tagGenerator.js +1 -2
- package/dist/tagGenerator.js.map +1 -1
- package/dist/useOfflineStatus.d.ts +33 -0
- package/dist/useOfflineStatus.d.ts.map +1 -0
- package/dist/useOfflineStatus.js +43 -0
- package/dist/useOfflineStatus.js.map +1 -0
- package/dist/useOfflineStatus.test.d.ts +2 -0
- package/dist/useOfflineStatus.test.d.ts.map +1 -0
- package/dist/useOfflineStatus.test.js +119 -0
- package/dist/useOfflineStatus.test.js.map +1 -0
- package/dist/useRealtimeDebug.d.ts +6 -0
- package/dist/useRealtimeDebug.d.ts.map +1 -0
- package/dist/useRealtimeDebug.js +41 -0
- package/dist/useRealtimeDebug.js.map +1 -0
- package/dist/useServerStatus.d.ts +29 -0
- package/dist/useServerStatus.d.ts.map +1 -0
- package/dist/useServerStatus.js +89 -0
- package/dist/useServerStatus.js.map +1 -0
- package/dist/useUpgradeCheck.d.ts +7 -3
- package/dist/useUpgradeCheck.d.ts.map +1 -1
- package/dist/useUpgradeCheck.js +27 -13
- package/dist/useUpgradeCheck.js.map +1 -1
- package/package.json +2 -2
- package/src/authSlice.test.ts +2 -11
- package/src/authSliceNative.test.ts +11 -4
- package/src/betterAuthSlice.test.ts +1 -25
- package/src/constants.test.ts +54 -1
- package/src/constants.ts +14 -3
- package/src/emptyApi.ts +8 -0
- package/src/index.ts +8 -0
- package/src/isolated/constants.isolated.ts +7 -3
- package/src/isolated/offlineMiddleware.isolated.ts +696 -0
- package/src/isolated/offlineMiddleware.native.isolated.ts +80 -0
- package/src/{useUpgradeCheck.mobile.test.ts → isolated/useUpgradeCheck.mobile.isolated.ts} +13 -4
- package/src/{useUpgradeCheck.test.ts → isolated/useUpgradeCheck.web.isolated.ts} +48 -6
- package/src/mongooseSlice.test.ts +1 -1
- package/src/offlineGate.test.ts +55 -0
- package/src/offlineGate.ts +25 -0
- package/src/offlineMiddleware.test.ts +187 -0
- package/src/offlineMiddleware.ts +718 -0
- package/src/offlineSlice.test.ts +204 -0
- package/src/offlineSlice.ts +130 -0
- package/src/realtime.test.ts +404 -0
- package/src/realtime.ts +408 -0
- package/src/socket.ts +33 -32
- package/src/sync.ts +310 -0
- package/src/tagGenerator.ts +29 -11
- package/src/useOfflineStatus.test.ts +157 -0
- package/src/useOfflineStatus.ts +82 -0
- package/src/useRealtimeDebug.ts +51 -0
- package/src/useServerStatus.ts +122 -0
- package/src/useUpgradeCheck.ts +35 -13
- package/dist/isolated/useUpgradeCheck.isolated.d.ts +0 -2
- package/dist/isolated/useUpgradeCheck.isolated.d.ts.map +0 -1
- package/dist/isolated/useUpgradeCheck.isolated.js +0 -153
- package/dist/isolated/useUpgradeCheck.isolated.js.map +0 -1
- package/dist/useUpgradeCheck.mobile.test.d.ts +0 -2
- package/dist/useUpgradeCheck.mobile.test.d.ts.map +0 -1
- package/dist/useUpgradeCheck.mobile.test.js.map +0 -1
- package/dist/useUpgradeCheck.test.d.ts +0 -2
- package/dist/useUpgradeCheck.test.d.ts.map +0 -1
- package/dist/useUpgradeCheck.test.js.map +0 -1
- package/src/isolated/useUpgradeCheck.isolated.ts +0 -201
|
@@ -0,0 +1,339 @@
|
|
|
1
|
+
// biome-ignore-all lint/suspicious/noExplicitAny: realtime RTK tests mock Socket.io and RTK Query runtime shapes
|
|
2
|
+
import { afterEach, describe, expect, it } from "bun:test";
|
|
3
|
+
const { realtimeDocument, realtimeList, setRealtimeSocket } = await import("./realtime");
|
|
4
|
+
const createDeferred = () => {
|
|
5
|
+
let resolve;
|
|
6
|
+
const promise = new Promise((res) => {
|
|
7
|
+
resolve = res;
|
|
8
|
+
});
|
|
9
|
+
return { promise, resolve };
|
|
10
|
+
};
|
|
11
|
+
const createMockSocket = (canonicalQueryId) => {
|
|
12
|
+
const listeners = new Map();
|
|
13
|
+
const socket = {
|
|
14
|
+
emit: (event, payload) => {
|
|
15
|
+
socket.emitted.push({ event, payload });
|
|
16
|
+
if (event !== "subscribe:query" || !canonicalQueryId) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
queueMicrotask(() => {
|
|
20
|
+
const handlers = listeners.get("query:subscribed") ?? new Set();
|
|
21
|
+
for (const handler of handlers) {
|
|
22
|
+
handler({ collection: payload.collection, queryId: canonicalQueryId });
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
},
|
|
26
|
+
emitted: [],
|
|
27
|
+
off: (event, handler) => {
|
|
28
|
+
listeners.get(event)?.delete(handler);
|
|
29
|
+
},
|
|
30
|
+
on: (event, handler) => {
|
|
31
|
+
if (!listeners.has(event)) {
|
|
32
|
+
listeners.set(event, new Set());
|
|
33
|
+
}
|
|
34
|
+
listeners.get(event)?.add(handler);
|
|
35
|
+
},
|
|
36
|
+
trigger: (event, payload) => {
|
|
37
|
+
const handlers = listeners.get(event) ?? new Set();
|
|
38
|
+
for (const handler of handlers) {
|
|
39
|
+
handler(payload);
|
|
40
|
+
}
|
|
41
|
+
},
|
|
42
|
+
};
|
|
43
|
+
return socket;
|
|
44
|
+
};
|
|
45
|
+
const createCacheApi = (draft) => {
|
|
46
|
+
const cacheEntryRemoved = createDeferred();
|
|
47
|
+
return {
|
|
48
|
+
cacheDataLoaded: Promise.resolve(),
|
|
49
|
+
cacheEntryRemoved: cacheEntryRemoved.promise,
|
|
50
|
+
remove: cacheEntryRemoved.resolve,
|
|
51
|
+
updateCachedData: (callback) => {
|
|
52
|
+
callback(draft);
|
|
53
|
+
},
|
|
54
|
+
};
|
|
55
|
+
};
|
|
56
|
+
const flushPromises = async () => {
|
|
57
|
+
await Promise.resolve();
|
|
58
|
+
await Promise.resolve();
|
|
59
|
+
};
|
|
60
|
+
describe("realtimeDocument", () => {
|
|
61
|
+
afterEach(() => {
|
|
62
|
+
setRealtimeSocket(null);
|
|
63
|
+
});
|
|
64
|
+
it("waits for a socket, patches matching update payloads, and unsubscribes", async () => {
|
|
65
|
+
const draft = { id: "doc-1", title: "Old" };
|
|
66
|
+
const api = createCacheApi(draft);
|
|
67
|
+
const task = realtimeDocument("todos")("doc-1", api);
|
|
68
|
+
await Promise.resolve();
|
|
69
|
+
const socket = createMockSocket();
|
|
70
|
+
setRealtimeSocket(socket);
|
|
71
|
+
await flushPromises();
|
|
72
|
+
socket.trigger("sync", {
|
|
73
|
+
collection: "other",
|
|
74
|
+
data: { _id: "doc-1", title: "Ignored" },
|
|
75
|
+
id: "doc-1",
|
|
76
|
+
method: "update",
|
|
77
|
+
model: "Todo",
|
|
78
|
+
timestamp: 1,
|
|
79
|
+
});
|
|
80
|
+
socket.trigger("sync", {
|
|
81
|
+
collection: "todos",
|
|
82
|
+
data: { _id: "doc-2", title: "Ignored" },
|
|
83
|
+
id: "doc-2",
|
|
84
|
+
method: "update",
|
|
85
|
+
model: "Todo",
|
|
86
|
+
timestamp: 1,
|
|
87
|
+
});
|
|
88
|
+
socket.trigger("sync", {
|
|
89
|
+
collection: "todos",
|
|
90
|
+
data: { _id: "doc-1", title: "New" },
|
|
91
|
+
id: "doc-1",
|
|
92
|
+
method: "update",
|
|
93
|
+
model: "Todo",
|
|
94
|
+
timestamp: 1,
|
|
95
|
+
});
|
|
96
|
+
socket.trigger("sync", {
|
|
97
|
+
collection: "todos",
|
|
98
|
+
id: "doc-1",
|
|
99
|
+
method: "delete",
|
|
100
|
+
model: "Todo",
|
|
101
|
+
timestamp: 1,
|
|
102
|
+
});
|
|
103
|
+
expect(draft).toEqual({ _id: "doc-1", id: "doc-1", title: "New" });
|
|
104
|
+
api.remove();
|
|
105
|
+
await task;
|
|
106
|
+
expect(socket.emitted).toContainEqual({
|
|
107
|
+
event: "subscribe:document",
|
|
108
|
+
payload: { collection: "todos", id: "doc-1" },
|
|
109
|
+
});
|
|
110
|
+
expect(socket.emitted).toContainEqual({
|
|
111
|
+
event: "unsubscribe:document",
|
|
112
|
+
payload: { collection: "todos", id: "doc-1" },
|
|
113
|
+
});
|
|
114
|
+
});
|
|
115
|
+
it("returns before subscribing when id or cache load is unavailable", async () => {
|
|
116
|
+
const socket = createMockSocket();
|
|
117
|
+
setRealtimeSocket(socket);
|
|
118
|
+
await realtimeDocument("todos")({}, createCacheApi({}));
|
|
119
|
+
await realtimeDocument("todos")("doc-1", {
|
|
120
|
+
cacheDataLoaded: Promise.reject(new Error("missing")),
|
|
121
|
+
cacheEntryRemoved: Promise.resolve(),
|
|
122
|
+
updateCachedData: () => undefined,
|
|
123
|
+
});
|
|
124
|
+
expect(socket.emitted).toEqual([]);
|
|
125
|
+
});
|
|
126
|
+
it("returns early when socket resolves to null before subscribing", async () => {
|
|
127
|
+
setRealtimeSocket(null);
|
|
128
|
+
const removed = createDeferred();
|
|
129
|
+
const task = realtimeDocument("todos")("doc-1", {
|
|
130
|
+
cacheDataLoaded: Promise.resolve(),
|
|
131
|
+
cacheEntryRemoved: removed.promise,
|
|
132
|
+
updateCachedData: () => undefined,
|
|
133
|
+
});
|
|
134
|
+
await Promise.resolve();
|
|
135
|
+
removed.resolve();
|
|
136
|
+
await task;
|
|
137
|
+
// No socket → no subscription events
|
|
138
|
+
});
|
|
139
|
+
it("logs sync events when websockets debug is enabled", async () => {
|
|
140
|
+
const { setRealtimeDebug } = await import("./constants");
|
|
141
|
+
const originalInfo = console.info;
|
|
142
|
+
const calls = [];
|
|
143
|
+
console.info = (...args) => {
|
|
144
|
+
calls.push(args);
|
|
145
|
+
};
|
|
146
|
+
setRealtimeDebug(true);
|
|
147
|
+
try {
|
|
148
|
+
const draft = { id: "doc-1", title: "Old" };
|
|
149
|
+
const api = createCacheApi(draft);
|
|
150
|
+
const socket = createMockSocket();
|
|
151
|
+
setRealtimeSocket(socket);
|
|
152
|
+
const task = realtimeDocument("todos")("doc-1", api);
|
|
153
|
+
await flushPromises();
|
|
154
|
+
socket.trigger("sync", {
|
|
155
|
+
collection: "todos",
|
|
156
|
+
data: { _id: "doc-1", title: "New" },
|
|
157
|
+
id: "doc-1",
|
|
158
|
+
method: "update",
|
|
159
|
+
model: "Todo",
|
|
160
|
+
timestamp: 1,
|
|
161
|
+
});
|
|
162
|
+
expect(calls.some((c) => c[0]?.includes("[websocket]"))).toBe(true);
|
|
163
|
+
api.remove();
|
|
164
|
+
await task;
|
|
165
|
+
}
|
|
166
|
+
finally {
|
|
167
|
+
setRealtimeDebug(false);
|
|
168
|
+
console.info = originalInfo;
|
|
169
|
+
}
|
|
170
|
+
});
|
|
171
|
+
});
|
|
172
|
+
describe("realtimeList", () => {
|
|
173
|
+
afterEach(() => {
|
|
174
|
+
setRealtimeSocket(null);
|
|
175
|
+
});
|
|
176
|
+
it("unsubscribes from the server-canonical queryId", async () => {
|
|
177
|
+
const cacheEntryRemoved = createDeferred();
|
|
178
|
+
const socket = createMockSocket('todos:{"completed":false,"ownerId":"user1"}');
|
|
179
|
+
setRealtimeSocket(socket);
|
|
180
|
+
const task = realtimeList("todos")({ completed: false, limit: 20 }, {
|
|
181
|
+
cacheDataLoaded: Promise.resolve(),
|
|
182
|
+
cacheEntryRemoved: cacheEntryRemoved.promise,
|
|
183
|
+
updateCachedData: () => undefined,
|
|
184
|
+
});
|
|
185
|
+
await Promise.resolve();
|
|
186
|
+
await Promise.resolve();
|
|
187
|
+
cacheEntryRemoved.resolve();
|
|
188
|
+
await task;
|
|
189
|
+
const unsubscribed = socket.emitted.find((item) => item.event === "unsubscribe:query");
|
|
190
|
+
expect(unsubscribed?.payload).toEqual({
|
|
191
|
+
queryId: 'todos:{"completed":false,"ownerId":"user1"}',
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
it("handles model-room create, update, stale update, insert-on-update, and delete events", async () => {
|
|
195
|
+
const socket = createMockSocket();
|
|
196
|
+
setRealtimeSocket(socket);
|
|
197
|
+
const draft = {
|
|
198
|
+
data: [{ id: "todo-1", title: "Existing", updated: "2026-01-02T00:00:00.000Z" }],
|
|
199
|
+
total: 1,
|
|
200
|
+
};
|
|
201
|
+
const api = createCacheApi(draft);
|
|
202
|
+
const task = realtimeList("todos")({ limit: 20 }, api);
|
|
203
|
+
await flushPromises();
|
|
204
|
+
socket.trigger("sync", {
|
|
205
|
+
collection: "other",
|
|
206
|
+
data: { _id: "ignored" },
|
|
207
|
+
id: "ignored",
|
|
208
|
+
method: "create",
|
|
209
|
+
model: "Todo",
|
|
210
|
+
timestamp: 1,
|
|
211
|
+
});
|
|
212
|
+
socket.trigger("sync", {
|
|
213
|
+
collection: "todos",
|
|
214
|
+
data: { _id: "todo-2", title: "Created" },
|
|
215
|
+
id: "todo-2",
|
|
216
|
+
method: "create",
|
|
217
|
+
model: "Todo",
|
|
218
|
+
timestamp: 1,
|
|
219
|
+
});
|
|
220
|
+
socket.trigger("sync", {
|
|
221
|
+
collection: "todos",
|
|
222
|
+
data: { id: "todo-1", title: "Stale", updated: "2026-01-01T00:00:00.000Z" },
|
|
223
|
+
id: "todo-1",
|
|
224
|
+
method: "update",
|
|
225
|
+
model: "Todo",
|
|
226
|
+
timestamp: 1,
|
|
227
|
+
});
|
|
228
|
+
socket.trigger("sync", {
|
|
229
|
+
collection: "todos",
|
|
230
|
+
data: { id: "todo-1", title: "Updated", updated: "2026-01-03T00:00:00.000Z" },
|
|
231
|
+
id: "todo-1",
|
|
232
|
+
method: "update",
|
|
233
|
+
model: "Todo",
|
|
234
|
+
timestamp: 1,
|
|
235
|
+
});
|
|
236
|
+
socket.trigger("sync", {
|
|
237
|
+
collection: "todos",
|
|
238
|
+
data: { id: "todo-3", title: "New match" },
|
|
239
|
+
id: "todo-3",
|
|
240
|
+
method: "update",
|
|
241
|
+
model: "Todo",
|
|
242
|
+
timestamp: 1,
|
|
243
|
+
});
|
|
244
|
+
socket.trigger("sync", {
|
|
245
|
+
collection: "todos",
|
|
246
|
+
id: "todo-2",
|
|
247
|
+
method: "delete",
|
|
248
|
+
model: "Todo",
|
|
249
|
+
timestamp: 1,
|
|
250
|
+
});
|
|
251
|
+
expect(draft.data.map((item) => item.id)).toEqual(["todo-3", "todo-1"]);
|
|
252
|
+
expect(draft.data[1].title).toBe("Updated");
|
|
253
|
+
expect(draft.total).toBe(2);
|
|
254
|
+
api.remove();
|
|
255
|
+
await task;
|
|
256
|
+
expect(socket.emitted).toContainEqual({ event: "subscribe:model", payload: "todos" });
|
|
257
|
+
expect(socket.emitted).toContainEqual({ event: "unsubscribe:model", payload: "todos" });
|
|
258
|
+
});
|
|
259
|
+
it("correlates query subscription acknowledgements before using canonical queryId", async () => {
|
|
260
|
+
const socket = createMockSocket();
|
|
261
|
+
setRealtimeSocket(socket);
|
|
262
|
+
const api = createCacheApi({ data: [], total: 0 });
|
|
263
|
+
const task = realtimeList("todos")({ completed: false }, api);
|
|
264
|
+
await flushPromises();
|
|
265
|
+
socket.trigger("query:subscribed", {
|
|
266
|
+
collection: "other",
|
|
267
|
+
queryId: "wrong-collection",
|
|
268
|
+
});
|
|
269
|
+
socket.trigger("query:subscribed", {
|
|
270
|
+
clientQueryId: 'todos:{"completed":true}',
|
|
271
|
+
collection: "todos",
|
|
272
|
+
queryId: "wrong-client",
|
|
273
|
+
});
|
|
274
|
+
socket.trigger("query:subscribed", {
|
|
275
|
+
clientQueryId: 'todos:{"completed":false}',
|
|
276
|
+
collection: "todos",
|
|
277
|
+
queryId: 'todos:{"completed":false,"ownerId":"owner-1"}',
|
|
278
|
+
});
|
|
279
|
+
api.remove();
|
|
280
|
+
await task;
|
|
281
|
+
expect(socket.emitted).toContainEqual({
|
|
282
|
+
event: "unsubscribe:query",
|
|
283
|
+
payload: { queryId: 'todos:{"completed":false,"ownerId":"owner-1"}' },
|
|
284
|
+
});
|
|
285
|
+
});
|
|
286
|
+
it("returns before subscribing when cache load fails or socket never arrives", async () => {
|
|
287
|
+
const socket = createMockSocket();
|
|
288
|
+
setRealtimeSocket(socket);
|
|
289
|
+
await realtimeList("todos")({}, {
|
|
290
|
+
cacheDataLoaded: Promise.reject(new Error("missing")),
|
|
291
|
+
cacheEntryRemoved: Promise.resolve(),
|
|
292
|
+
updateCachedData: () => undefined,
|
|
293
|
+
});
|
|
294
|
+
expect(socket.emitted).toEqual([]);
|
|
295
|
+
setRealtimeSocket(null);
|
|
296
|
+
const removed = createDeferred();
|
|
297
|
+
const task = realtimeList("todos")({}, {
|
|
298
|
+
cacheDataLoaded: Promise.resolve(),
|
|
299
|
+
cacheEntryRemoved: removed.promise,
|
|
300
|
+
updateCachedData: () => undefined,
|
|
301
|
+
});
|
|
302
|
+
await Promise.resolve();
|
|
303
|
+
removed.resolve();
|
|
304
|
+
await task;
|
|
305
|
+
});
|
|
306
|
+
it("logs sync events when websockets debug is enabled", async () => {
|
|
307
|
+
const { setRealtimeDebug } = await import("./constants");
|
|
308
|
+
const originalInfo = console.info;
|
|
309
|
+
const calls = [];
|
|
310
|
+
console.info = (...args) => {
|
|
311
|
+
calls.push(args);
|
|
312
|
+
};
|
|
313
|
+
setRealtimeDebug(true);
|
|
314
|
+
try {
|
|
315
|
+
const socket = createMockSocket();
|
|
316
|
+
setRealtimeSocket(socket);
|
|
317
|
+
const draft = { data: [{ id: "todo-1", title: "Existing" }], total: 1 };
|
|
318
|
+
const api = createCacheApi(draft);
|
|
319
|
+
const task = realtimeList("todos")({ limit: 20 }, api);
|
|
320
|
+
await flushPromises();
|
|
321
|
+
socket.trigger("sync", {
|
|
322
|
+
collection: "todos",
|
|
323
|
+
data: { _id: "todo-2", title: "Created" },
|
|
324
|
+
id: "todo-2",
|
|
325
|
+
method: "create",
|
|
326
|
+
model: "Todo",
|
|
327
|
+
timestamp: 1,
|
|
328
|
+
});
|
|
329
|
+
expect(calls.some((c) => c[0]?.includes("[websocket]"))).toBe(true);
|
|
330
|
+
api.remove();
|
|
331
|
+
await task;
|
|
332
|
+
}
|
|
333
|
+
finally {
|
|
334
|
+
setRealtimeDebug(false);
|
|
335
|
+
console.info = originalInfo;
|
|
336
|
+
}
|
|
337
|
+
});
|
|
338
|
+
});
|
|
339
|
+
//# sourceMappingURL=realtime.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"realtime.test.js","sourceRoot":"","sources":["../src/realtime.test.ts"],"names":[],"mappings":"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"}
|
package/dist/socket.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AAIA,OAAO,EAAK,KAAK,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAKjD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3C,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CAC3E;AAED,eAAO,MAAM,mBAAmB,GAAI,qHASjC,0BAA0B,KAAG;IAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,iBAAiB,EAAE,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AAIA,OAAO,EAAK,KAAK,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAKjD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3C,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CAC3E;AAED,eAAO,MAAM,mBAAmB,GAAI,qHASjC,0BAA0B,KAAG;IAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,iBAAiB,EAAE,gBAAgB,CAAC;CAgZrC,CAAC"}
|
package/dist/socket.js
CHANGED
|
@@ -9,6 +9,7 @@ import { getFriendlyExpirationInfo, getTokenExpirationTimes, refreshAuthToken }
|
|
|
9
9
|
export const useSocketConnection = ({ baseUrl, onConnect, onDisconnect, onConnectError, onReconnectFailed, getAuthToken, shouldConnect, // Whether we have a logged in user.
|
|
10
10
|
captureEvent, }) => {
|
|
11
11
|
const toast = useToast();
|
|
12
|
+
const socketRef = useRef(null);
|
|
12
13
|
const [socket, setSocket] = useState(null);
|
|
13
14
|
const isConnectedRef = useRef(undefined);
|
|
14
15
|
const [isSocketConnected, setIsSocketConnected] = useState({
|
|
@@ -29,11 +30,15 @@ captureEvent, }) => {
|
|
|
29
30
|
reconnectionAttempts: 5,
|
|
30
31
|
reconnectionDelay: 1000,
|
|
31
32
|
reconnectionDelayMax: 5000,
|
|
32
|
-
|
|
33
|
+
// Start with polling so dev server restarts don't fail the initial websocket-only
|
|
34
|
+
// handshake; Socket.io upgrades to websocket once the connection is established.
|
|
35
|
+
transports: ["polling", "websocket"],
|
|
33
36
|
});
|
|
37
|
+
socketRef.current = socketIo;
|
|
34
38
|
setSocket(socketIo);
|
|
35
39
|
return () => {
|
|
36
40
|
socketIo.disconnect();
|
|
41
|
+
socketRef.current = null;
|
|
37
42
|
};
|
|
38
43
|
}, [baseUrl]);
|
|
39
44
|
const hideDisconnectedToast = useCallback(() => {
|
|
@@ -59,16 +64,17 @@ captureEvent, }) => {
|
|
|
59
64
|
else {
|
|
60
65
|
logAuth("[SocketConnection] Token received from getAuthToken.");
|
|
61
66
|
}
|
|
62
|
-
if (
|
|
67
|
+
if (socketRef.current) {
|
|
68
|
+
const socketInstance = socketRef.current;
|
|
63
69
|
// Enhanced logging for Option 1 (token status)
|
|
64
|
-
logAuth(`[SocketConnection] Socket connecting ${token ? "with" : "without"} token. Current socket state: ${
|
|
65
|
-
|
|
66
|
-
|
|
70
|
+
logAuth(`[SocketConnection] Socket connecting ${token ? "with" : "without"} token. Current socket state: ${socketInstance.connected ? "connected" : "disconnected"}`);
|
|
71
|
+
socketInstance.auth = { token: `Bearer ${token}` };
|
|
72
|
+
socketInstance.connect();
|
|
67
73
|
}
|
|
68
74
|
else {
|
|
69
|
-
|
|
75
|
+
logAuth("[SocketConnection] connectSocket skipped — socket not initialized yet.");
|
|
70
76
|
}
|
|
71
|
-
}, [
|
|
77
|
+
}, [getAuthToken]);
|
|
72
78
|
// Extracted logic for checking token expiration, refreshing token, and handling related UI
|
|
73
79
|
const checkAndRefreshTokenLogic = useCallback(async (context) => {
|
|
74
80
|
let authRemainingSecs;
|
|
@@ -83,9 +89,10 @@ captureEvent, }) => {
|
|
|
83
89
|
logAuth(`[SocketConnection] Auth or refresh token nearing expiration or expired on ${context}, attempting refresh.`);
|
|
84
90
|
await refreshAuthToken();
|
|
85
91
|
// Attempt to reconnect after token refresh
|
|
86
|
-
|
|
92
|
+
const socketInstance = socketRef.current;
|
|
93
|
+
if (shouldConnect && socketInstance && !socketInstance.connected) {
|
|
87
94
|
logAuth(`[SocketConnection] Attempting to reconnect socket after token refresh due to ${context}.`);
|
|
88
|
-
|
|
95
|
+
socketInstance.connect();
|
|
89
96
|
}
|
|
90
97
|
}
|
|
91
98
|
}
|
|
@@ -113,7 +120,7 @@ captureEvent, }) => {
|
|
|
113
120
|
});
|
|
114
121
|
}
|
|
115
122
|
}
|
|
116
|
-
}, [shouldConnect,
|
|
123
|
+
}, [shouldConnect, captureEvent, hideDisconnectedToast, toast, hideTokenErrorToast]);
|
|
117
124
|
// Use Redux state for token refresh signal
|
|
118
125
|
const lastTokenRefreshTimestamp = useSelector(selectLastTokenRefreshTimestamp);
|
|
119
126
|
const previousTokenRefreshTimestampRef = useRef(null);
|
|
@@ -132,8 +139,11 @@ captureEvent, }) => {
|
|
|
132
139
|
}
|
|
133
140
|
previousTokenRefreshTimestampRef.current = lastTokenRefreshTimestamp;
|
|
134
141
|
}, [lastTokenRefreshTimestamp, socket, shouldConnect, connectSocket, hideTokenErrorToast]);
|
|
135
|
-
// Connect/disconnect socket based on shouldConnect flag
|
|
142
|
+
// Connect/disconnect socket based on shouldConnect flag (waits until socket is initialized)
|
|
136
143
|
useEffect(() => {
|
|
144
|
+
if (!socket) {
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
137
147
|
if (shouldConnect) {
|
|
138
148
|
if (!isSocketConnected.isConnected) {
|
|
139
149
|
logAuth(`[SocketConnection] Attempting to connect socket because shouldConnect is true and socket is not connected.`);
|
|
@@ -144,30 +154,16 @@ captureEvent, }) => {
|
|
|
144
154
|
}
|
|
145
155
|
}
|
|
146
156
|
else {
|
|
157
|
+
logAuth(`[SocketConnection] Disconnecting socket because shouldConnect is false.`);
|
|
158
|
+
socket?.disconnect();
|
|
147
159
|
if (isSocketConnected.isConnected) {
|
|
148
|
-
logAuth(`[SocketConnection] Attempting to disconnect socket because shouldConnect is false and socket is connected.`);
|
|
149
|
-
socket?.disconnect();
|
|
150
160
|
setIsSocketConnected({
|
|
151
161
|
isConnected: false,
|
|
152
|
-
lastDisconnectedAt: null,
|
|
162
|
+
lastDisconnectedAt: null,
|
|
153
163
|
});
|
|
154
164
|
}
|
|
155
|
-
else {
|
|
156
|
-
logAuth(`[SocketConnection] Socket is already disconnected and shouldConnect is false. No action needed.`);
|
|
157
|
-
}
|
|
158
165
|
}
|
|
159
166
|
}, [connectSocket, shouldConnect, isSocketConnected, socket]);
|
|
160
|
-
// Attempt to reconnect if token was refreshed and we are disconnected
|
|
161
|
-
useEffect(() => {
|
|
162
|
-
if (shouldConnect && !isSocketConnected.isConnected && socket) {
|
|
163
|
-
logAuth("[SocketConnection] Token refresh detected, attempting to reconnect socket.");
|
|
164
|
-
// We might want to ensure the socket isn't already in a connecting state here
|
|
165
|
-
// if socket.io-client provides such a state.
|
|
166
|
-
// Forcing a disconnect first can help if it's stuck in a bad state.
|
|
167
|
-
socket.disconnect();
|
|
168
|
-
void connectSocket();
|
|
169
|
-
}
|
|
170
|
-
}, [shouldConnect, isSocketConnected.isConnected, socket, connectSocket]);
|
|
171
167
|
// Show toast when disconnected
|
|
172
168
|
useEffect(() => {
|
|
173
169
|
if (!shouldConnect) {
|
|
@@ -252,6 +248,11 @@ captureEvent, }) => {
|
|
|
252
248
|
};
|
|
253
249
|
const handleConnectError = async (connectionError) => {
|
|
254
250
|
const tokenInfo = await getFriendlyExpirationInfo();
|
|
251
|
+
const browserOffline = typeof navigator !== "undefined" && !navigator.onLine;
|
|
252
|
+
if (browserOffline) {
|
|
253
|
+
logAuth(`[SocketConnection] Socket connection skipped while offline: ${connectionError.message}`);
|
|
254
|
+
return;
|
|
255
|
+
}
|
|
255
256
|
console.error("[SocketConnection] Socket connection error:", connectionError, "Token status:", tokenInfo);
|
|
256
257
|
captureEvent?.("WebSocket Connection Error", {
|
|
257
258
|
error: connectionError.message,
|
package/dist/socket.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AACrC,OAAO,EAAC,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,EAAE,EAAc,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,+BAA+B,EAAC,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AACpC,OAAO,EAAC,yBAAyB,EAAE,uBAAuB,EAAE,gBAAgB,EAAC,MAAM,YAAY,CAAC;AAkBhG,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,OAAO,EACP,SAAS,EACT,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,aAAa,EAAE,oCAAoC;AACnD,YAAY,GACe,EAG3B,EAAE;IACF,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAC1D,MAAM,cAAc,GAAG,MAAM,CAAmB,SAAS,CAAC,CAAC;IAC3D,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAmB;QAC3E,WAAW,EAAE,MAAM,EAAE,SAAS,IAAI,KAAK;QACvC,kBAAkB,EAAE,IAAI;KACzB,CAAC,CAAC;IACH,MAAM,mBAAmB,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IACxD,MAAM,iBAAiB,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IAEtD,uDAAuD;IACvD,SAAS,CAAC,GAAG,EAAE;QACb,cAAc,CAAC,OAAO,GAAG,iBAAiB,CAAC;IAC7C,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAExB,+BAA+B;IAC/B,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,EAAE;YAC3B,WAAW,EAAE,KAAK;YAClB,YAAY,EAAE,IAAI;YAClB,oBAAoB,EAAE,CAAC;YACvB,iBAAiB,EAAE,IAAI;YACvB,oBAAoB,EAAE,IAAI;YAC1B,UAAU,EAAE,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"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"}
|
package/dist/sync.d.ts
ADDED
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import type { Socket } from "socket.io-client";
|
|
2
|
+
interface UseSyncConnectionOptions {
|
|
3
|
+
/** Socket.io client instance (from useSocketConnection) */
|
|
4
|
+
socket: Socket | null;
|
|
5
|
+
/** RTK Query API instance (the enhanced API with tag types) */
|
|
6
|
+
api: any;
|
|
7
|
+
/** Tag types to listen for (e.g. ["todos", "users"]) — these should match the collection field in events */
|
|
8
|
+
tagTypes: string[];
|
|
9
|
+
/** Enable debug logging */
|
|
10
|
+
debug?: boolean;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Hook that connects WebSocket sync events to RTK Query's cache.
|
|
14
|
+
*
|
|
15
|
+
* For **create** events: invalidates cache tags to trigger refetch of list queries.
|
|
16
|
+
* For **update** events: patches entities in-place in cached queries, falling back to tag invalidation.
|
|
17
|
+
* For **delete** events: removes entities from cached list queries, falling back to tag invalidation.
|
|
18
|
+
*
|
|
19
|
+
* Automatically subscribes to model rooms for each tagType when the socket connects,
|
|
20
|
+
* so models using `roomStrategy: "model"` will work without additional setup.
|
|
21
|
+
*
|
|
22
|
+
* @example
|
|
23
|
+
* ```typescript
|
|
24
|
+
* const { socket } = useSocketConnection({ ... });
|
|
25
|
+
*
|
|
26
|
+
* useSyncConnection({
|
|
27
|
+
* socket,
|
|
28
|
+
* api: terrenoApi,
|
|
29
|
+
* tagTypes: ['todos', 'users'],
|
|
30
|
+
* });
|
|
31
|
+
* ```
|
|
32
|
+
*/
|
|
33
|
+
export declare const useSyncConnection: ({ socket, api, tagTypes, debug, }: UseSyncConnectionOptions) => void;
|
|
34
|
+
export {};
|
|
35
|
+
//# sourceMappingURL=sync.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAmC7C,UAAU,wBAAwB;IAChC,2DAA2D;IAC3D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,+DAA+D;IAE/D,GAAG,EAAE,GAAG,CAAC;IACT,4GAA4G;IAC5G,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,iBAAiB,GAAI,mCAK/B,wBAAwB,KAAG,IAyO7B,CAAC"}
|