@leofcoin/peernet 0.10.3 → 0.10.4

package/dist/commonjs/codec-format-interface.js

@@ -16,7 +16,7 @@ var isHex__default = /*#__PURE__*/_interopDefaultLegacy(isHex);
 
 class FormatInterface {
   /**
-   * @param {Buffer|String|Object} buffer -
+   * @param {Buffer|String|Object} buffer - data - The data needed to create the desired message
    * @param {Object} proto - {encode, decode}
    * @param {Object} options - {hashFormat, name}
    */
@@ -25,7 +25,9 @@ class FormatInterface {
     this.protoDecode = proto.decode;
     if (options.name) this.name = options.name;
     this.hashFormat = options.hashFormat || 'bs32';
-    if (Buffer.isBuffer(buffer)) {
+    if (buffer.name === options.name) {
+      return buffer
+    } else if (Buffer.isBuffer(buffer)) {
       const codec$1 = new codec.PeernetCodec(buffer);
       if (codec$1.name) {
         this.fromEncoded(buffer);
@@ -143,8 +145,22 @@ class FormatInterface {
    * @param {Object} data
    */
   create(data) {
-    this.decoded = data;
-    this.encode(data);
+    const decoded = {};
+    if (this.keys?.length > 0) {
+      for (const key of this.keys) {
+        Object.defineProperties(decoded, {
+          [key]: {
+            enumerable: true,
+            configurable: true,
+            set: (val) => value = data[key],
+            get: () => data[key]
+          }
+        });
+      }
+
+      this.decoded = decoded;
+      this.encode();
+    }
   }
 }
 

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');
@@ -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);
@@ -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.3";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -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'});
   }
 }
 
@@ -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);
@@ -1735,22 +1619,20 @@ class Peernet {
         let data;
 
         if (!store) {
-          data = await this.get(hash);
-        } else {
-          store = globalThis[`${store}Store`];
-          if (store.private) {
-            // TODO: ban
-            return
-          } else data = await store.get(hash);
+          store = await this.whichStore([...this.stores], hash);
         }
+        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 +1735,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
@@ -1989,7 +1871,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 +1882,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)
   }
 
   /**
@@ -2007,10 +1890,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/module/peernet.js

@@ -1,6 +1,7 @@
 import PubSub from '@vandeurenglenn/little-pubsub';
 import sha256 from 'crypto-js/sha256';
 import P2P from 'p2pt';
+import LeofcoinStorage$1 from '@leofcoin/storage';
 import { server } from 'websocket';
 import { createServer } from 'http';
 import Koa from 'koa';
@@ -150,129 +151,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.3";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -1267,7 +1146,7 @@ class PeernetHash {
 
 class FormatInterface {
   /**
-   * @param {Buffer|String|Object} buffer -
+   * @param {Buffer|String|Object} buffer - data - The data needed to create the desired message
    * @param {Object} proto - {encode, decode}
    * @param {Object} options - {hashFormat, name}
    */
@@ -1276,7 +1155,9 @@ class FormatInterface {
     this.protoDecode = proto.decode;
     if (options.name) this.name = options.name;
     this.hashFormat = options.hashFormat || 'bs32';
-    if (Buffer.isBuffer(buffer)) {
+    if (buffer.name === options.name) {
+      return buffer
+    } else if (Buffer.isBuffer(buffer)) {
       const codec = new PeernetCodec(buffer);
       if (codec.name) {
         this.fromEncoded(buffer);
@@ -1394,8 +1275,22 @@ class FormatInterface {
    * @param {Object} data
    */
   create(data) {
-    this.decoded = data;
-    this.encode(data);
+    const decoded = {};
+    if (this.keys?.length > 0) {
+      for (const key of this.keys) {
+        Object.defineProperties(decoded, {
+          [key]: {
+            enumerable: true,
+            configurable: true,
+            set: (val) => value = data[key],
+            get: () => data[key]
+          }
+        });
+      }
+
+      this.decoded = decoded;
+      this.encode();
+    }
   }
 }
 
@@ -1467,14 +1362,18 @@ message PeernetDataMessage {
 }
 `;
 
+/**
+ * @extends {CodecFormat}
+ */
 class DataMessage extends FormatInterface {
   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(proto$7).PeernetDataMessage, {name});
+    super(data, protons(proto$7).PeernetDataMessage, {name: 'peernet-data'});
   }
 }
 
@@ -2283,22 +2182,20 @@ class Peernet {
         let data;
 
         if (!store) {
-          data = await this.get(hash);
-        } else {
-          store = globalThis[`${store}Store`];
-          if (store.private) {
-            // TODO: ban
-            return
-          } else data = await store.get(hash);
+          store = await this.whichStore([...this.stores], hash);
         }
+        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]);
@@ -2401,7 +2298,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
@@ -2537,7 +2434,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}`);
@@ -2547,7 +2445,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)
   }
 
   /**
@@ -2555,10 +2453,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/package.json

@@ -1,15 +1,13 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "",
   "main": "dist/commonjs/peernet.js",
-  "module": "dist/module/peernet.js",
-  "browser": "dist/browser/peernet.js",
   "scripts": {
     "test": "node test/index.js",
     "server": "discovery-swarm-webrtc --port=4000",
     "demo": "jsproject --serve ./ --port 6868",
-    "doc": "./node_modules/.bin/esdoc",
+    "doc": "esdoc",
     "lint": "./node_modules/.bin/eslint src/**/**.js --fix",
     "coverage": "nyc --reporter=lcov npm run test",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
@@ -24,6 +22,7 @@
     "@leofcoin/generate-account": "^1.0.2",
     "@leofcoin/multi-wallet": "^2.0.6",
     "@leofcoin/storage": "^2.1.0",
+    "@vandeurenglenn/little-pubsub": "^1.3.1",
     "bs32": "^0.1.6",
     "bs58": "^4.0.1",
     "bs58check": "^2.1.2",

package/rollup.config.js

@@ -27,10 +27,13 @@ export default [{
 		modify({
 			"import fetch from 'node-fetch'": ''
 		}),
-		lint({
-		  fix: true,
-			exclude: ['package.json', "package-lock.json"]
-		})
+		cjs(),
+		// resolve(),
+		// lint({
+		//   fix: true,
+		// 	exclude: ['package.json', "package-lock.json"]
+		// })
+
 
 	]
 }, {

package/src/codec/codec-format-interface.js

@@ -6,7 +6,7 @@ import Hash from './../hash/hash'
 
 export default class FormatInterface {
   /**
-   * @param {Buffer|String|Object} buffer -
+   * @param {Buffer|String|Object} buffer - data - The data needed to create the desired message
    * @param {Object} proto - {encode, decode}
    * @param {Object} options - {hashFormat, name}
    */
@@ -15,7 +15,9 @@ export default class FormatInterface {
     this.protoDecode = proto.decode
     if (options.name) this.name = options.name
     this.hashFormat = options.hashFormat || 'bs32'
-    if (Buffer.isBuffer(buffer)) {
+    if (buffer.name === options.name) {
+      return buffer
+    } else if (Buffer.isBuffer(buffer)) {
       const codec = new Codec(buffer)
       if (codec.name) {
         this.fromEncoded(buffer)
@@ -133,7 +135,21 @@ export default class FormatInterface {
    * @param {Object} data
    */
   create(data) {
-    this.decoded = data
-    this.encode(data)
+    const decoded = {}
+    if (this.keys?.length > 0) {
+      for (const key of this.keys) {
+        Object.defineProperties(decoded, {
+          [key]: {
+            enumerable: true,
+            configurable: true,
+            set: (val) => value = data[key],
+            get: () => data[key]
+          }
+        })
+      }
+
+      this.decoded = decoded
+      this.encode()
+    }
   }
 }

package/src/messages/data.js

@@ -2,13 +2,17 @@ import protons from 'protons'
 import proto from './../proto/data.proto.js'
 import CodecFormat from './../codec/codec-format-interface.js'
 
+/**
+ * @extends {CodecFormat}
+ */
 export default class DataMessage extends CodecFormat {
   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(proto).PeernetDataMessage, {name})
+    super(data, protons(proto).PeernetDataMessage, {name: 'peernet-data'})
   }
 }