@leofcoin/chain 1.4.36 → 1.4.37

package/exports/browser/{index-1ce30988-44319c80.js → index-123daa04-05013cc5.js}

@@ -1,5 +1,5 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-63c7cb33.js';
-import './contract-163f031f.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-c95add6b.js';
+import './contract-32687834.js';
 
 /**
  * @params {String} network

package/exports/browser/{messages-e025829d-a0354268.js → messages-5ddc1083-1bd0ab64.js}

@@ -1,5 +1,5 @@
-import { F as FormatInterface } from './node-browser-63c7cb33.js';
-import './contract-163f031f.js';
+import { F as FormatInterface } from './node-browser-c95add6b.js';
+import './contract-32687834.js';
 
 var proto$b = {
     data: new Uint8Array(),

package/exports/browser/{node-browser-64b82fc8.js → node-browser-c95add6b.js}

@@ -1,4 +1,4 @@
-import { C as ContractMessage, T as TransactionMessage, B as BlockMessage, b as BWMessage, c as BWRequestMessage, V as ValidatorMessage } from './contract-163f031f.js';
+import { C as ContractMessage, T as TransactionMessage, d as BlockMessage, e as BWMessage, f as BWRequestMessage, V as ValidatorMessage } from './contract-32687834.js';
 
 var nodeConfig = async (config = {
     network: 'leofcoin:peach',
@@ -2206,7 +2206,7 @@ class DhtEarth {
         const address = await getAddress();
         const peerLoc = await this.getCoordinates(address);
         for (const provider of providers) {
-            if (provider.address === '127.0.0.1')
+            if (provider.address === '127.0.0.1' || provider.address === '::1')
                 all.push({ provider, distance: 0 });
             else
                 all.push(this.getDistance(peerLoc, provider));
@@ -2273,9 +2273,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) => {
@@ -2683,6 +2683,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;
@@ -16165,7 +16169,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-543bc6a3-be806e11.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-123daa04-05013cc5.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));
@@ -16229,6 +16233,7 @@ class Peernet {
     autoStart = true;
     #starting = false;
     #started = false;
+    #connections = {};
     /**
      * @access public
      * @param {Object} options
@@ -16307,13 +16312,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
@@ -16335,7 +16340,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-73e8ace1.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-5ddc1083-1bd0ab64.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -16369,15 +16374,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
@@ -16402,7 +16411,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-21cee984-77440b6b.js');
+        const importee = await import('./client-033977a1-60f68d3b.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -16414,12 +16423,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;
@@ -16476,6 +16486,7 @@ class Peernet {
             }
             case 'peernet-request': {
                 this.handleRequest(peer, id, proto);
+                break;
             }
             case 'peernet-ps': {
                 if (peer.peerId !== this.id)
@@ -16492,33 +16503,24 @@ class Peernet {
         if (!hash)
             throw new Error('hash expected, received undefined');
         const data = await new globalThis.peernet.protos['peernet-dht']({ hash });
-        this.client.id;
-        const walk = async (peer) => {
+        const walk = async (peer, peerId) => {
             const node = await this.prepareMessage(data);
             let result = await peer.request(node.encoded);
             result = new Uint8Array(Object.values(result));
             const proto = await protoFor(result);
             if (proto.name !== 'peernet-dht-response')
                 throw dhtError(proto.name);
-            // TODO: give ip and port (just used for location)
-            if (!peer.connection.remoteAddress || !peer.connection.localAddress) {
-                peer.connection.remoteFamily = 'ipv4';
-                peer.connection.remoteAddress = '127.0.0.1';
-                peer.connection.remotePort = '0000';
-            }
             const peerInfo = {
-                family: peer.connection.remoteFamily || peer.connection.localFamily,
-                address: peer.connection.remoteAddress || peer.connection.localAddress,
-                port: peer.connection.remotePort || peer.connection.localPort,
-                id: peer.peerId,
+                ...peer.connectionStats,
+                id: peerId,
             };
             if (proto.decoded.has)
                 this.dht.addProvider(peerInfo, proto.decoded.hash);
         };
         let walks = [];
-        for (const peer of this.connections) {
-            if (peer.peerId !== this.id) {
-                walks.push(walk(peer));
+        for (const [peerId, peer] of Object.entries(this.#connections)) {
+            if (peerId !== this.id) {
+                walks.push(walk(peer, peerId));
             }
         }
         return Promise.all(walks);
@@ -16528,7 +16530,7 @@ class Peernet {
      *
      * @param {String} hash
      */
-    async providersFor(hash) {
+    async providersFor(hash, store) {
         let providers = await this.dht.providersFor(hash);
         // walk the network to find a provider
         if (!providers || providers.length === 0) {
@@ -16591,23 +16593,25 @@ class Peernet {
         if (!closestPeer || !closestPeer.id)
             return this.requestData(hash, store?.name || store);
         const id = closestPeer.id;
-        if (this.connections) {
-            let closest = this.connections.filter((peer) => {
-                if (peer.peerId === id)
-                    return peer;
-            });
+        if (this.#connections[id]) {
+            const peer = this.#connections[id];
             let data = await new globalThis.peernet.protos['peernet-data']({ hash, store: store?.name || store });
             const node = await this.prepareMessage(data);
-            if (closest[0])
-                data = await closest[0].request(node.encoded);
+            if (peer)
+                data = await peer.request(node.encoded);
             else {
-                closest = this.connections.filter((peer) => {
-                    if (peer.peerId === id)
-                        return peer;
-                });
-                if (closest[0])
-                    data = await closest[0].request(node.encoded);
+                // fallback and try every provider found
+                const promises = [];
+                const providers = await this.providersFor(hash, store);
+                for (const provider of providers) {
+                    const peer = this.#connections[provider.id];
+                    if (peer)
+                        promises.push(peer.request(node.encoded));
+                }
+                data = await Promise.race(promises);
             }
+            if (data)
+                data = new Uint8Array(Object.values(data));
             const proto = await protoFor(data);
             // TODO: store data automaticly or not
             return BufferToUint8Array(proto.decoded.data);
@@ -16808,8 +16812,8 @@ 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 peer of this.connections) {
-            if (peer.peerId !== this.peerId) {
+        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);
             }
@@ -16874,4 +16878,4 @@ class Node {
     }
 }
 
-export { FormatInterface as F, LittlePubSub as L, MultiWallet as M, Node as N, base58$1 as b, commonjsGlobal as c, encrypt as e };
+export { FormatInterface as F, MultiWallet as M, Node as N, base58$1 as b, commonjsGlobal as c, encrypt as e, getDefaultExportFromCjs as g };

package/exports/browser/node-browser.js

@@ -1,2 +1,2 @@
-export { N as default } from './node-browser-64b82fc8.js';
-import './contract-163f031f.js';
+export { N as default } from './node-browser-c95add6b.js';
+import './contract-32687834.js';