@leofcoin/peernet 0.11.0 → 0.11.3

package/src/hash/hash.js

@@ -1,155 +1,155 @@
-import createKeccakHash from 'keccak';
-import varint from 'varint';
-import bs32 from '@vandeurenglenn/base32';
-import bs58 from '@vandeurenglenn/base58';
-import isHex from 'is-hex';
-import Codec from './../codec/codec';
-
-export default 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(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(buffer)) this.fromHex(buffer)
-        if (bs32.isBase32(buffer)) this.fromBs32(buffer)
-        else if (bs58.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.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.encode(this.hash)
-  }
-
-  fromBs32(bs) {
-    return this.decode(bs32.decode(bs))
-  }
-
-  toBs58() {
-    return bs58.encode(this.hash)
-  }
-
-  fromBs58(bs) {
-    return this.decode(bs58.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(this.name, this.codecs)
-    this.discoCodec.fromName(this.name)
-    let hashAlg = this.discoCodec.hashAlg
-    if (hashAlg.includes('dbl')) {
-      hashAlg = hashAlg.replace('dbl-', '')
-      buffer = createKeccakHash(hashAlg.replace('-', '')).update(buffer).digest()
-    }
-    this.digest = createKeccakHash(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.decode(buffer);
-      if (this.codecs[codec]) {
-        this.decode(buffer)
-      } else {
-        this.encode(buffer)
-      }
-    }
-    if (typeof buffer === 'string') {
-      if (isHex(buffer)) this.fromHex(buffer)
-      if (bs32.test(buffer)) this.fromBs32(buffer)
-    }
-    if (typeof buffer === 'object') this.fromJSON(buffer)
-  }
-
-  decode(buffer) {
-    this.hash = buffer
-    const codec = varint.decode(buffer);
-
-    this.discoCodec = new Codec(codec, this.codecs)
-    // TODO: validate codec
-    buffer = buffer.slice(varint.decode.bytes);
-    this.size = varint.decode(buffer);
-    this.digest = buffer.slice(varint.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,
-    }
-  }
-}
+import createKeccakHash from 'keccak';
+import varint from 'varint';
+import bs32 from '@vandeurenglenn/base32';
+import bs58 from '@vandeurenglenn/base58';
+import isHex from '@vandeurenglenn/is-hex';
+import Codec from './../codec/codec';
+
+export default 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(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(buffer)) this.fromHex(buffer)
+        if (bs32.isBase32(buffer)) this.fromBs32(buffer)
+        else if (bs58.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.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.encode(this.hash)
+  }
+
+  fromBs32(bs) {
+    return this.decode(bs32.decode(bs))
+  }
+
+  toBs58() {
+    return bs58.encode(this.hash)
+  }
+
+  fromBs58(bs) {
+    return this.decode(bs58.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(this.name, this.codecs)
+    this.discoCodec.fromName(this.name)
+    let hashAlg = this.discoCodec.hashAlg
+    if (hashAlg.includes('dbl')) {
+      hashAlg = hashAlg.replace('dbl-', '')
+      buffer = createKeccakHash(hashAlg.replace('-', '')).update(buffer).digest()
+    }
+    this.digest = createKeccakHash(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.decode(buffer);
+      if (this.codecs[codec]) {
+        this.decode(buffer)
+      } else {
+        this.encode(buffer)
+      }
+    }
+    if (typeof buffer === 'string') {
+      if (isHex(buffer)) this.fromHex(buffer)
+      if (bs32.test(buffer)) this.fromBs32(buffer)
+    }
+    if (typeof buffer === 'object') this.fromJSON(buffer)
+  }
+
+  decode(buffer) {
+    this.hash = buffer
+    const codec = varint.decode(buffer);
+
+    this.discoCodec = new Codec(codec, this.codecs)
+    // TODO: validate codec
+    buffer = buffer.slice(varint.decode.bytes);
+    this.size = varint.decode(buffer);
+    this.digest = buffer.slice(varint.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,
+    }
+  }
+}

package/src/http/client/http-client.js

@@ -1,44 +1,44 @@
-import Client from './../../../node_modules/socket-request-client/dist/es/index'
-
-export default class HttpClientApi {
-  constructor(config = {}) {
-    if (!config.apiPath) config.apiPath = 'api'
-
-    const address = `ws://${config.host}:${config.port}`
-
-    this.apiUrl = (url) => `${address}/${url}`;
-    return (async () => {
-      this.client = await Client(address, config.protocol, {pubsub: config.pubsub, retry: 3000})
-      return this
-    })()
-  }
-
-  async get(url, obj) {
-    const headers = {}
-    let body = null
-    let method = 'GET'
-    if (obj) {
-      method = 'POST'
-      headers['Content-Type'] = 'application/json'
-      body = JSON.stringify(obj)
-    }
-    let response = await this.client.request(url, {headers, body, method})
-    const type = response.headers.get('content-type').split(';')[0]
-    if (type==='application/json') response = await response.json()
-    return response
-  }
-
-  async put(url, obj) {
-    const headers = {}
-    let body = {}
-    if (obj) {
-      headers['Content-Type'] = 'application/json'
-      body = JSON.stringify(obj)
-    }
-
-    let response = await fetch(this.apiUrl(url), {method: 'PUT', headers, body})
-    const type = response.headers.get('content-type').split(';')[0]
-    if (type==='application/json') response = await response.json()
-    return response
-  }
-}
+import Client from './../../../node_modules/socket-request-client/dist/es/index'
+
+export default class HttpClientApi {
+  constructor(config = {}) {
+    if (!config.apiPath) config.apiPath = 'api'
+
+    const address = `ws://${config.host}:${config.port}`
+
+    this.apiUrl = (url) => `${address}/${url}`;
+    return (async () => {
+      this.client = await Client(address, config.protocol, {pubsub: config.pubsub, retry: 3000})
+      return this
+    })()
+  }
+
+  async get(url, obj) {
+    const headers = {}
+    let body = null
+    let method = 'GET'
+    if (obj) {
+      method = 'POST'
+      headers['Content-Type'] = 'application/json'
+      body = JSON.stringify(obj)
+    }
+    let response = await this.client.request(url, {headers, body, method})
+    const type = response.headers.get('content-type').split(';')[0]
+    if (type==='application/json') response = await response.json()
+    return response
+  }
+
+  async put(url, obj) {
+    const headers = {}
+    let body = {}
+    if (obj) {
+      headers['Content-Type'] = 'application/json'
+      body = JSON.stringify(obj)
+    }
+
+    let response = await fetch(this.apiUrl(url), {method: 'PUT', headers, body})
+    const type = response.headers.get('content-type').split(';')[0]
+    if (type==='application/json') response = await response.json()
+    return response
+  }
+}

package/src/messages/dht-response.js

@@ -1,14 +1,14 @@
-import protons from 'protons'
-import proto from './../proto/dht-response.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
-
-export default class DHTMessageResponse extends CodecFormat {
-  get keys() {
-    return ['hash', 'has']
-  }
-
-  constructor(data) {
-    const name = 'peernet-dht-response'
-    super(data, protons(proto).PeernetDHTMessageResponse, {name})
-  }
-}
+import protons from 'protons'
+import proto from './../proto/dht-response.proto.js'
+import CodecFormat from './../codec/codec-format-interface.js'
+
+export default class DHTMessageResponse extends CodecFormat {
+  get keys() {
+    return ['hash', 'has']
+  }
+
+  constructor(data) {
+    const name = 'peernet-dht-response'
+    super(data, protons(proto).PeernetDHTMessageResponse, {name})
+  }
+}

package/src/peer.js

@@ -1,67 +1,67 @@
-export default class PeernetPeer {
-  constructor(id, connection) {
-    this._events = {}
-    this.bw = {
-      up: 0,
-      down: 0,
-    }
-    this.id = id
-    this.connection = connection
-
-    this.connection.on('data', (message) => {
-      this.bw.down += message.length
-      pubsub.publish('peernet.data', JSON.parse(message.toString()))
-    })
-  }
-
-  request(data) {
-    return new Promise((resolve, reject) => {
-      const id = Math.random().toString(36).slice(-12)
-      data = Buffer.from(JSON.stringify({id, data}))
-      const _onData = (message) => {
-        if (message.id !== id) return
-
-        resolve(message.data)
-      }
-
-      pubsub.subscribe('peernet.data', _onData)
-
-      // cleanup subscriptions
-      setTimeout(() => {
-        pubsub.unsubscribe('peernet.data', _onData)
-      }, 5000);
-
-      this.write(data)
-    });
-  }
-
-  write(data) {
-    if (!Buffer.isBuffer(data)) data = Buffer.from(data)
-
-    this.bw.up += data.length
-    this.connection.write(data)
-  }
-
-  on(event = 'peernet.data', cb) {
-    this._events[event] = cb
-    pubsub.subscribe(event, cb)
-    // this.connection.on(event, cb)
-  }
-
-  removeListener(event = 'data', cb) {
-    delete this._events[event]
-    pubsub.unsubscribe(event, cb)
-  }
-
-  close() {
-    for (const event of Object.keys(this._events)) {
-      pubsub.unsubscribe(event, this._events[event])
-    }
-    this._events = []
-
-    for (const event of this.connection._events.data) {
-      this.connection.removeListener('data', event)
-    }
-    this.connection.destroy()
-  }
-}
+export default class PeernetPeer {
+  constructor(id, connection) {
+    this._events = {}
+    this.bw = {
+      up: 0,
+      down: 0,
+    }
+    this.id = id
+    this.connection = connection
+
+    this.connection.on('data', (message) => {
+      this.bw.down += message.length
+      pubsub.publish('peernet.data', JSON.parse(message.toString()))
+    })
+  }
+
+  request(data) {
+    return new Promise((resolve, reject) => {
+      const id = Math.random().toString(36).slice(-12)
+      data = Buffer.from(JSON.stringify({id, data}))
+      const _onData = (message) => {
+        if (message.id !== id) return
+
+        resolve(message.data)
+      }
+
+      pubsub.subscribe('peernet.data', _onData)
+
+      // cleanup subscriptions
+      setTimeout(() => {
+        pubsub.unsubscribe('peernet.data', _onData)
+      }, 5000);
+
+      this.write(data)
+    });
+  }
+
+  write(data) {
+    if (!Buffer.isBuffer(data)) data = Buffer.from(data)
+
+    this.bw.up += data.length
+    this.connection.write(data)
+  }
+
+  on(event = 'peernet.data', cb) {
+    this._events[event] = cb
+    pubsub.subscribe(event, cb)
+    // this.connection.on(event, cb)
+  }
+
+  removeListener(event = 'data', cb) {
+    delete this._events[event]
+    pubsub.unsubscribe(event, cb)
+  }
+
+  close() {
+    for (const event of Object.keys(this._events)) {
+      pubsub.unsubscribe(event, this._events[event])
+    }
+    this._events = []
+
+    for (const event of this.connection._events.data) {
+      this.connection.removeListener('data', event)
+    }
+    this.connection.destroy()
+  }
+}