@leofcoin/peernet 0.11.22 → 0.11.25

package/dist/commonjs/dht-response.js

@@ -1,14 +1,7 @@
 'use strict';
 
 var protons = require('protons');
-var codecFormatInterface = require('./codec-format-interface.js');
-require('@vandeurenglenn/base32');
-require('@vandeurenglenn/base58');
-require('@vandeurenglenn/is-hex');
-require('./codec-45796010.js');
-require('varint');
-require('./hash.js');
-require('keccak');
+var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -22,7 +15,7 @@ message PeernetDHTMessageResponse {
 }
 `;
 
-class DHTMessageResponse extends codecFormatInterface {
+class DHTMessageResponse extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['hash', 'has']
   }

package/dist/commonjs/dht.js

@@ -1,14 +1,7 @@
 'use strict';
 
 var protons = require('protons');
-var codecFormatInterface = require('./codec-format-interface.js');
-require('@vandeurenglenn/base32');
-require('@vandeurenglenn/base58');
-require('@vandeurenglenn/is-hex');
-require('./codec-45796010.js');
-require('varint');
-require('./hash.js');
-require('keccak');
+var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -30,7 +23,7 @@ message PeernetDHTMessage {
    message = new DHTMessage('hashmvbs124xcfd...', 'block')
  `
  */
-class DHTMessage extends codecFormatInterface {
+class DHTMessage extends codecFormatInterface.FormatInterface {
   /**
    *
    */

package/dist/commonjs/{http-4e34d4a5.js → http-78686629.js}

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
 var Koa__default = /*#__PURE__*/_interopDefaultLegacy(Koa);
 
-var version = "0.11.21";
+var version = "0.11.24";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),

package/dist/commonjs/peernet-message.js

@@ -1,14 +1,7 @@
 'use strict';
 
 var protons = require('protons');
-var codecFormatInterface = require('./codec-format-interface.js');
-require('@vandeurenglenn/base32');
-require('@vandeurenglenn/base58');
-require('@vandeurenglenn/is-hex');
-require('./codec-45796010.js');
-require('varint');
-require('./hash.js');
-require('keccak');
+var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -24,7 +17,7 @@ message PeernetMessage {
   optional string id = 5;
 }`;
 
-class PeernetMessage extends codecFormatInterface {
+class PeernetMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['data', 'signature', 'from', 'to', 'id']
   }

package/dist/commonjs/peernet.js

@@ -1,17 +1,16 @@
 'use strict';
 
 require('@vandeurenglenn/debug');
+var pako = require('pako');
 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('./codec-format-interface.js');
+var codecFormatInterface = require('@leofcoin/codec-format-interface');
 var request = require('./request.js');
 var response = require('./response.js');
 var fetch = require('node-fetch');
-var codec = require('./codec-45796010.js');
-var hash = require('./hash.js');
 var MultiWallet$1 = require('@leofcoin/multi-wallet');
 var bs58check = require('bs58check');
 var bip32 = require('bip32');
@@ -21,9 +20,6 @@ var Mnemonic = require('@leofcoin/mnemonic');
 var MultiSignature = require('multi-signature');
 var varint = require('varint');
 var randombytes = require('randombytes');
-require('@vandeurenglenn/base32');
-require('@vandeurenglenn/base58');
-require('@vandeurenglenn/is-hex');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -45,6 +41,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
+var pako__default = /*#__PURE__*/_interopDefaultLegacy(pako);
 var LeofcoinStorage__default = /*#__PURE__*/_interopDefaultLegacy(LeofcoinStorage);
 var protons__default = /*#__PURE__*/_interopDefaultLegacy(protons);
 var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
@@ -285,11 +282,8 @@ const socketRequestClient = (url, protocols = 'echo-protocol', options = { retry
   });
 };
 
-const messageQue = {};
-
 class Peer {
   #connection
-  #ready = false
   #connecting = false
   #connected = false
   #channelReady = false
@@ -302,10 +296,14 @@ class Peer {
   #remoteStreams = []
   #pendingCandidates = []
   #senderMap = new Map()
+  #messageQue = []
+  #chunksQue = {}
   #iceCompleteTimer
   #channel
   #peerId
-  #chunkSize = 16384
+  #chunkSize = 16 * 1024 // 16384
+  #queRunning = false
+  #MAX_BUFFERED_AMOUNT = 16 * 1024 * 1024
 
   get connection() {
     return this.#connection
@@ -359,6 +357,7 @@ class Peer {
 
    splitMessage(message) {
      const chunks = [];
+     message = pako__default["default"].deflate(message);
      const size = message.byteLength || message.length;
      let offset = 0;
      return new Promise((resolve, reject) => {
@@ -374,27 +373,53 @@ class Peer {
      })
    }
 
-   async send(message, id) {
-     const { chunks, size } = await this.splitMessage(message);
+   async #runQue() {
+     this.#queRunning = true;
+     if (this.#messageQue.length > 0 && this.channel.bufferedAmount + this.#messageQue[0]?.length < this.#MAX_BUFFERED_AMOUNT) {
+       const message = this.#messageQue.shift();
+
+       switch (this.channel?.readyState) {
+         case 'open':
+          await this.channel.send(message);
+          if (this.#messageQue.length > 0) return this.#runQue()
+          else this.#queRunning = false;
+         break;
+         case 'closed':
+         case 'closing':
+          this.#messageQue = [];
+          this.#queRunning = false;
+          debug('channel already closed, this usually means a bad implementation, try checking the readyState or check if the peer is connected before sending');
+         break;
+         case undefined:
+          this.#messageQue = [];
+          this.#queRunning = false;
+          debug(`trying to send before a channel is created`);
+         break;
+       }
+
+
+     } else {
+       return setTimeout(() => this.#runQue(), 50)
+     }
+   }
+
+   #trySend({ size, id, chunks }) {
      let offset = 0;
+
      for (const chunk of chunks) {
-        const start = offset;
-        const end = offset + chunk.length;
-        const message = new TextEncoder().encode(JSON.stringify({ size, id, chunk, start, end }));
-        switch (this.channel?.readyState) {
-          case 'open':
-           this.bw.up += message.length || message.byteLength;
-           this.channel.send(message);
-          break;
-          case 'closed':
-          case 'closing':
-           debug('channel already closed, this usually means a bad implementation, try checking the readyState or check if the peer is connected before sending');
-          break;
-          case undefined:
-          debug(`trying to send before a channel is created`);
-          break;
-        }
-      }
+       const start = offset;
+       const end = offset + chunk.length;
+
+       const message = new TextEncoder().encode(JSON.stringify({ size, id, chunk, start, end }));
+       this.#messageQue.push(message);
+     }
+
+     if (!this.queRunning) return this.#runQue()
+   }
+
+   async send(message, id) {
+     const { chunks, size } = await this.splitMessage(message);
+     return this.#trySend({ size, id, chunks })
    }
 
    request(data) {
@@ -480,17 +505,21 @@ class Peer {
      message = JSON.parse(new TextDecoder().decode(message.data));
      // allow sharding (multiple peers share data)
      pubsub.publish('peernet:shard', message);
-     if (!messageQue[message.id]) messageQue[message.id] = [];
+     const { id } = message;
+
+     if (!this.#chunksQue[id]) this.#chunksQue[id] = [];
 
-     if (message.size > messageQue[message.id].length || message.size === messageQue[message.id].length) {
+     if (message.size > this.#chunksQue[id].length || message.size === this.#chunksQue[id].length) {
        for (const value of Object.values(message.chunk)) {
-         messageQue[message.id].push(value);
+         this.#chunksQue[id].push(value);
        }
      }
 
-     if (message.size === messageQue[message.id].length) {
-       pubsub.publish('peer:data', {id: message.id, data: new Uint8Array(Object.values(messageQue[message.id]))});
-       delete messageQue[message.id];
+     if (message.size === this.#chunksQue[id].length) {
+       let data = new Uint8Array(Object.values(this.#chunksQue[id]));
+       delete this.#chunksQue[id];
+       data = pako__default["default"].inflate(data);
+       pubsub.publish('peer:data', { id, data });
      }
      this.bw.down += message.byteLength || message.length;
    }
@@ -736,7 +765,7 @@ message PeernetDataMessage {
 /**
  * @extends {CodecFormat}
  */
-class DataMessage extends codecFormatInterface {
+class DataMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['hash', 'store']
   }
@@ -755,7 +784,7 @@ message PsMessage {
   required bytes topic = 2;
 }`;
 
-class PsMessage extends codecFormatInterface {
+class PsMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['data', 'topic']
   }
@@ -773,7 +802,7 @@ message PeernetPeerMessage {
 }
 `;
 
-class PeerMessage extends codecFormatInterface {
+class PeerMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['id']
   }
@@ -791,7 +820,7 @@ message PeernetPeerMessageResponse {
 }
 `;
 
-class PeerMessageResponse extends codecFormatInterface {
+class PeerMessageResponse extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['id']
   }
@@ -810,7 +839,7 @@ message PeernetDataMessageResponse {
 }
 `;
 
-class DataMessageResponse extends codecFormatInterface {
+class DataMessageResponse extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['hash', 'data']
   }
@@ -829,7 +858,7 @@ message ChatMessage {
   repeated string files = 4;
 }`;
 
-class ChatMessage extends codecFormatInterface {
+class ChatMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['author', 'value', 'timestamp', 'files']
   }
@@ -842,10 +871,10 @@ class ChatMessage extends codecFormatInterface {
 
 const protoFor = (data) => {
   if (!Buffer.isBuffer(data)) data = Buffer.from(data);
-  const codec$1 = new codec.PeernetCodec(data);
-  if (!codec$1.name) throw new Error('proto not found')
-  const Proto = globalThis.peernet.protos[codec$1.name];
-  if (!Proto) throw (new Error(`No proto defined for ${codec$1.name}`))
+  const codec = new codecFormatInterface.Codec(data);
+  if (!codec.name) throw new Error('proto not found')
+  const Proto = globalThis.peernet.protos[codec.name];
+  if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
   return new Proto(data)
 };
 
@@ -1627,7 +1656,7 @@ class MessageHandler {
    * @return signature
    */
   async hashAndSignMessage(message) {
-    const hasher = new hash(message, {name: 'peernet-message'});
+    const hasher = new codecFormatInterface.CodecHash(message, {name: 'peernet-message'});
     let identity = await walletStore.get('identity');
     identity = JSON.parse(new TextDecoder().decode(identity));
     const wallet = new MultiWallet(this.network);
@@ -1836,7 +1865,7 @@ class Peernet {
     };
 
     this.protos = globalThis.peernet.protos;
-    this.codecs = codec.codecs;
+    this.codecs = codecFormatInterface.codecs;
 
     this._messageHandler = new MessageHandler(this.network);
 
@@ -1849,7 +1878,7 @@ class Peernet {
 					protocol: 'peernet-v0.1.0', host: '127.0.0.1', port: options.port
 				});
 			} else {
-				const http = await Promise.resolve().then(function () { return require('./http-4e34d4a5.js'); });
+				const http = await Promise.resolve().then(function () { return require('./http-78686629.js'); });
 	      if (environment !== 'browser') http.default(options);
 	    }
 
@@ -2245,7 +2274,7 @@ class Peernet {
   }
 
   createHash(data, name) {
-    return new hash(data, {name})
+    return new codecFormatInterface.CodecHash(data, {name})
   }
 
   /**

package/dist/commonjs/request.js

@@ -1,14 +1,7 @@
 'use strict';
 
 var protons = require('protons');
-var codecFormatInterface = require('./codec-format-interface.js');
-require('@vandeurenglenn/base32');
-require('@vandeurenglenn/base58');
-require('@vandeurenglenn/is-hex');
-require('./codec-45796010.js');
-require('varint');
-require('./hash.js');
-require('keccak');
+var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -21,7 +14,7 @@ message PeernetRequestMessage {
 }
 `;
 
-class RequestMessage extends codecFormatInterface {
+class RequestMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['request']
   }

package/dist/commonjs/response.js

@@ -1,14 +1,7 @@
 'use strict';
 
 var protons = require('protons');
-var codecFormatInterface = require('./codec-format-interface.js');
-require('@vandeurenglenn/base32');
-require('@vandeurenglenn/base58');
-require('@vandeurenglenn/is-hex');
-require('./codec-45796010.js');
-require('varint');
-require('./hash.js');
-require('keccak');
+var codecFormatInterface = require('@leofcoin/codec-format-interface');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -21,7 +14,7 @@ message PeernetResponseMessage {
 }
 `;
 
-class ResponseMessage extends codecFormatInterface {
+class ResponseMessage extends codecFormatInterface.FormatInterface {
   get keys() {
     return ['response']
   }