@peerbit/react 0.0.9 → 0.0.10

package/lib/esm/utils.d.ts

@@ -1,8 +1,12 @@
 import { Ed25519Keypair } from "@peerbit/crypto";
 import { FastMutex } from "./lockstorage";
-export declare const getTabId: () => any;
+export declare const cookiesWhereClearedJustNow: () => boolean;
+export declare const getTabId: () => string;
 export declare const releaseKey: (path: string, lock?: FastMutex) => void;
-export declare const getFreeKeypair: (id?: string, lock?: FastMutex, lockCondition?: () => boolean, releaseLockIfSameId?: boolean) => Promise<{
+export declare const getFreeKeypair: (id?: string, lock?: FastMutex, lockCondition?: () => boolean, options?: {
+    releaseLockIfSameId?: boolean;
+    releaseFirstLock?: boolean;
+}) => Promise<{
     path: string;
     key: Ed25519Keypair;
 }>;

package/lib/esm/utils.js

@@ -3,14 +3,23 @@ import { Ed25519Keypair, toBase64, fromBase64 } from "@peerbit/crypto";
 import { FastMutex } from "./lockstorage";
 import { v4 as uuid } from "uuid";
 import sodium from "libsodium-wrappers";
+const TAB_ID_KEY = "TAB_ID";
+export const cookiesWhereClearedJustNow = () => {
+    const lastPersistedAt = localStorage.getItem("lastPersistedAt");
+    if (lastPersistedAt) {
+        return false;
+    }
+    localStorage.setItem("lastPersistedAt", Date.now().toString());
+    return true;
+};
 export const getTabId = () => {
-    const idFromStorage = sessionStorage.getItem("TAB_ID");
+    const idFromStorage = sessionStorage.getItem(TAB_ID_KEY);
     if (idFromStorage) {
         return idFromStorage;
     }
     else {
         const id = uuid(); // generate unique UUID
-        sessionStorage.setItem("TAB_ID", id);
+        sessionStorage.setItem(TAB_ID_KEY, id);
         return id;
     }
 };
@@ -19,7 +28,7 @@ const getKeyId = (prefix, id) => prefix + "/" + id;
 export const releaseKey = (path, lock = new FastMutex({ clientId: getTabId() })) => {
     lock.release(path);
 };
-export const getFreeKeypair = async (id = "", lock = new FastMutex({ clientId: getTabId() }), lockCondition = () => true, releaseLockIfSameId) => {
+export const getFreeKeypair = async (id = "", lock = new FastMutex({ clientId: getTabId() }), lockCondition = () => true, options) => {
     await sodium.ready;
     const idCounterKey = ID_COUNTER_KEY + id;
     await lock.lock(idCounterKey, () => true);
@@ -27,8 +36,11 @@ export const getFreeKeypair = async (id = "", lock = new FastMutex({ clientId: g
     for (let i = 0; i < 10000; i++) {
         const key = getKeyId(id, i);
         let lockedInfo = lock.getLockedInfo(key);
+        console.log("KEY KEY AT", key, id, i, lockedInfo, lockedInfo === lock.clientId, options);
         if (lockedInfo) {
-            if (lockedInfo === lock.clientId && releaseLockIfSameId) {
+            if ((lockedInfo === lock.clientId &&
+                options?.releaseLockIfSameId) ||
+                options?.releaseFirstLock) {
                 await lock.release(key); // Release lock
             }
             else {

package/lib/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,8 @@
 {
     "name": "@peerbit/react",
-    "version": "0.0.9",
+    "version": "0.0.10",
     "homepage": "https://dao-xyz.github.io/peerbit-examples",
+    "type": "module",
     "module": "lib/esm/index.js",
     "types": "lib/esm/index.d.ts",
     "exports": {
@@ -22,9 +23,9 @@
         "react": "*"
     },
     "dependencies": {
-        "@chainsafe/libp2p-yamux": "^6",
-        "@libp2p/webrtc": "^4",
-        "@peerbit/document": "^6",
+        "@chainsafe/libp2p-yamux": "^7",
+        "@libp2p/webrtc": "^5",
+        "@peerbit/document": "^7",
         "@peerbit/proxy-window": "^3",
         "@types/react": "^18.2.46",
         "@types/react-dom": "^18.2.18",
@@ -33,13 +34,14 @@
         "peerbit": "^4",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "react-router-dom": "^6.16.0",
+        "react-router-dom": "^6.27.0",
         "react-use": "^17.4.0"
     },
     "devDependencies": {
         "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-transform-typescript": "^7.20.2",
+        "@types/node-localstorage": "^1",
         "@types/sinon": "^10.0.13",
         "node-localstorage": "^2.2.1",
         "sinon": "^15.0.1"
@@ -47,12 +49,11 @@
     "scripts": {
         "clean": "shx rm -rf lib/*",
         "build": "yarn clean && tsc -p tsconfig.json",
-        "test": "jest"
+        "test": "mocha"
     },
     "eslintConfig": {
         "extends": [
-            "react-app",
-            "react-app/jest"
+            "react-app"
         ]
     },
     "browserslist": {
@@ -69,5 +70,5 @@
             "last 1 safari version"
         ]
     },
-    "gitHead": "fe197ee72e4c9272d3706c6486ce48d2fefb0a06"
+    "gitHead": "737695f1fa51c866c38841e152a9a0faff3c22f4"
 }

package/src/__tests__/lockstorage.test.ts

@@ -17,15 +17,24 @@ THIS SOFTWARE.
 
 import { FastMutex } from "../lockstorage.js";
 import sinon from "sinon";
-
 import nodelocalstorage from "node-localstorage";
-import { jest } from "@jest/globals";
+import { expect } from "chai";
 import { delay } from "@peerbit/time";
-var LocalStorage = nodelocalstorage.LocalStorage;
-var localStorage = new LocalStorage("./tmp/FastMutex");
-globalThis.localStorage = localStorage;
+
 describe("FastMutex", () => {
     let sandbox;
+
+    before(() => {
+        var LocalStorage = nodelocalstorage!.LocalStorage;
+        var localStorage = new LocalStorage("./tmp/FastMutex");
+        localStorage.clear();
+        globalThis.localStorage = localStorage;
+    });
+
+    after(() => {
+        globalThis.localStorage.clear();
+    });
+
     beforeEach(() => {
         sandbox = sinon.createSandbox();
         localStorage.clear();
@@ -33,15 +42,15 @@ describe("FastMutex", () => {
     afterEach(() => {
         sandbox.restore();
         localStorage.clear();
-        expect(localStorage.length).toEqual(0);
+        expect(localStorage.length).to.eq(0);
     });
 
     it("should immediately establish a lock when there is no contention", async () => {
         const fm1 = new FastMutex({ localStorage: localStorage });
 
-        expect(fm1.isLocked("clientId")).toBeFalse();
+        expect(fm1.isLocked("clientId")).to.be.false;
         const stats = await fm1.lock("clientId");
-        expect(fm1.isLocked("clientId")).toBeTrue();
+        expect(fm1.isLocked("clientId")).to.be.true;
     });
 
     it("When another client has a lock (Y is not 0), it should restart to acquire a lock at a later time", function () {
@@ -59,7 +68,7 @@ describe("FastMutex", () => {
         }, 20);
 
         return fm1.lock(key).then(() => {
-            expect(fm1.getLockedInfo(key)).toBeDefined();
+            expect(fm1.getLockedInfo(key)).to.exist;
         });
     });
 
@@ -81,9 +90,9 @@ describe("FastMutex", () => {
         stub.onCall(4).returns("uniqueId");
 
         return fm.lock(key).then((stats) => {
-            expect(stats.restartCount).toEqual(1);
-            expect(stats.locksLost).toEqual(1);
-            expect(stats.contentionCount).toEqual(1);
+            expect(stats.restartCount).to.eq(1);
+            expect(stats.locksLost).to.eq(1);
+            expect(stats.contentionCount).to.eq(1);
         });
     });
 
@@ -103,10 +112,10 @@ describe("FastMutex", () => {
         const spy = sandbox.spy(fm, "lock");
 
         return fm.lock(key).then((stats) => {
-            expect(stats.restartCount).toEqual(0);
-            expect(stats.locksLost).toEqual(0);
-            expect(stats.contentionCount).toEqual(1);
-            expect(spy.callCount).toEqual(1);
+            expect(stats.restartCount).to.eq(0);
+            expect(stats.locksLost).to.eq(0);
+            expect(stats.contentionCount).to.eq(1);
+            expect(spy.callCount).to.eq(1);
         });
     });
 
@@ -127,20 +136,20 @@ describe("FastMutex", () => {
         /* eslint-disable jest/valid-expect-in-promise */
         const lock1Promise = fm1.lock("lock1").then((stats) => {
             lock1Acquired = true;
-            expect(localStorage.getItem(yPrefix + "lock1")).toBeDefined();
+            expect(localStorage.getItem(yPrefix + "lock1")).to.exist;
             return stats;
         });
 
         /* eslint-disable jest/valid-expect-in-promise */
         const lock2Promise = fm2.lock("lock2").then((stats) => {
             lock2Acquired = true;
-            expect(localStorage.getItem(yPrefix + "lock2")).toBeDefined();
+            expect(localStorage.getItem(yPrefix + "lock2")).to.exist;
             return stats;
         });
 
         await Promise.all([lock1Promise, lock2Promise]).then(() => {
-            expect(lock1Acquired).toBeTrue();
-            expect(lock2Acquired).toBeTrue();
+            expect(lock1Acquired).to.be.true;
+            expect(lock2Acquired).to.be.true;
         });
     });
 
@@ -154,11 +163,11 @@ describe("FastMutex", () => {
         return fm1
             .lock(key)
             .then(() => {
-                expect(fm1.getItem("yLock" + key)).toEqual("releaseTestId");
+                expect(fm1.getItem("yLock" + key)).to.eq("releaseTestId");
                 return fm1.release(key);
             })
             .then(() => {
-                expect(fm1.getItem("yLock" + key)).toBeUndefined();
+                expect(fm1.getItem("yLock" + key)).to.be.undefined;
             });
     });
 
@@ -176,7 +185,7 @@ describe("FastMutex", () => {
             .then(() => {
                 // before the lock is released, try to establish another lock:
                 var lock2Promise = fm2.lock("clientId");
-                expect(fm1LockReleased).toBeFalse();
+                expect(fm1LockReleased).to.be.false;
 
                 // in a few milliseconds, release the lock
                 setTimeout(() => {
@@ -188,14 +197,11 @@ describe("FastMutex", () => {
             })
             .then((lock2) => {
                 // this will only execute once the other lock was released
-                expect(fm1LockReleased).toBeTrue();
+                expect(fm1LockReleased).to.be.true;
             });
     });
 
-    it("should throw if lock is never acquired after set time period", function () {
-        jest.setTimeout(1000);
-        // this.slow(500);
-
+    it("should throw if lock is never acquired after set time period", () => {
         const fm1 = new FastMutex({ localStorage: localStorage, timeout: 50 });
         const fm2 = new FastMutex({ localStorage: localStorage, timeout: 50 });
 
@@ -204,10 +210,10 @@ describe("FastMutex", () => {
             return fm2.lock("timeoutTest");
         });
 
-        return expect(p).rejects.toThrowError();
+        expect(p).eventually.to.throw();
     });
 
-    it("should ignore expired locks", () => {
+    it("should ignore expired locks", async () => {
         const fm1 = new FastMutex({
             localStorage: localStorage,
             timeout: 5000,
@@ -221,9 +227,10 @@ describe("FastMutex", () => {
 
         localStorage.setItem("yLocktimeoutTest", JSON.stringify(expiredRecord));
         expect(
-            JSON.parse(localStorage.getItem("yLocktimeoutTest")).value
-        ).toEqual("oldclient");
-        return expect(fm1.lock("timeoutTest")).toResolve();
+            JSON.parse(localStorage.getItem("yLocktimeoutTest")!).value
+        ).to.eq("oldclient");
+
+        await fm1.lock("timeoutTest"); // should not throw
     });
 
     it("should reset the client stats after lock is released", async () => {
@@ -233,19 +240,20 @@ describe("FastMutex", () => {
         let keepLock = true;
         let keepLockFn = () => keepLock;
         await fm1.lock("resetStats", keepLockFn);
-        expect(fm1.isLocked("resetStats")).toBeTrue();
+        expect(fm1.isLocked("resetStats")).to.be.true;
         keepLock = false;
         await delay(100); // await timeout
-        expect(fm1.isLocked("resetStats")).toBeFalse();
+        expect(fm1.isLocked("resetStats")).to.be.false;
         const p = fm1.lock("resetStats").then(() => fm1.release("resetStats"));
-        await expect(p).toResolve();
+
+        await p; // should not throw
     });
 
     it("can keep lock with callback function", async () => {
         const fm1 = new FastMutex({ localStorage: localStorage, timeout: 50 });
         await fm1.lock("x");
         await fm1.release("x");
-        expect(fm1.isLocked("x")).toBeFalse();
+        expect(fm1.isLocked("x")).to.be.false;
         await fm1.lock("x").then(() => fm1.release("x"));
     });
 
@@ -259,6 +267,7 @@ describe("FastMutex", () => {
 
         // try to acquire a lock after `timeout`:
         await delay(50);
-        await expect(fm1.lock("resetStats")).toResolve();
+
+        await fm1.lock("resetStats"); // should not throw
     });
 });

package/src/__tests__/utils.test.ts

@@ -4,13 +4,19 @@ import { FastMutex } from "../lockstorage";
 import { delay } from "@peerbit/time";
 import { default as sodium } from "libsodium-wrappers";
 import { v4 as uuid } from "uuid";
-var LocalStorage = nodelocalstorage.LocalStorage;
-var localStorage = new LocalStorage("./tmp/getKeypair");
-globalThis.localStorage = localStorage;
+import { expect } from "chai";
 
 describe("getKeypair", () => {
-    beforeAll(async () => {
+    before(async () => {
         await sodium.ready;
+
+        var LocalStorage = nodelocalstorage.LocalStorage;
+        var localStorage = new LocalStorage("./tmp/getKeypair");
+        globalThis.localStorage = localStorage;
+    });
+
+    after(() => {
+        globalThis.localStorage.clear();
     });
 
     it("can aquire multiple keypairs", async () => {
@@ -25,16 +31,16 @@ describe("getKeypair", () => {
             lockCondition
         );
         const { key: keypair2, path: path2 } = await getFreeKeypair(id, mutex);
-        expect(keypair!.equals(keypair2!)).toBeFalse();
-        expect(path1).not.toEqual(path2);
+        expect(keypair!.equals(keypair2!)).to.be.false;
+        expect(path1).not.to.eq(path2);
         lock = false;
         await delay(timeout);
         const { path: path3, key: keypair3 } = await getFreeKeypair(id, mutex);
-        expect(path3).toEqual(path1);
-        expect(keypair3.equals(keypair)).toBeTrue();
+        expect(path3).to.eq(path1);
+        expect(keypair3.equals(keypair)).to.be.true;
 
         const allKeypair = await getAllKeyPairs(id);
-        expect(allKeypair.map((x) => x.publicKey.hashcode())).toEqual([
+        expect(allKeypair.map((x) => x.publicKey.hashcode())).to.deep.eq([
             keypair3.publicKey.hashcode(),
             keypair2.publicKey.hashcode(),
         ]);
@@ -50,18 +56,18 @@ describe("getKeypair", () => {
             id,
             mutex,
             lockCondition,
-            true
+            { releaseLockIfSameId: true }
         );
         const { key: keypair2, path: path2 } = await getFreeKeypair(
             id,
             mutex,
             undefined,
-            true
+            { releaseLockIfSameId: true }
         );
-        expect(keypair!.equals(keypair2!)).toBeTrue();
-        expect(path1).toEqual(path2);
+        expect(keypair!.equals(keypair2!)).to.be.true;
+        expect(path1).to.eq(path2);
         const allKeypair = await getAllKeyPairs(id);
-        expect(allKeypair).toHaveLength(1);
+        expect(allKeypair).to.have.length(1);
     });
 
     it("releases manually", async () => {
@@ -73,11 +79,11 @@ describe("getKeypair", () => {
 
         const { key: keypair2, path: path2 } = await getFreeKeypair(id, mutex);
 
-        expect(path1).not.toEqual(path2);
+        expect(path1).not.to.eq(path2);
         releaseKey(path1, mutex);
-        expect(mutex.getLockedInfo(path1)).toBeUndefined();
+        expect(mutex.getLockedInfo(path1)).to.be.undefined;
         const { key: keypair3, path: path3 } = await getFreeKeypair(id, mutex);
 
-        expect(path1).toEqual(path3); // we can now acquire key at path1 again, since we released it
+        expect(path1).to.eq(path3); // we can now acquire key at path1 again, since we released it
     });
 });

package/src/index.ts

@@ -2,3 +2,4 @@ export { PeerProvider, PeerContext, usePeer } from "./usePeer.js";
 export * from "./utils.js";
 export { FastMutex } from "./lockstorage.js";
 export { useProgram } from "./useProgram.js";
+export { useLocal } from "./useLocal.js";

package/src/lockstorage.ts

@@ -32,7 +32,7 @@ export class FastMutex {
         xPrefix = "_MUTEX_LOCK_X_",
         yPrefix = "_MUTEX_LOCK_Y_",
         timeout = 5000,
-        localStorage = undefined,
+        localStorage = undefined as any,
     } = {}) {
         this.clientId = clientId;
         this.xPrefix = xPrefix;

package/src/useLocal.tsx

@@ -0,0 +1,27 @@
+import { Documents, SearchRequest } from "@peerbit/document";
+import { useEffect, useState } from "react";
+export const useLocal = <T extends Record<string, any>>(
+    db?: Documents<T, any>
+) => {
+    const [all, setAll] = useState<T[]>([]);
+    useEffect(() => {
+        if (!db || db.closed) {
+            return;
+        }
+
+        const changeListener = async () => {
+            setAll(
+                await db.index.search(new SearchRequest(), {
+                    local: true,
+                    remote: false,
+                })
+            );
+        };
+
+        changeListener();
+        db.events.addEventListener("change", changeListener);
+
+        return () => db.events.addEventListener("change", changeListener);
+    }, [db?.address, db?.closed]);
+    return all;
+};

package/src/usePeer.tsx

@@ -1,22 +1,28 @@
 import React, { useContext } from "react";
 import { Multiaddr } from "@multiformats/multiaddr";
 import { Peerbit } from "peerbit";
-import { webSockets } from "@libp2p/websockets";
 import { DirectSub } from "@peerbit/pubsub";
 import { yamux } from "@chainsafe/libp2p-yamux";
-import { getFreeKeypair, getTabId, inIframe } from "./utils.js";
-import { noise } from "@dao-xyz/libp2p-noise";
+import {
+    getFreeKeypair,
+    getTabId,
+    inIframe,
+    cookiesWhereClearedJustNow,
+} from "./utils.js";
+import { noise } from "@chainsafe/libp2p-noise";
 import { v4 as uuid } from "uuid";
 import { Ed25519Keypair } from "@peerbit/crypto";
 import { FastMutex } from "./lockstorage.js";
 import sodium from "libsodium-wrappers";
-import * as filters from "@libp2p/websockets/filters";
+
 import { useMount } from "./useMount.js";
 import { createClient, createHost } from "@peerbit/proxy-window";
 import { ProgramClient } from "@peerbit/program";
-import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
-import { webRTC } from "@libp2p/webrtc";
 import { identify } from "@libp2p/identify";
+import { webSockets } from "@libp2p/websockets";
+import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
+
+import * as filters from "@libp2p/websockets/filters";
 import { detectIncognito } from "detectincognitojs";
 
 export type ConnectionStatus =
@@ -114,6 +120,7 @@ export const PeerProvider = (options: PeerOptions) => {
                 : (options as TopOptions);
 
             if (nodeOptions.type !== "proxy") {
+                const releaseFirstLock = cookiesWhereClearedJustNow();
                 const nodeId =
                     nodeOptions.keypair ||
                     (
@@ -124,10 +131,13 @@ export const PeerProvider = (options: PeerOptions) => {
                                 timeout: 1000,
                             }),
                             undefined,
-                            true // reuse keypairs from same tab, (force release)
+                            {
+                                releaseFirstLock, // when clearing cookies sometimes the localStorage is not cleared immediately so we need to release the lock forcefully. TODO investigate why this is happening
+                                releaseLockIfSameId: true, // reuse keypairs from same tab, (force release)
+                            }
                         )
                     ).key;
-                const peerId = await nodeId.toPeerId();
+                const peerId = nodeId.toPeerId();
 
                 let directory: string | undefined = undefined;
                 if (
@@ -157,13 +167,15 @@ export const PeerProvider = (options: PeerOptions) => {
                 newPeer = await Peerbit.create({
                     libp2p: {
                         addresses: {
-                            listen: ["/webrtc"],
+                            listen: [
+                                "/p2p-circuit",
+                                /* "/webrtc" */
+                            ], // TMP disable because flaky behaviour with libp2p 1.8.1
                         },
-                        connectionEncryption: [noise()],
+                        connectionEncrypters: [noise()],
                         peerId, //, having the same peer accross broswers does not work, only one tab will be recognized by other peers
                         connectionManager: {
                             maxConnections: 100,
-                            minConnections: 1,
                         },
 
                         streamMuxers: [yamux()],
@@ -183,19 +195,15 @@ export const PeerProvider = (options: PeerOptions) => {
                                       webSockets({
                                           filter: filters.all,
                                       }),
-                                      circuitRelayTransport({
-                                          discoverRelays: 1,
-                                      }),
-                                      webRTC(),
+                                      circuitRelayTransport(),
+                                      /*    webRTC(), */ // TMP disable because flaky behaviour with libp2p 1.8.1
                                   ],
                               }
                             : {
                                   transports: [
                                       webSockets({ filter: filters.wss }),
-                                      circuitRelayTransport({
-                                          discoverRelays: 1,
-                                      }),
-                                      webRTC(),
+                                      circuitRelayTransport(),
+                                      /*   webRTC(), */ // TMP disable because flaky behaviour with libp2p 1.8.1
                                   ],
                               }),
 
@@ -212,8 +220,10 @@ export const PeerProvider = (options: PeerOptions) => {
                     },
                     directory,
                 });
-                console.log("Create done");
-                console.log(newPeer?.identity.publicKey.hashcode());
+                console.log("Client created", {
+                    directory,
+                    peerHash: newPeer?.identity.publicKey.hashcode(),
+                });
 
                 setConnectionState("connecting");
 

package/src/useProgram.tsx

@@ -38,6 +38,7 @@ export const useProgram = <
         }
         setLoading(true);
         let changeListener: () => void;
+
         closingRef.current.then(() => {
             programLoadingRef.current = peer
                 ?.open(addressOrOpen, { ...options, existing: "reuse" })
@@ -67,18 +68,26 @@ export const useProgram = <
             let startRef = programLoadingRef.current;
 
             // TODO don't close on reopen the same db?
-            closingRef.current =
-                programLoadingRef.current?.then((p) =>
-                    p.close().then(() => {
-                        p.events.removeEventListener("join", changeListener);
-                        p.events.removeEventListener("leave", changeListener);
+            if (programLoadingRef.current) {
+                closingRef.current =
+                    programLoadingRef.current.then((p) =>
+                        p.close().then(() => {
+                            p.events.removeEventListener(
+                                "join",
+                                changeListener
+                            );
+                            p.events.removeEventListener(
+                                "leave",
+                                changeListener
+                            );
 
-                        if (programLoadingRef.current === startRef) {
-                            setProgram(undefined);
-                            programLoadingRef.current = undefined;
-                        }
-                    })
-                ) || Promise.resolve();
+                            if (programLoadingRef.current === startRef) {
+                                setProgram(undefined);
+                                programLoadingRef.current = undefined;
+                            }
+                        })
+                    ) || Promise.resolve();
+            }
         };
     }, [
         peer?.identity.publicKey.hashcode(),