@leofcoin/peernet 1.1.66 → 1.1.68

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;
@@ -632,23 +637,30 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('@netpeer/p2pt-swarm');
+        const importee = await import('@netpeer/swarm/client');
         /**
          * @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;
     }
@@ -752,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));
             }
@@ -819,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,
@@ -833,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));
                 }
@@ -1047,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.66",
+  "version": "1.1.68",
   "description": "",
   "main": "src/peernet.js",
   "exports": {
@@ -37,6 +37,7 @@
     "@leofcoin/peernet-swarm": "^1.1.0",
     "@leofcoin/storage": "^3.0.0",
     "@netpeer/p2pt-swarm": "^1.3.5",
+    "@netpeer/swarm": "^0.8.1",
     "@types/node": "^18.11.18",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",
@@ -48,7 +49,7 @@
     "multi-signature": "^1.3.1",
     "qr-scanner": "^1.4.2",
     "qrcode": "^1.5.1",
-    "socket-request-client": "^1.5.0",
+    "socket-request-client": "^2.0.6",
     "socket-request-server": "^1.5.0"
   },
   "devDependencies": {

package/rollup.config.js

@@ -1,76 +1,70 @@
-import resolve, { nodeResolve } from "@rollup/plugin-node-resolve";
-import commonjs from "@rollup/plugin-commonjs";
-import json from "@rollup/plugin-json";
-import wasm from "@rollup/plugin-wasm";
-import rimraf from "rimraf";
-import typescript from "@rollup/plugin-typescript";
-import modify from "rollup-plugin-modify";
+import resolve, { nodeResolve } from '@rollup/plugin-node-resolve'
+import commonjs from '@rollup/plugin-commonjs'
+import json from '@rollup/plugin-json'
+import wasm from '@rollup/plugin-wasm'
+import rimraf from 'rimraf'
+import typescript from '@rollup/plugin-typescript'
+import modify from 'rollup-plugin-modify'
 
-rimraf.sync("./exports/**");
+rimraf.sync('./exports/**')
 
 export default [
   {
-    input: [
-      "./src/peernet.ts",
-      "./node_modules/@leofcoin/storage/exports/browser-store.js",
-    ],
+    input: ['./src/peernet.ts', './node_modules/@leofcoin/storage/exports/browser-store.js'],
     output: {
-      format: "es",
-      dir: "./exports/browser",
+      format: 'es',
+      dir: './exports/browser'
     },
     plugins: [
       json(),
       wasm(),
       modify({
-        "@netpeer/p2pt-swarm": "@netpeer/p2pt-swarm/browser",
+        "await import('@netpeer/swarm/client')": (await import('@netpeer/swarm/browser')).default.toString()
       }),
       resolve({
         browser: true,
         preferBuiltins: false,
-        mainFields: ["browser", "module", "main"],
+        mainFields: ['browser', 'module', 'main']
       }),
       commonjs({
-        mainFields: ["browser", "module", "main"],
+        mainFields: ['browser', 'module', 'main']
       }),
 
-      typescript({ compilerOptions: { outDir: "./exports/browser" } }),
+      typescript({ compilerOptions: { outDir: './exports/browser' } })
     ],
-    external: ["./prompts/password.js"],
+    external: ['./prompts/password.js']
   },
   {
-    input: [
-      "./src/peernet.ts",
-      "./node_modules/@leofcoin/storage/exports/store.js",
-    ],
+    input: ['./src/peernet.ts', './node_modules/@leofcoin/storage/exports/store.js'],
     output: {
-      format: "es",
-      dir: "./exports",
+      format: 'es',
+      dir: './exports'
     },
     plugins: [
       modify({
-        "@netpeer/p2pt-swarm": "@netpeer/p2pt-swarm",
+        '@netpeer/swarm/client': '@netpeer/swarm/client'
       }),
       typescript({
         compilerOptions: {
-          outDir: "./exports",
-          declarationDir: "./exports/types",
-        },
-      }),
+          outDir: './exports',
+          declarationDir: './exports/types'
+        }
+      })
     ],
-    external: ["./prompts/password.js"],
+    external: ['./prompts/password.js']
   },
   {
-    input: ["./src/prompts/password/browser.js"],
+    input: ['./src/prompts/password/browser.js'],
     output: {
-      format: "es",
-      file: "./exports/browser/src/prompts/password.js",
-    },
+      format: 'es',
+      file: './exports/browser/src/prompts/password.js'
+    }
   },
   {
-    input: ["./src/prompts/password/node.js"],
+    input: ['./src/prompts/password/node.js'],
     output: {
-      format: "es",
-      file: "./exports/src/prompts/password.js",
-    },
-  },
-];
+      format: 'es',
+      file: './exports/src/prompts/password.js'
+    }
+  }
+]