@leofcoin/peernet 0.11.30 → 0.12.1

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});
   }
 }
 
@@ -981,12 +1024,12 @@ 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;
@@ -1017,7 +1060,7 @@ 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})));
@@ -1716,7 +1759,7 @@ class MessageHandler {
       data,
     };
     const signature = await this.hashAndSignMessage(message);
-    const node = new PeernetMessage({
+    const node = await new PeernetMessage({
       ...message,
       signature,
     });
@@ -1730,8 +1773,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);
@@ -1797,6 +1840,14 @@ class Peernet {
     return ['account', 'wallet', 'block', 'transaction', 'chain', 'data', 'message']
   }
 
+  get protos() {
+    return globalThis.peernet.protos
+  }
+
+  get codecs() {
+    return codecs
+  }
+
   addProto(name, proto) {
     if (!this.protos[name]) this.protos[name] = proto;
   }
@@ -1901,16 +1952,11 @@ class Peernet {
       'chat-message': ChatMessage,
     };
 
-    this.protos = globalThis.peernet.protos;
-    this.codecs = codecs;
-
     this._messageHandler = new MessageHandler(this.network);
 
     const {daemon, environment} = await target();
     this.hasDaemon = daemon;
 
-    
-
     for (const store of this.defaultStores) {
       await this.addStore(store, options.storePrefix, options.root);
     }
@@ -1924,12 +1970,10 @@ class Peernet {
       // fixing account issue (string while needs to be a JSON)
       // TODO: remove when on mainnet
       try {
-        accounts = JSON.parse(new TextDecoder().decode(accounts));
+        this.accounts = JSON.parse(account);
       } catch (e) {
-        accounts = [accounts.split(',')];
+        this.accounts = [accounts.split(',')];
       }
-
-      this.accounts = JSON.parse(new TextDecoder().decode(accounts));
     } catch (e) {
       if (e.code === 'ERR_NOT_FOUND') {
         const {identity, accounts, config} = await generateAccount(this.network);
@@ -2008,7 +2052,7 @@ class Peernet {
           if (store.private) has = false;
           else has = await store.has(hash);
         }
-        const data = new DHTMessageResponse({hash, has});
+        const data = await new DHTMessageResponse({hash, has});
         const node = await this.prepareMessage(from, data.encoded);
 
         this.sendMessage(peer, id, node.encoded);
@@ -2024,7 +2068,7 @@ class Peernet {
           data = await store.get(hash);
 
           if (data) {
-            data = new DataMessageResponse({hash, data});
+            data = await new DataMessageResponse({hash, data});
 
             const node = await this.prepareMessage(from, data.encoded);
             this.sendMessage(peer, id, node.encoded);
@@ -2051,16 +2095,16 @@ class Peernet {
    */
   async walk(hash) {
     if (!hash) throw new Error('hash expected, received undefined')
-    const data = new DHTMessage({hash});
+    const data = await new DHTMessage({hash});
     this.client.id;
     const walk = async peer => {
       const node = await this.prepareMessage(peer.peerId, data.encoded);
       let result = await peer.request(node.encoded);
       result = new Uint8Array(Object.values(result));
-      let proto = protoFor(result);
+      let proto = await protoFor(result);
       if (proto.name !== 'peernet-message') throw encapsulatedError()
       const from = proto.decoded.from;
-      proto = protoFor(proto.decoded.data);
+      proto = await protoFor(proto.decoded.data);
       if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
 
       // TODO: give ip and port (just used for location)
@@ -2159,7 +2203,7 @@ class Peernet {
         if (peer.peerId === id) return peer
       });
 
-      let data = new DataMessage({hash, store: store?.name ? store?.name : store});
+      let data = await 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);
@@ -2170,8 +2214,8 @@ class Peernet {
         if (closest[0]) data = await closest[0].request(node.encoded);
       }
       data = new Uint8Array(Object.values(data));
-      let proto = protoFor(data);
-      proto = protoFor(proto.decoded.data);
+      let proto = await protoFor(data);
+      proto = await protoFor(proto.decoded.data);
       // TODO: store data automaticly or not
       return proto.decoded.data
 
@@ -2304,7 +2348,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.30",
+  "version": "0.12.1",
   "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.1",
     "@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})
   }
 }

package/src/messages/peer.js

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

package/src/messages/peernet-message.js

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

package/src/messages/ps.js

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

package/src/messages/request.js

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

package/src/messages/response.js

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