@leofcoin/peernet 1.1.66 → 1.1.68

package/src/peernet.ts

@@ -9,8 +9,8 @@ import { dhtError, nothingFoundError } from './errors/errors.js'
 import { Storage as LeofcoinStorageClass } from '@leofcoin/storage'
 import { utils as codecUtils } from '@leofcoin/codecs'
 import Identity from './identity.js'
-import swarm, { PeerId } from '@netpeer/p2pt-swarm'
-import P2PTPeer from '@netpeer/p2pt-swarm/peer'
+import swarm from '@netpeer/swarm/client'
+import SwarmPeer from '@netpeer/swarm/peer'
 
 globalThis.LeofcoinStorage = LeofcoinStorageClass
 
@@ -60,11 +60,11 @@ export default class Peernet {
   autoStart: boolean = true
   #starting: boolean = false
   #started: boolean = false
-  #connections: { [index: PeerId]: P2PTPeer } = {}
   requestProtos = {}
   _messageHandler: MessageHandler
   _peerHandler: PeerDiscovery
   protos: {}
+  version
 
   /**
    * @access public
@@ -72,6 +72,7 @@ export default class Peernet {
    * @param {String} options.network - desired network
    * @param {String} options.stars - star list for selected network (these should match, don't mix networks)
    * @param {String} options.root - path to root directory
+   * @param {String} options.version - path to root directory
    * @param {String} options.storePrefix - prefix for datatores (lfc)
    *
    * @return {Promise} instance of Peernet
@@ -86,6 +87,7 @@ export default class Peernet {
     this.network = options.network || 'leofcoin'
     this.autoStart = options.autoStart === undefined ? true : options.autoStart
     this.stars = options.stars
+    this.version = options.version
     const parts = this.network.split(':')
     this.networkVersion = options.networkVersion || parts.length > 1 ? parts[1] : 'mainnet'
 
@@ -162,15 +164,15 @@ export default class Peernet {
    * @return {Array} peerId
    */
   get peers() {
-    return Object.entries(this.#connections)
+    return Object.entries(this.client.connections)
   }
 
   get connections() {
-    return Object.values(this.#connections)
+    return this.client.connections
   }
 
   get peerEntries() {
-    return Object.values(this.#connections)
+    return Object.values(this.client.connections)
   }
 
   /**
@@ -248,40 +250,44 @@ export default class Peernet {
     this._peerHandler = new PeerDiscovery(this.id)
     this.peerId = this.id
 
-    this.addRequestHandler('handshake', () => {
-      return new peernet.protos['peernet-response']({
-        response: { peerId: this.id }
-      })
-    })
-
-    pubsub.subscribe('peer:discovered', async (peer) => {
-      // console.log(peer);
-
-      if (this.requestProtos['version']) {
-        let data = await new globalThis.peernet.protos['peernet-request']({
-          request: 'version'
-        })
-        let node = await globalThis.peernet.prepareMessage(data)
-        let response = await peer.request(node.encoded)
-        response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)))
-        peer.version = response.decoded.response.version
-      }
-
-      let data = await new globalThis.peernet.protos['peernet-request']({
-        request: 'handshake'
-      })
-      let node = await globalThis.peernet.prepareMessage(data)
-      let response = await peer.request(node.encoded)
-
-      response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)))
-      // todo: response.decoded should be the response and not response.peerId
-
-      this.#connections[response.decoded.response.peerId] = peer
-      pubsub.publish('peer:connected', peer)
-      // todo: cleanup discovered
-    })
-
-    pubsub.subscribe('peer:left', this.#peerLeft.bind(this))
+    // this.addRequestHandler('handshake', () => {
+    //   return new peernet.protos['peernet-response']({
+    //     response: { peerId: this.id }
+    //   })
+    // })
+
+    // pubsub.subscribe('peer:discovered', async (peer) => {
+    //   // console.log(peer);
+
+    //   if (this.requestProtos['version'] && !peer.version) {
+    //     let data = await new globalThis.peernet.protos['peernet-request']({
+    //       request: 'version'
+    //     })
+    //     let node = await globalThis.peernet.prepareMessage(data)
+    //     let response = await peer.request(node.encoded)
+    //     response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)))
+    //     peer.version = response.decoded.response.version
+    //   }
+
+    //   if (!peer.peerId) {
+    //     let data = await new globalThis.peernet.protos['peernet-request']({
+    //       request: 'handshake'
+    //     })
+    //     let node = await globalThis.peernet.prepareMessage(data)
+    //     let response = await peer.request(node.encoded)
+
+    //     response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)))
+    //     // todo: response.decoded should be the response and not response.peerId
+    //     // todo: ignore above and remove discover completly
+    //     response.decoded.response.peerId
+    //   }
+
+    // this.connections[peer.peerId] = peer
+    // pubsub.publish('peer:connected', peer)
+    // todo: cleanup discovered
+    // })
+
+    // pubsub.subscribe('peer:left', this.#peerLeft.bind(this))
 
     /**
      * converts data -> message -> proto
@@ -289,20 +295,21 @@ export default class Peernet {
      */
     pubsub.subscribe('peer:data', dataHandler)
 
-    if (globalThis.navigator) {
-      globalThis.addEventListener('beforeunload', async () => this.client.destroy())
-    } else {
-      process.on('SIGTERM', async () => {
-        process.stdin.resume()
-        try {
-          await this.client.destroy()
-        } catch (error) {
-          // @ts-ignore
-          await this.client.close()
-        }
-        process.exit()
-      })
-    }
+    // // todo: remove below, already handles in the swarm
+    // if (globalThis.navigator) {
+    //   globalThis.addEventListener('beforeunload', async () => this.client.close())
+    // } else {
+    //   process.on('SIGTERM', async () => {
+    //     process.stdin.resume()
+    //     try {
+    //       await this.client.close()
+    //     } catch (error) {
+    //       // @ts-ignore
+    //       await this.client.close()
+    //     }
+    //     process.exit()
+    //   })
+    // }
     if (this.autoStart) await this.start()
     return this
   }
@@ -311,24 +318,32 @@ export default class Peernet {
     if (this.#starting || this.#started) return
 
     this.#starting = true
-    const importee = await import('@netpeer/p2pt-swarm')
+    const importee = await import('@netpeer/swarm/client')
     /**
      * @access public
      * @type {PeernetClient}
      */
-    this.client = new importee.default(this.id, this.networkVersion, this.stars)
+    console.log(this.stars)
+
+    this.client = new importee.default({
+      peerId: this.id,
+      networkVersion: this.networkVersion,
+      version: this.version,
+      stars: this.stars
+    })
     this.#started = true
     this.#starting = false
   }
 
-  #peerLeft(peer: P2PTPeer) {
-    for (const [id, _peer] of Object.entries(this.#connections)) {
-      if (_peer.id === peer.id && this.#connections[id] && !this.#connections[id].connected) {
-        delete this.#connections[id]
-        this.removePeer(_peer)
-      }
-    }
-  }
+  // todo: remove, handled in swarm now
+  // #peerLeft(peer: SwarmPeer) {
+  //   for (const [id, _peer] of Object.entries(this.connections)) {
+  //     if (_peer.id === peer.id && this.connections[id] && !this.connections[id].connected) {
+  //       delete this.connections[id]
+  //       this.removePeer(_peer)
+  //     }
+  //   }
+  // }
 
   addRequestHandler(name, method) {
     this.requestProtos[name] = method
@@ -445,7 +460,7 @@ export default class Peernet {
       if (proto.decoded.has) this.dht.addProvider(peerInfo, proto.decoded.hash)
     }
     let walks = []
-    for (const [peerId, peer] of Object.entries(this.#connections)) {
+    for (const [peerId, peer] of Object.entries(this.connections)) {
       if (peerId !== this.id) {
         walks.push(walk(peer, peerId))
       }
@@ -512,7 +527,7 @@ export default class Peernet {
     if (!closestPeer || !closestPeer.id) return this.requestData(hash, store?.name || store)
 
     const id = closestPeer.id
-    const peer = this.#connections[id]
+    const peer = this.connections[id]
 
     if (peer?.connected) {
       let data = await new globalThis.peernet.protos['peernet-data']({
@@ -528,7 +543,7 @@ export default class Peernet {
         const promises = []
         const providers = await this.providersFor(hash, store)
         for (const provider of Object.values(providers)) {
-          const peer = this.#connections[provider.id]
+          const peer = this.connections[provider.id]
 
           if (peer) promises.push(peer.request(node.encoded))
         }
@@ -743,7 +758,7 @@ export default class Peernet {
     // globalSub.publish(topic, data)
     const id = Math.random().toString(36).slice(-12)
     data = await new globalThis.peernet.protos['peernet-ps']({ data, topic })
-    for (const [peerId, peer] of Object.entries(this.#connections)) {
+    for (const [peerId, peer] of Object.entries(this.connections)) {
       if (peerId !== this.id) {
         const node = await this.prepareMessage(data)
         this.sendMessage(peer, id, node.encoded)

package/test.js

@@ -1,64 +1,62 @@
 import Client from './exports/peernet.js'
 
-
-
-  const client = await new Client({
-    network: 'leofcoin:peach', networkVersion: 'peach', stars: ['wss://peach.leofcoin.org']
-  })
-  console.log(pubsub.subscribers);
-  pubsub.subscribe('peer:discovered', (data) => {
-    // console.log(data);
-    console.log(`discovered: ${Object.keys(peernet.client.discovered).length}`);
-    console.log(Object.keys(peernet.client.discovered));
-  })
-  pubsub.subscribe('peer:connected', (data) => {
-    // console.log(data);
-    console.log(`connections: ${peernet.connections.length}`);
-  })
-  pubsub.subscribe('peer:left', (data) => {
-    console.log(`connections: ${peernet.connections.length}`);
-    console.log(`discovered: ${Object.keys(peernet.client.discovered).length}`);
-    // console.log(data);
-  })
-
-  // peernet.addFolder([{
-  //   path: 'assets/asset.png',
-  //   content: Buffer.from('png')
-  // }, {
-  //   path: 'index.html',
-  //   content: Buffer.from('html')
-  // }]).then(hash => peernet.ls(hash).then(paths => peernet.cat(paths[0].hash).then(content => console.log(content))))
-
-  // pubsub.subscribe('peer:connected', async peer => {
-  //   chainStore.put('localBlock', '00000')
-  //   const request = await new globalThis.peernet.protos['peernet-request']({
-  //           request:'lastBlock'
-  //         })
-  //   const to = peer.id
-  //   await peernet.data.put('hello', 'hi')
-  //   console.log({request});
-  //   const node = await peernet.prepareMessage(request)
-  //   console.log({node});
-  //   let response = await peer.request(node.encoded)
-  //   console.log({response});
-  //   const keys = Object.keys(response)
-  //   const uint8Array = new Uint8Array(keys.length)
-  //   for (const key of keys) {
-  //     uint8Array[Number(key)] = response[key]
-  //   }
-  //   // const proto = await new globalThis.peernet.protos['peernet-message'](uint8Array)
-  //   // console.log(proto.decoded.data);
-  //   response = await new globalThis.peernet.protos['peernet-response'](uint8Array)
-  //   console.log({response});
-
-  //   const block = new TextDecoder().decode(response.decoded.response)
-  //   console.log(block);
-  //   const task = () => setTimeout(() => {
-  //     console.log(peernet.connections[0]?.connected);
-  //     console.log(pubsub.subscribers);
-  //     task()
-  //   }, 5000);
-    // task()
-  // })
-
-
+const client = await new Client({
+  network: 'leofcoin:peach',
+  networkVersion: 'peach',
+  stars: ['wss://star.leofcoin.org']
+})
+console.log(pubsub.subscribers)
+pubsub.subscribe('peer:discovered', (data) => {
+  // console.log(data);
+  console.log(`discovered: ${Object.keys(peernet.client.discovered).length}`)
+  console.log(Object.keys(peernet.client.discovered))
+})
+pubsub.subscribe('peer:connected', (data) => {
+  // console.log(data);
+  console.log(`connections: ${peernet.connections.length}`)
+})
+pubsub.subscribe('peer:left', (data) => {
+  console.log(`connections: ${peernet.connections.length}`)
+  console.log(`discovered: ${Object.keys(peernet.client.discovered).length}`)
+  // console.log(data);
+})
+
+// peernet.addFolder([{
+//   path: 'assets/asset.png',
+//   content: Buffer.from('png')
+// }, {
+//   path: 'index.html',
+//   content: Buffer.from('html')
+// }]).then(hash => peernet.ls(hash).then(paths => peernet.cat(paths[0].hash).then(content => console.log(content))))
+
+// pubsub.subscribe('peer:connected', async peer => {
+//   chainStore.put('localBlock', '00000')
+//   const request = await new globalThis.peernet.protos['peernet-request']({
+//           request:'lastBlock'
+//         })
+//   const to = peer.id
+//   await peernet.data.put('hello', 'hi')
+//   console.log({request});
+//   const node = await peernet.prepareMessage(request)
+//   console.log({node});
+//   let response = await peer.request(node.encoded)
+//   console.log({response});
+//   const keys = Object.keys(response)
+//   const uint8Array = new Uint8Array(keys.length)
+//   for (const key of keys) {
+//     uint8Array[Number(key)] = response[key]
+//   }
+//   // const proto = await new globalThis.peernet.protos['peernet-message'](uint8Array)
+//   // console.log(proto.decoded.data);
+//   response = await new globalThis.peernet.protos['peernet-response'](uint8Array)
+//   console.log({response});
+
+//   const block = new TextDecoder().decode(response.decoded.response)
+//   console.log(block);
+//   const task = () => setTimeout(() => {
+//     console.log(peernet.connections[0]?.connected);
+//     console.log(pubsub.subscribers);
+//     task()
+//   }, 5000);
+// task()
+// })

package/test2.js

@@ -1,7 +1,11 @@
-const Client = require('./dist/commonjs/peernet.js');
-
-(async () => {
-  const client = await new Client({root: '.peernet/test2', network: 'leofcoin:peach', networkVersion: 'peach'})
+import Client from './exports/peernet.js'
+;(async () => {
+  const client = await new Client({
+    root: '.peernet/test2',
+    network: 'peach',
+    networkVersion: 'peach',
+    stars: [['wss://star.leofcoin.org']]
+  })
   const job = () => client.publish('socket-data', 'hello')
   setTimeout(async () => {
     job()