@leofcoin/peernet 1.1.67 → 1.1.68

package/exports/browser/{index-1d597e6b.js → index-e6b55b51.js}

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

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

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

package/exports/browser/{peernet-55ce42c7.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-1d597e6b.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-67e5efa0.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-606d459f.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -27314,55 +27316,58 @@ 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);
-        if (globalThis.navigator) {
-            globalThis.addEventListener('beforeunload', async () => this.client.destroy());
-        }
-        else {
-            process.on('SIGTERM', async () => {
-                process.stdin.resume();
-                try {
-                    await this.client.destroy();
-                }
-                catch (error) {
-                    // @ts-ignore
-                    await this.client.close();
-                }
-                process.exit();
-            });
-        }
+        // // 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;
@@ -27375,6 +27380,7 @@ class Peernet {
     #peerId;
     #connections = {};
     #stars = {};
+    #connectEvent = 'peer:connected';
     id;
     networkVersion;
     starsConfig;
@@ -27394,18 +27400,32 @@ class Peernet {
     getPeer(peerId) {
         return this.#connections[peerId];
     }
-    constructor(peerId, networkVersion = 'peach', version, stars = ['wss://peach.leofcoin.org']) {
+    /**
+     *
+     * @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._init(stars);
-    }
-    async _init(stars = []) {
+        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 stars) {
+        for (const star of this.starsConfig) {
             try {
                 const client = new SocketRequestClient(star, this.networkVersion);
                 this.#stars[star] = await client.init();
@@ -27416,7 +27436,8 @@ class Peernet {
                 });
             }
             catch (e) {
-                if (stars.indexOf(star) === stars.length - 1 && !this.socketClient)
+                if (this.starsConfig.indexOf(star) === this.starsConfig.length - 1 &&
+                    !this.socketClient)
                     throw new Error(`No star available to connect`);
             }
         }
@@ -27542,7 +27563,7 @@ class Peernet {
     };
     #peerConnect = (peer) => {
         globalThis.debug(`${peer.peerId} connected`);
-        globalThis.pubsub.publish('peer:connected', peer.peerId);
+        globalThis.pubsub.publish(this.#connectEvent, peer.peerId);
     };
     #noticeMessage = (message, id) => {
         if (globalThis.pubsub.subscribers[id]) {
@@ -27592,18 +27613,24 @@ class Peernet {
          * @type {PeernetClient}
          */
         console.log(this.stars);
-        this.client = new importee.default(this.id, this.networkVersion, this.version, 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;
     }
@@ -27707,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));
             }
@@ -27774,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,
@@ -27788,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));
                 }
@@ -28002,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-55ce42c7.js';
+export { P as default } from './peernet-b93a3e33.js';
 import './value-4e80eeeb.js';

package/exports/peernet.js

@@ -425,17 +425,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
@@ -450,6 +451,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)
@@ -514,13 +516,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
@@ -575,55 +577,58 @@ 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);
-        if (globalThis.navigator) {
-            globalThis.addEventListener('beforeunload', async () => this.client.destroy());
-        }
-        else {
-            process.on('SIGTERM', async () => {
-                process.stdin.resume();
-                try {
-                    await this.client.destroy();
-                }
-                catch (error) {
-                    // @ts-ignore
-                    await this.client.close();
-                }
-                process.exit();
-            });
-        }
+        // // 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;
@@ -638,18 +643,24 @@ class Peernet {
          * @type {PeernetClient}
          */
         console.log(this.stars);
-        this.client = new importee.default(this.id, this.networkVersion, this.version, 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;
     }
@@ -753,7 +764,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));
             }
@@ -820,7 +831,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,
@@ -834,7 +845,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));
                 }
@@ -1048,7 +1059,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/types/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.1.67",
+  "version": "1.1.68",
   "description": "",
   "main": "src/peernet.js",
   "exports": {
@@ -37,7 +37,7 @@
     "@leofcoin/peernet-swarm": "^1.1.0",
     "@leofcoin/storage": "^3.0.0",
     "@netpeer/p2pt-swarm": "^1.3.5",
-    "@netpeer/swarm": "^0.7.2",
+    "@netpeer/swarm": "^0.8.1",
     "@types/node": "^18.11.18",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",

package/src/peernet.ts

@@ -9,8 +9,8 @@ import { dhtError, nothingFoundError } from './errors/errors.js'
 import { Storage as LeofcoinStorageClass } from '@leofcoin/storage'
 import { utils as codecUtils } from '@leofcoin/codecs'
 import Identity from './identity.js'
-import swarm, { PeerId } from '@netpeer/p2pt-swarm'
-import P2PTPeer from '@netpeer/p2pt-swarm/peer'
+import swarm from '@netpeer/swarm/client'
+import SwarmPeer from '@netpeer/swarm/peer'
 
 globalThis.LeofcoinStorage = LeofcoinStorageClass
 
@@ -60,11 +60,11 @@ export default class Peernet {
   autoStart: boolean = true
   #starting: boolean = false
   #started: boolean = false
-  #connections: { [index: PeerId]: P2PTPeer } = {}
   requestProtos = {}
   _messageHandler: MessageHandler
   _peerHandler: PeerDiscovery
   protos: {}
+  version
 
   /**
    * @access public
@@ -72,6 +72,7 @@ export default class Peernet {
    * @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
@@ -86,6 +87,7 @@ export default 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'
 
@@ -162,15 +164,15 @@ export default 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)
   }
 
   /**
@@ -248,40 +250,44 @@ export default class Peernet {
     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
@@ -289,20 +295,21 @@ export default class Peernet {
      */
     pubsub.subscribe('peer:data', dataHandler)
 
-    if (globalThis.navigator) {
-      globalThis.addEventListener('beforeunload', async () => this.client.destroy())
-    } else {
-      process.on('SIGTERM', async () => {
-        process.stdin.resume()
-        try {
-          await this.client.destroy()
-        } catch (error) {
-          // @ts-ignore
-          await this.client.close()
-        }
-        process.exit()
-      })
-    }
+    // // 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
   }
@@ -318,19 +325,25 @@ export default class Peernet {
      */
     console.log(this.stars)
 
-    this.client = new importee.default(this.id, this.networkVersion, this.version, 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: P2PTPeer) {
-    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
@@ -447,7 +460,7 @@ export default class Peernet {
       if (proto.decoded.has) 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))
       }
@@ -514,7 +527,7 @@ export default 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']({
@@ -530,7 +543,7 @@ export default 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))
         }
@@ -745,7 +758,7 @@ export default 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)