@peerbit/react 0.0.3 → 0.0.5

package/lib/esm/index.d.ts

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

package/lib/esm/index.js

@@ -1,4 +1,5 @@
-export { PeerProvider, PeerContext, usePeer, submitKeypairChange, } from "./usePeer.js";
+export { PeerProvider, PeerContext, usePeer } from "./usePeer.js";
 export * from "./utils.js";
 export { FastMutex } from "./lockstorage.js";
+export { useProgram } from "./useProgram.js";
 //# sourceMappingURL=index.js.map

package/lib/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACZ,WAAW,EACX,OAAO,EACP,mBAAmB,GACtB,MAAM,cAAc,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAClE,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC"}

package/lib/esm/usePeer.d.ts

@@ -1,25 +1,39 @@
 import React from "react";
 import { Multiaddr } from "@multiformats/multiaddr";
-import { Peerbit } from "peerbit";
 import { Ed25519Keypair } from "@peerbit/crypto";
+import { ProgramClient } from "@peerbit/program";
 export type ConnectionStatus = "disconnected" | "connected" | "connecting" | "failed";
 interface IPeerContext {
-    peer: Peerbit | undefined;
+    peer: ProgramClient | undefined;
     promise: Promise<void> | undefined;
     loading: boolean;
     status: ConnectionStatus;
 }
-export declare const subscribeToKeypairChange: (onChange: (keypair: Ed25519Keypair) => any) => void;
-export declare const submitKeypairChange: (element: HTMLIFrameElement, keypair: Ed25519Keypair, origin: string) => void;
 export declare const PeerContext: React.Context<IPeerContext>;
 export declare const usePeer: () => IPeerContext;
-export declare const PeerProvider: ({ network, bootstrap, children, inMemory, keypair, waitForConnnected, waitForKeypairInIFrame, }: {
+type IFrameOptions = {
+    type: "proxy";
+    targetOrigin: string;
+};
+type NodeOptions = {
+    type?: "node";
     network: "local" | "remote";
-    inMemory?: boolean | undefined;
-    waitForConnnected?: boolean | undefined;
-    keypair?: Ed25519Keypair | undefined;
-    waitForKeypairInIFrame?: boolean | undefined;
-    bootstrap?: (string | Multiaddr)[] | undefined;
+    waitForConnnected?: boolean;
+    keypair?: Ed25519Keypair;
+    bootstrap?: (Multiaddr | string)[];
+    host?: boolean;
+};
+type TopOptions = NodeOptions & WithMemory;
+type TopAndIframeOptions = {
+    iframe: IFrameOptions | NodeOptions;
+    top: TopOptions;
+};
+type WithMemory = {
+    inMemory?: boolean;
+};
+type WithChildren = {
     children: JSX.Element;
-}) => import("react/jsx-runtime").JSX.Element;
+};
+type PeerOptions = (TopAndIframeOptions | TopOptions) & WithChildren;
+export declare const PeerProvider: (options: PeerOptions) => import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/esm/usePeer.js

@@ -1,41 +1,25 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 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 { mplex } from "@libp2p/mplex";
 import { getFreeKeypair, getTabId, inIframe } from "./utils.js";
-import { resolveBootstrapAddresses } from "@peerbit/network-utils";
 import { noise } from "@dao-xyz/libp2p-noise";
 import { v4 as uuid } from "uuid";
-import { Ed25519Keypair } from "@peerbit/crypto";
 import { FastMutex } from "./lockstorage.js";
-import { serialize, deserialize } from "@dao-xyz/borsh";
-import { waitFor } from "@peerbit/time";
 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 { identifyService } from "libp2p/identify";
+import { detectIncognito } from "detectincognitojs";
 if (!window.name) {
     window.name = uuid();
 }
-export const subscribeToKeypairChange = (onChange) => {
-    window.onmessage = (c) => {
-        if (c.data.type == "keypair") {
-            onChange(deserialize(c.data.bytes, Ed25519Keypair));
-        }
-    };
-};
-export const submitKeypairChange = (element, keypair, origin) => {
-    element.contentWindow.postMessage({ type: "keypair", bytes: serialize(keypair) }, origin);
-};
-let keypairMessages = [];
-subscribeToKeypairChange((keypair) => {
-    console.log("got keypair!", keypair);
-    keypairMessages.push(keypair);
-});
 export const PeerContext = React.createContext({});
 export const usePeer = () => useContext(PeerContext);
-export const PeerProvider = ({ network, bootstrap, children, inMemory, keypair, waitForConnnected, waitForKeypairInIFrame, }) => {
+export const PeerProvider = (options) => {
     const [peer, setPeer] = React.useState(undefined);
     const [promise, setPromise] = React.useState(undefined);
     const [loading, setLoading] = React.useState(false);
@@ -50,131 +34,136 @@ export const PeerProvider = ({ network, bootstrap, children, inMemory, keypair,
         loading,
         !!promise,
         connectionState,
-        peer?.identity?.publicKey.toString(),
+        peer?.identity?.publicKey?.hashcode(),
     ]);
     useMount(() => {
         setLoading(true);
-        const fn = async (keypair = keypairMessages[keypairMessages.length - 1]) => {
+        const fn = async () => {
             await sodium.ready;
-            if (!keypair && waitForKeypairInIFrame && inIframe()) {
-                await waitFor(() => (keypair = keypairMessages[keypairMessages.length - 1]));
-            }
-            if (keypair &&
-                keypairMessages[keypairMessages.length - 1] &&
-                keypairMessages[keypairMessages.length - 1].equals(keypair)) {
-                console.log("Creating client from identity sent from parent window: " +
-                    keypair.publicKey.hashcode());
-            }
-            else {
-                if (!keypair) {
-                    console.log("Generating new keypair for client");
-                }
-                else {
-                    console.log("Keypair missmatch with latest keypair message", keypairMessages.map((x) => x.publicKey.hashcode()), keypair.publicKey.hashcode());
-                }
-            }
             if (peer) {
                 await peer.stop();
                 setPeer(undefined);
             }
-            const nodeId = keypair ||
-                (await getFreeKeypair("", new FastMutex({ clientId: getTabId(), timeout: 1000 }), undefined, true // reuse keypairs from same tab, (force release)
-                )).key;
-            // We create a new directrory to make tab to tab communication go smoothly
-            const newPeer = await Peerbit.create({
-                libp2p: {
-                    addresses: {
-                        listen: [
-                        /*    '/webrtc' */
-                        ],
-                    },
-                    connectionEncryption: [noise()],
-                    peerId: await nodeId.toPeerId(),
-                    connectionManager: {
-                        maxConnections: 100,
-                        minConnections: 0,
-                    },
-                    streamMuxers: [mplex()],
-                    ...(network === "local"
-                        ? {
-                            connectionGater: {
-                                denyDialMultiaddr: () => {
-                                    // by default we refuse to dial local addresses from the browser since they
-                                    // are usually sent by remote peers broadcasting undialable multiaddrs but
-                                    // here we are explicitly connecting to a local node so do not deny dialing
-                                    // any discovered address
-                                    return false;
-                                },
-                            },
-                            transports: [
-                                // Add websocket impl so we can connect to "unsafe" ws (production only allows wss)
-                                webSockets({
-                                    filter: filters.all,
-                                }),
-                                /*            circuitRelayTransport({ discoverRelays: 1 }),
-               webRTC(), */
+            let newPeer;
+            const nodeOptions = options.top
+                ? inIframe()
+                    ? options.iframe
+                    : options.top
+                : options;
+            if (nodeOptions.type !== "proxy") {
+                const nodeId = nodeOptions.keypair ||
+                    (await getFreeKeypair("", new FastMutex({
+                        clientId: getTabId(),
+                        timeout: 1000,
+                    }), undefined, true // reuse keypairs from same tab, (force release)
+                    )).key;
+                // We create a new directrory to make tab to tab communication go smoothly
+                newPeer = await Peerbit.create({
+                    libp2p: {
+                        addresses: {
+                            listen: [
+                            /* "/webrtc" */
                             ],
-                        }
-                        : {
-                            connectionGater: {
-                                denyDialMultiaddr: () => {
-                                    // by default we refuse to dial local addresses from the browser since they
-                                    // are usually sent by remote peers broadcasting undialable multiaddrs but
-                                    // here we are explicitly connecting to a local node so do not deny dialing
-                                    // any discovered address
-                                    return false;
+                        },
+                        connectionEncryption: [noise()],
+                        peerId: await nodeId.toPeerId(),
+                        connectionManager: {
+                            maxConnections: 100,
+                            minConnections: 0,
+                        },
+                        streamMuxers: [mplex() /* , mplex() */],
+                        ...(nodeOptions.network === "local"
+                            ? {
+                                connectionGater: {
+                                    denyDialMultiaddr: () => {
+                                        // by default we refuse to dial local addresses from the browser since they
+                                        // are usually sent by remote peers broadcasting undialable multiaddrs but
+                                        // here we are explicitly connecting to a local node so do not deny dialing
+                                        // any discovered address
+                                        return false;
+                                    },
                                 },
-                            },
-                            transports: [
-                                webSockets({ filter: filters.all }),
-                                /*             circuitRelayTransport({ discoverRelays: 1 }),
-                webRTC(), */
-                            ],
-                        }),
-                },
-                directory: !inMemory ? "./repo" : undefined,
-                limitSigning: true,
-            });
-            setConnectionState("connecting");
-            // Resolve bootstrap nodes async (we want to return before this is done)
-            const connectFn = async () => {
-                try {
-                    const addresses = await (bootstrap
-                        ? Promise.resolve(bootstrap)
-                        : resolveBootstrapAddresses(network));
-                    if (addresses && addresses?.length > 0) {
-                        try {
-                            await Promise.all(addresses
-                                .map((a) => typeof a === "string" ? multiaddr(a) : a)
-                                .map((a) => newPeer.dial(a)));
-                            setConnectionState("connected");
+                                transports: [
+                                    // Add websocket impl so we can connect to "unsafe" ws (production only allows wss)
+                                    webSockets({
+                                        filter: filters.all,
+                                    }),
+                                    /*        circuitRelayTransport({
+                                             discoverRelays: 1,
+                                         }),
+                                         webRTC(), */
+                                    /*            circuitRelayTransport({ discoverRelays: 1 }),
+webRTC(), */
+                                ],
+                            }
+                            : {
+                                transports: [
+                                    webSockets({ filter: filters.wss }),
+                                    /*    circuitRelayTransport({
+                                         discoverRelays: 1,
+                                     }),
+                                     webRTC(), */
+                                ],
+                            }),
+                        services: {
+                            pubsub: (c) => new DirectSub(c, {
+                                canRelayMessage: true,
+                                emitSelf: true,
+                                /*  connectionManager: {
+                                     autoDial: false,
+                                 }, */
+                            }),
+                            identify: identifyService(),
+                        },
+                    },
+                    directory: !nodeOptions.inMemory &&
+                        !(await detectIncognito()).isPrivate
+                        ? "./repo"
+                        : undefined,
+                });
+                setConnectionState("connecting");
+                // Resolve bootstrap nodes async (we want to return before this is done)
+                const connectFn = async () => {
+                    try {
+                        if (nodeOptions.network === "local") {
+                            await newPeer.dial("/ip4/127.0.0.1/tcp/8002/ws/p2p/" +
+                                (await (await fetch("http://localhost:8082/peer/id")).text()));
                         }
-                        catch (error) {
-                            console.error("Failed to resolve relay node. Please come back later or start the demo locally");
-                            setConnectionState("failed");
-                            throw error;
+                        else {
+                            // TODO fix types. When proxy client this will not be available
+                            if (nodeOptions.bootstrap) {
+                                for (const addr of nodeOptions.bootstrap) {
+                                    await newPeer.dial(addr);
+                                }
+                            }
+                            else {
+                                await newPeer["bootstrap"]?.();
+                            }
                         }
+                        setConnectionState("connected");
                     }
-                    else {
-                        console.error("No addresses to connect to");
+                    catch (err) {
+                        console.error("Failed to resolve relay addresses. " + err?.message);
                         setConnectionState("failed");
                     }
+                    if (nodeOptions.host) {
+                        newPeer = await createHost(newPeer);
+                    }
+                };
+                const promise = connectFn();
+                // Make sure data flow as expected between tabs and windows locally (offline states)
+                if (nodeOptions.waitForConnnected !== false) {
+                    await promise;
                 }
-                catch (err) {
-                    console.error("Failed to resolve relay addresses. " + err?.message);
-                    setConnectionState("failed");
-                }
-            };
-            const promise = connectFn();
-            // Make sure data flow as expected between tabs and windows locally (offline states)
-            if (waitForConnnected) {
-                await promise;
+            }
+            else {
+                newPeer = await createClient(nodeOptions.targetOrigin);
             }
             setPeer(newPeer);
             setLoading(false);
         };
-        setPromise(fn(keypair));
+        setPromise(fn());
     });
-    return _jsx(PeerContext.Provider, { value: memo, children: children });
+    return (_jsx(PeerContext.Provider, { value: memo, children: options.children }));
 };
 //# sourceMappingURL=usePeer.js.map

package/lib/esm/usePeer.js.map

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

package/lib/esm/useProgram.d.ts

@@ -0,0 +1,6 @@
+import { Program, ProgramEvents, OpenOptions } from "@peerbit/program";
+export declare const useProgram: <A, B extends ProgramEvents, P extends Program<A, B>>(addressOrOpen: string | P, options?: OpenOptions<A, P> | undefined) => {
+    program: P | undefined;
+    loading: boolean;
+    promise: Promise<P> | undefined;
+};

package/lib/esm/useProgram.js

@@ -0,0 +1,38 @@
+import { usePeer } from "./usePeer.js";
+import { useEffect, useRef, useState } from "react";
+const addressOrUndefined = (p) => {
+    try {
+        return p.address;
+    }
+    catch (error) {
+        return undefined;
+    }
+};
+export const useProgram = (addressOrOpen, options) => {
+    const { peer } = usePeer();
+    let [program, setProgram] = useState();
+    let programRef = useRef();
+    let [loading, setLoading] = useState(false);
+    useEffect(() => {
+        if (!peer || !addressOrOpen) {
+            return;
+        }
+        setLoading(true);
+        programRef.current = peer
+            ?.open(addressOrOpen, { ...options, existing: "reuse" })
+            .then((p) => {
+            setProgram(p);
+            return p;
+        })
+            .finally(() => {
+            setLoading(false);
+        });
+    }, [
+        peer?.identity.publicKey.hashcode(),
+        typeof addressOrOpen === "string"
+            ? addressOrOpen
+            : addressOrUndefined(addressOrOpen),
+    ]);
+    return { program, loading, promise: programRef.current };
+};
+//# sourceMappingURL=useProgram.js.map

package/lib/esm/useProgram.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useProgram.js","sourceRoot":"","sources":["../../src/useProgram.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEpD,MAAM,kBAAkB,GAAG,CAKvB,CAAI,EACN,EAAE;IACA,IAAI;QACA,OAAO,CAAC,CAAC,OAAO,CAAC;KACpB;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,SAAS,CAAC;KACpB;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CACtB,aAAyB,EACzB,OAA2B,EAC7B,EAAE;IACA,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IAC3B,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAiB,CAAC;IACtD,IAAI,UAAU,GAAG,MAAM,EAAc,CAAC;IACtC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE5C,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE;YACzB,OAAO;SACV;QACD,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,UAAU,CAAC,OAAO,GAAG,IAAI;YACrB,EAAE,IAAI,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;aACvD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACR,UAAU,CAAC,CAAC,CAAC,CAAC;YACd,OAAO,CAAC,CAAC;QACb,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE;YACV,UAAU,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACX,CAAC,EAAE;QACC,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE;QACnC,OAAO,aAAa,KAAK,QAAQ;YAC7B,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,kBAAkB,CAAC,aAAa,CAAC;KAC1C,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;AAC7D,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@peerbit/react",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "homepage": "https://dao-xyz.github.io/peerbit-examples",
     "module": "lib/esm/index.js",
     "types": "lib/esm/index.d.ts",
@@ -22,19 +22,17 @@
         "react": "*"
     },
     "dependencies": {
-        "@emotion/react": "^11.10.5",
-        "@emotion/styled": "^11.10.5",
-        "@libp2p/webrtc": "^2.0.11",
-        "@mui/icons-material": "^5.10.16",
-        "@mui/material": "^5.10.13",
-        "@peerbit/network-utils": "^0.0.2",
+        "@chainsafe/libp2p-yamux": "^5.0.0",
+        "@libp2p/webrtc": "^3.2.1",
+        "@peerbit/proxy-window": "^1.0.1",
         "@types/react": "^18.0.25",
         "@types/react-dom": "^18.0.8",
+        "detectincognitojs": "^1.3.0",
         "path-browserify": "^1.0.1",
-        "peerbit": "^1.1.5",
+        "peerbit": "^2",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "react-router-dom": "^6.8.0",
+        "react-router-dom": "^6.16.0",
         "react-use": "^17.4.0"
     },
     "devDependencies": {
@@ -42,7 +40,6 @@
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-transform-typescript": "^7.20.2",
         "@types/sinon": "^10.0.13",
-        "gh-pages": "^4.0.0",
         "node-localstorage": "^2.2.1",
         "sinon": "^15.0.1"
     },
@@ -72,5 +69,5 @@
             "last 1 safari version"
         ]
     },
-    "gitHead": "f8266c28458441809aeeabaf2d686995ce05e707"
+    "gitHead": "00c275554aa08e6a70bceaee3e3377936ca0e8d9"
 }

package/src/index.ts

@@ -1,8 +1,4 @@
-export {
-    PeerProvider,
-    PeerContext,
-    usePeer,
-    submitKeypairChange,
-} from "./usePeer.js";
+export { PeerProvider, PeerContext, usePeer } from "./usePeer.js";
 export * from "./utils.js";
 export { FastMutex } from "./lockstorage.js";
+export { useProgram } from "./useProgram.js";

package/src/usePeer.tsx

@@ -2,25 +2,33 @@ import React, { useContext } from "react";
 import { multiaddr, Multiaddr } from "@multiformats/multiaddr";
 import { Peerbit } from "peerbit";
 import { webSockets } from "@libp2p/websockets";
+import { DirectSub } from "@peerbit/pubsub";
+
 import { mplex } from "@libp2p/mplex";
+import { yamux } from "@chainsafe/libp2p-yamux";
+
 import { getFreeKeypair, getTabId, inIframe } from "./utils.js";
-import { resolveBootstrapAddresses } from "@peerbit/network-utils";
 import { noise } from "@dao-xyz/libp2p-noise";
 import { v4 as uuid } from "uuid";
 import { Ed25519Keypair } from "@peerbit/crypto";
 import { FastMutex } from "./lockstorage.js";
-import { serialize, deserialize } from "@dao-xyz/borsh";
-import { waitFor } from "@peerbit/time";
 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";
+import { webRTC } from "@libp2p/webrtc";
+import { identifyService } from "libp2p/identify";
+import { detectIncognito } from "detectincognitojs";
+
 export type ConnectionStatus =
     | "disconnected"
     | "connected"
     | "connecting"
     | "failed";
 interface IPeerContext {
-    peer: Peerbit | undefined;
+    peer: ProgramClient | undefined;
     promise: Promise<void> | undefined;
     loading: boolean;
     status: ConnectionStatus;
@@ -30,59 +38,38 @@ if (!window.name) {
     window.name = uuid();
 }
 
-interface KeypairMessage {
-    type: "keypair";
-    bytes: Uint8Array;
-}
-export const subscribeToKeypairChange = (
-    onChange: (keypair: Ed25519Keypair) => any
-) => {
-    window.onmessage = (c: MessageEvent) => {
-        if ((c.data as KeypairMessage).type == "keypair") {
-            onChange(
-                deserialize((c.data as KeypairMessage).bytes, Ed25519Keypair)
-            );
-        }
-    };
-};
-
-export const submitKeypairChange = (
-    element: HTMLIFrameElement,
-    keypair: Ed25519Keypair,
-    origin: string
-) => {
-    element.contentWindow!.postMessage(
-        { type: "keypair", bytes: serialize(keypair) } as KeypairMessage,
-        origin
-    );
-};
-
-let keypairMessages: Ed25519Keypair[] = [];
-subscribeToKeypairChange((keypair) => {
-    console.log("got keypair!", keypair);
-    keypairMessages.push(keypair);
-});
-
 export const PeerContext = React.createContext<IPeerContext>({} as any);
 export const usePeer = () => useContext(PeerContext);
-export const PeerProvider = ({
-    network,
-    bootstrap,
-    children,
-    inMemory,
-    keypair,
-    waitForConnnected,
-    waitForKeypairInIFrame,
-}: {
+type IFrameOptions = {
+    type: "proxy";
+    targetOrigin: string;
+};
+
+type NodeOptions = {
+    type?: "node";
     network: "local" | "remote";
-    inMemory?: boolean;
     waitForConnnected?: boolean;
     keypair?: Ed25519Keypair;
-    waitForKeypairInIFrame?: boolean;
     bootstrap?: (Multiaddr | string)[];
+    host?: boolean;
+};
+type TopOptions = NodeOptions & WithMemory;
+type TopAndIframeOptions = {
+    iframe: IFrameOptions | NodeOptions;
+    top: TopOptions;
+};
+type WithMemory = {
+    inMemory?: boolean;
+};
+type WithChildren = {
     children: JSX.Element;
-}) => {
-    const [peer, setPeer] = React.useState<Peerbit | undefined>(undefined);
+};
+type PeerOptions = (TopAndIframeOptions | TopOptions) & WithChildren;
+
+export const PeerProvider = (options: PeerOptions) => {
+    const [peer, setPeer] = React.useState<ProgramClient | undefined>(
+        undefined
+    );
     const [promise, setPromise] = React.useState<Promise<void> | undefined>(
         undefined
     );
@@ -102,169 +89,167 @@ export const PeerProvider = ({
             loading,
             !!promise,
             connectionState,
-            peer?.identity?.publicKey.toString(),
+            peer?.identity?.publicKey?.hashcode(),
         ]
     );
 
     useMount(() => {
         setLoading(true);
-        const fn = async (
-            keypair: Ed25519Keypair = keypairMessages[
-                keypairMessages.length - 1
-            ]
-        ) => {
+        const fn = async () => {
             await sodium.ready;
-
-            if (!keypair && waitForKeypairInIFrame && inIframe()) {
-                await waitFor(
-                    () =>
-                        (keypair = keypairMessages[keypairMessages.length - 1])
-                );
-            }
-
-            if (
-                keypair &&
-                keypairMessages[keypairMessages.length - 1] &&
-                keypairMessages[keypairMessages.length - 1].equals(keypair)
-            ) {
-                console.log(
-                    "Creating client from identity sent from parent window: " +
-                        keypair.publicKey.hashcode()
-                );
-            } else {
-                if (!keypair) {
-                    console.log("Generating new keypair for client");
-                } else {
-                    console.log(
-                        "Keypair missmatch with latest keypair message",
-                        keypairMessages.map((x) => x.publicKey.hashcode()),
-                        keypair.publicKey.hashcode()
-                    );
-                }
-            }
-
             if (peer) {
                 await peer.stop();
                 setPeer(undefined);
             }
 
-            const nodeId =
-                keypair ||
-                (
-                    await getFreeKeypair(
-                        "",
-                        new FastMutex({ clientId: getTabId(), timeout: 1000 }),
-                        undefined,
-                        true // reuse keypairs from same tab, (force release)
-                    )
-                ).key;
-
-            // We create a new directrory to make tab to tab communication go smoothly
-            const newPeer = await Peerbit.create({
-                libp2p: {
-                    addresses: {
-                        listen: [
-                            /*    '/webrtc' */
-                        ],
-                    },
-                    connectionEncryption: [noise()],
-                    peerId: await nodeId.toPeerId(), //, having the same peer accross broswers does not work, only one tab will be recognized by other peers
-                    connectionManager: {
-                        maxConnections: 100,
-                        minConnections: 0,
-                    },
-                    streamMuxers: [mplex()],
-                    ...(network === "local"
-                        ? {
-                              connectionGater: {
-                                  denyDialMultiaddr: () => {
-                                      // by default we refuse to dial local addresses from the browser since they
-                                      // are usually sent by remote peers broadcasting undialable multiaddrs but
-                                      // here we are explicitly connecting to a local node so do not deny dialing
-                                      // any discovered address
-                                      return false;
+            let newPeer: ProgramClient;
+            const nodeOptions = (options as TopAndIframeOptions).top
+                ? inIframe()
+                    ? (options as TopAndIframeOptions).iframe
+                    : (options as TopAndIframeOptions).top
+                : (options as TopOptions);
+            if (nodeOptions.type !== "proxy") {
+                const nodeId =
+                    nodeOptions.keypair ||
+                    (
+                        await getFreeKeypair(
+                            "",
+                            new FastMutex({
+                                clientId: getTabId(),
+                                timeout: 1000,
+                            }),
+                            undefined,
+                            true // reuse keypairs from same tab, (force release)
+                        )
+                    ).key;
+
+                // We create a new directrory to make tab to tab communication go smoothly
+                newPeer = await Peerbit.create({
+                    libp2p: {
+                        addresses: {
+                            listen: [
+                                /* "/webrtc" */
+                            ],
+                        },
+                        connectionEncryption: [noise()],
+                        peerId: await nodeId.toPeerId(), //, having the same peer accross broswers does not work, only one tab will be recognized by other peers
+                        connectionManager: {
+                            maxConnections: 100,
+                            minConnections: 0,
+                        },
+
+                        streamMuxers: [mplex() /* , mplex() */],
+                        ...(nodeOptions.network === "local"
+                            ? {
+                                  connectionGater: {
+                                      denyDialMultiaddr: () => {
+                                          // by default we refuse to dial local addresses from the browser since they
+                                          // are usually sent by remote peers broadcasting undialable multiaddrs but
+                                          // here we are explicitly connecting to a local node so do not deny dialing
+                                          // any discovered address
+                                          return false;
+                                      },
                                   },
-                              },
-                              transports: [
-                                  // Add websocket impl so we can connect to "unsafe" ws (production only allows wss)
-                                  webSockets({
-                                      filter: filters.all,
-                                  }),
-                                  /*            circuitRelayTransport({ discoverRelays: 1 }),
-                 webRTC(), */
-                              ],
-                          }
-                        : {
-                              connectionGater: {
-                                  denyDialMultiaddr: () => {
-                                      // by default we refuse to dial local addresses from the browser since they
-                                      // are usually sent by remote peers broadcasting undialable multiaddrs but
-                                      // here we are explicitly connecting to a local node so do not deny dialing
-                                      // any discovered address
-                                      return false;
-                                  },
-                              },
-                              transports: [
-                                  webSockets({ filter: filters.all }),
-                                  /*             circuitRelayTransport({ discoverRelays: 1 }),
-                  webRTC(), */
-                              ],
-                          }),
-                },
-                directory: !inMemory ? "./repo" : undefined,
-                limitSigning: true,
-            });
-
-            setConnectionState("connecting");
-
-            // Resolve bootstrap nodes async (we want to return before this is done)
-            const connectFn = async () => {
-                try {
-                    const addresses = await (bootstrap
-                        ? Promise.resolve(bootstrap)
-                        : resolveBootstrapAddresses(network));
-                    if (addresses && addresses?.length > 0) {
-                        try {
-                            await Promise.all(
-                                addresses
-                                    .map((a) =>
-                                        typeof a === "string" ? multiaddr(a) : a
-                                    )
-                                    .map((a) => newPeer.dial(a))
-                            );
-                            setConnectionState("connected");
-                        } catch (error) {
-                            console.error(
-                                "Failed to resolve relay node. Please come back later or start the demo locally"
+                                  transports: [
+                                      // Add websocket impl so we can connect to "unsafe" ws (production only allows wss)
+                                      webSockets({
+                                          filter: filters.all,
+                                      }),
+                                      /*        circuitRelayTransport({
+                                               discoverRelays: 1,
+                                           }),
+                                           webRTC(), */
+                                      /*            circuitRelayTransport({ discoverRelays: 1 }),
+webRTC(), */
+                                  ],
+                              }
+                            : {
+                                  transports: [
+                                      webSockets({ filter: filters.wss }),
+                                      /*    circuitRelayTransport({
+                                           discoverRelays: 1,
+                                       }),
+                                       webRTC(), */
+                                  ],
+                              }),
+
+                        services: {
+                            pubsub: (c) =>
+                                new DirectSub(c, {
+                                    canRelayMessage: true,
+                                    emitSelf: true,
+                                    /*  connectionManager: {
+                                         autoDial: false,
+                                     }, */
+                                }),
+                            identify: identifyService(),
+                        },
+                    },
+                    directory:
+                        !(nodeOptions as WithMemory).inMemory &&
+                        !(
+                            await detectIncognito()
+                        ).isPrivate
+                            ? "./repo"
+                            : undefined,
+                });
+
+                setConnectionState("connecting");
+
+                // Resolve bootstrap nodes async (we want to return before this is done)
+                const connectFn = async () => {
+                    try {
+                        if (nodeOptions.network === "local") {
+                            await newPeer.dial(
+                                "/ip4/127.0.0.1/tcp/8002/ws/p2p/" +
+                                    (await (
+                                        await fetch(
+                                            "http://localhost:8082/peer/id"
+                                        )
+                                    ).text())
                             );
-                            setConnectionState("failed");
-                            throw error;
+                        } else {
+                            // TODO fix types. When proxy client this will not be available
+                            if (nodeOptions.bootstrap) {
+                                for (const addr of nodeOptions.bootstrap) {
+                                    await newPeer.dial(addr);
+                                }
+                            } else {
+                                await newPeer["bootstrap"]?.();
+                            }
                         }
-                    } else {
-                        console.error("No addresses to connect to");
+                        setConnectionState("connected");
+                    } catch (err: any) {
+                        console.error(
+                            "Failed to resolve relay addresses. " + err?.message
+                        );
                         setConnectionState("failed");
                     }
-                } catch (err: any) {
-                    console.error(
-                        "Failed to resolve relay addresses. " + err?.message
-                    );
-                    setConnectionState("failed");
-                }
-            };
 
-            const promise = connectFn();
+                    if (nodeOptions.host) {
+                        newPeer = await createHost(newPeer);
+                    }
+                };
+
+                const promise = connectFn();
 
-            // Make sure data flow as expected between tabs and windows locally (offline states)
+                // Make sure data flow as expected between tabs and windows locally (offline states)
 
-            if (waitForConnnected) {
-                await promise;
+                if (nodeOptions.waitForConnnected !== false) {
+                    await promise;
+                }
+            } else {
+                newPeer = await createClient(nodeOptions.targetOrigin);
             }
-
             setPeer(newPeer);
             setLoading(false);
         };
-        setPromise(fn(keypair));
+        setPromise(fn());
     });
 
-    return <PeerContext.Provider value={memo}>{children}</PeerContext.Provider>;
+    return (
+        <PeerContext.Provider value={memo}>
+            {options.children}
+        </PeerContext.Provider>
+    );
 };

package/src/useProgram.tsx

@@ -0,0 +1,49 @@
+import { Program, ProgramEvents, OpenOptions } from "@peerbit/program";
+import { usePeer } from "./usePeer.js";
+import { useEffect, useRef, useState } from "react";
+
+const addressOrUndefined = <
+    A,
+    B extends ProgramEvents,
+    P extends Program<A, B>
+>(
+    p: P
+) => {
+    try {
+        return p.address;
+    } catch (error) {
+        return undefined;
+    }
+};
+
+export const useProgram = <A, B extends ProgramEvents, P extends Program<A, B>>(
+    addressOrOpen: P | string,
+    options?: OpenOptions<A, P>
+) => {
+    const { peer } = usePeer();
+    let [program, setProgram] = useState<P | undefined>();
+    let programRef = useRef<Promise<P>>();
+    let [loading, setLoading] = useState(false);
+
+    useEffect(() => {
+        if (!peer || !addressOrOpen) {
+            return;
+        }
+        setLoading(true);
+        programRef.current = peer
+            ?.open(addressOrOpen, { ...options, existing: "reuse" })
+            .then((p) => {
+                setProgram(p);
+                return p;
+            })
+            .finally(() => {
+                setLoading(false);
+            });
+    }, [
+        peer?.identity.publicKey.hashcode(),
+        typeof addressOrOpen === "string"
+            ? addressOrOpen
+            : addressOrUndefined(addressOrOpen),
+    ]);
+    return { program, loading, promise: programRef.current };
+};