@peerbit/react 0.0.32 → 0.0.33

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.
Files changed (11) hide show
  1. package/lib/esm/__tests__/useQuery.dom.test.js +81 -7
  2. package/lib/esm/__tests__/useQuery.dom.test.js.map +1 -1
  3. package/lib/esm/usePeer.d.ts +1 -1
  4. package/lib/esm/usePeer.js +35 -11
  5. package/lib/esm/usePeer.js.map +1 -1
  6. package/lib/esm/useQuery.js +138 -68
  7. package/lib/esm/useQuery.js.map +1 -1
  8. package/package.json +74 -75
  9. package/src/__tests__/useQuery.dom.test.ts +134 -7
  10. package/src/usePeer.tsx +42 -19
  11. package/src/useQuery.tsx +177 -98
package/lib/esm/useQuery.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/useQuery.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/useQuery.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,78 +1,77 @@
1
1
  {
2
- "name": "@peerbit/react",
3
- "version": "0.0.32",
4
- "homepage": "https://dao-xyz.github.io/peerbit-examples",
5
- "type": "module",
6
- "module": "lib/esm/index.js",
7
- "types": "lib/esm/index.d.ts",
8
- "exports": {
9
- ".": {
10
- "types": "./lib/esm/index.d.ts",
11
- "import": "./lib/esm/index.js"
12
- },
13
- "./package.json": "./package.json"
2
+ "name": "@peerbit/react",
3
+ "version": "0.0.33",
4
+ "homepage": "https://dao-xyz.github.io/peerbit-examples",
5
+ "type": "module",
6
+ "module": "lib/esm/index.js",
7
+ "types": "lib/esm/index.d.ts",
8
+ "exports": {
9
+ ".": {
10
+ "types": "./lib/esm/index.d.ts",
11
+ "import": "./lib/esm/index.js"
14
12
  },
15
- "files": [
16
- "lib",
17
- "src",
18
- "LICENSE"
13
+ "./package.json": "./package.json"
14
+ },
15
+ "files": [
16
+ "lib",
17
+ "src",
18
+ "LICENSE"
19
+ ],
20
+ "publishConfig": {
21
+ "access": "public"
22
+ },
23
+ "peerDependencies": {
24
+ "react": "*"
25
+ },
26
+ "dependencies": {
27
+ "@chainsafe/libp2p-yamux": "^8",
28
+ "@libp2p/webrtc": "^6",
29
+ "@peerbit/document": "^10",
30
+ "@peerbit/proxy-window": "^3",
31
+ "@types/react": "^19.1.8",
32
+ "@types/react-dom": "^19.1.6",
33
+ "detectincognitojs": "^1.6.1",
34
+ "path-browserify": "^1.0.1",
35
+ "peerbit": "^4",
36
+ "react": "^19.1.0",
37
+ "react-dom": "^19.1.0",
38
+ "react-router": "^7.9.3",
39
+ "react-use": "^17.6.0"
40
+ },
41
+ "devDependencies": {
42
+ "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
43
+ "@babel/plugin-syntax-dynamic-import": "^7.8.3",
44
+ "@babel/plugin-transform-typescript": "^7.20.2",
45
+ "@types/node-localstorage": "^1",
46
+ "@types/sinon": "^10.0.13",
47
+ "node-localstorage": "^2.2.1",
48
+ "sinon": "^15.0.1"
49
+ },
50
+ "eslintConfig": {
51
+ "extends": [
52
+ "react-app"
53
+ ]
54
+ },
55
+ "browserslist": {
56
+ "production": [
57
+ "chrome >= 67",
58
+ "edge >= 79",
59
+ "firefox >= 68",
60
+ "opera >= 54",
61
+ "safari >= 14"
19
62
  ],
20
- "publishConfig": {
21
- "access": "public"
22
- },
23
- "peerDependencies": {
24
- "react": "*"
25
- },
26
- "dependencies": {
27
- "@chainsafe/libp2p-yamux": "^7",
28
- "@libp2p/webrtc": "^5",
29
- "@peerbit/document": "^9",
30
- "@peerbit/proxy-window": "^3",
31
- "@types/react": "^19.1.8",
32
- "@types/react-dom": "^19.1.6",
33
- "detectincognitojs": "^1.6.1",
34
- "path-browserify": "^1.0.1",
35
- "peerbit": "^4",
36
- "react": "^19.1.0",
37
- "react-dom": "^19.1.0",
38
- "react-router": "^7.6.2",
39
- "react-use": "^17.6.0"
40
- },
41
- "devDependencies": {
42
- "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
43
- "@babel/plugin-syntax-dynamic-import": "^7.8.3",
44
- "@babel/plugin-transform-typescript": "^7.20.2",
45
- "@types/node-localstorage": "^1",
46
- "@types/sinon": "^10.0.13",
47
- "node-localstorage": "^2.2.1",
48
- "sinon": "^15.0.1"
49
- },
50
- "scripts": {
51
- "clean": "shx rm -rf lib/*",
52
- "build": "yarn clean && tsc -p tsconfig.json",
53
- "test": "vitest run",
54
- "test:node": "vitest run --project node",
55
- "test:dom": "vitest run --project happy-dom",
56
- "test:watch": "vitest"
57
- },
58
- "eslintConfig": {
59
- "extends": [
60
- "react-app"
61
- ]
62
- },
63
- "browserslist": {
64
- "production": [
65
- "chrome >= 67",
66
- "edge >= 79",
67
- "firefox >= 68",
68
- "opera >= 54",
69
- "safari >= 14"
70
- ],
71
- "development": [
72
- "last 1 chrome version",
73
- "last 1 firefox version",
74
- "last 1 safari version"
75
- ]
76
- },
77
- "gitHead": "9ba5707ef8b025649cb02732d11b9b8d9f9d64af"
78
- }
63
+ "development": [
64
+ "last 1 chrome version",
65
+ "last 1 firefox version",
66
+ "last 1 safari version"
67
+ ]
68
+ },
69
+ "scripts": {
70
+ "clean": "shx rm -rf lib/*",
71
+ "build": "pnpm run clean && tsc -p tsconfig.json",
72
+ "test": "vitest run",
73
+ "test:node": "vitest run --project node",
74
+ "test:dom": "vitest run --project happy-dom",
75
+ "test:watch": "vitest"
76
+ }
77
+ }
package/src/__tests__/useQuery.dom.test.ts CHANGED
@@ -54,14 +54,18 @@ class PostsDB extends Program<{ replicate?: boolean }> {
54
54
  describe("useQuery (integration with Documents)", () => {
55
55
  let peerWriter: Peerbit;
56
56
  let peerReader: Peerbit;
57
+ let peerReader2: Peerbit | undefined;
57
58
  let dbWriter: PostsDB;
58
59
  let dbReader: PostsDB;
60
+ let dbReader2: PostsDB | undefined;
59
61
  let autoUnmount: undefined | (() => void);
60
62
 
61
63
  beforeEach(async () => {
62
64
  await sodium.ready;
63
65
  peerWriter = await Peerbit.create();
64
66
  peerReader = await Peerbit.create();
67
+ peerReader2 = undefined;
68
+ dbReader2 = undefined;
65
69
  });
66
70
  const setupConnected = async () => {
67
71
  await peerWriter.dial(peerReader);
@@ -94,6 +98,7 @@ describe("useQuery (integration with Documents)", () => {
94
98
  autoUnmount = undefined;
95
99
  await peerWriter?.stop();
96
100
  await peerReader?.stop();
101
+ await peerReader2?.stop();
97
102
  });
98
103
 
99
104
  function renderUseQuery<R extends boolean>(
@@ -235,6 +240,129 @@ describe("useQuery (integration with Documents)", () => {
235
240
  expect(result.current.items[0].message).toBe("late");
236
241
  });
237
242
 
243
+ it("pushes remote writes from replicator to non-replicator", async () => {
244
+ await setupConnected();
245
+
246
+ const { result } = renderUseQuery(dbReader, {
247
+ query: {},
248
+ resolve: true,
249
+ local: false,
250
+ remote: { reach: { eager: true } },
251
+ updates: { merge: true },
252
+ prefetch: false,
253
+ });
254
+
255
+ await waitFor(() => {
256
+ expect(result.current).toBeDefined();
257
+ });
258
+
259
+ expect(result.current.items.length).toBe(0);
260
+
261
+ await act(async () => {
262
+ await dbWriter.posts.put(new Post({ message: "replicator-push" }));
263
+ });
264
+
265
+ await act(async () => {
266
+ await result.current.loadMore();
267
+ });
268
+
269
+ await waitFor(
270
+ () =>
271
+ expect(
272
+ result.current.items.map((p) => (p as Post).message)
273
+ ).toContain("replicator-push"),
274
+ { timeout: 10_000 }
275
+ );
276
+ });
277
+
278
+ it("fanouts pushed updates to multiple observers", async () => {
279
+ await setupConnected();
280
+
281
+ peerReader2 = await Peerbit.create();
282
+ await peerReader2.dial(peerWriter);
283
+ dbReader2 = await peerReader2.open<PostsDB>(dbWriter.address, {
284
+ args: { replicate: false },
285
+ });
286
+
287
+ await dbReader2.posts.log.waitForReplicator(
288
+ peerWriter.identity.publicKey
289
+ );
290
+
291
+ const hookOne = renderUseQuery(dbReader, {
292
+ query: {},
293
+ resolve: true,
294
+ local: false,
295
+ remote: { reach: { eager: true } },
296
+ updates: { merge: true },
297
+ prefetch: false,
298
+ });
299
+
300
+ const hookTwo = renderUseQuery(dbReader2, {
301
+ query: {},
302
+ resolve: true,
303
+ local: false,
304
+ remote: { reach: { eager: true } },
305
+ updates: { merge: true },
306
+ prefetch: false,
307
+ });
308
+
309
+ await waitFor(() => {
310
+ expect(hookOne.result.current).toBeDefined();
311
+ expect(hookTwo.result.current).toBeDefined();
312
+ });
313
+
314
+ await act(async () => {
315
+ await dbWriter.posts.put(new Post({ message: "broadcast" }));
316
+ });
317
+
318
+ await act(async () => {
319
+ await hookOne.result.current.loadMore();
320
+ await hookTwo.result.current.loadMore();
321
+ });
322
+
323
+ await waitFor(
324
+ () =>
325
+ expect(
326
+ hookOne.result.current.items.some(
327
+ (p) => (p as Post).message === "broadcast"
328
+ )
329
+ ).toBe(true),
330
+ { timeout: 10_000 }
331
+ );
332
+
333
+ await waitFor(
334
+ () =>
335
+ expect(
336
+ hookTwo.result.current.items.some(
337
+ (p) => (p as Post).message === "broadcast"
338
+ )
339
+ ).toBe(true),
340
+ { timeout: 10_000 }
341
+ );
342
+
343
+ await act(async () => {
344
+ await dbReader.posts.put(new Post({ message: "observer-origin" }));
345
+ });
346
+
347
+ await act(async () => {
348
+ await hookOne.result.current.loadMore();
349
+ await hookTwo.result.current.loadMore();
350
+ });
351
+
352
+ await waitFor(
353
+ () =>
354
+ expect(
355
+ hookTwo.result.current.items.some(
356
+ (p) => (p as Post).message === "observer-origin"
357
+ )
358
+ ).toBe(true),
359
+ { timeout: 10_000 }
360
+ );
361
+
362
+ hookOne.unmount();
363
+ hookTwo.unmount();
364
+ });
365
+
238
366
  describe("merge", () => {
239
367
  const checkAsResolvedResults = async <R extends boolean>(
240
368
  out: ReturnType<typeof renderUseQuery<R>>,
@@ -310,14 +438,13 @@ describe("useQuery (integration with Documents)", () => {
310
438
  });
311
439
  });
312
440
 
313
- /* TODO not yet supported
314
-
441
+ /*
315
442
  it("updates.merge reflects document mutation in hook state", async () => {
316
443
  await setupConnected();
317
-
444
+
318
445
  const id = `${Date.now()}-mut`;
319
446
  await dbWriter.posts.put(new Post({ id, message: "v1" }));
320
-
447
+
321
448
  const { result } = renderUseQuery(dbReader, {
322
449
  query: {},
323
450
  resolve: true,
@@ -326,18 +453,18 @@ describe("useQuery (integration with Documents)", () => {
326
453
  prefetch: true,
327
454
  updates: { merge: true },
328
455
  });
329
-
456
+
330
457
  await waitFor(() => expect(result.current.items.length).toBe(1), {
331
458
  timeout: 1e4,
332
459
  });
333
460
  expect(result.current.items[0].message).toBe("v1");
334
-
461
+
335
462
  // Mutate by putting a new version with the same id
336
463
  await act(async () => {
337
464
  // the reader actually does the put (a user)
338
465
  await dbReader.posts.put(new Post({ id, message: "v2" }));
339
466
  });
340
-
467
+
341
468
  // Expect the hook state to reflect the updated content
342
469
  await waitFor(
343
470
  () => {
package/src/usePeer.tsx CHANGED
@@ -17,9 +17,9 @@ import { useMount } from "./useMount.js";
17
17
  import { createClient, createHost } from "@peerbit/proxy-window";
18
18
  import { ProgramClient } from "@peerbit/program";
19
19
  import { webSockets } from "@libp2p/websockets";
20
- import * as filters from "@libp2p/websockets/filters";
21
20
  import { detectIncognito } from "detectincognitojs";
22
-
21
+ import { waitFor } from "@testing-library/dom";
22
+ import { Libp2p } from "@libp2p/interface";
23
23
  const isInStandaloneMode = () =>
24
24
  window.matchMedia("(display-mode: standalone)").matches ||
25
25
  window.navigator["standalone"] ||
@@ -90,7 +90,7 @@ export type NetworkOption =
90
90
  type NodeOptions = {
91
91
  type?: "node";
92
92
  network: "local" | "remote" | NetworkOption;
93
- waitForConnnected?: boolean;
93
+ waitForConnnected?: boolean | "in-flight";
94
94
  keypair?: Ed25519Keypair;
95
95
  host?: boolean;
96
96
  singleton?: boolean;
@@ -212,7 +212,7 @@ export const PeerProvider = (options: PeerOptions) => {
212
212
  // Mark expired and remove proactively
213
213
  try {
214
214
  mutex.release(lockKey);
215
- } catch {}
215
+ } catch { }
216
216
  }
217
217
  };
218
218
  document.addEventListener(
@@ -289,20 +289,23 @@ export const PeerProvider = (options: PeerOptions) => {
289
289
  connectionMonitor: { enabled: false },
290
290
  ...(nodeOptions.network === "local"
291
291
  ? {
292
- connectionGater: {
293
- denyDialMultiaddr: () => false,
294
- },
295
- transports: [
296
- webSockets({ filter: filters.all }) /* ,
292
+ connectionGater: {
293
+ denyDialMultiaddr: () => false,
294
+ },
295
+ transports: [
296
+ webSockets({}) /* ,
297
297
  circuitRelayTransport(), */,
298
- ],
299
- }
298
+ ],
299
+ }
300
300
  : {
301
- transports: [
302
- webSockets() /* ,
301
+ connectionGater: {
302
+ denyDialMultiaddr: () => false, // TODO do right here, dont allow local dials except bootstrap
303
+ },
304
+ transports: [
305
+ webSockets() /* ,
303
306
  circuitRelayTransport(), */,
304
- ],
305
- }) /*
307
+ ],
308
+ }) /*
306
309
  services: {
307
310
  pubsub: (c) =>
308
311
  new DirectSub(c, { canRelayMessage: true }),
@@ -370,7 +373,7 @@ export const PeerProvider = (options: PeerOptions) => {
370
373
  }
371
374
  // 3) Remote default: use bootstrap service (no explicit bootstrap provided)
372
375
  else {
373
- await newPeer["bootstrap"]?.();
376
+ await (newPeer as Peerbit).bootstrap?.();
374
377
  }
375
378
  setConnectionState("connected");
376
379
  } catch (err: any) {
@@ -410,10 +413,30 @@ export const PeerProvider = (options: PeerOptions) => {
410
413
  })
411
414
  );
412
415
  }
413
- } catch {}
416
+ } catch { }
414
417
  });
415
- if (nodeOptions.waitForConnnected !== false) {
418
+ if (nodeOptions.waitForConnnected === true) {
416
419
  await promise;
420
+ } else if (nodeOptions.waitForConnnected === "in-flight") {
421
+ // wait for dialQueue to not be empty or connections to contains the peerId
422
+ // or done
423
+ let isDone = false;
424
+ promise.finally(() => {
425
+ isDone = true;
426
+ });
427
+ await waitFor(() => {
428
+ if (isDone) {
429
+ return true;
430
+ }
431
+ const libp2p = newPeer as any as Libp2p;
432
+ if (libp2p.getDialQueue().length > 0) {
433
+ return true;
434
+ }
435
+ if (libp2p.getConnections().length > 0) {
436
+ return true;
437
+ }
438
+ return false;
439
+ });
417
440
  }
418
441
  } else {
419
442
  // When in proxy mode (iframe), use the provided targetOrigin.
@@ -430,7 +453,7 @@ export const PeerProvider = (options: PeerOptions) => {
430
453
  detail: (window as any).__peerInfo,
431
454
  })
432
455
  );
433
- } catch {}
456
+ } catch { }
434
457
  }
435
458
 
436
459
  setPeer(newPeer);