@leofcoin/peernet 0.10.3 → 0.10.6

package/dist/commonjs/peernet.js

@@ -3,6 +3,7 @@
 var PubSub = require('@vandeurenglenn/little-pubsub');
 var sha256 = require('crypto-js/sha256');
 var P2P = require('p2pt');
+var LeofcoinStorage$1 = require('@leofcoin/storage');
 var websocket = require('websocket');
 var http$1 = require('http');
 var Koa = require('koa');
@@ -14,7 +15,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 var request = require('./request.js');
 var response = require('./response.js');
 var fetch$1 = require('node-fetch');
-var codec = require('./codec-73adfc0f.js');
+var codec = require('./codec-6367213c.js');
 var hash = require('./hash.js');
 var MultiWallet = require('@leofcoin/multi-wallet');
 require('bs32');
@@ -28,6 +29,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
 var sha256__default = /*#__PURE__*/_interopDefaultLegacy(sha256);
 var P2P__default = /*#__PURE__*/_interopDefaultLegacy(P2P);
+var LeofcoinStorage__default = /*#__PURE__*/_interopDefaultLegacy(LeofcoinStorage$1);
 var Koa__default = /*#__PURE__*/_interopDefaultLegacy(Koa);
 var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
 var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch$1);
@@ -108,7 +110,7 @@ class PeernetPeer {
  */
 globalThis.connections = new Map();
 globalThis.recentConnections = new Map();
-globalThis.pubsub = globalThis.pubsub || new PubSub__default['default']({verbose: false});
+globalThis.pubsub = globalThis.pubsub || new PubSub__default["default"]({verbose: false});
 
 class PeernetClient {
   constructor(options = {}) {
@@ -117,14 +119,14 @@ class PeernetClient {
     if (!options.networkName) options.networkName = 'peernet';
     this.id = options.id;
 
-    this.topic = Buffer.from(sha256__default['default'](`${options.networkName}-${options.networkVersion}`).toString());
+    this.topic = Buffer.from(sha256__default["default"](`${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__default['default'](trackers, this.topic.slice(0, 20));
+    this.p2p = new P2P__default["default"](trackers, this.topic.slice(0, 20));
     this.p2p.on('peerconnect', (peer) => {
       peer = new PeernetPeer(peer.id, peer);
       connections.set(peer.id, peer);
@@ -170,129 +172,7 @@ class PeernetClient {
   }
 }
 
-// const level = require('level');
-const LevelStore = require('datastore-level');
-const { homedir } = require('os');
-const { join } = require('path');
-const Key = require('interface-datastore').Key;
-const {readdirSync, mkdirSync} = require('fs');
-
-class LeofcoinStorage$1 {
-
-  constructor(path, root = '.leofcoin', home = true) {
-    if (!home) this.root = root;
-    else this.root = join(homedir(), root);
-    if (readdirSync) try {
-      readdirSync(this.root);
-    } catch (e) {
-      let _path = home ? homedir() : root;
-      const parts = root.split('/');
-      if (e.code === 'ENOENT') {
-
-        if (parts.length > 0) {
-          for (const path of parts) {
-            _path = join(_path, path);
-            try {
-              readdirSync(_path);
-            } catch (e) {
-              if (e.code === 'ENOENT') mkdirSync(_path);
-              else throw e
-            }
-          }
-        } else {
-          mkdirSync(this.root);
-        }
-      } else throw e
-    }
-    this.db = new LevelStore(join(this.root, path));
-    // this.db = level(path, { prefix: 'lfc-'})
-  }
-
-  toBuffer(value) {
-    if (Buffer.isBuffer(value)) return value;
-    if (typeof value === 'object' ||
-        typeof value === 'boolean' ||
-        !isNaN(value)) value = JSON.stringify(value);
-
-    return Buffer.from(value)
-  }
-
-  async many(type, _value) {
-    const jobs = [];
-
-    for (const key of Object.keys(_value)) {
-      const value = this.toBuffer(_value[key]);
-
-      jobs.push(this[type](key, value));
-    }
-
-    return Promise.all(jobs)
-  }
-
-  async put(key, value) {
-    if (typeof key === 'object') return this.many('put', key);
-    value = this.toBuffer(value);
-
-    return this.db.put(new Key(String(key)), value);
-  }
-
-  async query() {
-    const object = {};
-
-    for await (let query of this.db.query({})) {
-      const key = query.key.baseNamespace();
-      object[key] = this.possibleJSON(query.value);
-    }
-
-    return object
-  }
-
-  async get(key) {
-    if (!key) return this.query()
-    if (typeof key === 'object') return this.many('get', key);
-    let data = await this.db.get(new Key(String(key)));
-    if (!data) return undefined
-    return this.possibleJSON(data)
-  }
-
-  async has(key) {
-    if (typeof key === 'object') return this.many('has', key);
-
-    try {
-      await this.db.get(new Key(String(key)));
-      return true;
-    } catch (e) {
-      return false
-    }
-  }
-
-  async delete(key) {
-    return this.db.delete(new Key(String(key)))
-  }
-
-  async size() {
-    const object = await this.query();
-    return Object.keys(object).length
-  }
-
-  // TODO: deprecate usage possibleJSON
-  // make possibleJSON optional
-  // or release as its own package
-  possibleJSON(data) {
-    let string = data.toString();
-    if (string.charAt(0) === '{' && string.charAt(string.length - 1) === '}' ||
-        string.charAt(0) === '[' && string.charAt(string.length - 1) === ']' ||
-        string === 'true' ||
-        string === 'false' ||
-        !isNaN(string))
-        return JSON.parse(string);
-
-    return data
-  }
-
-}
-
-var version = "0.10.2";
+var version = "0.10.5";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -460,7 +340,7 @@ const socketRequestServer = (options, routes = {}) => {
   // else if (!options && !routes) return console.error('no routes defined');
 
   let {httpServer, httpsServer, port, protocol, credentials, origin, pubsub } = options;
-  if (!pubsub) pubsub = new PubSub__default['default']({verbose: false});
+  if (!pubsub) pubsub = new PubSub__default["default"]({verbose: false});
   if (!port) port = 6000;
   const connections = [];
   let connection;
@@ -585,7 +465,7 @@ var http = (config = {}) => {
   if (!config.port) config.port = 2000;
   if (!config.host) config.host = '127.0.0.1';
 
-  const app = new Koa__default['default']();
+  const app = new Koa__default["default"]();
 
   app.use(async (ctx) => {
     const url = ctx.url.split('/api/')[1];
@@ -727,7 +607,7 @@ var clientApi = _pubsub => {
 
 const socketRequestClient = (url, protocols = 'echo-protocol', options = { retry: false, pubsub: false }) => {
   let { pubsub, retry } = options;
-  if (!pubsub) pubsub = new PubSub__default['default']({verbose: false});
+  if (!pubsub) pubsub = new PubSub__default["default"]({verbose: false});
   
   const api = clientApi(pubsub);
   
@@ -955,14 +835,18 @@ message PeernetDataMessage {
 }
 `;
 
+/**
+ * @extends {CodecFormat}
+ */
 class DataMessage extends codecFormatInterface {
   get keys() {
     return ['hash', 'store']
   }
-
+  /**
+   * @param {Buffer|String|Object|DataMessage} data - The data needed to create the DataMessage
+   */
   constructor(data) {
-    const name = 'peernet-data';
-    super(data, protons__default['default'](proto$5).PeernetDataMessage, {name});
+    super(data, protons__default["default"](proto$5).PeernetDataMessage, {name: 'peernet-data'});
   }
 }
 
@@ -980,7 +864,7 @@ class PsMessage extends codecFormatInterface {
 
   constructor(buffer) {
     const name = 'peernet-ps';
-    super(buffer, protons__default['default'](proto$4).PsMessage, {name});
+    super(buffer, protons__default["default"](proto$4).PsMessage, {name});
   }
 }
 
@@ -998,7 +882,7 @@ class PeerMessage extends codecFormatInterface {
 
   constructor(data) {
     const name = 'peernet-peer';
-    super(data, protons__default['default'](proto$3).PeernetPeerMessage, {name});
+    super(data, protons__default["default"](proto$3).PeernetPeerMessage, {name});
   }
 }
 
@@ -1016,7 +900,7 @@ class PeerMessageResponse extends codecFormatInterface {
 
   constructor(data) {
     const name = 'peernet-peer-response';
-    super(data, protons__default['default'](proto$2).PeernetPeerMessageResponse, {name});
+    super(data, protons__default["default"](proto$2).PeernetPeerMessageResponse, {name});
   }
 }
 
@@ -1035,7 +919,7 @@ class DataMessageResponse extends codecFormatInterface {
 
   constructor(data) {
     const name = 'peernet-data-response';
-    super(data, protons__default['default'](proto$1).PeernetDataMessageResponse, {name});
+    super(data, protons__default["default"](proto$1).PeernetDataMessageResponse, {name});
   }
 }
 
@@ -1054,7 +938,7 @@ class ChatMessage extends codecFormatInterface {
 
   constructor(buffer) {
     const name = 'chat-message';
-    super(buffer, protons__default['default'](proto).ChatMessage, {name});
+    super(buffer, protons__default["default"](proto).ChatMessage, {name});
   }
 }
 
@@ -1077,7 +961,7 @@ const protoFor = (data) => {
  */
 const hasDaemon = async () => {
   try {
-    let response = await fetch__default['default']('http://127.0.0.1:1000/api/version');
+    let response = await fetch__default["default"]('http://127.0.0.1:1000/api/version');
     response = await response.json();
     return Boolean(response.client === '@peernet/api/http')
   } catch (e) {
@@ -1213,7 +1097,7 @@ const getAddress = async () => {
   const {address} = lastFetched;
   const now = Math.round(new Date().getTime() / 1000);
   if (now - address.timestamp > 1200000) {
-    address.value = await fetch__default['default']('https://icanhazip.com/');
+    address.value = await fetch__default["default"]('https://icanhazip.com/');
     address.value = await address.value.text();
     address.timestamp = Math.round(new Date().getTime() / 1000);
     lastFetched.address = address;
@@ -1255,7 +1139,7 @@ class DhtEarth {
   async getCoordinates(address) {
     // const {address} = parseAddress(provider)
     const request = `https://whereis.leofcoin.org/?ip=${address}`;
-    let response = await fetch__default['default'](request);
+    let response = await fetch__default["default"](request);
     response = await response.json();
     const {lat, lon} = response;
     return {latitude: lat, longitude: lon}
@@ -1318,7 +1202,7 @@ class DhtEarth {
  * @return {object} { identity, accounts, config }
  */
 var generateAccount = async network => {
-    const wallet = new MultiWallet__default['default'](network);
+    const wallet = new MultiWallet__default["default"](network);
     /**
      * @type {string}
      */
@@ -1371,7 +1255,7 @@ class MessageHandler {
     const hasher = new hash(message, {name: 'peernet-message'});
     const identity = await walletStore.get('identity');
 
-    const wallet = new MultiWallet__default['default'](this.network);
+    const wallet = new MultiWallet__default["default"](this.network);
     wallet.import(identity.multiWIF);
     return wallet.sign(hasher.hash.slice(0, 32))
   }
@@ -1416,7 +1300,7 @@ const nothingFoundError = (hash) => {
 };
 
 globalThis.leofcoin = globalThis.leofcoin || {};
-globalThis.globalSub = globalThis.globalSub || new PubSub__default['default']({verbose: true});
+globalThis.globalSub = globalThis.globalSub || new PubSub__default["default"]({verbose: true});
 
 /**
  * @access public
@@ -1478,7 +1362,7 @@ class Peernet {
     if (this.hasDaemon) {
       Storage = LeofcoinStorageClient;
     } else {
-      Storage = LeofcoinStorage$1;
+      Storage = LeofcoinStorage__default["default"];
     }
     globalThis[`${name}Store`] = globalThis[`${name}Store`] ||
       await new Storage(`${prefix}-${name}`, root);
@@ -1733,24 +1617,23 @@ class Peernet {
       } else if (proto.name === 'peernet-data') {
         let { hash, store } = proto.decoded;
         let data;
-
         if (!store) {
-          data = await this.get(hash);
+          store = await this.whichStore([...this.stores], hash);
         } else {
-          store = globalThis[`${store}Store`];
-          if (store.private) {
-            // TODO: ban
-            return
-          } else data = await store.get(hash);
+          store = globalThis.stores[`${store}Store`];
         }
+        if (store && !store.private) {
+          data = await store.get(hash);
 
-        if (data) {
-          data = new DataMessageResponse({hash, data: data.decoded ? Buffer.from(JSON.stringify(data)) : Buffer.from(data)});
+          if (data) {
+            data = new DataMessageResponse({hash, data: data.decoded ? Buffer.from(JSON.stringify(data)) : Buffer.from(data)});
 
-          const node = await this.prepareMessage(from, data.encoded);
-          peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
-          this.bw.up += node.encoded.length;
+            const node = await this.prepareMessage(from, data.encoded);
+            peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})));
+            this.bw.up += node.encoded.length;
+          }
         }
+
       } else if (proto.name === 'peernet-peer') {
         const from = proto.decoded.id;
         if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id]);
@@ -1853,7 +1736,7 @@ class Peernet {
       get: async (hash) => {
         const data = await blockStore.has(hash);
         if (data) return await blockStore.get(hash)
-        return this.requestData(hash)
+        return this.requestData(hash, 'block')
       },
       put: async (hash, data) => {
         if (await blockStore.has(hash)) return
@@ -1885,7 +1768,7 @@ 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)
+    if (!closestPeer || !closestPeer.id) return this.requestData(hash, store.name ? store.name : store)
 
     const id = closestPeer.id.toString();
     if (this.peers) {
@@ -1989,7 +1872,8 @@ class Peernet {
   /**
    * Get content for given hash
    *
-   * @param {String} hash
+   * @param {String} hash - the hash of the wanted data
+   * @param {String} store - storeName to access
    */
   async get(hash, store) {
     debug(`get ${hash}`);
@@ -1999,7 +1883,7 @@ class Peernet {
     if (store && await store.has(hash)) data = await store.get(hash);
     if (data) return data
 
-    return this.requestData(hash, 'data')
+    return this.requestData(hash, store.name ? store.name : store)
   }
 
   /**
@@ -2007,10 +1891,11 @@ class Peernet {
    *
    * @param {String} hash
    * @param {Buffer} data
+   * @param {String} store - storeName to access
    */
   async put(hash, data, store = 'data') {
     store = globalThis[`${store}Store`];
-    return await store.put(hash, data)
+    return store.put(hash, data)
   }
 
   /**

package/dist/commonjs/request.js

@@ -5,7 +5,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 require('bs32');
 require('bs58');
 require('is-hex');
-require('./codec-73adfc0f.js');
+require('./codec-6367213c.js');
 require('varint');
 require('./hash.js');
 require('keccak');
@@ -28,7 +28,7 @@ class RequestMessage extends codecFormatInterface {
 
   constructor(data) {
     const name = 'peernet-request';
-    super(data, protons__default['default'](proto).PeernetRequestMessage, {name});
+    super(data, protons__default["default"](proto).PeernetRequestMessage, {name});
   }
 }
 

package/dist/commonjs/response.js

@@ -5,7 +5,7 @@ var codecFormatInterface = require('./codec-format-interface.js');
 require('bs32');
 require('bs58');
 require('is-hex');
-require('./codec-73adfc0f.js');
+require('./codec-6367213c.js');
 require('varint');
 require('./hash.js');
 require('keccak');
@@ -28,7 +28,7 @@ class ResponseMessage extends codecFormatInterface {
 
   constructor(data) {
     const name = 'peernet-response';
-    super(data, protons__default['default'](proto).PeernetResponseMessage, {name});
+    super(data, protons__default["default"](proto).PeernetResponseMessage, {name});
   }
 }