@leofcoin/peernet 0.10.8 → 0.11.0

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

@@ -1,4 +1,4 @@
-import Client from './../../../node_modules/socket-request-client/src/index.js'
+import Client from './../../../node_modules/socket-request-client/dist/es/index'
 
 export default class HttpClientApi {
   constructor(config = {}) {

package/src/messages/chat-message.js

@@ -1,14 +1,14 @@
-import protons from 'protons'
-import proto from './../proto/chat-message.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
-
-export default class ChatMessage extends CodecFormat {
-  get keys() {
-    return ['author', 'value', 'timestamp', 'files']
-  }
-
-  constructor(buffer) {
-    const name = 'chat-message'
-    super(buffer, protons(proto).ChatMessage, {name})
-  }
-}
+import protons from 'protons'
+import proto from './../proto/chat-message.proto.js'
+import CodecFormat from './../codec/codec-format-interface.js'
+
+export default class ChatMessage extends CodecFormat {
+  get keys() {
+    return ['author', 'value', 'timestamp', 'files']
+  }
+
+  constructor(buffer) {
+    const name = 'chat-message'
+    super(buffer, protons(proto).ChatMessage, {name})
+  }
+}

package/src/messages/data-response.js

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

package/src/messages/data.js

@@ -1,18 +1,18 @@
-import protons from 'protons'
-import proto from './../proto/data.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
-
-/**
- * @extends {CodecFormat}
- */
-export default class DataMessage extends CodecFormat {
-  get keys() {
-    return ['hash', 'store']
-  }
-  /**
-   * @param {Buffer|String|Object|DataMessage} data - The data needed to create the DataMessage
-   */
-  constructor(data) {
-    super(data, protons(proto).PeernetDataMessage, {name: 'peernet-data'})
-  }
-}
+import protons from 'protons'
+import proto from './../proto/data.proto.js'
+import CodecFormat from './../codec/codec-format-interface.js'
+
+/**
+ * @extends {CodecFormat}
+ */
+export default class DataMessage extends CodecFormat {
+  get keys() {
+    return ['hash', 'store']
+  }
+  /**
+   * @param {Buffer|String|Object|DataMessage} data - The data needed to create the DataMessage
+   */
+  constructor(data) {
+    super(data, protons(proto).PeernetDataMessage, {name: 'peernet-data'})
+  }
+}

package/src/messages/dht-response.js

@@ -1,6 +1,5 @@
 import protons from 'protons'
 import proto from './../proto/dht-response.proto.js'
-import {encode, decode} from 'bs32'
 import CodecFormat from './../codec/codec-format-interface.js'
 
 export default class DHTMessageResponse extends CodecFormat {

package/src/messages/dht.js

@@ -1,25 +1,25 @@
-import protons from 'protons'
-import proto from './../proto/dht.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
-
-/**
- * @example `
-   new DHTMessage(hash, store)
-   // store = optional if not set, peernet checks every store
-   let message = new DHTMessage('hashmvbs124xcfd...', 'transaction')
-   message = new DHTMessage('hashmvbs124xcfd...', 'block')
- `
- */
-export default class DHTMessage extends CodecFormat {
-  /**
-   *
-   */
-  get keys() {
-    return ['hash', 'store']
-  }
-
-  constructor(data) {
-    const name = 'peernet-dht'
-    super(data, protons(proto).PeernetDHTMessage, {name})
-  }
-}
+import protons from 'protons'
+import proto from './../proto/dht.proto.js'
+import CodecFormat from './../codec/codec-format-interface.js'
+
+/**
+ * @example `
+   new DHTMessage(hash, store)
+   // store = optional if not set, peernet checks every store
+   let message = new DHTMessage('hashmvbs124xcfd...', 'transaction')
+   message = new DHTMessage('hashmvbs124xcfd...', 'block')
+ `
+ */
+export default class DHTMessage extends CodecFormat {
+  /**
+   *
+   */
+  get keys() {
+    return ['hash', 'store']
+  }
+
+  constructor(data) {
+    const name = 'peernet-dht'
+    super(data, protons(proto).PeernetDHTMessage, {name})
+  }
+}

package/src/messages/peer-response.js

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

package/src/messages/peer.js

@@ -1,14 +1,14 @@
-import protons from 'protons'
-import proto from './../proto/peer.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
-
-export default class PeerMessage extends CodecFormat {
-  get keys() {
-    return ['id']
-  }
-
-  constructor(data) {
-    const name = 'peernet-peer'
-    super(data, protons(proto).PeernetPeerMessage, {name})
-  }
-}
+import protons from 'protons'
+import proto from './../proto/peer.proto.js'
+import CodecFormat from './../codec/codec-format-interface.js'
+
+export default class PeerMessage extends CodecFormat {
+  get keys() {
+    return ['id']
+  }
+
+  constructor(data) {
+    const name = 'peernet-peer'
+    super(data, protons(proto).PeernetPeerMessage, {name})
+  }
+}

package/src/messages/peernet-message.js

@@ -1,14 +1,14 @@
-import protons from 'protons'
-import proto from './../proto/peernet.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
-
-export default class PeernetMessage extends CodecFormat {
-  get keys() {
-    return ['data', 'signature', 'from', 'to', 'id']
-  }
-
-  constructor(buffer) {
-    const name = 'peernet-message'
-    super(buffer, protons(proto).PeernetMessage, {name})
-  }
-}
+import protons from 'protons'
+import proto from './../proto/peernet.proto.js'
+import CodecFormat from './../codec/codec-format-interface.js'
+
+export default class PeernetMessage extends CodecFormat {
+  get keys() {
+    return ['data', 'signature', 'from', 'to', 'id']
+  }
+
+  constructor(buffer) {
+    const name = 'peernet-message'
+    super(buffer, protons(proto).PeernetMessage, {name})
+  }
+}

package/src/messages/ps.js

@@ -1,14 +1,14 @@
-import protons from 'protons'
-import proto from './../proto/ps.proto.js'
-import CodecFormat from './../codec/codec-format-interface.js'
-
-export default class PsMessage extends CodecFormat {
-  get keys() {
-    return ['data', 'topic']
-  }
-
-  constructor(buffer) {
-    const name = 'peernet-ps'
-    super(buffer, protons(proto).PsMessage, {name})
-  }
-}
+import protons from 'protons'
+import proto from './../proto/ps.proto.js'
+import CodecFormat from './../codec/codec-format-interface.js'
+
+export default class PsMessage extends CodecFormat {
+  get keys() {
+    return ['data', 'topic']
+  }
+
+  constructor(buffer) {
+    const name = 'peernet-ps'
+    super(buffer, protons(proto).PsMessage, {name})
+  }
+}

package/src/messages/request.js

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

package/src/messages/response.js

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

package/src/peernet.js

@@ -1,8 +1,5 @@
-import Pubsub from '@vandeurenglenn/little-pubsub'
-import Client from './client'
+import Client from './../node_modules/@leofcoin/peernet-swarm/dist/es/client.js'
 import LeofcoinStorage from '@leofcoin/storage'
-import http from './http/http.js'
-import httpClient from './http/client/client.js'
 import LeofcoinStorageClient from './http/client/storage.js'
 import PeernetMessage from './messages/peernet-message.js'
 import DHTMessage from './messages/dht.js'
@@ -20,14 +17,13 @@ import DHT from './dht/dht.js'
 import Hash from './hash/hash'
 import codecs from './codec/codecs'
 import { debug, protoFor, target } from './utils/utils.js'
-import generateAccount from
-  './../node_modules/@leofcoin/generate-account/dist/module/generate-account.js'
+import generateAccount from '@leofcoin/generate-account'
 import MessageHandler from './handlers/message.js'
 import { encapsulatedError, dhtError,
   nothingFoundError } from './errors/errors.js'
 
 globalThis.leofcoin = globalThis.leofcoin || {}
-globalThis.globalSub = globalThis.globalSub || new Pubsub({verbose: true})
+globalThis.globalSub = globalThis.globalSub || new PubSub({verbose: true})
 
 /**
  * @access public
@@ -171,13 +167,7 @@ export default class Peernet {
     const {daemon, environment} = await target()
     this.hasDaemon = daemon
 
-    if (this.hasDaemon) {
-      globalThis.peernet.client = await httpClient({
-        protocol: 'peernet-v0.1.0', host: '127.0.0.1', port: options.port,
-      })
-    } else {
-      if (environment !== 'browser') http(options)
-    }
+    HTTP_IMPORT
 
     for (const store of this.defaultStores) {
       await this.addStore(store, options.storePrefix, options.root)
@@ -203,42 +193,11 @@ export default class Peernet {
       }
     }
     this._peerHandler = new PeerDiscovery(this.id)
-    // peernet id
-    const id = Buffer.from(this.id.slice(0, 32))
-    this.peerId = id
-
-    pubsub.subscribe('peer:discovered', async (peer) => {
-      peer.on('peernet.data', async (message) => {
-        const id = message.id;
-        message = new PeernetMessage(Buffer.from(message.data.data));
-        const proto = protoFor(message.decoded.data);
-        await this._protoHandler({id, proto}, peer);
-      });
-      await this._peerHandler.discover(peer);
-      const fulldId = this._getPeerId(peer.id);
-      if (fulldId && this._discovered.indexOf(peer.id) === -1) {
-        this._discovered.push(peer.id);
-        pubsub.publish('peer:connected', peer);
-      }
-    });
-    pubsub.subscribe('peer:disconnected', async (peer) => {
-      let index = this._discovered.indexOf(peer.id)
-      if (index !== -1) this._discovered.splice(index, 1)
-      const id = this._getPeerId(peer.id)
-      let peerIds = this.peerMap.get(id)
-
-      if (peerIds) {
-        index = peerIds.indexOf(peer.id)
-        if (index !== -1) peerIds.splice(index, 1)
-      } else {
-        peerIds = []
-      }
+    this.peerId = this.id
 
-      if (peerIds.length === 0) this.peerMap.delete(id)
-      else this.peerMap.set(id, peerIds)
-    })
     pubsub.subscribe('peer:connected', async (peer) => {
-      console.log({connected: peer.id, as: this._getPeerId(peer.id) });
+      console.log(peer);
+      // console.log({connected: peer.id, as: this._getPeerId(peer.id) });
       // peer.on('peernet.data', async (message) => {
       //   const id = message.id
       //   message = new PeernetMessage(Buffer.from(message.data.data))
@@ -247,11 +206,25 @@ export default class Peernet {
       // })
     })
 
+    pubsub.subscribe('peer:data', async message => {
+      if (!message.data) return
+      const {id, data} = JSON.parse(new TextDecoder().decode(message.data))
+      const uint8Array = new Uint8Array(Object.keys(data).length)
+      for (var i = 0; i < Object.keys(data).length; i++) {
+        uint8Array[i] = data[i]
+      }
+      message = new PeernetMessage(uint8Array)
+      const proto = protoFor(message.decoded.data)
+
+      const from = new TextDecoder().decode(message.decoded.from)
+      this._protoHandler({id, proto}, this.client.connections[from], from)
+    })
+
     /**
      * @access public
      * @type {PeernetClient}
      */
-    this.client = new Client({...options, id})
+    this.client = new Client(this.id)
     if (globalThis.onbeforeunload) {
       globalThis.addEventListener('beforeunload', async () => this.client.close());
     }
@@ -276,55 +249,10 @@ export default class Peernet {
    * @param {Buffer} message - peernet message
    * @param {PeernetPeer} peer - peernet peer
    */
-  async _protoHandler(message, peer) {
+  async _protoHandler(message, peer, from) {
     const {id, proto} = message
     this.bw.down += proto.encoded.length
-    if (proto.name === 'peernet-peer') {
-      const from = proto.decoded.id
-      if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-      else {
-        const connections = this.peerMap.get(from)
-        if (connections.indexOf(peer.id) === -1) {
-          connections.push(peer.id)
-          this.peerMap.set(from, connections)
-        }
-      }
-      const data = new PeerMessageResponse({id: this.id})
-      const node = await this.prepareMessage(from, data.encoded)
-
-      peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})))
-      this.bw.up += node.encoded.length
-    } else if (proto.name === 'peernet-peer-response') {
-      const from = proto.decoded.id
-      if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-      else {
-        const connections = this.peerMap.get(from)
-        if (connections.indexOf(peer.id) === -1) {
-          connections.push(peer.id)
-          this.peerMap.set(from, connections)
-        }
-      }
-    } else {
-      let from = this._getPeerId(peer.id)
-      if (!from) {
-        const data = new PeerMessage({id: this.id})
-        const node = await this.prepareMessage(peer.id, data.encoded)
-        this.bw.up += node.encoded.length
-        let response = await peer.request(node.encoded)
-        response = protoFor(response)
-
-        response = new PeerMessageResponse(response.decoded.data)
-
-        from = response.decoded.id
-        if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-        else {
-          const connections = this.peerMap.get(from)
-          if (connections.indexOf(peer.id) === -1) {
-            connections.push(peer.id)
-            this.peerMap.set(from, connections)
-          }
-        }
-      }
+
       if (proto.name === 'peernet-dht') {
         let { hash, store } = proto.decoded
         let has;
@@ -339,7 +267,7 @@ export default class Peernet {
         const data = new DHTMessageResponse({hash, has})
         const node = await this.prepareMessage(from, data.encoded)
 
-        peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})))
+        peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})))
         this.bw.up += node.encoded.length
       } else if (proto.name === 'peernet-data') {
         let { hash, store } = proto.decoded
@@ -356,26 +284,13 @@ export default class Peernet {
             data = new DataMessageResponse({hash, data: data.decoded ? Buffer.from(JSON.stringify(data)) : Buffer.from(data)});
 
             const node = await this.prepareMessage(from, data.encoded)
-            peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})))
+            peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})))
             this.bw.up += node.encoded.length
           }
         } else {
           // ban (trying to access private st)
         }
 
-      } else if (proto.name === 'peernet-peer') {
-        const from = proto.decoded.id
-        if (!this.peerMap.has(from)) this.peerMap.set(from, [peer.id])
-        else {
-          const connections = this.peerMap.get(from)
-          connections.push(peer.id)
-          this.peerMap.set(from, connections)
-        }
-        const data = new PeerMessage({id: this.id})
-        const node = await this.prepareMessage(from, data.encoded)
-
-        peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})))
-        this.bw.up += node.encoded.length
       } else if (proto.name === 'peernet-request') {
         // TODO: make dynamic
         // exposeddevapi[proto.decoded.request](proto.decoded.params)
@@ -383,14 +298,14 @@ export default class Peernet {
         if (method) {
           const data = await method()
           const node = await this.prepareMessage(from, data.encoded)
-          peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})))
+          peer.send(new TextEncoder().encode(JSON.stringify({id, data: node.encoded})))
           this.bw.up += node.encoded.length
         }
       } else if (proto.name === 'peernet-ps' &&
                  this._getPeerId(peer.id) !== this.id.toString()) {
         globalSub.publish(proto.decoded.topic.toString(), proto.decoded.data.toString())
       }
-    }
+    // }
   }
 
   /**
@@ -656,7 +571,7 @@ export default class Peernet {
       if (peer.connection._connected) {
         if (peer.id.toString() !== this.peerId.toString()) {
           const node = await this.prepareMessage(peer.id, data.encoded)
-          peer.write(Buffer.from(JSON.stringify({id, data: node.encoded})))
+          peer.send(Buffer.from(JSON.stringify({id, data: node.encoded})))
         }
       } else {
         this.removePeer(peer)

package/test/codec.js

@@ -3,17 +3,18 @@ const Codec = require('./../dist/commonjs/codec.js')
 
 const block = '4lmacqas6kpnmvehxpmlvsndgydw5i46mf2pgnaub72eug63dozkw4oqxhk3fazbhkguvlhslcaeqm5jtwghxdk5nvmuakrs7yi2gl6xqmmmw';
 const itx = '5hmacqb6ao252jmbhkhu5isr4yua3jnkhgb5ejjbiomrlzglwarlb777wq7aw5nfz5m4pubx5uffaxp2cqc4ckrh4xirss4nkujvcjbnmomtm';
-const dht = '5demcay'
+const dht = 'b4wiyebqbigjfvm5mizik7ke3v6lyhoahecqiwergnl3cytarf5bd2qvqase'
 const message = '4xnmcay'
 const data = '4hemcay'
 globalThis.peernet = {};
+console.log(parseInt('706468', 16));
 
 test('peernet dht codec', tape => {
   tape.plan(2)
 
   const codec = new Codec(dht)
   const codec2 = new Codec(codec.encoded)
-  tape.equal(codec.name, 'peernet-dht', `name from encoded is valid ${codec.name}`)
+  tape.equal(codec.name, 'peernet-dht-response', `name from encoded is valid ${codec.name}`)
   tape.equal(codec.name, codec2.name, `decoded name is valid ${codec.name}`)
 })
 

package/test/messages.js

@@ -1,8 +1,7 @@
 const test = require('tape')
 const Node = require('./../dist/commonjs/dht-response.js')
 
-const response = '6lemcaykavugk3dmn4iac'
-const responseHash = '6lemcazaudes2wowemufpvcn27f4dxadsbielcitgv5rmjqis6qr5ikyajca'
+const responseHash = 'cqbigjfvm5mizik7ke3v6lyhoahecqiwergnl3cytarf5bd2qvqase'
 
 const block = '4lmacqas6kpnmvehxpmlvsndgydw5i46mf2pgnaub72eug63dozkw4oqxhk3fazbhkguvlhslcaeqm5jtwghxdk5nvmuakrs7yi2gl6xqmmmw';
 const itx = '5hmacqb6ao252jmbhkhu5isr4yua3jnkhgb5ejjbiomrlzglwarlb777wq7aw5nfz5m4pubx5uffaxp2cqc4ckrh4xirss4nkujvcjbnmomtm';
@@ -10,12 +9,16 @@ const dht = '5demcay'
 
 const message = '4xnmcay'
 const data = '4hemcay'
-
+globalThis.peernet = {
+  codecs: {}
+}
 test('peernet message dht-response', tape => {
   tape.plan(4)
   const n = new Node({ hash: 'hello', has: true })
-  const node = new Node(response)
+  console.log(n.hash);
+  const node = new Node(n.encoded)
   const node2 = new Node(node.encoded)
+
   tape.equal(node.name, 'peernet-dht-response', `name from encoded is valid ${node.name}`)
   tape.equal(node.name, node2.name, `decoded name is valid ${node.name}`)
   tape.equal(node.hash, responseHash, `hash from encoded is valid ${node.hash}`)

package/test.js

@@ -7,14 +7,21 @@ pubsub.subscribe('peer:connected', async peer => {
   const request = new globalThis.peernet.protos['peernet-request']({
           request:'lastBlock'
         })
-  const to = peernet._getPeerId(peer.id)
+  const to = peer.id
+  console.log(request);
   const node = await peernet.prepareMessage(to, request.encoded)
+  console.log({node});
   let response = await peer.request(node.encoded)
   console.log({response});
-  const proto = new globalThis.peernet.protos['peernet-message'](Buffer.from(response.data))
-  response = new globalThis.peernet.protos['peernet-response'](Buffer.from(proto.decoded.data))
+  const keys = Object.keys(response)
+  const uint8Array = new Uint8Array(keys.length)
+  for (const key of keys) {
+    uint8Array[Number(key)] = response[key]
+  }
+  const proto = new globalThis.peernet.protos['peernet-message'](uint8Array)
+  console.log(proto.decoded.data);
+  response = new globalThis.peernet.protos['peernet-response'](proto.decoded.data)
   console.log({response});
-  console.log();
 
   const block = JSON.parse(response.decoded.response)
   console.log(block);