@leofcoin/peernet 0.12.0 → 0.12.1

package/dist/browser/peernet.js

@@ -1067,12 +1067,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;
@@ -1103,7 +1103,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})));
@@ -1802,7 +1802,7 @@ class MessageHandler {
       data,
     };
     const signature = await this.hashAndSignMessage(message);
-    const node = new PeernetMessage({
+    const node = await new PeernetMessage({
       ...message,
       signature,
     });
@@ -1816,8 +1816,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);
@@ -1883,6 +1883,14 @@ class Peernet {
     return ['account', 'wallet', 'block', 'transaction', 'chain', 'data', 'message']
   }
 
+  get protos() {
+    return globalThis.peernet.protos
+  }
+
+  get codecs() {
+    return codecFormatInterface.codecs
+  }
+
   addProto(name, proto) {
     if (!this.protos[name]) this.protos[name] = proto;
   }
@@ -1987,16 +1995,11 @@ class Peernet {
       'chat-message': ChatMessage,
     };
 
-    this.protos = globalThis.peernet.protos;
-    this.codecs = codecFormatInterface.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);
     }
@@ -2092,7 +2095,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);
@@ -2108,7 +2111,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);
@@ -2135,16 +2138,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)
@@ -2243,7 +2246,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);
@@ -2254,8 +2257,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
 
@@ -2388,7 +2391,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);
@@ -2443,7 +2446,46 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "default": function() { return /* binding */ src; }
+  "BasicInterface": function() { return /* reexport */ basic_interface_namespaceObject; },
+  "Codec": function() { return /* reexport */ codec_namespaceObject; },
+  "CodecHash": function() { return /* reexport */ codec_hash_namespaceObject; },
+  "FormatInterface": function() { return /* reexport */ codec_format_interface_namespaceObject; },
+  "codecs": function() { return /* reexport */ codecs_namespaceObject; }
+});
+
+// NAMESPACE OBJECT: ./node_modules/@leofcoin/codec-format-interface/src/basic-interface.js
+var basic_interface_namespaceObject = {};
+__webpack_require__.r(basic_interface_namespaceObject);
+__webpack_require__.d(basic_interface_namespaceObject, {
+  "default": function() { return BasicInterface; }
+});
+
+// NAMESPACE OBJECT: ./node_modules/@leofcoin/codec-format-interface/src/codecs.js
+var codecs_namespaceObject = {};
+__webpack_require__.r(codecs_namespaceObject);
+__webpack_require__.d(codecs_namespaceObject, {
+  "default": function() { return codecs; }
+});
+
+// NAMESPACE OBJECT: ./node_modules/@leofcoin/codec-format-interface/src/codec.js
+var codec_namespaceObject = {};
+__webpack_require__.r(codec_namespaceObject);
+__webpack_require__.d(codec_namespaceObject, {
+  "default": function() { return PeernetCodec; }
+});
+
+// NAMESPACE OBJECT: ./node_modules/@leofcoin/codec-format-interface/src/codec-hash.js
+var codec_hash_namespaceObject = {};
+__webpack_require__.r(codec_hash_namespaceObject);
+__webpack_require__.d(codec_hash_namespaceObject, {
+  "default": function() { return CodecHash; }
+});
+
+// NAMESPACE OBJECT: ./node_modules/@leofcoin/codec-format-interface/src/codec-format-interface.js
+var codec_format_interface_namespaceObject = {};
+__webpack_require__.r(codec_format_interface_namespaceObject);
+__webpack_require__.d(codec_format_interface_namespaceObject, {
+  "default": function() { return FormatInterface; }
 });
 
 // EXTERNAL MODULE: ./node_modules/@vandeurenglenn/base32/src/base32.js
@@ -3011,8 +3053,6 @@ class FormatInterface extends BasicInterface {
 
 
 
-
-/* harmony default export */ var src = ({ codecs: codecs, Codec: PeernetCodec, CodecHash: CodecHash, FormatInterface: FormatInterface, BasicInterface: BasicInterface });
 
 
 /***/ }),

package/dist/commonjs/peernet.js

@@ -939,12 +939,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;
@@ -975,7 +975,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})));
@@ -1674,7 +1674,7 @@ class MessageHandler {
       data,
     };
     const signature = await this.hashAndSignMessage(message);
-    const node = new peernetMessage({
+    const node = await new peernetMessage({
       ...message,
       signature,
     });
@@ -1688,8 +1688,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);
@@ -1755,6 +1755,14 @@ class Peernet {
     return ['account', 'wallet', 'block', 'transaction', 'chain', 'data', 'message']
   }
 
+  get protos() {
+    return globalThis.peernet.protos
+  }
+
+  get codecs() {
+    return codecFormatInterface.codecs
+  }
+
   addProto(name, proto) {
     if (!this.protos[name]) this.protos[name] = proto;
   }
@@ -1859,16 +1867,11 @@ class Peernet {
       'chat-message': ChatMessage,
     };
 
-    this.protos = globalThis.peernet.protos;
-    this.codecs = codecFormatInterface.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);
     }
@@ -1964,7 +1967,7 @@ class Peernet {
           if (store.private) has = false;
           else has = await store.has(hash);
         }
-        const data = new dhtResponse({hash, has});
+        const data = await new dhtResponse({hash, has});
         const node = await this.prepareMessage(from, data.encoded);
 
         this.sendMessage(peer, id, node.encoded);
@@ -1980,7 +1983,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);
@@ -2007,16 +2010,16 @@ class Peernet {
    */
   async walk(hash) {
     if (!hash) throw new Error('hash expected, received undefined')
-    const data = new dht({hash});
+    const data = await new dht({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)
@@ -2115,7 +2118,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);
@@ -2126,8 +2129,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
 
@@ -2260,7 +2263,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/dist/module/peernet.js

@@ -1024,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;
@@ -1060,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})));
@@ -1759,7 +1759,7 @@ class MessageHandler {
       data,
     };
     const signature = await this.hashAndSignMessage(message);
-    const node = new PeernetMessage({
+    const node = await new PeernetMessage({
       ...message,
       signature,
     });
@@ -1773,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);
@@ -1840,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;
   }
@@ -1944,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);
     }
@@ -2049,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);
@@ -2065,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);
@@ -2092,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)
@@ -2200,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);
@@ -2211,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
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.12.0",
+  "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.1.0",
+    "@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",