@leofcoin/peernet 0.11.29 → 0.12.0

package/dist/commonjs/dht-response.js

@@ -1,12 +1,7 @@
 'use strict';
 
-var protons = require('protons');
 var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
-
 var proto = `
 // PeernetDHTMessageResponse
 message PeernetDHTMessageResponse {
@@ -20,9 +15,13 @@ class DHTMessageResponse extends codecFormatInterface.FormatInterface {
     return ['hash', 'has']
   }
 
+  get messageName() {
+    return 'PeernetDHTMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-dht-response';
-    super(data, protons__default["default"](proto).PeernetDHTMessageResponse, {name});
+    super(data, proto, {name});
   }
 }
 

package/dist/commonjs/dht.js

@@ -1,12 +1,7 @@
 'use strict';
 
-var protons = require('protons');
 var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
-
 var proto = `
 // PeernetDHTMessage
 message PeernetDHTMessage {
@@ -31,9 +26,13 @@ class DHTMessage extends codecFormatInterface.FormatInterface {
     return ['hash', 'store']
   }
 
+  get messageName() {
+    return 'PeernetDHTMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-dht';
-    super(data, protons__default["default"](proto).PeernetDHTMessage, {name});
+    super(data, proto, {name});
   }
 }
 

package/dist/commonjs/peernet-message.js

@@ -1,12 +1,7 @@
 'use strict';
 
-var protons = require('protons');
 var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
-
 var proto = `
 // PeernetMessage
 message PeernetMessage {
@@ -22,9 +17,13 @@ class PeernetMessage extends codecFormatInterface.FormatInterface {
     return ['data', 'signature', 'from', 'to', 'id']
   }
 
+  get messageName() {
+    return 'PeernetMessage'
+  }
+
   constructor(buffer) {
     const name = 'peernet-message';
-    super(buffer, protons__default["default"](proto).PeernetMessage, {name});
+    super(buffer, proto, {name});
   }
 }
 

package/dist/commonjs/peernet.js

@@ -6,7 +6,6 @@ var LeofcoinStorage = require('@leofcoin/storage');
 var peernetMessage = require('./peernet-message.js');
 var dht = require('./dht.js');
 var dhtResponse = require('./dht-response.js');
-var protons = require('protons');
 var codecFormatInterface = require('@leofcoin/codec-format-interface');
 var request = require('./request.js');
 var response = require('./response.js');
@@ -43,7 +42,6 @@ function _interopNamespace(e) {
 
 var pako__default = /*#__PURE__*/_interopDefaultLegacy(pako);
 var LeofcoinStorage__default = /*#__PURE__*/_interopDefaultLegacy(LeofcoinStorage);
-var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
 var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
 var MultiWallet__default = /*#__PURE__*/_interopDefaultLegacy(MultiWallet$1);
 var bs58check__default = /*#__PURE__*/_interopDefaultLegacy(bs58check);
@@ -742,11 +740,15 @@ class DataMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['hash', 'store']
   }
+
+  get messageName() {
+    return 'PeernetDataMessage'
+  }
   /**
    * @param {Buffer|String|Object|DataMessage} data - The data needed to create the DataMessage
    */
   constructor(data) {
-    super(data, protons__default["default"](proto$5).PeernetDataMessage, {name: 'peernet-data'});
+    super(data, proto$5, {name: 'peernet-data'});
   }
 }
 
@@ -762,9 +764,13 @@ class PsMessage extends codecFormatInterface.FormatInterface {
     return ['data', 'topic']
   }
 
+  get messageName() {
+    return 'PsMessage'
+  }
+
   constructor(buffer) {
     const name = 'peernet-ps';
-    super(buffer, protons__default["default"](proto$4).PsMessage, {name});
+    super(buffer, proto$4, {name});
   }
 }
 
@@ -780,9 +786,13 @@ class PeerMessage extends codecFormatInterface.FormatInterface {
     return ['id']
   }
 
+  get messageName() {
+    return 'PeernetPeerMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-peer';
-    super(data, protons__default["default"](proto$3).PeernetPeerMessage, {name});
+    super(data, proto$3, {name});
   }
 }
 
@@ -798,9 +808,13 @@ class PeerMessageResponse extends codecFormatInterface.FormatInterface {
     return ['id']
   }
 
+  get messageName() {
+    return 'PeernetPeerMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-peer-response';
-    super(data, protons__default["default"](proto$2).PeernetPeerMessageResponse, {name});
+    super(data, proto$2, {name});
   }
 }
 
@@ -817,9 +831,13 @@ class DataMessageResponse extends codecFormatInterface.FormatInterface {
     return ['hash', 'data']
   }
 
+  get messageName() {
+    return 'PeernetDataMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-data-response';
-    super(data, protons__default["default"](proto$1).PeernetDataMessageResponse, {name});
+    super(data, proto$1, {name});
   }
 }
 
@@ -836,9 +854,13 @@ class ChatMessage extends codecFormatInterface.FormatInterface {
     return ['author', 'value', 'timestamp', 'files']
   }
 
+  get messageName() {
+    return 'ChatMessage'
+  }
+
   constructor(buffer) {
     const name = 'chat-message';
-    super(buffer, protons__default["default"](proto).ChatMessage, {name});
+    super(buffer, proto, {name});
   }
 }
 
@@ -1854,13 +1876,21 @@ class Peernet {
     try {
       const pub = await accountStore.get('public');
       this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
-      const accounts = await walletStore.get('accounts');
-      this.accounts = JSON.parse(new TextDecoder().decode(accounts));
+      let accounts = await walletStore.get('accounts');
+      accounts = new TextDecoder().decode(accounts);
+
+      // fixing account issue (string while needs to be a JSON)
+      // TODO: remove when on mainnet
+      try {
+        this.accounts = JSON.parse(account);
+      } catch (e) {
+        this.accounts = [accounts.split(',')];
+      }
     } catch (e) {
       if (e.code === 'ERR_NOT_FOUND') {
         const {identity, accounts, config} = await generateAccount(this.network);
         walletStore.put('version', new TextEncoder().encode(1));
-        walletStore.put('accounts', new TextEncoder().encode(accounts));
+        walletStore.put('accounts', new TextEncoder().encode(JSON.stringify(accounts)));
         walletStore.put('identity', new TextEncoder().encode(JSON.stringify(identity)));
         await accountStore.put('config', new TextEncoder().encode(JSON.stringify(config)));
         await accountStore.put('public', new TextEncoder().encode(JSON.stringify({walletId: identity.walletId})));

package/dist/commonjs/request.js

@@ -1,12 +1,7 @@
 'use strict';
 
-var protons = require('protons');
 var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
-
 var proto = `
 // PeernetRequestMessage
 message PeernetRequestMessage {
@@ -19,9 +14,13 @@ class RequestMessage extends codecFormatInterface.FormatInterface {
     return ['request']
   }
 
+  get messageName() {
+    return 'PeernetRequestMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-request';
-    super(data, protons__default["default"](proto).PeernetRequestMessage, {name});
+    super(data, proto, {name});
   }
 }
 

package/dist/commonjs/response.js

@@ -1,12 +1,7 @@
 'use strict';
 
-var protons = require('protons');
 var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
-
 var proto = `
 // PeernetResponseMessage
 message PeernetResponseMessage {
@@ -19,9 +14,13 @@ class ResponseMessage extends codecFormatInterface.FormatInterface {
     return ['response']
   }
 
+  get messageName() {
+    return 'PeernetResponseMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-response';
-    super(data, protons__default["default"](proto).PeernetResponseMessage, {name});
+    super(data, proto, {name});
   }
 }
 

package/dist/module/peernet.js

@@ -1,7 +1,6 @@
 import '@vandeurenglenn/debug';
 import pako from 'pako';
 import LeofcoinStorage from '@leofcoin/storage';
-import protons from 'protons';
 import { FormatInterface, Codec, CodecHash, codecs } from '@leofcoin/codec-format-interface';
 import MultiWallet$1 from '@leofcoin/multi-wallet';
 import * as bs58check from 'bs58check';
@@ -700,9 +699,13 @@ class PeernetMessage extends FormatInterface {
     return ['data', 'signature', 'from', 'to', 'id']
   }
 
+  get messageName() {
+    return 'PeernetMessage'
+  }
+
   constructor(buffer) {
     const name = 'peernet-message';
-    super(buffer, protons(proto$a).PeernetMessage, {name});
+    super(buffer, proto$a, {name});
   }
 }
 
@@ -730,9 +733,13 @@ class DHTMessage extends FormatInterface {
     return ['hash', 'store']
   }
 
+  get messageName() {
+    return 'PeernetDHTMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-dht';
-    super(data, protons(proto$9).PeernetDHTMessage, {name});
+    super(data, proto$9, {name});
   }
 }
 
@@ -749,9 +756,13 @@ class DHTMessageResponse extends FormatInterface {
     return ['hash', 'has']
   }
 
+  get messageName() {
+    return 'PeernetDHTMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-dht-response';
-    super(data, protons(proto$8).PeernetDHTMessageResponse, {name});
+    super(data, proto$8, {name});
   }
 }
 
@@ -770,11 +781,15 @@ class DataMessage extends FormatInterface {
   get keys() {
     return ['hash', 'store']
   }
+
+  get messageName() {
+    return 'PeernetDataMessage'
+  }
   /**
    * @param {Buffer|String|Object|DataMessage} data - The data needed to create the DataMessage
    */
   constructor(data) {
-    super(data, protons(proto$7).PeernetDataMessage, {name: 'peernet-data'});
+    super(data, proto$7, {name: 'peernet-data'});
   }
 }
 
@@ -790,9 +805,13 @@ class PsMessage extends FormatInterface {
     return ['data', 'topic']
   }
 
+  get messageName() {
+    return 'PsMessage'
+  }
+
   constructor(buffer) {
     const name = 'peernet-ps';
-    super(buffer, protons(proto$6).PsMessage, {name});
+    super(buffer, proto$6, {name});
   }
 }
 
@@ -808,9 +827,13 @@ class PeerMessage extends FormatInterface {
     return ['id']
   }
 
+  get messageName() {
+    return 'PeernetPeerMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-peer';
-    super(data, protons(proto$5).PeernetPeerMessage, {name});
+    super(data, proto$5, {name});
   }
 }
 
@@ -826,9 +849,13 @@ class RequestMessage extends FormatInterface {
     return ['request']
   }
 
+  get messageName() {
+    return 'PeernetRequestMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-request';
-    super(data, protons(proto$4).PeernetRequestMessage, {name});
+    super(data, proto$4, {name});
   }
 }
 
@@ -844,9 +871,13 @@ class ResponseMessage extends FormatInterface {
     return ['response']
   }
 
+  get messageName() {
+    return 'PeernetResponseMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-response';
-    super(data, protons(proto$3).PeernetResponseMessage, {name});
+    super(data, proto$3, {name});
   }
 }
 
@@ -862,9 +893,13 @@ class PeerMessageResponse extends FormatInterface {
     return ['id']
   }
 
+  get messageName() {
+    return 'PeernetPeerMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-peer-response';
-    super(data, protons(proto$2).PeernetPeerMessageResponse, {name});
+    super(data, proto$2, {name});
   }
 }
 
@@ -881,9 +916,13 @@ class DataMessageResponse extends FormatInterface {
     return ['hash', 'data']
   }
 
+  get messageName() {
+    return 'PeernetDataMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-data-response';
-    super(data, protons(proto$1).PeernetDataMessageResponse, {name});
+    super(data, proto$1, {name});
   }
 }
 
@@ -900,9 +939,13 @@ class ChatMessage extends FormatInterface {
     return ['author', 'value', 'timestamp', 'files']
   }
 
+  get messageName() {
+    return 'ChatMessage'
+  }
+
   constructor(buffer) {
     const name = 'chat-message';
-    super(buffer, protons(proto).ChatMessage, {name});
+    super(buffer, proto, {name});
   }
 }
 
@@ -1909,7 +1952,7 @@ class Peernet {
     const {daemon, environment} = await target();
     this.hasDaemon = daemon;
 
-    
+
 
     for (const store of this.defaultStores) {
       await this.addStore(store, options.storePrefix, options.root);
@@ -1918,13 +1961,21 @@ class Peernet {
     try {
       const pub = await accountStore.get('public');
       this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
-      const accounts = await walletStore.get('accounts');
-      this.accounts = JSON.parse(new TextDecoder().decode(accounts));
+      let accounts = await walletStore.get('accounts');
+      accounts = new TextDecoder().decode(accounts);
+
+      // fixing account issue (string while needs to be a JSON)
+      // TODO: remove when on mainnet
+      try {
+        this.accounts = JSON.parse(account);
+      } catch (e) {
+        this.accounts = [accounts.split(',')];
+      }
     } catch (e) {
       if (e.code === 'ERR_NOT_FOUND') {
         const {identity, accounts, config} = await generateAccount(this.network);
         walletStore.put('version', new TextEncoder().encode(1));
-        walletStore.put('accounts', new TextEncoder().encode(accounts));
+        walletStore.put('accounts', new TextEncoder().encode(JSON.stringify(accounts)));
         walletStore.put('identity', new TextEncoder().encode(JSON.stringify(identity)));
         await accountStore.put('config', new TextEncoder().encode(JSON.stringify(config)));
         await accountStore.put('public', new TextEncoder().encode(JSON.stringify({walletId: identity.walletId})));
@@ -2294,7 +2345,7 @@ class Peernet {
     if (topic instanceof Uint8Array === false) topic = new TextEncoder().encode(topic);
     if (data instanceof Uint8Array === false) data = new TextEncoder().encode(JSON.stringify(data));
     const id = Math.random().toString(36).slice(-12);
-    data = new PsMessage({data, topic});
+    data = await new PsMessage({data, topic});
     for (const peer of this.connections) {
       if (peer.peerId !== this.peerId) {
         const node = await this.prepareMessage(peer.peerId, data.encoded);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.11.29",
+  "version": "0.12.0",
   "description": "",
   "main": "dist/commonjs/peernet.js",
   "module": "dist/module/peernet.js",
@@ -23,7 +23,7 @@
   "license": "MIT",
   "browserslist": "> 0.5%, last 2 versions, not dead",
   "dependencies": {
-    "@leofcoin/codec-format-interface": "^1.0.1",
+    "@leofcoin/codec-format-interface": "^1.1.0",
     "@leofcoin/generate-account": "^1.0.2",
     "@leofcoin/multi-wallet": "^2.1.2",
     "@leofcoin/peernet-swarm": "^0.3.1",
@@ -35,7 +35,6 @@
     "keccak": "^3.0.1",
     "koa": "^2.13.1",
     "node-fetch": "^2.6.1",
-    "protons": "^2.0.1",
     "socket-request-client": "^1.5.0",
     "socket-request-server": "^1.5.0",
     "stream-browserify": "^3.0.0",

package/src/discovery/peer-discovery.js

@@ -18,12 +18,12 @@ export default class PeerDiscovery {
   async discover(peer) {
     let id = this._getPeerId(peer.id)
     if (id) return id
-    const data = new peernet.protos['peernet-peer']({id: this.id})
+    const data = await new peernet.protos['peernet-peer']({id: this.id})
     const node = await peernet.prepareMessage(peer.id, data.encoded)
 
     let response = await peer.request(node.encoded)
-    response = protoFor(response)
-    response = new peernet.protos['peernet-peer-response'](response.decoded.data)
+    response = await protoFor(response)
+    response = await new peernet.protos['peernet-peer-response'](response.decoded.data)
 
     id = response.decoded.id
     if (id === this.id) return;
@@ -54,7 +54,7 @@ export default class PeerDiscovery {
           peernet.peerMap.set(from, connections)
         }
       }
-      const data = new peernet.protos['peernet-peer-response']({id: this.id})
+      const data = await new peernet.protos['peernet-peer-response']({id: this.id})
       const node = await peernet.prepareMessage(from, data.encoded)
 
       peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})))

package/src/handlers/data.js

@@ -5,8 +5,8 @@ const dataHandler = async message => {
 
   const {data, id} = message
 
-  message = protoFor(data)
-  const proto = protoFor(message.decoded.data)
+  message = await protoFor(data)
+  const proto = await protoFor(message.decoded.data)
   const from = message.decoded.from
 
   peernet._protoHandler({id, proto}, peernet.client.connections[from], from)

package/src/handlers/message.js

@@ -40,7 +40,7 @@ export default class MessageHandler {
       data,
     }
     const signature = await this.hashAndSignMessage(message)
-    const node = new PeernetMessage({
+    const node = await new PeernetMessage({
       ...message,
       signature,
     })

package/src/messages/chat-message.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/chat-message.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class ChatMessage extends FormatInterface {
     return ['author', 'value', 'timestamp', 'files']
   }
 
+  get messageName() {
+    return 'ChatMessage'
+  }
+
   constructor(buffer) {
     const name = 'chat-message'
-    super(buffer, protons(proto).ChatMessage, {name})
+    super(buffer, proto, {name})
   }
 }

package/src/messages/data-response.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/data-response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class DataMessageResponse extends FormatInterface {
     return ['hash', 'data']
   }
 
+  get messageName() {
+    return 'PeernetDataMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-data-response'
-    super(data, protons(proto).PeernetDataMessageResponse, {name})
+    super(data, proto, {name})
   }
 }

package/src/messages/data.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/data.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -9,10 +8,14 @@ export default class DataMessage extends FormatInterface {
   get keys() {
     return ['hash', 'store']
   }
+
+  get messageName() {
+    return 'PeernetDataMessage'
+  }
   /**
    * @param {Buffer|String|Object|DataMessage} data - The data needed to create the DataMessage
    */
   constructor(data) {
-    super(data, protons(proto).PeernetDataMessage, {name: 'peernet-data'})
+    super(data, proto, {name: 'peernet-data'})
   }
 }

package/src/messages/dht-response.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/dht-response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class DHTMessageResponse extends FormatInterface {
     return ['hash', 'has']
   }
 
+  get messageName() {
+    return 'PeernetDHTMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-dht-response'
-    super(data, protons(proto).PeernetDHTMessageResponse, {name})
+    super(data, proto, {name})
   }
 }

package/src/messages/dht.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/dht.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -18,8 +17,12 @@ export default class DHTMessage extends FormatInterface {
     return ['hash', 'store']
   }
 
+  get messageName() {
+    return 'PeernetDHTMessage'
+  }
+
   constructor(data) {
     const name = 'peernet-dht'
-    super(data, protons(proto).PeernetDHTMessage, {name})
+    super(data, proto, {name})
   }
 }

package/src/messages/peer-response.js

@@ -1,4 +1,3 @@
-import protons from 'protons'
 import proto from './../proto/peer-response.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
@@ -7,8 +6,12 @@ export default class PeerMessageResponse extends FormatInterface {
     return ['id']
   }
 
+  get messageName() {
+    return 'PeernetPeerMessageResponse'
+  }
+
   constructor(data) {
     const name = 'peernet-peer-response'
-    super(data, protons(proto).PeernetPeerMessageResponse, {name})
+    super(data, proto, {name})
   }
 }