@leofcoin/peernet 0.11.8 → 0.11.11

package/dist/commonjs/{http-12850e18.js → http-1de9e08b.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.7";
+var version = "0.11.10";
 
 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');
@@ -356,7 +357,7 @@ constructor(options = {}) {
    }
 
    send(message) {
-     this.bw.up += message.length;
+     this.bw.up += message.length || message.byteLength;
      this.channel.send(message);
    }
 
@@ -369,16 +370,16 @@ constructor(options = {}) {
         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);
     });
@@ -407,11 +408,12 @@ 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);
+           pubsub.publish('peer:data', message);
+           debug(`incoming message from ${this.id}`);
+           debug(message);
            this.bw.down += message.length || message.byteLength;
          };
          this.channel = message.channel;
@@ -427,9 +429,9 @@ 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);
+          pubsub.publish('peer:data', message);
+          debug(`incoming message from ${this.peerId}`);
+          debug(message);
           this.bw.down += message.length || message.byteLength;
         };
 
@@ -460,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;
@@ -469,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));
         }
      }
@@ -484,6 +490,7 @@ constructor(options = {}) {
  }
 
  close() {
+   debug(`closing ${this.peerId}`);
    this.channel?.close();
    this.#connection?.close();
 
@@ -514,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;
@@ -536,14 +542,6 @@ class Client {
       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() {
@@ -602,10 +600,7 @@ class Client {
         }
       }
     }
-
-    console.log(`star ${id} left`);
-
-
+    debug(`star ${id} left`);
   }
 
   peerLeft(id) {
@@ -613,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) {
@@ -623,7 +618,7 @@ class Client {
     }
     // RTCPeerConnection
     this.#connections[id] = new Peer({initiator: true, channelName: `${this.id}:${id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
-    console.log(`peer ${id} joined`);
+    debug(`peer ${id} joined`);
   }
 
 
@@ -781,10 +776,6 @@ class ChatMessage extends codecFormatInterface {
   }
 }
 
-const debug = (log) => {
-  if (globalThis.DEBUG || globalThis.debug) console.log(`%c ${log}`, 'color: #0080ff;');
-};
-
 const protoFor = (data) => {
   if (!Buffer.isBuffer(data)) data = Buffer.from(data);
   const codec$1 = new codec.PeernetCodec(data);
@@ -1643,7 +1634,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-12850e18.js'); });
+				const http = await Promise.resolve().then(function () { return require('./http-1de9e08b.js'); });
 	      if (environment !== 'browser') http.default(options);
 	    }
 
@@ -1729,7 +1720,6 @@ class Peernet {
 
     const {id, proto} = message;
     this.bw.down += proto.encoded.length;
-
       if (proto.name === 'peernet-dht') {
         let { hash, store } = proto.decoded;
         let has;
@@ -1778,7 +1768,7 @@ class Peernet {
           this.bw.up += node.encoded.length;
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
-        globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString());
+        globalSub.publish(new TextDecoder().decode(proto.decoded.topic), proto.decoded.data);
       }
     // }
   }
@@ -1797,11 +1787,9 @@ class Peernet {
       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)
@@ -1892,15 +1880,15 @@ 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.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);
@@ -1910,12 +1898,11 @@ class Peernet {
         });
         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)
     }
@@ -2008,7 +1995,7 @@ 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)
   }
 
   /**

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';
@@ -313,7 +314,7 @@ constructor(options = {}) {
    }
 
    send(message) {
-     this.bw.up += message.length;
+     this.bw.up += message.length || message.byteLength;
      this.channel.send(message);
    }
 
@@ -326,16 +327,16 @@ constructor(options = {}) {
         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);
     });
@@ -364,11 +365,12 @@ 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);
+           pubsub.publish('peer:data', message);
+           debug(`incoming message from ${this.id}`);
+           debug(message);
            this.bw.down += message.length || message.byteLength;
          };
          this.channel = message.channel;
@@ -384,9 +386,9 @@ 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);
+          pubsub.publish('peer:data', message);
+          debug(`incoming message from ${this.peerId}`);
+          debug(message);
           this.bw.down += message.length || message.byteLength;
         };
 
@@ -417,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;
@@ -426,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));
         }
      }
@@ -441,6 +447,7 @@ constructor(options = {}) {
  }
 
  close() {
+   debug(`closing ${this.peerId}`);
    this.channel?.close();
    this.#connection?.close();
 
@@ -471,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;
@@ -493,14 +499,6 @@ class Client {
       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() {
@@ -559,10 +557,7 @@ class Client {
         }
       }
     }
-
-    console.log(`star ${id} left`);
-
-
+    debug(`star ${id} left`);
   }
 
   peerLeft(id) {
@@ -570,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) {
@@ -580,7 +575,7 @@ class Client {
     }
     // RTCPeerConnection
     this.#connections[id] = new Peer({initiator: true, channelName: `${this.id}:${id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id});
-    console.log(`peer ${id} joined`);
+    debug(`peer ${id} joined`);
   }
 
 
@@ -1378,10 +1373,6 @@ class ChatMessage extends FormatInterface {
   }
 }
 
-const debug = (log) => {
-  if (globalThis.DEBUG || globalThis.debug) console.log(`%c ${log}`, 'color: #0080ff;');
-};
-
 const protoFor = (data) => {
   if (!Buffer.isBuffer(data)) data = Buffer.from(data);
   const codec = new PeernetCodec(data);
@@ -2318,7 +2309,6 @@ class Peernet {
 
     const {id, proto} = message;
     this.bw.down += proto.encoded.length;
-
       if (proto.name === 'peernet-dht') {
         let { hash, store } = proto.decoded;
         let has;
@@ -2367,7 +2357,7 @@ class Peernet {
           this.bw.up += node.encoded.length;
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
-        globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString());
+        globalSub.publish(new TextDecoder().decode(proto.decoded.topic), proto.decoded.data);
       }
     // }
   }
@@ -2386,11 +2376,9 @@ class Peernet {
       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)
@@ -2481,15 +2469,15 @@ 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.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);
@@ -2499,12 +2487,11 @@ class Peernet {
         });
         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)
     }
@@ -2597,7 +2584,7 @@ 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)
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.11.8",
+  "version": "0.11.11",
   "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.12",
+    "@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/peernet.js

@@ -1,3 +1,4 @@
+import '@vandeurenglenn/debug'
 import Client from './../node_modules/@leofcoin/peernet-swarm/dist/es/client.js'
 import LeofcoinStorage from '@leofcoin/storage'
 import LeofcoinStorageClient from './http/client/storage.js'
@@ -16,7 +17,7 @@ import PeerDiscovery from './discovery/peer-discovery'
 import DHT from './dht/dht.js'
 import Hash from './hash/hash'
 import codecs from './codec/codecs'
-import { debug, protoFor, target } from './utils/utils.js'
+import { protoFor, target } from './utils/utils.js'
 import generateAccount from '@leofcoin/generate-account'
 import MessageHandler from './handlers/message.js'
 import { encapsulatedError, dhtError,
@@ -260,7 +261,6 @@ export default class Peernet {
 
     const {id, proto} = message
     this.bw.down += proto.encoded.length
-
       if (proto.name === 'peernet-dht') {
         let { hash, store } = proto.decoded
         let has;
@@ -311,7 +311,7 @@ export default class Peernet {
           this.bw.up += node.encoded.length
         }
       } else if (proto.name === 'peernet-ps' && peer.peerId !== this.id) {
-        globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString())
+        globalSub.publish(new TextDecoder().decode(proto.decoded.topic), proto.decoded.data)
       }
     // }
   }
@@ -330,11 +330,9 @@ export default class Peernet {
       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)
@@ -425,15 +423,15 @@ 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.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)
@@ -443,12 +441,11 @@ export default class Peernet {
         })
         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)
     }
@@ -542,7 +539,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)
   }
 
   /**

package/src/utils/utils.js

@@ -16,10 +16,6 @@ export const expected = (expected, actual) => {
       ${entries.join('\n\t')}`;
 }
 
-export const debug = (log) => {
-  if (globalThis.DEBUG || globalThis.debug) console.log(`%c ${log}`, 'color: #0080ff;')
-}
-
 export const protoFor = (data) => {
   if (!Buffer.isBuffer(data)) data = Buffer.from(data)
   const codec = new Codec(data)

package/test.js

@@ -8,6 +8,7 @@ pubsub.subscribe('peer:connected', async peer => {
           request:'lastBlock'
         })
   const to = peer.id
+  await peernet.data.put('hello', 'hi')
   console.log(request);
   const node = await peernet.prepareMessage(to, request.encoded)
   console.log({node});
@@ -25,4 +26,10 @@ pubsub.subscribe('peer:connected', async peer => {
 
   const block = new TextDecoder().decode(response.decoded.response)
   console.log(block);
+  const task = () => setTimeout(() => {
+    console.log(peernet.connections[0]?.connected);
+    console.log(pubsub.subscribers);
+    task()
+  }, 5000);
+  task()
 })