@leofcoin/peernet 0.10.8 → 0.11.2

package/dist/commonjs/hash.js

@@ -2,10 +2,10 @@
 
 var createKeccakHash = require('keccak');
 var varint = require('varint');
-var bs32 = require('bs32');
-var bs58 = require('bs58');
-var isHex = require('is-hex');
-var codec = require('./codec-6367213c.js');
+var bs32 = require('@vandeurenglenn/base32');
+var bs58 = require('@vandeurenglenn/base58');
+var isHex = require('@vandeurenglenn/is-hex');
+var codec = require('./codec-8c8c652f.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -15,143 +15,153 @@ var bs32__default = /*#__PURE__*/_interopDefaultLegacy(bs32);
 var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
 var isHex__default = /*#__PURE__*/_interopDefaultLegacy(isHex);
 
-class PeernetHash {
-  constructor(buffer, options = {}) {
-    if (options.name) this.name = options.name;
-    else this.name = 'disco-hash';
-    if (options.codecs) this.codecs = options.codecs;
-    if (buffer) {
-      if (Buffer.isBuffer(buffer)) {
-        this.discoCodec = new codec.PeernetCodec(buffer, this.codecs);
-        const name = this.discoCodec.name;
-
-        if (name) {
-          this.name = name;
-          this.decode(buffer);
-        } else {
-          this.encode(buffer);
-        }
-      }
-
-      if (typeof buffer === 'string') {
-        if (isHex__default["default"](buffer)) this.fromHex(buffer);
-        if (bs32__default["default"].test(buffer)) this.fromBs32(buffer);
-        else this.fromBs58(buffer);
-      } else if (typeof buffer === 'object') this.fromJSON(buffer);
-    }
-  }
-
-  get prefix() {
-    return Buffer.concat([this.discoCodec.codecBuffer, this.length])
-  }
-
-  get length() {
-    return Buffer.from(varint__default["default"].encode(this.size))
-  }
-
-  get buffer() {
-    return this.hash
-  }
-
-  toHex() {
-    return this.hash.toString('hex')
-  }
-
-  fromHex(hex) {
-    return this.decode(Buffer.from(hex, 'hex'))
-  }
-
-  fromJSON(json) {
-    return this.encode(Buffer.from(JSON.stringify(json)))
-  }
-
-  toBs32() {
-    return bs32__default["default"].encode(this.hash)
-  }
-
-  fromBs32(bs) {
-    return this.decode(bs32__default["default"].decode(bs))
-  }
-
-  toBs58() {
-    return bs58__default["default"].encode(this.hash)
-  }
-
-  fromBs58(bs) {
-    return this.decode(bs58__default["default"].decode(bs))
-  }
-
-  toString(encoding = 'utf8') {
-    return this.hash.toString(encoding)
-  }
-
-  encode(buffer, name) {
-    if (!this.name && name) this.name = name;
-    if (!buffer) buffer = this.buffer;
-    this.discoCodec = new codec.PeernetCodec(this.name, this.codecs);
-    this.discoCodec.fromName(this.name);
-    let hashAlg = this.discoCodec.hashAlg;
-    if (hashAlg.includes('dbl')) {
-      hashAlg = hashAlg.replace('dbl-', '');
-      buffer = createKeccakHash__default["default"](hashAlg.replace('-', '')).update(buffer).digest();
-    }
-    this.digest = createKeccakHash__default["default"](hashAlg.replace('-', '')).update(buffer).digest();
-    this.size = this.digest.length;
-
-    this.codec = this.discoCodec.encode();
-    this.codec = this.discoCodec.codecBuffer;
-    this.hash = Buffer.concat([
-      this.prefix,
-      this.digest,
-    ]);
-
-    return this.hash
-  }
-
-  validate(buffer) {
-    if (Buffer.isBuffer(buffer)) {
-      const codec = varint__default["default"].decode(buffer);
-      if (this.codecs[codec]) {
-        this.decode(buffer);
-      } else {
-        this.encode(buffer);
-      }
-    }
-    if (typeof buffer === 'string') {
-      if (isHex__default["default"](buffer)) this.fromHex(buffer);
-      if (bs32__default["default"].test(buffer)) this.fromBs32(buffer);
-    }
-    if (typeof buffer === 'object') this.fromJSON(buffer);
-  }
-
-  decode(buffer) {
-    this.hash = buffer;
-    const codec$1 = varint__default["default"].decode(buffer);
-
-    this.discoCodec = new codec.PeernetCodec(codec$1, this.codecs);
-    // TODO: validate codec
-    buffer = buffer.slice(varint__default["default"].decode.bytes);
-    this.size = varint__default["default"].decode(buffer);
-    this.digest = buffer.slice(varint__default["default"].decode.bytes);
-    if (this.digest.length !== this.size) {
-      throw new Error(`hash length inconsistent: 0x${this.hash.toString('hex')}`)
-    }
-
-    // const discoCodec = new Codec(codec, this.codecs)
-
-    this.name = this.discoCodec.name;
-
-
-    this.size = this.digest.length;
-
-    return {
-      codec: this.codec,
-      name: this.name,
-      size: this.size,
-      length: this.length,
-      digest: this.digest,
-    }
-  }
+class PeernetHash {
+  constructor(buffer, options = {}) {
+    if (options.name) this.name = options.name;
+    else this.name = 'disco-hash';
+    if (options.codecs) this.codecs = options.codecs;
+    if (buffer) {
+      if (Buffer.isBuffer(buffer)) {
+        this.discoCodec = new codec.PeernetCodec(buffer, this.codecs);
+        const name = this.discoCodec.name;
+
+        if (name) {
+          this.name = name;
+          this.decode(buffer);
+        } else {
+          this.encode(buffer);
+        }
+      }
+
+      if (typeof buffer === 'string') {
+        if (isHex__default["default"](buffer)) this.fromHex(buffer);
+        if (bs32__default["default"].isBase32(buffer)) this.fromBs32(buffer);
+        else if (bs58__default["default"].isBase58(buffer)) this.fromBs58(buffer);
+        else throw new Error(`unsupported string ${buffer}`)
+      } else if (typeof buffer === 'object') this.fromJSON(buffer);
+    }
+  }
+
+  get prefix() {
+    const length = this.length;
+    const uint8Array = new Uint8Array(length.length + this.discoCodec.codecBuffer.length);
+    for (let i = 0; i < this.discoCodec.codecBuffer.length; i++) {
+      uint8Array[i] = this.discoCodec.codecBuffer[i];
+    }
+
+    for (let i = uint8Array.length - 1; i < length.length; i++) {
+      uint8Array[i] = length[i];
+    }
+    return uint8Array
+  }
+
+  get length() {
+    return varint__default["default"].encode(this.size)
+  }
+
+  get buffer() {
+    return this.hash
+  }
+
+  toHex() {
+    return this.hash.toString('hex')
+  }
+
+  fromHex(hex) {
+    return this.decode(Buffer.from(hex, 'hex'))
+  }
+
+  fromJSON(json) {
+    return this.encode(Buffer.from(JSON.stringify(json)))
+  }
+
+  toBs32() {
+    return bs32__default["default"].encode(this.hash)
+  }
+
+  fromBs32(bs) {
+    return this.decode(bs32__default["default"].decode(bs))
+  }
+
+  toBs58() {
+    return bs58__default["default"].encode(this.hash)
+  }
+
+  fromBs58(bs) {
+    return this.decode(bs58__default["default"].decode(bs))
+  }
+
+  toString(encoding = 'utf8') {
+    return this.hash.toString(encoding)
+  }
+
+  encode(buffer, name) {
+    if (!this.name && name) this.name = name;
+    if (!buffer) buffer = this.buffer;
+    this.discoCodec = new codec.PeernetCodec(this.name, this.codecs);
+    this.discoCodec.fromName(this.name);
+    let hashAlg = this.discoCodec.hashAlg;
+    if (hashAlg.includes('dbl')) {
+      hashAlg = hashAlg.replace('dbl-', '');
+      buffer = createKeccakHash__default["default"](hashAlg.replace('-', '')).update(buffer).digest();
+    }
+    this.digest = createKeccakHash__default["default"](hashAlg.replace('-', '')).update(buffer).digest();
+    this.size = this.digest.length;
+
+    this.codec = this.discoCodec.encode();
+    this.codec = this.discoCodec.codecBuffer;
+    this.hash = Buffer.concat([
+      this.prefix,
+      this.digest,
+    ]);
+
+    return this.hash
+  }
+
+  validate(buffer) {
+    if (Buffer.isBuffer(buffer)) {
+      const codec = varint__default["default"].decode(buffer);
+      if (this.codecs[codec]) {
+        this.decode(buffer);
+      } else {
+        this.encode(buffer);
+      }
+    }
+    if (typeof buffer === 'string') {
+      if (isHex__default["default"](buffer)) this.fromHex(buffer);
+      if (bs32__default["default"].test(buffer)) this.fromBs32(buffer);
+    }
+    if (typeof buffer === 'object') this.fromJSON(buffer);
+  }
+
+  decode(buffer) {
+    this.hash = buffer;
+    const codec$1 = varint__default["default"].decode(buffer);
+
+    this.discoCodec = new codec.PeernetCodec(codec$1, this.codecs);
+    // TODO: validate codec
+    buffer = buffer.slice(varint__default["default"].decode.bytes);
+    this.size = varint__default["default"].decode(buffer);
+    this.digest = buffer.slice(varint__default["default"].decode.bytes);
+    if (this.digest.length !== this.size) {
+      throw new Error(`hash length inconsistent: 0x${this.hash.toString('hex')}`)
+    }
+
+    // const discoCodec = new Codec(codec, this.codecs)
+
+    this.name = this.discoCodec.name;
+
+
+    this.size = this.digest.length;
+
+    return {
+      codec: this.codec,
+      name: this.name,
+      size: this.size,
+      length: this.length,
+      digest: this.digest,
+    }
+  }
 }
 
 module.exports = PeernetHash;

package/dist/commonjs/{http-a94c5a81.js → http-4bc6caeb.js}

@@ -1,16 +1,16 @@
 'use strict';
 
-var Pubsub = require('@vandeurenglenn/little-pubsub');
 var websocket = require('websocket');
+var PubSub = require('@vandeurenglenn/little-pubsub');
 var http$1 = require('http');
 var Koa = require('koa');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var Pubsub__default = /*#__PURE__*/_interopDefaultLegacy(Pubsub);
+var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
 var Koa__default = /*#__PURE__*/_interopDefaultLegacy(Koa);
 
-var version = "0.7.18";
+var version = "0.11.1";
 
 var api$1 = {
   version: ({send}) => send({client: '@peernet/api/http', version}),
@@ -173,12 +173,15 @@ var socketResponse = (connection, url, id, customEvent) => {
   }
 };
 
+if (!globalThis.PubSub) globalThis.PubSub = PubSub__default["default"];
+if (!globalThis.pubsub) globalThis.pubsub = new PubSub__default["default"]();
+
 const socketRequestServer = (options, routes = {}) => {
   // if (!routes && !routes.port && options) routes = options;
   // else if (!options && !routes) return console.error('no routes defined');
 
   let {httpServer, httpsServer, port, protocol, credentials, origin, pubsub } = options;
-  if (!pubsub) pubsub = new Pubsub__default['default']({verbose: false});
+  if (!pubsub) pubsub = new PubSub__default["default"]({verbose: false});
   if (!port) port = 6000;
   const connections = [];
   let connection;
@@ -195,12 +198,12 @@ const socketRequestServer = (options, routes = {}) => {
           response = params;
           params = {};
         }
-        
+
         if (!params.topic) params.topic = 'pubsub';
-                
+
         const topic = params.topic;
         delete params.topic;
-        
+
         if (params.subscribe) {
           pubsub.subscribe(topic, message => {
             response.connection.send(JSON.stringify({url: topic, status: 200, value: message}));
@@ -225,7 +228,7 @@ const socketRequestServer = (options, routes = {}) => {
           pubsub.publish(topic, params.value);
           response.send('ok', 200);
       };
-      
+
     }
     globalThis.peerMap = new Map();
     if (!routes.peernet) {
@@ -282,10 +285,10 @@ const socketRequestServer = (options, routes = {}) => {
       // ignore api when customEvent is defined
       if (customEvent) return;
       if (routes[url]) {
-        if (!params) return routes[url](socketResponse(connection, url, id));
-        return routes[url](params, socketResponse(connection, url, id));
+        if (!params) return routes[url](socketResponse(connection, url, id), connections);
+        return routes[url](params, socketResponse(connection, url, id), connections);
       }
-      else return socketResponse(connection, url, id).error(`nop handler found for '${message.url}'`);
+      else return socketResponse(connection, url, id).error(`no handler found for '${message.url}'`);
     };
 
     connection.on('message', routeHandler);
@@ -295,7 +298,8 @@ const socketRequestServer = (options, routes = {}) => {
     close: () => socketServer.shutDown(),
     connections
   };
-};
+};
+var server = socketRequestServer;
 
 var http = (config = {}) => {
   if (typeof config !== 'object') config = {};
@@ -303,7 +307,7 @@ var http = (config = {}) => {
   if (!config.port) config.port = 2000;
   if (!config.host) config.host = '127.0.0.1';
 
-  const app = new Koa__default['default']();
+  const app = new Koa__default["default"]();
 
   app.use(async (ctx) => {
     const url = ctx.url.split('/api/')[1];
@@ -318,7 +322,7 @@ var http = (config = {}) => {
     console.log(`listening on ${config.port}`);
   });
 
-  return socketRequestServer(config, api$1)
+  return server(config, api$1)
 };
 
-exports.default = http;
+exports["default"] = http;

package/dist/commonjs/peernet-message.js

@@ -2,10 +2,10 @@
 
 var protons = require('protons');
 var codecFormatInterface = require('./codec-format-interface.js');
-require('bs32');
-require('bs58');
-require('is-hex');
-require('./codec-6367213c.js');
+require('@vandeurenglenn/base32');
+require('@vandeurenglenn/base58');
+require('@vandeurenglenn/is-hex');
+require('./codec-8c8c652f.js');
 require('varint');
 require('./hash.js');
 require('keccak');
@@ -19,20 +19,20 @@ var proto = `
 message PeernetMessage {
   required bytes data = 1;
   required bytes signature = 2;
-  optional bytes from = 3;
-  optional bytes to = 4;
+  optional string from = 3;
+  optional string to = 4;
   optional string id = 5;
 }`;
 
-class PeernetMessage extends codecFormatInterface {
-  get keys() {
-    return ['data', 'signature', 'from', 'to', 'id']
-  }
-
-  constructor(buffer) {
-    const name = 'peernet-message';
-    super(buffer, protons__default["default"](proto).PeernetMessage, {name});
-  }
+class PeernetMessage extends codecFormatInterface {
+  get keys() {
+    return ['data', 'signature', 'from', 'to', 'id']
+  }
+
+  constructor(buffer) {
+    const name = 'peernet-message';
+    super(buffer, protons__default["default"](proto).PeernetMessage, {name});
+  }
 }
 
 module.exports = PeernetMessage;