@leofcoin/peernet 0.11.7 → 0.11.10

package/dist/commonjs/{http-906864ff.js → http-e330b910.js}

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
 var Koa__default = /*#__PURE__*/_interopDefaultLegacy(Koa);
 
-var version = "0.11.6";
+var version = "0.11.9";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),

package/dist/commonjs/peernet.js

@@ -1,5 +1,6 @@
 'use strict';
 
+require('@vandeurenglenn/debug');
 var LeofcoinStorage = require('@leofcoin/storage');
 var peernetMessage = require('./peernet-message.js');
 var dht = require('./dht.js');
@@ -307,6 +308,7 @@ class Peer {
   #senderMap = new Map()
   #iceCompleteTimer
   #channel
+  #peerId
 
   get connection() {
     return this.#connection
@@ -333,12 +335,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;
@@ -350,28 +357,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);
     });
@@ -400,12 +408,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;
        };
@@ -420,10 +429,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();
@@ -453,6 +462,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;
@@ -462,12 +473,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));
         }
      }
@@ -477,6 +490,7 @@ constructor(options = {}) {
  }
 
  close() {
+   debug(`closing ${this.peerId}`);
    this.channel?.close();
    this.#connection?.close();
 
@@ -507,7 +521,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;
@@ -526,17 +539,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() {
@@ -585,7 +590,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});
             }
 
           }
@@ -595,10 +600,7 @@ class Client {
         }
       }
     }
-
-    console.log(`star ${id} left`);
-
-
+    debug(`star ${id} left`);
   }
 
   peerLeft(id) {
@@ -606,7 +608,7 @@ class Client {
       this.#connections[id].close();
       delete this.#connections[id];
     }
-    console.log(`peer ${id} left`);
+    debug(`peer ${id} left`);
   }
 
   peerJoined(id, signal) {
@@ -615,8 +617,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`);
   }
 
 
@@ -774,7 +776,7 @@ class ChatMessage extends codecFormatInterface {
   }
 }
 
-const debug = (log) => {
+const debug$1 = (log) => {
   if (globalThis.DEBUG || globalThis.debug) console.log(`%c ${log}`, 'color: #0080ff;');
 };
 
@@ -1636,7 +1638,7 @@ class Peernet {
 					protocol: 'peernet-v0.1.0', host: '127.0.0.1', port: options.port
 				});
 			} else {
-				const http = await Promise.resolve().then(function () { return require('./http-906864ff.js'); });
+				const http = await Promise.resolve().then(function () { return require('./http-e330b910.js'); });
 	      if (environment !== 'browser') http.default(options);
 	    }
 
@@ -1719,9 +1721,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;
@@ -1769,9 +1771,8 @@ class Peernet {
 
           this.bw.up += node.encoded.length;
         }
-      } else if (proto.name === 'peernet-ps' &&
-                 this._getPeerId(peer.id) !== this.id.toString()) {
-        globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString());
+      } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
+        globalSub.publish(new TextDecoder().decode(proto.decoded.topic), proto.decoded.data);
       }
     // }
   }
@@ -1785,17 +1786,14 @@ class Peernet {
     if (!hash) throw new Error('hash expected, received undefined')
     const data = new dht({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)
@@ -1813,8 +1811,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)
   }
 
   /**
@@ -1876,34 +1880,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)
     }
@@ -1919,7 +1922,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')
@@ -1947,7 +1950,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')
@@ -1989,14 +1992,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)
   }
 
   /**
@@ -2037,8 +2040,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 {
@@ -2063,7 +2066,7 @@ class Peernet {
   }
 
   async removePeer(peer) {
-    delete this.client.connections[peer.id];
+    delete this.client.connections[peer.peerId];
   }
 
   get Buffer() {