@leofcoin/peernet 0.11.6 → 0.11.9

package/dist/module/peernet.js

@@ -1,3 +1,4 @@
+import '@vandeurenglenn/debug';
 import LeofcoinStorage from '@leofcoin/storage';
 import protons from 'protons';
 import bs32 from '@vandeurenglenn/base32';
@@ -264,6 +265,7 @@ class Peer {
   #senderMap = new Map()
   #iceCompleteTimer
   #channel
+  #peerId
 
   get connection() {
     return this.#connection
@@ -290,12 +292,17 @@ constructor(options = {}) {
       down: 0
     };
 
-    this.channelName = options.channelName || Buffer.from(Math.random().toString(36).slice(-12)).toString('hex');
-    console.log(this.channelName);
+    this.channelName = options.channelName;
+
+    this.#peerId = options.peerId;
     this.options = options;
     this.#init();
    }
 
+   get peerId() {
+     return this.#peerId
+   }
+
    set socketClient(value) {
      // this.socketClient?.pubsub.unsubscribe('signal', this._in)
      this._socketClient = value;
@@ -307,28 +314,29 @@ constructor(options = {}) {
    }
 
    send(message) {
-     this.bw.up += message.length;
+     this.bw.up += message.length || message.byteLength;
      this.channel.send(message);
    }
 
    request(data) {
     return new Promise((resolve, reject) => {
       const id = Math.random().toString(36).slice(-12);
+      // TODO: get rid of JSON
       data = new TextEncoder().encode(JSON.stringify({id, data}));
       const _onData = message => {
         message = JSON.parse(new TextDecoder().decode(message.data));
         if (message.id === id) {
           resolve(message.data);
-          pubsub.unsubscribe('peer:data', _onData);
+          pubsub.unsubscribe(`peer:data`, _onData);
         }
       };
 
-      pubsub.subscribe('peer:data', _onData);
+      pubsub.subscribe(`peer:data`, _onData);
 
       // cleanup subscriptions
-      setTimeout(() => {
-        pubsub.unsubscribe('peer:data', _onData);
-      }, 5000);
+      // setTimeout(() => {
+      //   pubsub.unsubscribe(`peer:data-request-${id}`, _onData)
+      // }, 5000);
 
       this.send(data);
     });
@@ -357,12 +365,13 @@ constructor(options = {}) {
            this.#connected = true;
            pubsub.publish('peer:connected', this);
          };
-         message.channel.onclose = () => console.log('close');
+         message.channel.onclose = () => this.close.bind(this);
+
          message.channel.onmessage = (message) => {
-           if (message.to) {
-             if (message.to === this.id) pubsub.publish('peer:data', message);
-           } else pubsub.publish('peer:data', message);
-           this.bw.down += message.length;
+           pubsub.publish('peer:data', message);
+           debug(`incoming message from ${this.id}`);
+           debug(message);
+           this.bw.down += message.length || message.byteLength;
          };
          this.channel = message.channel;
        };
@@ -377,10 +386,10 @@ constructor(options = {}) {
         this.channel.onclose = () => this.close.bind(this);
 
         this.channel.onmessage = (message) => {
-          if (message.to) {
-            if (message.to === this.id) pubsub.publish('peer:data', message);
-          } else pubsub.publish('peer:data', message);
-          this.bw.down += message.length;
+          pubsub.publish('peer:data', message);
+          debug(`incoming message from ${this.peerId}`);
+          debug(message);
+          this.bw.down += message.length || message.byteLength;
         };
 
        const offer = await this.#connection.createOffer();
@@ -410,6 +419,8 @@ constructor(options = {}) {
     // if (data.videocall) return this._startStream(true, false); // start video and audio stream
     // if (data.call) return this._startStream(true, true); // start audio stream
     if (message.candidate) {
+      debug(`incoming candidate ${this.channelName}`);
+      debug(message.candidate.candidate);
       this.remoteAddress = message.candidate.address;
       this.remotePort = message.candidate.port;
       this.remoteProtocol = message.candidate.protocol;
@@ -419,12 +430,14 @@ constructor(options = {}) {
     try {
       if (message.sdp) {
         if (message.sdp.type === 'offer') {
+          debug(`incoming offer ${this.channelName}`);
           await this.#connection.setRemoteDescription(new wrtc.RTCSessionDescription(message.sdp));
           const answer = await this.#connection.createAnswer();
           await this.#connection.setLocalDescription(answer);
           this._sendMessage({'sdp': this.#connection.localDescription});
         }
         if (message.sdp.type === 'answer') {
+          debug(`incoming answer ${this.channelName}`);
           await this.#connection.setRemoteDescription(new wrtc.RTCSessionDescription(message.sdp));
         }
      }
@@ -434,6 +447,7 @@ constructor(options = {}) {
  }
 
  close() {
+   debug(`closing ${this.peerId}`);
    this.channel?.close();
    this.#connection?.close();
 
@@ -464,7 +478,6 @@ class Client {
   async _init(identifiers, stars = []) {
     if (stars.length === 0) {
       stars.push('wss://star.leofcoin.org');
-      stars.push('ws://localhost:44444');
     }
     this.identifiers = identifiers;
     this.starsConfig = stars;
@@ -483,17 +496,9 @@ class Client {
     }
     const peers = await this.socketClient.peernet.join({id: this.id});
     for (const id of peers) {
-      if (id !== this.id && !this.#connections[id]) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id});
+      if (id !== this.id && !this.#connections[id]) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
     }
     this.setupListeners();
-
-    pubsub.subscribe('peer:connected', (peer) => {
-      // peer.send(JSON.stringify({data: 'hello', from: this.id, to: peer.to}))
-      console.log({peer: peer.to});
-      console.log({id: peer.id});
-      console.log({id: this.id});
-    });
-    // pubsub.subscribe('peer:data', (data) => console.log({data}))
   }
 
   setupListeners() {
@@ -542,7 +547,7 @@ class Client {
                 delete this.#connections[id];
               }
               // reconnect
-              if (id !== this.id) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id});
+              if (id !== this.id) this.#connections[id] = new Peer({channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
             }
 
           }
@@ -552,10 +557,7 @@ class Client {
         }
       }
     }
-
-    console.log(`star ${id} left`);
-
-
+    debug(`star ${id} left`);
   }
 
   peerLeft(id) {
@@ -563,7 +565,7 @@ class Client {
       this.#connections[id].close();
       delete this.#connections[id];
     }
-    console.log(`peer ${id} left`);
+    debug(`peer ${id} left`);
   }
 
   peerJoined(id, signal) {
@@ -572,8 +574,8 @@ class Client {
       delete this.#connections[id];
     }
     // RTCPeerConnection
-    this.#connections[id] = new Peer({initiator: true, channelName: `${this.id}:${id}`, socketClient: this.socketClient, id: this.id, to: id});
-    console.log(`peer ${id} joined`);
+    this.#connections[id] = new Peer({initiator: true, channelName: `${this.id}:${id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
+    debug(`peer ${id} joined`);
   }
 
 
@@ -630,7 +632,7 @@ var codecs = {
   // just a hash
   'disco-hash': {
     codec: parseInt('30', 16),
-    hashAlg: 'dbl-keccak-512', // ,
+    hashAlg: 'dbl-keccak-256', // ,
     // testnet: 'olivia'
   },
   'peernet-peer-response': {
@@ -661,7 +663,7 @@ var codecs = {
   // message
   'peernet-message': {
     codec: parseInt('706d65', 16),
-    hashAlg: 'keccak-512',
+    hashAlg: 'keccak-256',
   },
   // pubsub
   'peernet-ps': {
@@ -702,7 +704,7 @@ var codecs = {
   // chat message
   'chat-message': {
     codec: parseInt('636d', 16),
-    hashAlg: 'dbl-keccak-512',
+    hashAlg: 'dbl-keccak-256',
   },
 };
 
@@ -831,7 +833,7 @@ class PeernetHash {
     else this.name = 'disco-hash';
     if (options.codecs) this.codecs = options.codecs;
     if (buffer) {
-      if (Buffer.isBuffer(buffer)) {
+      if (buffer instanceof Uint8Array) {
         this.discoCodec = new PeernetCodec(buffer, this.codecs);
         const name = this.discoCodec.name;
 
@@ -855,13 +857,9 @@ class PeernetHash {
   get prefix() {
     const length = this.length;
     const uint8Array = new Uint8Array(length.length + this.discoCodec.codecBuffer.length);
-    for (let i = 0; i < this.discoCodec.codecBuffer.length; i++) {
-      uint8Array[i] = this.discoCodec.codecBuffer[i];
-    }
+    uint8Array.set(length);
+    uint8Array.set(this.discoCodec.codecBuffer, length.length);
 
-    for (let i = uint8Array.length - 1; i < length.length; i++) {
-      uint8Array[i] = length[i];
-    }
     return uint8Array
   }
 
@@ -920,10 +918,11 @@ class PeernetHash {
 
     this.codec = this.discoCodec.encode();
     this.codec = this.discoCodec.codecBuffer;
-    this.hash = Buffer.concat([
-      this.prefix,
-      this.digest,
-    ]);
+    const uint8Array = new Uint8Array(this.digest.length + this.prefix.length);
+    uint8Array.set(this.prefix);
+    uint8Array.set(this.digest, this.prefix.length);
+
+    this.hash = uint8Array;
 
     return this.hash
   }
@@ -1374,7 +1373,7 @@ class ChatMessage extends FormatInterface {
   }
 }
 
-const debug = (log) => {
+const debug$1 = (log) => {
   if (globalThis.DEBUG || globalThis.debug) console.log(`%c ${log}`, 'color: #0080ff;');
 };
 
@@ -2037,7 +2036,7 @@ class MessageHandler {
     identity = JSON.parse(new TextDecoder().decode(identity));
     const wallet = new MultiWallet(this.network);
     wallet.import(identity.multiWIF);
-    return wallet.sign(hasher.hash.slice(0, 32))
+    return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
   }
 
   /**
@@ -2311,9 +2310,9 @@ class Peernet {
    * @param {PeernetPeer} peer - peernet peer
    */
   async _protoHandler(message, peer, from) {
+
     const {id, proto} = message;
     this.bw.down += proto.encoded.length;
-
       if (proto.name === 'peernet-dht') {
         let { hash, store } = proto.decoded;
         let has;
@@ -2361,8 +2360,7 @@ class Peernet {
 
           this.bw.up += node.encoded.length;
         }
-      } else if (proto.name === 'peernet-ps' &&
-                 this._getPeerId(peer.id) !== this.id.toString()) {
+      } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
         globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString());
       }
     // }
@@ -2377,17 +2375,14 @@ class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new DHTMessage({hash});
     this.client.id;
-    for (const peer of this.connections) {
-      const node = await this.prepareMessage(peer.id, data.encoded);
-
-      const result = await peer.request(node.encoded);
-
-      let proto = protoFor(result.data);
-
+    const walk = async peer => {
+      const node = await this.prepareMessage(peer.peerId, data.encoded);
+      let result = await peer.request(node.encoded);
+      result = new Uint8Array(Object.values(result));
+      let proto = protoFor(result);
       if (proto.name !== 'peernet-message') throw encapsulatedError()
       const from = proto.decoded.from;
       proto = protoFor(proto.decoded.data);
-
       if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
 
       // TODO: give ip and port (just used for location)
@@ -2405,8 +2400,14 @@ class Peernet {
       };
 
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash);
+    };
+    let walks = [];
+    for (const peer of this.connections) {
+      if (peer.peerId !== this.id) {
+        walks.push(walk(peer));
+      }
     }
-    return
+    return Promise.all(walks)
   }
 
   /**
@@ -2468,34 +2469,33 @@ class Peernet {
   async requestData(hash, store) {
     const providers = await this.providersFor(hash);
     if (!providers || providers.size === 0) throw nothingFoundError(hash)
-    debug(`found ${providers.size} provider(s) for ${hash}`);
+    debug$1(`found ${providers.size} provider(s) for ${hash}`);
     // get closest peer on earth
     const closestPeer = await this.dht.closestPeer(providers);
     // get peer instance by id
-    if (!closestPeer || !closestPeer.id) return this.requestData(hash, store.name ? store.name : store)
+    if (!closestPeer || !closestPeer.id) return this.requestData(hash, store?.name ? store?.name : store)
 
-    const id = closestPeer.id.toString();
+    const id = closestPeer.id;
     if (this.connections) {
       let closest = this.connections.filter((peer) => {
-        if (peer.id === id) return peer
+        if (peer.peerId === id) return peer
       });
 
-      let data = new DataMessage({hash, store: store.name ? store.name : store});
+      let data = new DataMessage({hash, store: store?.name ? store?.name : store});
 
       const node = await this.prepareMessage(id, data.encoded);
       if (closest[0]) data = await closest[0].request(node.encoded);
       else {
         closest = this.connections.filter((peer) => {
-          if (peer.id === id) return peer
+          if (peer.peerId === id) return peer
         });
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
-      if (data.data) {
-        console.log(data.data);
-        let proto = protoFor(data.data);
-        proto = protoFor(proto.decoded.data);
-        return proto.decoded.data
-      }
+      data = new Uint8Array(Object.values(data));
+      let proto = protoFor(data);
+      proto = protoFor(proto.decoded.data);
+      // TODO: store data automaticly or not
+      return proto.decoded.data
 
       // this.put(hash, proto.decoded.data)
     }
@@ -2511,7 +2511,7 @@ class Peernet {
        * @param {String} hash
        */
       get: async (hash) => {
-        debug(`get message ${hash}`);
+        debug$1(`get message ${hash}`);
         const message = await messageStore.has(hash);
         if (message) return await messageStore.get(hash)
         return this.requestData(hash, 'message')
@@ -2539,7 +2539,7 @@ class Peernet {
        * @param {String} hash
        */
       get: async (hash) => {
-        debug(`get data ${hash}`);
+        debug$1(`get data ${hash}`);
         const data = await dataStore.has(hash);
         if (data) return await dataStore.get(hash)
         return this.requestData(hash, 'data')
@@ -2581,14 +2581,14 @@ class Peernet {
    * @param {String} store - storeName to access
    */
   async get(hash, store) {
-    debug(`get ${hash}`);
+    debug$1(`get ${hash}`);
     let data;
     if (store) store = globalThis[`${store}Store`];
     if (!store) store = await this.whichStore([...this.stores], hash);
     if (store && await store.has(hash)) data = await store.get(hash);
     if (data) return data
 
-    return this.requestData(hash, store.name ? store.name : store)
+    return this.requestData(hash, store?.name ? store.name : store)
   }
 
   /**
@@ -2629,8 +2629,8 @@ class Peernet {
     data = new PsMessage({data, topic});
     for (const peer of this.connections) {
       if (peer.connected) {
-        if (peer.id !== this.peerId) {
-          const node = await this.prepareMessage(peer.id, data.encoded);
+        if (peer.peerId !== this.peerId) {
+          const node = await this.prepareMessage(peer.peerId, data.encoded);
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})));
         }
       } else {
@@ -2655,7 +2655,7 @@ class Peernet {
   }
 
   async removePeer(peer) {
-    delete this.client.connections[peer.id];
+    delete this.client.connections[peer.peerId];
   }
 
   get Buffer() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.11.6",
+  "version": "0.11.9",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "dist/module/peernet.js",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@leofcoin/generate-account": "^1.0.2",
     "@leofcoin/multi-wallet": "^2.1.2",
-    "@leofcoin/peernet-swarm": "^0.1.9",
+    "@leofcoin/peernet-swarm": "^0.1.16",
     "@leofcoin/storage": "^2.3.0",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",
@@ -46,6 +46,7 @@
     "@rollup/plugin-eslint": "^8.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
+    "@vandeurenglenn/debug": "^1.0.0",
     "coveralls": "^3.1.1",
     "esdoc": "^1.1.0",
     "esdoc-ecmascript-proposal-plugin": "^1.0.0",

package/src/codec/codecs.js

@@ -2,7 +2,7 @@ export default {
   // just a hash
   'disco-hash': {
     codec: parseInt('30', 16),
-    hashAlg: 'dbl-keccak-512', // ,
+    hashAlg: 'dbl-keccak-256', // ,
     // testnet: 'olivia'
   },
   'peernet-peer-response': {
@@ -33,7 +33,7 @@ export default {
   // message
   'peernet-message': {
     codec: parseInt('706d65', 16),
-    hashAlg: 'keccak-512',
+    hashAlg: 'keccak-256',
   },
   // pubsub
   'peernet-ps': {
@@ -74,6 +74,6 @@ export default {
   // chat message
   'chat-message': {
     codec: parseInt('636d', 16),
-    hashAlg: 'dbl-keccak-512',
+    hashAlg: 'dbl-keccak-256',
   },
 }

package/src/handlers/message.js

@@ -22,7 +22,7 @@ export default class MessageHandler {
     identity = JSON.parse(new TextDecoder().decode(identity))
     const wallet = new MultiWallet(this.network)
     wallet.import(identity.multiWIF)
-    return wallet.sign(hasher.hash.slice(0, 32))
+    return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))
   }
 
   /**

package/src/hash/hash.js

@@ -11,7 +11,7 @@ export default class PeernetHash {
     else this.name = 'disco-hash'
     if (options.codecs) this.codecs = options.codecs
     if (buffer) {
-      if (Buffer.isBuffer(buffer)) {
+      if (buffer instanceof Uint8Array) {
         this.discoCodec = new Codec(buffer, this.codecs)
         const name = this.discoCodec.name
 
@@ -35,13 +35,9 @@ export default class PeernetHash {
   get prefix() {
     const length = this.length
     const uint8Array = new Uint8Array(length.length + this.discoCodec.codecBuffer.length)
-    for (let i = 0; i < this.discoCodec.codecBuffer.length; i++) {
-      uint8Array[i] = this.discoCodec.codecBuffer[i]
-    }
+    uint8Array.set(length)
+    uint8Array.set(this.discoCodec.codecBuffer, length.length)
 
-    for (let i = uint8Array.length - 1; i < length.length; i++) {
-      uint8Array[i] = length[i]
-    }
     return uint8Array
   }
 
@@ -100,10 +96,11 @@ export default class PeernetHash {
 
     this.codec = this.discoCodec.encode();
     this.codec = this.discoCodec.codecBuffer
-    this.hash = Buffer.concat([
-      this.prefix,
-      this.digest,
-    ])
+    const uint8Array = new Uint8Array(this.digest.length + this.prefix.length)
+    uint8Array.set(this.prefix)
+    uint8Array.set(this.digest, this.prefix.length)
+
+    this.hash = uint8Array
 
     return this.hash
   }

package/src/peernet.js

@@ -257,9 +257,9 @@ export default class Peernet {
    * @param {PeernetPeer} peer - peernet peer
    */
   async _protoHandler(message, peer, from) {
+
     const {id, proto} = message
     this.bw.down += proto.encoded.length
-
       if (proto.name === 'peernet-dht') {
         let { hash, store } = proto.decoded
         let has;
@@ -309,8 +309,7 @@ export default class Peernet {
 
           this.bw.up += node.encoded.length
         }
-      } else if (proto.name === 'peernet-ps' &&
-                 this._getPeerId(peer.id) !== this.id.toString()) {
+      } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
         globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString())
       }
     // }
@@ -325,17 +324,14 @@ export default class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new DHTMessage({hash})
     const clientId = this.client.id
-    for (const peer of this.connections) {
-      const node = await this.prepareMessage(peer.id, data.encoded)
-
-      const result = await peer.request(node.encoded)
-
-      let proto = protoFor(result.data)
-
+    const walk = async peer => {
+      const node = await this.prepareMessage(peer.peerId, data.encoded)
+      let result = await peer.request(node.encoded)
+      result = new Uint8Array(Object.values(result))
+      let proto = protoFor(result)
       if (proto.name !== 'peernet-message') throw encapsulatedError()
       const from = proto.decoded.from
       proto = protoFor(proto.decoded.data)
-
       if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
 
       // TODO: give ip and port (just used for location)
@@ -354,7 +350,13 @@ export default class Peernet {
 
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash)
     }
-    return
+    let walks = []
+    for (const peer of this.connections) {
+      if (peer.peerId !== this.id) {
+        walks.push(walk(peer))
+      }
+    }
+    return Promise.all(walks)
   }
 
   /**
@@ -420,30 +422,29 @@ export default class Peernet {
     // get closest peer on earth
     const closestPeer = await this.dht.closestPeer(providers)
     // get peer instance by id
-    if (!closestPeer || !closestPeer.id) return this.requestData(hash, store.name ? store.name : store)
+    if (!closestPeer || !closestPeer.id) return this.requestData(hash, store?.name ? store?.name : store)
 
-    const id = closestPeer.id.toString()
+    const id = closestPeer.id
     if (this.connections) {
       let closest = this.connections.filter((peer) => {
-        if (peer.id === id) return peer
+        if (peer.peerId === id) return peer
       })
 
-      let data = new DataMessage({hash, store: store.name ? store.name : store});
+      let data = new DataMessage({hash, store: store?.name ? store?.name : store});
 
       const node = await this.prepareMessage(id, data.encoded)
       if (closest[0]) data = await closest[0].request(node.encoded)
       else {
         closest = this.connections.filter((peer) => {
-          if (peer.id === id) return peer
+          if (peer.peerId === id) return peer
         })
         if (closest[0]) data = await closest[0].request(node.encoded)
       }
-      if (data.data) {
-        console.log(data.data);
-        let proto = protoFor(data.data)
-        proto = protoFor(proto.decoded.data)
-        return proto.decoded.data
-      }
+      data = new Uint8Array(Object.values(data))
+      let proto = protoFor(data)
+      proto = protoFor(proto.decoded.data)
+      // TODO: store data automaticly or not
+      return proto.decoded.data
 
       // this.put(hash, proto.decoded.data)
     }
@@ -537,7 +538,7 @@ export default class Peernet {
     if (store && await store.has(hash)) data = await store.get(hash)
     if (data) return data
 
-    return this.requestData(hash, store.name ? store.name : store)
+    return this.requestData(hash, store?.name ? store.name : store)
   }
 
   /**
@@ -578,8 +579,8 @@ export default class Peernet {
     data = new PsMessage({data, topic})
     for (const peer of this.connections) {
       if (peer.connected) {
-        if (peer.id !== this.peerId) {
-          const node = await this.prepareMessage(peer.id, data.encoded)
+        if (peer.peerId !== this.peerId) {
+          const node = await this.prepareMessage(peer.peerId, data.encoded)
           peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
         }
       } else {
@@ -604,7 +605,7 @@ export default class Peernet {
   }
 
   async removePeer(peer) {
-    delete this.client.connections[peer.id]
+    delete this.client.connections[peer.peerId]
   }
 
   get Buffer() {