@leofcoin/peernet 1.1.7 → 1.1.9

package/exports/browser/{index-543bc6a3.js → index-59ec4d46.js}

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

package/exports/browser/{messages-48deb2c3.js → messages-c720a8ba.js}

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

package/exports/browser/{peernet-b4c44d17.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) => {
@@ -2600,6 +2600,10 @@ var index = {
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+
 function getAugmentedNamespace(n) {
   if (n.__esModule) return n;
   var f = n.default;
@@ -16082,7 +16086,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-543bc6a3.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));
@@ -16146,6 +16150,7 @@ class Peernet {
     autoStart = true;
     #starting = false;
     #started = false;
+    #connections = {};
     /**
      * @access public
      * @param {Object} options
@@ -16224,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
@@ -16252,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-48deb2c3.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-c720a8ba.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -16286,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
@@ -16319,7 +16328,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-21cee984.js');
+        const importee = await import('./client-6f8b633a.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -16331,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;
@@ -16393,6 +16403,7 @@ class Peernet {
             }
             case 'peernet-request': {
                 this.handleRequest(peer, id, proto);
+                break;
             }
             case 'peernet-ps': {
                 if (peer.peerId !== this.id)
@@ -16754,4 +16765,4 @@ class Peernet {
 }
 globalThis.Peernet = Peernet;
 
-export { FormatInterface as F, LittlePubSub as L, MultiWallet as M, Peernet as P, base58$1 as b, commonjsGlobal as c, encrypt as e };
+export { FormatInterface as F, MultiWallet as M, Peernet as P, base58$1 as b, commonjsGlobal as c, encrypt as e, getDefaultExportFromCjs as g };

package/exports/browser/peernet.js

@@ -1,2 +1,2 @@
-export { P as default } from './peernet-b4c44d17.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('@leofcoin/peernet-swarm/client');
+        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.7",
+  "version": "1.1.9",
   "description": "",
   "main": "src/peernet.js",
   "exports": {
@@ -31,6 +31,7 @@
     "@leofcoin/multi-wallet": "^3.0.1",
     "@leofcoin/peernet-swarm": "^1.1.0",
     "@leofcoin/storage": "^3.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('@leofcoin/peernet-swarm/client')
+    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': {

package/test.js

@@ -12,36 +12,36 @@ import Client from './exports/peernet.js'
   //   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()
-  })
+  // 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/exports/browser/browser-10ffabe1.js

@@ -1,56 +0,0 @@
-function _mergeNamespaces(n, m) {
-	m.forEach(function (e) {
-		e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
-			if (k !== 'default' && !(k in n)) {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	});
-	return Object.freeze(n);
-}
-
-var browser$1 = {};
-
-var MediaStream = browser$1.MediaStream = window.MediaStream;
-var MediaStreamTrack = browser$1.MediaStreamTrack = window.MediaStreamTrack;
-var RTCDataChannel = browser$1.RTCDataChannel = window.RTCDataChannel;
-var RTCDataChannelEvent = browser$1.RTCDataChannelEvent = window.RTCDataChannelEvent;
-var RTCDtlsTransport = browser$1.RTCDtlsTransport = window.RTCDtlsTransport;
-var RTCIceCandidate = browser$1.RTCIceCandidate = window.RTCIceCandidate;
-var RTCIceTransport = browser$1.RTCIceTransport = window.RTCIceTransport;
-var RTCPeerConnection = browser$1.RTCPeerConnection = window.RTCPeerConnection;
-var RTCPeerConnectionIceEvent = browser$1.RTCPeerConnectionIceEvent = window.RTCPeerConnectionIceEvent;
-var RTCRtpReceiver = browser$1.RTCRtpReceiver = window.RTCRtpReceiver;
-var RTCRtpSender = browser$1.RTCRtpSender = window.RTCRtpSender;
-var RTCRtpTransceiver = browser$1.RTCRtpTransceiver = window.RTCRtpTransceiver;
-var RTCSctpTransport = browser$1.RTCSctpTransport = window.RTCSctpTransport;
-var RTCSessionDescription = browser$1.RTCSessionDescription = window.RTCSessionDescription;
-var getUserMedia = browser$1.getUserMedia = window.getUserMedia;
-var mediaDevices = browser$1.mediaDevices = navigator.mediaDevices;
-
-var browser = /*#__PURE__*/_mergeNamespaces({
-	__proto__: null,
-	MediaStream: MediaStream,
-	MediaStreamTrack: MediaStreamTrack,
-	RTCDataChannel: RTCDataChannel,
-	RTCDataChannelEvent: RTCDataChannelEvent,
-	RTCDtlsTransport: RTCDtlsTransport,
-	RTCIceCandidate: RTCIceCandidate,
-	RTCIceTransport: RTCIceTransport,
-	RTCPeerConnection: RTCPeerConnection,
-	RTCPeerConnectionIceEvent: RTCPeerConnectionIceEvent,
-	RTCRtpReceiver: RTCRtpReceiver,
-	RTCRtpSender: RTCRtpSender,
-	RTCRtpTransceiver: RTCRtpTransceiver,
-	RTCSctpTransport: RTCSctpTransport,
-	RTCSessionDescription: RTCSessionDescription,
-	default: browser$1,
-	getUserMedia: getUserMedia,
-	mediaDevices: mediaDevices
-}, [browser$1]);
-
-export { browser as b };