@leofcoin/peernet 1.1.66 → 1.1.68

package/exports/browser/browser-2c73e2ef.js

@@ -0,0 +1,25 @@
+var browser$1 = {};
+
+browser$1.MediaStream = window.MediaStream;
+browser$1.MediaStreamTrack = window.MediaStreamTrack;
+browser$1.RTCDataChannel = window.RTCDataChannel;
+browser$1.RTCDataChannelEvent = window.RTCDataChannelEvent;
+browser$1.RTCDtlsTransport = window.RTCDtlsTransport;
+browser$1.RTCIceCandidate = window.RTCIceCandidate;
+browser$1.RTCIceTransport = window.RTCIceTransport;
+browser$1.RTCPeerConnection = window.RTCPeerConnection;
+browser$1.RTCPeerConnectionIceEvent = window.RTCPeerConnectionIceEvent;
+browser$1.RTCRtpReceiver = window.RTCRtpReceiver;
+browser$1.RTCRtpSender = window.RTCRtpSender;
+browser$1.RTCRtpTransceiver = window.RTCRtpTransceiver;
+browser$1.RTCSctpTransport = window.RTCSctpTransport;
+browser$1.RTCSessionDescription = window.RTCSessionDescription;
+browser$1.getUserMedia = window.getUserMedia;
+browser$1.mediaDevices = navigator.mediaDevices;
+
+var browser = /*#__PURE__*/Object.freeze({
+	__proto__: null,
+	default: browser$1
+});
+
+export { browser as b };

package/exports/browser/{index-34c93510.js → index-e6b55b51.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-72528dd9.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-b93a3e33.js';
 import './value-4e80eeeb.js';
 
 /**

package/exports/browser/{messages-b7f41cba.js → messages-606d459f.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './peernet-72528dd9.js';
+import { F as FormatInterface } from './peernet-b93a3e33.js';
 import './value-4e80eeeb.js';
 
 var proto$b = {

package/exports/browser/{peernet-72528dd9.js → peernet-b93a3e33.js}

@@ -27088,7 +27088,7 @@ class Identity {
             this.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-34c93510.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-e6b55b51.js');
             const { identity, accounts } = await importee.default(password, this.network);
             await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }));
             await globalThis.walletStore.put('version', String(1));
@@ -27164,17 +27164,18 @@ class Peernet {
     autoStart = true;
     #starting = false;
     #started = false;
-    #connections = {};
     requestProtos = {};
     _messageHandler;
     _peerHandler;
     protos;
+    version;
     /**
      * @access public
      * @param {Object} options
      * @param {String} options.network - desired network
      * @param {String} options.stars - star list for selected network (these should match, don't mix networks)
      * @param {String} options.root - path to root directory
+     * @param {String} options.version - path to root directory
      * @param {String} options.storePrefix - prefix for datatores (lfc)
      *
      * @return {Promise} instance of Peernet
@@ -27189,6 +27190,7 @@ class Peernet {
         this.network = options.network || 'leofcoin';
         this.autoStart = options.autoStart === undefined ? true : options.autoStart;
         this.stars = options.stars;
+        this.version = options.version;
         const parts = this.network.split(':');
         this.networkVersion = options.networkVersion || parts.length > 1 ? parts[1] : 'mainnet';
         if (!options.storePrefix)
@@ -27253,13 +27255,13 @@ class Peernet {
      * @return {Array} peerId
      */
     get peers() {
-        return Object.entries(this.#connections);
+        return Object.entries(this.client.connections);
     }
     get connections() {
-        return Object.values(this.#connections);
+        return this.client.connections;
     }
     get peerEntries() {
-        return Object.values(this.#connections);
+        return Object.values(this.client.connections);
     }
     /**
      * @return {String} id - peerId
@@ -27280,7 +27282,7 @@ class Peernet {
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-b7f41cba.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-606d459f.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -27314,80 +27316,321 @@ class Peernet {
         await this.identity.load(password);
         this._peerHandler = new PeerDiscovery(this.id);
         this.peerId = this.id;
-        this.addRequestHandler('handshake', () => {
-            return new peernet.protos['peernet-response']({
-                response: { peerId: this.id }
-            });
-        });
-        pubsub.subscribe('peer:discovered', async (peer) => {
-            // console.log(peer);
-            if (this.requestProtos['version']) {
-                let data = await new globalThis.peernet.protos['peernet-request']({
-                    request: 'version'
-                });
-                let node = await globalThis.peernet.prepareMessage(data);
-                let response = await peer.request(node.encoded);
-                response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
-                peer.version = response.decoded.response.version;
-            }
-            let data = await new globalThis.peernet.protos['peernet-request']({
-                request: 'handshake'
-            });
-            let node = await globalThis.peernet.prepareMessage(data);
-            let response = await peer.request(node.encoded);
-            response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
-            // todo: response.decoded should be the response and not response.peerId
-            this.#connections[response.decoded.response.peerId] = peer;
-            pubsub.publish('peer:connected', peer);
-            // todo: cleanup discovered
-        });
-        pubsub.subscribe('peer:left', this.#peerLeft.bind(this));
+        // this.addRequestHandler('handshake', () => {
+        //   return new peernet.protos['peernet-response']({
+        //     response: { peerId: this.id }
+        //   })
+        // })
+        // pubsub.subscribe('peer:discovered', async (peer) => {
+        //   // console.log(peer);
+        //   if (this.requestProtos['version'] && !peer.version) {
+        //     let data = await new globalThis.peernet.protos['peernet-request']({
+        //       request: 'version'
+        //     })
+        //     let node = await globalThis.peernet.prepareMessage(data)
+        //     let response = await peer.request(node.encoded)
+        //     response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)))
+        //     peer.version = response.decoded.response.version
+        //   }
+        //   if (!peer.peerId) {
+        //     let data = await new globalThis.peernet.protos['peernet-request']({
+        //       request: 'handshake'
+        //     })
+        //     let node = await globalThis.peernet.prepareMessage(data)
+        //     let response = await peer.request(node.encoded)
+        //     response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)))
+        //     // todo: response.decoded should be the response and not response.peerId
+        //     // todo: ignore above and remove discover completly
+        //     response.decoded.response.peerId
+        //   }
+        // this.connections[peer.peerId] = peer
+        // pubsub.publish('peer:connected', peer)
+        // todo: cleanup discovered
+        // })
+        // pubsub.subscribe('peer:left', this.#peerLeft.bind(this))
         /**
          * converts data -> message -> proto
          * @see DataHandler
          */
         pubsub.subscribe('peer:data', dataHandler);
+        // // todo: remove below, already handles in the swarm
+        // if (globalThis.navigator) {
+        //   globalThis.addEventListener('beforeunload', async () => this.client.close())
+        // } else {
+        //   process.on('SIGTERM', async () => {
+        //     process.stdin.resume()
+        //     try {
+        //       await this.client.close()
+        //     } catch (error) {
+        //       // @ts-ignore
+        //       await this.client.close()
+        //     }
+        //     process.exit()
+        //   })
+        // }
+        if (this.autoStart)
+            await this.start();
+        return this;
+    }
+    async start() {
+        if (this.#starting || this.#started)
+            return;
+        this.#starting = true;
+        const importee = class Client {
+    #peerId;
+    #connections = {};
+    #stars = {};
+    #connectEvent = 'peer:connected';
+    id;
+    networkVersion;
+    starsConfig;
+    socketClient;
+    messageSize = 262144;
+    version;
+    #messagesToHandle = {};
+    get peerId() {
+        return this.#peerId;
+    }
+    get connections() {
+        return { ...this.#connections };
+    }
+    get peers() {
+        return Object.entries(this.#connections);
+    }
+    getPeer(peerId) {
+        return this.#connections[peerId];
+    }
+    /**
+     *
+     * @param options {object}
+     * @param options.peerId {string}
+     * @param options.networkVersion {string}
+     * @param options.version {string}
+     * @param options.stars {string[]}
+     * @param options.connectEvent {string} defaults to peer:connected, can be renamed to handle different protocols, like peer:discovered (setup peer props before fireing the connect event)
+     */
+    constructor(options) {
+        const { peerId, networkVersion, version, connectEvent, stars } = {
+            ...defaultOptions,
+            ...options
+        };
+        this.#peerId = peerId;
+        this.networkVersion = networkVersion;
+        this.version = version;
+        this.#connectEvent = connectEvent;
+        this.starsConfig = stars;
+        this._init();
+    }
+    async _init() {
+        // reconnectJob()
+        if (!globalThis.RTCPeerConnection)
+            globalThis.wrtc = (await import('./browser-2c73e2ef.js').then(function (n) { return n.b; })).default;
+        for (const star of this.starsConfig) {
+            try {
+                const client = new SocketRequestClient(star, this.networkVersion);
+                this.#stars[star] = await client.init();
+                this.setupStarListeners(this.#stars[star]);
+                this.#stars[star].send({
+                    url: 'join',
+                    params: { version: this.version, peerId: this.peerId }
+                });
+            }
+            catch (e) {
+                if (this.starsConfig.indexOf(star) === this.starsConfig.length - 1 &&
+                    !this.socketClient)
+                    throw new Error(`No star available to connect`);
+            }
+        }
         if (globalThis.navigator) {
-            globalThis.addEventListener('beforeunload', async () => this.client.destroy());
+            globalThis.addEventListener('beforeunload', async () => this.close());
         }
         else {
-            process.on('SIGTERM', async () => {
+            process.on('SIGINT', async () => {
                 process.stdin.resume();
-                try {
-                    await this.client.destroy();
-                }
-                catch (error) {
-                    // @ts-ignore
-                    await this.client.close();
-                }
+                await this.close();
                 process.exit();
             });
         }
-        if (this.autoStart)
-            await this.start();
-        return this;
     }
-    async start() {
-        if (this.#starting || this.#started)
+    setupStarListeners(star) {
+        star.pubsub.subscribe('peer:joined', (id) => this.#peerJoined(id, star));
+        star.pubsub.subscribe('peer:left', (id) => this.#peerLeft(id, star));
+        star.pubsub.subscribe('star:joined', this.#starJoined);
+        star.pubsub.subscribe('star:left', this.#starLeft);
+        star.pubsub.subscribe('signal', (message) => this.#inComingSignal(message, star));
+    }
+    #starJoined = (id) => {
+        if (this.#stars[id]) {
+            this.#stars[id].close(0);
+            delete this.#stars[id];
+        }
+        console.log(`star ${id} joined`);
+    };
+    #starLeft = async (id) => {
+        if (this.#stars[id]) {
+            this.#stars[id].close(0);
+            delete this.#stars[id];
+        }
+        if (Object.keys(this.#stars).length === 0) {
+            for (const star of this.starsConfig) {
+                try {
+                    const socketClient = await new SocketRequestClient(star, this.networkVersion).init();
+                    if (!socketClient?.client?.OPEN)
+                        return;
+                    this.#stars[star] = socketClient;
+                    this.#stars[star].send({
+                        url: 'join',
+                        params: { peerId: this.peerId, version: this.version }
+                    });
+                    this.setupStarListeners(socketClient);
+                }
+                catch (e) {
+                    if (this.starsConfig.indexOf(star) === this.starsConfig.length - 1)
+                        throw new Error(`No star available to connect`);
+                }
+            }
+        }
+        globalThis.debug(`star ${id} left`);
+    };
+    #peerLeft(peer, star) {
+        const id = peer.peerId || peer;
+        if (this.#connections[id]) {
+            this.#connections[id].destroy();
+            delete this.#connections[id];
+        }
+        globalThis.debug(`peer ${id} left`);
+    }
+    #createRTCPeerConnection = (peerId, star, version, initiator = false) => {
+        const peer = new Peer({
+            initiator: initiator,
+            from: this.peerId,
+            to: peerId,
+            version
+        });
+        peer.on('signal', (signal) => this.#peerSignal(peer, signal, star));
+        peer.on('connect', () => this.#peerConnect(peer));
+        peer.on('close', () => this.#peerClose(peer));
+        peer.on('data', (data) => this.#peerData(peer, data));
+        peer.on('error', (error) => this.#peerError(peer, error));
+        this.#connections[peerId] = peer;
+    };
+    #peerJoined = async ({ peerId, version }, star) => {
+        // check if peer rejoined before the previous connection closed
+        if (this.#connections[peerId]) {
+            if (this.#connections[peerId].connected)
+                this.#connections[peerId].destroy();
+            delete this.#connections[peerId];
+        }
+        // RTCPeerConnection
+        this.#createRTCPeerConnection(peerId, star, version, true);
+        globalThis.debug(`peer ${peerId} joined`);
+    };
+    #inComingSignal = async ({ from, signal, channelName, version }, star) => {
+        if (version !== this.version) {
+            console.warn(`${from} joined using the wrong version.\nexpected: ${this.version} but got:${version}`);
             return;
-        this.#starting = true;
-        const importee = await import('./client-493cbd83.js');
+        }
+        let peer = this.#connections[from];
+        if (!peer) {
+            this.#createRTCPeerConnection(from, star, version);
+            peer = this.#connections[from];
+        }
+        if (String(peer.channelName) !== String(channelName))
+            console.warn(`channelNames don't match: got ${peer.channelName}, expected: ${channelName}`);
+        peer.signal(signal);
+    };
+    #peerSignal = (peer, signal, star) => {
+        let client = this.#stars[star];
+        if (!client)
+            client = this.#stars[Object.keys(this.#stars)[0]];
+        client.send({
+            url: 'signal',
+            params: {
+                from: this.peerId,
+                to: peer.peerId,
+                channelName: peer.channelName,
+                version: this.version,
+                signal
+            }
+        });
+    };
+    #peerClose = (peer) => {
+        if (this.#connections[peer.peerId]) {
+            this.#connections[peer.peerId].destroy();
+            delete this.#connections[peer.peerId];
+        }
+        globalThis.debug(`closed ${peer.peerId}'s connection`);
+    };
+    #peerConnect = (peer) => {
+        globalThis.debug(`${peer.peerId} connected`);
+        globalThis.pubsub.publish(this.#connectEvent, peer.peerId);
+    };
+    #noticeMessage = (message, id) => {
+        if (globalThis.pubsub.subscribers[id]) {
+            globalThis.pubsub.publish(id, new Uint8Array(message));
+        }
+        else {
+            globalThis.pubsub.publish('peer:data', new Uint8Array(message));
+        }
+    };
+    #peerData = (peer, data) => {
+        const { id, size, chunk } = JSON.parse(new TextDecoder().decode(data));
+        peer.bw.down += size;
+        if (size <= MAX_MESSAGE_SIZE) {
+            this.#noticeMessage(chunk, id);
+        }
+        else {
+            if (!this.#messagesToHandle[id])
+                this.#messagesToHandle[id] = [];
+            this.#messagesToHandle[id] = [
+                ...this.#messagesToHandle[id],
+                ...Object.values(chunk)
+            ];
+            if (this.#messagesToHandle[id].length === Number(size)) {
+                this.#noticeMessage(this.#messagesToHandle[id], id);
+                delete this.#messagesToHandle[id];
+            }
+        }
+    };
+    #peerError = (peer, error) => {
+        console.warn(`Connection error: ${error.message}`);
+        peer.destroy();
+    };
+    async close() {
+        for (const star in this.#stars) {
+            if (this.#stars[star].connectionState() === 'open')
+                await this.#stars[star].send({ url: 'leave', params: this.peerId });
+        }
+        const promises = [
+            Object.values(this.#connections).map((connection) => connection.destroy()),
+            Object.values(this.#stars).map((connection) => connection.close(0))
+        ];
+        await Promise.allSettled(promises);
+    }
+};
         /**
          * @access public
          * @type {PeernetClient}
          */
-        this.client = new importee.default(this.id, this.networkVersion, this.stars);
+        console.log(this.stars);
+        this.client = new importee.default({
+            peerId: this.id,
+            networkVersion: this.networkVersion,
+            version: this.version,
+            stars: this.stars
+        });
         this.#started = true;
         this.#starting = false;
     }
-    #peerLeft(peer) {
-        for (const [id, _peer] of Object.entries(this.#connections)) {
-            if (_peer.id === peer.id && this.#connections[id] && !this.#connections[id].connected) {
-                delete this.#connections[id];
-                this.removePeer(_peer);
-            }
-        }
-    }
+    // todo: remove, handled in swarm now
+    // #peerLeft(peer: SwarmPeer) {
+    //   for (const [id, _peer] of Object.entries(this.connections)) {
+    //     if (_peer.id === peer.id && this.connections[id] && !this.connections[id].connected) {
+    //       delete this.connections[id]
+    //       this.removePeer(_peer)
+    //     }
+    //   }
+    // }
     addRequestHandler(name, method) {
         this.requestProtos[name] = method;
     }
@@ -27491,7 +27734,7 @@ class Peernet {
                 this.dht.addProvider(peerInfo, proto.decoded.hash);
         };
         let walks = [];
-        for (const [peerId, peer] of Object.entries(this.#connections)) {
+        for (const [peerId, peer] of Object.entries(this.connections)) {
             if (peerId !== this.id) {
                 walks.push(walk(peer, peerId));
             }
@@ -27558,7 +27801,7 @@ class Peernet {
         if (!closestPeer || !closestPeer.id)
             return this.requestData(hash, store?.name || store);
         const id = closestPeer.id;
-        const peer = this.#connections[id];
+        const peer = this.connections[id];
         if (peer?.connected) {
             let data = await new globalThis.peernet.protos['peernet-data']({
                 hash,
@@ -27572,7 +27815,7 @@ class Peernet {
                 const promises = [];
                 const providers = await this.providersFor(hash, store);
                 for (const provider of Object.values(providers)) {
-                    const peer = this.#connections[provider.id];
+                    const peer = this.connections[provider.id];
                     if (peer)
                         promises.push(peer.request(node.encoded));
                 }
@@ -27786,7 +28029,7 @@ class Peernet {
         // globalSub.publish(topic, data)
         const id = Math.random().toString(36).slice(-12);
         data = await new globalThis.peernet.protos['peernet-ps']({ data, topic });
-        for (const [peerId, peer] of Object.entries(this.#connections)) {
+        for (const [peerId, peer] of Object.entries(this.connections)) {
             if (peerId !== this.id) {
                 const node = await this.prepareMessage(data);
                 this.sendMessage(peer, id, node.encoded);

package/exports/browser/peernet.d.ts

@@ -6,7 +6,8 @@ import DHT from './dht/dht.js';
 import MessageHandler from './handlers/message.js';
 import { Storage as LeofcoinStorageClass } from '@leofcoin/storage';
 import Identity from './identity.js';
-import swarm from '@netpeer/p2pt-swarm';
+import swarm from '@netpeer/swarm/client';
+import SwarmPeer from '@netpeer/swarm/peer';
 declare global {
     var LeofcoinStorage: typeof LeofcoinStorageClass;
     var peernet: Peernet;
@@ -51,12 +52,14 @@ export default class Peernet {
     _messageHandler: MessageHandler;
     _peerHandler: PeerDiscovery;
     protos: {};
+    version: any;
     /**
      * @access public
      * @param {Object} options
      * @param {String} options.network - desired network
      * @param {String} options.stars - star list for selected network (these should match, don't mix networks)
      * @param {String} options.root - path to root directory
+     * @param {String} options.version - path to root directory
      * @param {String} options.storePrefix - prefix for datatores (lfc)
      *
      * @return {Promise} instance of Peernet
@@ -82,13 +85,15 @@ export default class Peernet {
      *
      * @return {Array} peerId
      */
-    get peers(): [string, unknown][];
-    get connections(): unknown[];
-    get peerEntries(): unknown[];
+    get peers(): [string, SwarmPeer][];
+    get connections(): {
+        [x: string]: SwarmPeer;
+    };
+    get peerEntries(): SwarmPeer[];
     /**
      * @return {String} id - peerId
      */
-    getConnection(id: any): unknown;
+    getConnection(id: any): SwarmPeer;
     /**
      * @private
      *
@@ -238,6 +243,6 @@ export default class Peernet {
      * @param {Method} cb
      */
     subscribe(topic: string, callback: Function): Promise<void>;
-    removePeer(peer: any): Promise<boolean>;
+    removePeer(peer: any): Promise<any>;
     get Buffer(): BufferConstructor;
 }

package/exports/browser/peernet.js

@@ -1,2 +1,2 @@
-export { P as default } from './peernet-72528dd9.js';
+export { P as default } from './peernet-b93a3e33.js';
 import './value-4e80eeeb.js';