@leofcoin/peernet 0.11.9 → 0.11.12

package/dist/browser/peernet.js

@@ -83727,10 +83727,6 @@ const expected = (expected, actual) => {
       ${entries.join('\n\t')}`;
 }
 
-const utils_debug = (log) => {
-  if (globalThis.DEBUG || globalThis.debug) console.log(`%c ${log}`, 'color: #0080ff;')
-}
-
 const protoFor = (data) => {
   if (!utils_Buffer.isBuffer(data)) data = utils_Buffer.from(data)
   const codec = new PeernetCodec(data)
@@ -84530,6 +84526,7 @@ const nothingFoundError = (hash) => {
 
 
 
+
 
 
 globalThis.leofcoin = globalThis.leofcoin || {}
@@ -84648,7 +84645,6 @@ class Peernet {
      * @type {Map}
      * @property {Object} peer Instance of Peer
      */
-    this.peerMap = new Map()
     this.stores = []
     this.requestProtos = {}
     this.storePrefix = options.storePrefix
@@ -84748,14 +84744,6 @@ class Peernet {
     return this
   }
 
-  _getPeerId(id) {
-    for (const entry of [...this.peerMap.entries()]) {
-      for (const _id of entry[1]) {
-        if (_id === id) return entry[0]
-      }
-    }
-  }
-
   addRequestHandler(name, method) {
     this.requestProtos[name] = method
   }
@@ -84820,7 +84808,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)
       }
     // }
   }
@@ -84928,7 +84916,7 @@ class Peernet {
   async requestData(hash, store) {
     const providers = await this.providersFor(hash)
     if (!providers || providers.size === 0) throw nothingFoundError(hash)
-    utils_debug(`found ${providers.size} provider(s) for ${hash}`)
+    debug(`found ${providers.size} provider(s) for ${hash}`)
     // get closest peer on earth
     const closestPeer = await this.dht.closestPeer(providers)
     // get peer instance by id
@@ -84970,7 +84958,7 @@ class Peernet {
        * @param {String} hash
        */
       get: async (hash) => {
-        utils_debug(`get message ${hash}`)
+        debug(`get message ${hash}`)
         const message = await messageStore.has(hash)
         if (message) return await messageStore.get(hash)
         return this.requestData(hash, 'message')
@@ -84998,7 +84986,7 @@ class Peernet {
        * @param {String} hash
        */
       get: async (hash) => {
-        utils_debug(`get data ${hash}`)
+        debug(`get data ${hash}`)
         const data = await dataStore.has(hash)
         if (data) return await dataStore.get(hash)
         return this.requestData(hash, 'data')
@@ -85041,7 +85029,7 @@ class Peernet {
    * @param {String} store - storeName to access
    */
   async get(hash, store) {
-    utils_debug(`get ${hash}`)
+    debug(`get ${hash}`)
     let data
     if (store) store = globalThis[`${store}Store`]
     if (!store) store = await this.whichStore([...this.stores], hash)

package/dist/commonjs/{http-63196be9.js → http-dc146709.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.8";
+var version = "0.11.11";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),

package/dist/commonjs/peernet.js

@@ -776,10 +776,6 @@ class ChatMessage extends codecFormatInterface {
   }
 }
 
-const debug$1 = (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);
@@ -1595,7 +1591,6 @@ class Peernet {
      * @type {Map}
      * @property {Object} peer Instance of Peer
      */
-    this.peerMap = new Map();
     this.stores = [];
     this.requestProtos = {};
     this.storePrefix = options.storePrefix;
@@ -1638,7 +1633,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-63196be9.js'); });
+				const http = await Promise.resolve().then(function () { return require('./http-dc146709.js'); });
 	      if (environment !== 'browser') http.default(options);
 	    }
 
@@ -1702,14 +1697,6 @@ class Peernet {
     return this
   }
 
-  _getPeerId(id) {
-    for (const entry of [...this.peerMap.entries()]) {
-      for (const _id of entry[1]) {
-        if (_id === id) return entry[0]
-      }
-    }
-  }
-
   addRequestHandler(name, method) {
     this.requestProtos[name] = method;
   }
@@ -1772,7 +1759,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);
       }
     // }
   }
@@ -1880,7 +1867,7 @@ class Peernet {
   async requestData(hash, store) {
     const providers = await this.providersFor(hash);
     if (!providers || providers.size === 0) throw nothingFoundError(hash)
-    debug$1(`found ${providers.size} provider(s) for ${hash}`);
+    debug(`found ${providers.size} provider(s) for ${hash}`);
     // get closest peer on earth
     const closestPeer = await this.dht.closestPeer(providers);
     // get peer instance by id
@@ -1922,7 +1909,7 @@ class Peernet {
        * @param {String} hash
        */
       get: async (hash) => {
-        debug$1(`get message ${hash}`);
+        debug(`get message ${hash}`);
         const message = await messageStore.has(hash);
         if (message) return await messageStore.get(hash)
         return this.requestData(hash, 'message')
@@ -1950,7 +1937,7 @@ class Peernet {
        * @param {String} hash
        */
       get: async (hash) => {
-        debug$1(`get data ${hash}`);
+        debug(`get data ${hash}`);
         const data = await dataStore.has(hash);
         if (data) return await dataStore.get(hash)
         return this.requestData(hash, 'data')
@@ -1992,7 +1979,7 @@ class Peernet {
    * @param {String} store - storeName to access
    */
   async get(hash, store) {
-    debug$1(`get ${hash}`);
+    debug(`get ${hash}`);
     let data;
     if (store) store = globalThis[`${store}Store`];
     if (!store) store = await this.whichStore([...this.stores], hash);

package/dist/module/peernet.js

@@ -1373,10 +1373,6 @@ class ChatMessage extends FormatInterface {
   }
 }
 
-const debug$1 = (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);
@@ -2192,7 +2188,6 @@ class Peernet {
      * @type {Map}
      * @property {Object} peer Instance of Peer
      */
-    this.peerMap = new Map();
     this.stores = [];
     this.requestProtos = {};
     this.storePrefix = options.storePrefix;
@@ -2291,14 +2286,6 @@ class Peernet {
     return this
   }
 
-  _getPeerId(id) {
-    for (const entry of [...this.peerMap.entries()]) {
-      for (const _id of entry[1]) {
-        if (_id === id) return entry[0]
-      }
-    }
-  }
-
   addRequestHandler(name, method) {
     this.requestProtos[name] = method;
   }
@@ -2361,7 +2348,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);
       }
     // }
   }
@@ -2469,7 +2456,7 @@ class Peernet {
   async requestData(hash, store) {
     const providers = await this.providersFor(hash);
     if (!providers || providers.size === 0) throw nothingFoundError(hash)
-    debug$1(`found ${providers.size} provider(s) for ${hash}`);
+    debug(`found ${providers.size} provider(s) for ${hash}`);
     // get closest peer on earth
     const closestPeer = await this.dht.closestPeer(providers);
     // get peer instance by id
@@ -2511,7 +2498,7 @@ class Peernet {
        * @param {String} hash
        */
       get: async (hash) => {
-        debug$1(`get message ${hash}`);
+        debug(`get message ${hash}`);
         const message = await messageStore.has(hash);
         if (message) return await messageStore.get(hash)
         return this.requestData(hash, 'message')
@@ -2539,7 +2526,7 @@ class Peernet {
        * @param {String} hash
        */
       get: async (hash) => {
-        debug$1(`get data ${hash}`);
+        debug(`get data ${hash}`);
         const data = await dataStore.has(hash);
         if (data) return await dataStore.get(hash)
         return this.requestData(hash, 'data')
@@ -2581,7 +2568,7 @@ class Peernet {
    * @param {String} store - storeName to access
    */
   async get(hash, store) {
-    debug$1(`get ${hash}`);
+    debug(`get ${hash}`);
     let data;
     if (store) store = globalThis[`${store}Store`];
     if (!store) store = await this.whichStore([...this.stores], hash);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.11.9",
+  "version": "0.11.12",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "dist/module/peernet.js",

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,
@@ -138,7 +139,6 @@ export default class Peernet {
      * @type {Map}
      * @property {Object} peer Instance of Peer
      */
-    this.peerMap = new Map()
     this.stores = []
     this.requestProtos = {}
     this.storePrefix = options.storePrefix
@@ -238,14 +238,6 @@ export default class Peernet {
     return this
   }
 
-  _getPeerId(id) {
-    for (const entry of [...this.peerMap.entries()]) {
-      for (const _id of entry[1]) {
-        if (_id === id) return entry[0]
-      }
-    }
-  }
-
   addRequestHandler(name, method) {
     this.requestProtos[name] = method
   }
@@ -310,7 +302,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)
       }
     // }
   }

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/src/client.js

@@ -1,75 +0,0 @@
-import Pubsub from '@vandeurenglenn/little-pubsub'
-import PeernetPeer from './peer.js'
-import sha256 from 'crypto-js/sha256'
-
-import P2P from 'p2pt'
-
-
-/**
- * Array of peers
- * @type {Array}
- * @property {PeernetPeer} peer Instance of Peer
- */
-globalThis.connections = new Map()
-globalThis.recentConnections = new Map()
-globalThis.pubsub = globalThis.pubsub || new Pubsub({verbose: false})
-
-export default class PeernetClient {
-  constructor(options = {}) {
-    if (!options.id) options.id = Buffer.from('00000000000000000000000000000000')
-    if (!options.networkVersion) options.networkVersion = 'v0.1.0'
-    if (!options.networkName) options.networkName = 'peernet'
-    this.id = options.id
-
-    this.topic = Buffer.from(sha256(`${options.networkName}-${options.networkVersion}`).toString())
-
-    const trackers = [
-      'wss://star.leofcoin.org',
-      'wss://tracker.openwebtorrent.com',
-      // 'wss://tracker.sloppyta.co:443/announce',
-    ]
-    this.p2p = new P2P(trackers, this.topic.slice(0, 20))
-    this.p2p.on('peerconnect', (peer) => {
-      peer = new PeernetPeer(peer.id, peer)
-      connections.set(peer.id, peer)
-      pubsub.publish('peer:discovered', peer)
-    })
-
-    this.p2p.on('peerclose', (peer) => {
-      // TODO: close peernetPeer
-      const peernetPeer = connections.get(peer.id)
-      if (peernetPeer) {
-        peernetPeer.close()
-      }
-      connections.delete(peer.id)
-      pubsub.publish('peer:disconnected', peer)
-    })
-
-    this.p2p.start()
-
-    if (globalThis.process) {
-      process.on('SIGINT', async () => {
-        console.log('Caught interrupt signal')
-        this.close()
-        setTimeout(async () => {
-          process.exit();
-        }, 100);
-      })
-    } else {
-      globalThis.onbeforeunload = () => {
-        this.close()
-      }
-    }
-    //
-    // this.sw.on('close', () => {
-    // })
-  }
-
-  close() {
-    return this.p2p.destroy()
-  }
-
-  _peers() {
-    return this.p2p.getPeers()
-  }
-}

package/src/peer.js

@@ -1,67 +0,0 @@
-export default class PeernetPeer {
-  constructor(id, connection) {
-    this._events = {}
-    this.bw = {
-      up: 0,
-      down: 0,
-    }
-    this.id = id
-    this.connection = connection
-
-    this.connection.on('data', (message) => {
-      this.bw.down += message.length
-      pubsub.publish('peernet.data', JSON.parse(message.toString()))
-    })
-  }
-
-  request(data) {
-    return new Promise((resolve, reject) => {
-      const id = Math.random().toString(36).slice(-12)
-      data = Buffer.from(JSON.stringify({id, data}))
-      const _onData = (message) => {
-        if (message.id !== id) return
-
-        resolve(message.data)
-      }
-
-      pubsub.subscribe('peernet.data', _onData)
-
-      // cleanup subscriptions
-      setTimeout(() => {
-        pubsub.unsubscribe('peernet.data', _onData)
-      }, 5000);
-
-      this.write(data)
-    });
-  }
-
-  write(data) {
-    if (!Buffer.isBuffer(data)) data = Buffer.from(data)
-
-    this.bw.up += data.length
-    this.connection.write(data)
-  }
-
-  on(event = 'peernet.data', cb) {
-    this._events[event] = cb
-    pubsub.subscribe(event, cb)
-    // this.connection.on(event, cb)
-  }
-
-  removeListener(event = 'data', cb) {
-    delete this._events[event]
-    pubsub.unsubscribe(event, cb)
-  }
-
-  close() {
-    for (const event of Object.keys(this._events)) {
-      pubsub.unsubscribe(event, this._events[event])
-    }
-    this._events = []
-
-    for (const event of this.connection._events.data) {
-      this.connection.removeListener('data', event)
-    }
-    this.connection.destroy()
-  }
-}