@leofcoin/peernet 1.1.8 → 1.1.9

package/exports/browser/{client-56d3de03.js → client-6f8b633a.js}

@@ -1,4 +1,4 @@
-import { g as getDefaultExportFromCjs, c as commonjsGlobal } from './peernet-73c61737.js';
+import { g as getDefaultExportFromCjs, c as commonjsGlobal } from './peernet-3281374b.js';
 import './value-157ab062.js';
 
 function commonjsRequire(path) {
@@ -10529,7 +10529,7 @@ var p2pt_umd = {
 	                this.responseWaiting[peer.id][data.id]([peer, msg]);
 	                delete this.responseWaiting[peer.id][data.id];
 	              } else {
-	                this.emit('msg', peer, msg);
+	                this.emit('msg', peer, msg, data.from);
 	              }
 	              this._destroyChunks(data.id);
 	            }
@@ -10634,7 +10634,8 @@ var p2pt_umd = {
 	    return new Promise((resolve, reject) => {
 	      const data = {
 	        id: msgID !== '' ? msgID : Math.floor(Math.random() * 100000 + 100000),
-	        msg
+	        msg,
+	        from: this.peerId
 	      };
 
 	      if (typeof msg === 'object') {
@@ -40890,16 +40891,9 @@ var p2pt_umd = {
 var P2PT = /*@__PURE__*/getDefaultExportFromCjs(p2pt_umdExports);
 
 class P2PTPeer {
-  #connected = false
-  #messageQue = []
-  #chunksQue = {}
-  #channel
   id;
   #peerId;
   #channelName
-  #chunkSize = 16 * 1024 // 16384
-  #queRunning = false
-  #MAX_BUFFERED_AMOUNT = 16 * 1024 * 1024
   initiator = false
   state;
   #connection
@@ -40908,6 +40902,10 @@ class P2PTPeer {
     return this.#channelName
   }
 
+  get connected() {
+    return this.#connection.connected
+  }
+
   constructor(peer, p2pt, options = {}) {
     this.#connection = peer;
     this.p2pt = p2pt;
@@ -40920,83 +40918,31 @@ class P2PTPeer {
 
     this.#channelName = peer.channelName; 
 
-    this.#peerId = options.peerId;
+    this.#peerId = this.p2pt.peerId;
     this.options = options;
-    return this.#init(options)
-  }
-
-  async #init(options) {
-    if (!globalThis.pako) {
-      const importee = await import('./pako.esm-aa674ebf.js');
-      globalThis.pako = importee.default;
-    }
-    return this
   }
 
   _handleMessage(message) {
-
     message = JSON.parse(new TextDecoder().decode(message.slice(1)));
     // allow sharding (multiple peers share data)
     pubsub.publish('peernet:shard', message);
-    const { id } = message;
+    const { id, from } = message;
 
     // console.log(new TextDecoder().decode(new Uint8Array(Object.values(JSON.parse(message.msg)))));
     const data = new Uint8Array(Object.values(JSON.parse(message.msg)));
-      pubsub.publish('peer:data', { id, data, from: this.peerId });
+      pubsub.publish('peer:data', { id, data, from, peer: this });
   
     this.bw.down += data.byteLength || data.length;
   }
 
   async send(data, id) {
     this.bw.up += data.byteLength || data.length;
-    return this.p2pt.send(this.#connection, data)
-  }
-
-  request(data) {
-    return this.send(data)
-  }
-
-  #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 }));
-      this.#messageQue.push(message);
-    }
-
-    if (!this.queRunning) return this.#runQue()
-  }
-
-  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();
-      await this.#connection.send(message);
-      if (this.#messageQue.length > 0) return this.#runQue()
-    } else {
-      return setTimeout(() => this.#runQue(), 50)
-    }
+    return this.p2pt.send(this.#connection, data, id)
   }
 
-  splitMessage(message) {
-    const chunks = [];
-    message = pako.deflate(message);
-    const size = message.byteLength || message.length;
-    let offset = 0;
-    return new Promise((resolve, reject) => {
-      const splitMessage = () => {
-        const chunk = message.slice(offset, offset + this.#chunkSize > size ? size : offset + this.#chunkSize);
-        offset += this.#chunkSize;
-        chunks.push(chunk);
-        if (offset < size) return splitMessage()
-        else resolve({chunks, size});
-      };
-
-      splitMessage();
-    })
+  async request(data) {
+    const [peer, msg] = await this.send(data);
+    return msg
   }
 
   get peerId() {
@@ -41056,8 +41002,9 @@ class LittlePubSub {
 }
 
 if (!globalThis.pubsub) globalThis.pubsub = new LittlePubSub();
+
 class P2PTClient extends P2PT {
-  #connections = {
+  #discovered = {
 
   }
 
@@ -41066,81 +41013,45 @@ class P2PTClient extends P2PT {
     down: 0
   }
 
-  // static trackersAnnounceURLs = [
-  //   // "wss://tracker.openw/ebtorrent.com",
-  //   'wss://peach.leofcoin.org'
-  //   // "wss://tracker.btorrent.xyz"
-  // ]
-  static JSON_MESSAGE_IDENTIFIER = '^'
+  get discovered() {
+    return this.#discovered || {}
+  }
 
   constructor(peerId, networkVersion = 'leofcoin:peach', stars = ['wss://peach.leofcoin.org']) {
-    super(stars, networkVersion);
+    super(stars, networkVersion, peerId);
+
     this.stars = stars;
     this.networkVersion = networkVersion;
     this.peerId = peerId;
 
-// If a tracker connection was successful
-this.on('trackerconnect', async (tracker, stats) => {
-  // console.log({tracker});
-  const peers = tracker.peers;
-  // console.log(peers);
-  for (const [id, peer] of Object.entries(peers)) {
-    this.#connections[id] = await new P2PTPeer(peer, this);
-    // promises.push(() => peer.send('request'))
-    // this.peers.includes(peerId)
-  }
-});
-
-// If a new peer, send message
-this.on('peerconnect', async (peer) => {
-  console.log(peer.id);
-  console.log('id');
-  this.#connections[peer.id] = await new P2PTPeer(peer, this);
-  // console.log(peer);
-  console.log(peer.id);
-  // console.log(peer.send(new TextEncoder().encode(JSON.stringify({data: {type: 'requestId', from: this.peerId}}))));
-  // await this.#connections[peer.id].send(new TextEncoder().encode(JSON.stringify({type: 'requestId', from: this.peerId})))
-  const id = await this.#connections[peer.id].request(new TextEncoder().encode(JSON.stringify({type: 'requestId', from: this.peerId})));
-  console.log({id});
-  // this.send(peer, 'Hi').then(([peer, msg]) => {
-  //   console.log('Got response : ' + msg)
-
-  // this.send(peer, 'request')
-  //   return peer.respond('Bye')
-  // }).then(([peer, msg]) => {
-  //   console.log('Got response2 : ' + msg)
-  // })
-});
-
-// If message received from peer
-// this.on('msg', async (peer, msg) => {
-//   console.log({msg});
-//   const hasPeer = this.#connections[peer.id]
-//   if (!hasPeer) this.#connections[peer.id] = await new P2PTPeer(peer, this)
-// // data.message = new Uint8Array()
-//   this.#connections[peer.id]?._handleMessage(new Uint8Array(Object.values(msg)))
-//   if (msg.type === 'requestId') peer.respond(this.peerId)
-//   console.log(`Got message from ${peer.id} : ${msg}`)
-//   if (msg === 'Hi') {
-//     peer.respond('Hello !').then(([peer, msg]) => {
-//       peer.respond('Bye !')
-//     })
-//   }
-// })
-
-this.on('data', async (peer, data) => {
-  // console.log(peer.id);
-  // data = data.slice(1)
-  // console.log(data);
-  const hasPeer = this.#connections[peer.id];
-  if (!hasPeer) this.#connections[peer.id] = await new P2PTPeer(peer, this);
-// data.message = new Uint8Array()
-  this.#connections[peer.id]?._handleMessage(new Uint8Array(Object.values(data)));
-  console.log(this.#connections[peer.id]?.bw);
-  this.bw.down += data.length || data.byteLength;
-});
-console.log('P2PT started. My peer id : ' + this._peerId);
-this.start();
+    this.on('trackerconnect', async (tracker, stats) => {
+      const peers = tracker.peers;
+      let promises = Object.entries(peers).map(async ([id, peer]) => {
+        this.#discovered[id] = await new P2PTPeer(peer, this);
+      });
+
+      promises = await Promise.allSettled(promises);
+      pubsub.publish('star:connected', tracker);
+    });
+
+    this.on('peerconnect', async (peer) => {
+      this.#discovered[peer.id] = await new P2PTPeer(peer, this);
+      pubsub.publish('peer:discovered', this.#discovered[peer.id]);
+    });
+
+    this.on('peerclose', async (peer) => {
+      pubsub.publish('peer:left', this.#discovered[peer.id]);
+    });
+
+    this.on('data', async (peer, data) => {
+      const hasPeer = this.#discovered[peer.id];
+      if (!hasPeer) this.#discovered[peer.id] = await new P2PTPeer(peer, this);
+
+      this.#discovered[peer.id]?._handleMessage(new Uint8Array(Object.values(data)));
+      this.bw.down += data.length || data.byteLength;
+    });
+    console.log('Peer started as: ' + this._peerId);
+    this.start();
   }
   
 }

package/exports/browser/{index-60443f35.js → index-59ec4d46.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-73c61737.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-3281374b.js';
 import './value-157ab062.js';
 
 /**

package/exports/browser/{messages-54d97ac1.js → messages-c720a8ba.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './peernet-73c61737.js';
+import { F as FormatInterface } from './peernet-3281374b.js';
 import './value-157ab062.js';
 
 var proto$b = {

package/exports/browser/{peernet-73c61737.js → peernet-3281374b.js}

@@ -2190,9 +2190,9 @@ class MessageHandler {
 const dataHandler = async (message) => {
     if (!message)
         return;
-    const { data, id, from } = message;
+    const { data, id, from, peer } = message;
     const proto = await protoFor(data);
-    peernet._protoHandler({ id, proto }, peernet.client.connections[from], from);
+    peernet._protoHandler({ id, proto }, peernet.connections[from] || peer, from);
 };
 
 const dhtError = (proto) => {
@@ -16086,7 +16086,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-60443f35.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-59ec4d46.js');
             const { identity, accounts } = await importee.default(password, this.network);
             await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }));
             await globalThis.walletStore.put('version', String(1));
@@ -16150,6 +16150,7 @@ class Peernet {
     autoStart = true;
     #starting = false;
     #started = false;
+    #connections = {};
     /**
      * @access public
      * @param {Object} options
@@ -16228,13 +16229,13 @@ class Peernet {
      * @return {Array} peerId
      */
     get peers() {
-        return Object.keys(this.client.connections);
+        return Object.values(this.#connections);
     }
     get connections() {
-        return Object.values(this.client.connections);
+        return Object.values(this.#connections);
     }
     get peerEntries() {
-        return Object.entries(this.client.connections);
+        return Object.values(this.#connections);
     }
     /**
      * @return {String} id - peerId
@@ -16256,7 +16257,7 @@ class Peernet {
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-54d97ac1.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-c720a8ba.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -16290,15 +16291,19 @@ class Peernet {
         await this.identity.load(password);
         this._peerHandler = new PeerDiscovery(this.id);
         this.peerId = this.id;
-        pubsub.subscribe('peer:connected', async (peer) => {
+        this.addRequestHandler('handshake', () => {
+            return new peernet.protos['peernet-response']({ response: { peerId: this.id } });
+        });
+        pubsub.subscribe('peer:discovered', async (peer) => {
             // 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))
-            //   const proto = protoFor(message.decoded.data)
-            //   this._protoHandler({id, proto}, peer)
-            // })
+            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
         });
         /**
          * converts data -> message -> proto
@@ -16323,7 +16328,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-56d3de03.js');
+        const importee = await import('./client-6f8b633a.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -16335,12 +16340,13 @@ class Peernet {
     addRequestHandler(name, method) {
         this.requestProtos[name] = method;
     }
-    sendMessage(peer, id, data) {
-        if (peer.readyState === 'open') {
-            peer.send(data, id);
-            this.bw.up += data.length;
-        }
-        else if (peer.readyState === 'closed') ;
+    async sendMessage(peer, id, data) {
+        // if (peer.readyState === 'open') {
+        await peer.send(data, id);
+        this.bw.up += data.length;
+        // } else if (peer.readyState === 'closed') {
+        // this.removePeer(peer)
+        // }
     }
     async handleDHT(peer, id, proto) {
         let { hash, store } = proto.decoded;
@@ -16397,6 +16403,7 @@ class Peernet {
             }
             case 'peernet-request': {
                 this.handleRequest(peer, id, proto);
+                break;
             }
             case 'peernet-ps': {
                 if (peer.peerId !== this.id)

package/exports/browser/peernet.js

@@ -1,2 +1,2 @@
-export { P as default } from './peernet-73c61737.js';
+export { P as default } from './peernet-3281374b.js';
 import './value-157ab062.js';

package/exports/peernet.js

@@ -290,9 +290,9 @@ class MessageHandler {
 const dataHandler = async (message) => {
     if (!message)
         return;
-    const { data, id, from } = message;
+    const { data, id, from, peer } = message;
     const proto = await protoFor(data);
-    peernet._protoHandler({ id, proto }, peernet.client.connections[from], from);
+    peernet._protoHandler({ id, proto }, peernet.connections[from] || peer, from);
 };
 
 const dhtError = (proto) => {
@@ -404,6 +404,7 @@ class Peernet {
     autoStart = true;
     #starting = false;
     #started = false;
+    #connections = {};
     /**
      * @access public
      * @param {Object} options
@@ -482,13 +483,13 @@ class Peernet {
      * @return {Array} peerId
      */
     get peers() {
-        return Object.keys(this.client.connections);
+        return Object.values(this.#connections);
     }
     get connections() {
-        return Object.values(this.client.connections);
+        return Object.values(this.#connections);
     }
     get peerEntries() {
-        return Object.entries(this.client.connections);
+        return Object.values(this.#connections);
     }
     /**
      * @return {String} id - peerId
@@ -544,15 +545,19 @@ class Peernet {
         await this.identity.load(password);
         this._peerHandler = new PeerDiscovery(this.id);
         this.peerId = this.id;
-        pubsub.subscribe('peer:connected', async (peer) => {
+        this.addRequestHandler('handshake', () => {
+            return new peernet.protos['peernet-response']({ response: { peerId: this.id } });
+        });
+        pubsub.subscribe('peer:discovered', async (peer) => {
             // 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))
-            //   const proto = protoFor(message.decoded.data)
-            //   this._protoHandler({id, proto}, peer)
-            // })
+            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
         });
         /**
          * converts data -> message -> proto
@@ -577,7 +582,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('@netpeer/p2pt-swarm/src/client/client.js');
+        const importee = await import('@netpeer/p2pt-swarm/client.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -589,12 +594,13 @@ class Peernet {
     addRequestHandler(name, method) {
         this.requestProtos[name] = method;
     }
-    sendMessage(peer, id, data) {
-        if (peer.readyState === 'open') {
-            peer.send(data, id);
-            this.bw.up += data.length;
-        }
-        else if (peer.readyState === 'closed') ;
+    async sendMessage(peer, id, data) {
+        // if (peer.readyState === 'open') {
+        await peer.send(data, id);
+        this.bw.up += data.length;
+        // } else if (peer.readyState === 'closed') {
+        // this.removePeer(peer)
+        // }
     }
     async handleDHT(peer, id, proto) {
         let { hash, store } = proto.decoded;
@@ -651,6 +657,7 @@ class Peernet {
             }
             case 'peernet-request': {
                 this.handleRequest(peer, id, proto);
+                break;
             }
             case 'peernet-ps': {
                 if (peer.peerId !== this.id)

package/index.html

@@ -9,7 +9,7 @@
     </script> -->
 
     <script type="module">
-      import Peernet from './dist/peernet.js';
+      import Peernet from './exports/browser/peernet.js';
       (async () => {
         const peernet = await new Peernet({network: 'leofcoin:peach', networkVersion: 'peach'})
         peernet.addRequestHandler('lastBlock', () => new peernet.protos['peernet-response']({response: new TextEncoder().encode(100)}))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "",
   "main": "src/peernet.js",
   "exports": {
@@ -31,7 +31,7 @@
     "@leofcoin/multi-wallet": "^3.0.1",
     "@leofcoin/peernet-swarm": "^1.1.0",
     "@leofcoin/storage": "^3.0.0",
-    "@netpeer/p2pt-swarm": "^1.0.0",
+    "@netpeer/p2pt-swarm": "^1.1.5",
     "@types/node": "^18.11.18",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",

package/src/handlers/data.js

@@ -3,10 +3,9 @@ import { protoFor } from './../utils/utils.js'
 const dataHandler = async message => {
   if (!message) return
 
-  const {data, id, from} = message
+  const {data, id, from, peer} = message
   const proto = await protoFor(data)
-
-  peernet._protoHandler({id, proto}, peernet.client.connections[from], from)
+  peernet._protoHandler({id, proto}, peernet.connections[from] || peer, from)
 }
 
 export default dataHandler

package/src/peernet.ts

@@ -46,6 +46,7 @@ export default class Peernet {
   autoStart: boolean = true
   #starting: boolean = false
   #started: boolean = false
+  #connections = {}
 
   /**
    * @access public
@@ -135,15 +136,15 @@ export default class Peernet {
    * @return {Array} peerId
    */
   get peers() {
-    return Object.keys(this.client.connections)
+    return Object.values(this.#connections)
   }
 
   get connections() {
-    return Object.values(this.client.connections)
+    return Object.values(this.#connections)
   }
 
   get peerEntries() {
-    return Object.entries(this.client.connections)
+    return Object.values(this.#connections)
   }
 
   /**
@@ -223,15 +224,22 @@ export default class Peernet {
     this._peerHandler = new PeerDiscovery(this.id)
     this.peerId = this.id
 
-    pubsub.subscribe('peer:connected', async (peer) => {
+    this.addRequestHandler('handshake', ( ) => {
+      return new peernet.protos['peernet-response']({response: {peerId: this.id}})
+    })
+
+    pubsub.subscribe('peer:discovered', async (peer) => {
       // 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))
-      //   const proto = protoFor(message.decoded.data)
-      //   this._protoHandler({id, proto}, peer)
-      // })
+      
+      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
     })
 
     /**
@@ -257,7 +265,7 @@ export default class Peernet {
     if (this.#starting || this.#started) return
 
     this.#starting = true
-    const importee = await import('@netpeer/p2pt-swarm/src/client/client.js')
+    const importee = await import('@netpeer/p2pt-swarm/client.js')
     /**
      * @access public
      * @type {PeernetClient}
@@ -271,13 +279,14 @@ export default class Peernet {
     this.requestProtos[name] = method
   }
 
-  sendMessage(peer, id, data) {
-    if (peer.readyState === 'open') {
-      peer.send(data, id)
+  async sendMessage(peer, id, data) {
+    
+    // if (peer.readyState === 'open') {
+      await peer.send(data, id)
       this.bw.up += data.length
-    } else if (peer.readyState === 'closed') {
+    // } else if (peer.readyState === 'closed') {
       // this.removePeer(peer)
-    }
+    // }
 
   }
 
@@ -334,6 +343,7 @@ export default class Peernet {
    */
   async _protoHandler(message, peer, from) {
     const {id, proto} = message
+    
     this.bw.down += proto.encoded.length
     switch(proto.name) {
       case 'peernet-dht': {
@@ -346,6 +356,7 @@ export default class Peernet {
       }
       case 'peernet-request': {
         this.handleRequest(peer, id, proto)
+        break
       }
 
       case 'peernet-ps': {