@leofcoin/peernet 1.1.70 → 1.1.72

package/exports/browser/{index-2836cc96.js → index-687f692b.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-509d1c89.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-fa94440c.js';
 import './value-4e80eeeb.js';
 
 /**

package/exports/browser/{messages-554d2a85.js → messages-1c117282.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './peernet-509d1c89.js';
+import { F as FormatInterface } from './peernet-fa94440c.js';
 import './value-4e80eeeb.js';
 
 var proto$b = {

package/exports/browser/{peernet-509d1c89.js → peernet-fa94440c.js}

@@ -8,58 +8,62 @@ globalThis.debug = text => {
   if (globalThis.DEBUG) console.log('\x1b[34m\x1b[1m%s', text, '\x1b[0m'); // bright blue
 };
 
-class LittlePubSub {
-    subscribers = {};
-    verbose;
-    constructor(verbose) {
-        this.verbose = verbose;
-    }
-    _handleContext(handler, context) {
-        if (typeof context === 'undefined') {
-            context = handler;
-        }
-        return context;
-    }
-    hasSubscribers(event) {
-        return this.subscribers[event] ? true : false;
-    }
-    subscribe(event, handler, context) {
-        if (!this.hasSubscribers(event))
-            this.subscribers[event] = { handlers: [], value: undefined };
-        context = this._handleContext(handler, context);
-        this.subscribers[event].handlers.push(handler.bind(context));
-    }
-    unsubscribe(event, handler, context) {
-        if (!this.hasSubscribers(event))
-            return;
-        context = this._handleContext(handler, context);
-        const index = this.subscribers[event].handlers.indexOf(handler.bind(context));
-        this.subscribers[event].handlers.splice(index);
-        if (this.subscribers[event].handlers.length === 0)
-            delete this.subscribers[event];
-    }
-    publish(event, value) {
-        // always set value even when having no subscribers
-        if (!this.hasSubscribers(event))
-            this.subscribers[event] = {
-                handlers: []
-            };
-        const oldValue = this.subscribers[event]?.value;
-        this.subscribers[event].value = value;
-        if (this.verbose || oldValue !== value)
-            for (const handler of this.subscribers[event].handlers) {
-                handler(value, oldValue);
-            }
-    }
-    once(event) {
-        return new Promise((resolve) => {
-            const cb = (value) => {
-                this.unsubscribe(event, cb);
-                resolve(value);
-            };
-            this.subscribe(event, cb);
-        });
-    }
+class LittlePubSub {
+    subscribers = {};
+    verbose;
+    constructor(verbose) {
+        this.verbose = verbose;
+    }
+    _handleContext(handler, context) {
+        if (typeof context === 'undefined') {
+            context = handler;
+        }
+        return context;
+    }
+    hasSubscribers(event) {
+        return this.subscribers[event] ? true : false;
+    }
+    subscribe(event, handler, context) {
+        if (!this.hasSubscribers(event))
+            this.subscribers[event] = { handlers: [], value: undefined };
+        context = this._handleContext(handler, context);
+        this.subscribers[event].handlers.push(handler.bind(context));
+    }
+    unsubscribe(event, handler, context) {
+        if (!this.hasSubscribers(event))
+            return;
+        context = this._handleContext(handler, context);
+        const index = this.subscribers[event].handlers.indexOf(handler.bind(context));
+        this.subscribers[event].handlers.splice(index);
+        if (this.subscribers[event].handlers.length === 0)
+            delete this.subscribers[event];
+    }
+    publish(event, value, verbose) {
+        // always set value even when having no subscribers
+        if (!this.hasSubscribers(event))
+            this.subscribers[event] = {
+                handlers: []
+            };
+        const oldValue = this.subscribers[event]?.value;
+        if (this.verbose || verbose || oldValue !== value) {
+            this.subscribers[event].value = value;
+            for (const handler of this.subscribers[event].handlers) {
+                handler(value, oldValue);
+            }
+        }
+    }
+    publishVerbose(event, value) {
+        this.publish(event, value, true);
+    }
+    once(event) {
+        return new Promise((resolve) => {
+            const cb = (value) => {
+                resolve(value);
+                this.unsubscribe(event, cb);
+            };
+            this.subscribe(event, cb);
+        });
+    }
 }
 
 // base-x encoding / decoding
@@ -27088,7 +27092,7 @@ class Identity {
             this.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-2836cc96.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-687f692b.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));
@@ -27279,7 +27283,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-554d2a85.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-1c117282.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -27489,14 +27493,14 @@ class Peernet {
         }
         globalThis.debug(`star ${id} left`);
     };
-    #peerLeft(peer, star) {
+    #peerLeft = (peer, star) => {
         const id = peer.peerId || peer;
         if (this.#connections[id]) {
             this.#connections[id].destroy();
             delete this.#connections[id];
         }
         globalThis.debug(`peer ${id} left`);
-    }
+    };
     #createRTCPeerConnection = (peerId, star, version, initiator = false) => {
         const peer = new Peer({
             initiator: initiator,
@@ -27514,8 +27518,7 @@ class Peernet {
     #peerJoined = async ({ peerId, version }, star) => {
         // check if peer rejoined before the previous connection closed
         if (this.#connections[peerId]) {
-            if (this.#connections[peerId].connected)
-                this.#connections[peerId].destroy();
+            this.#connections[peerId].destroy();
             delete this.#connections[peerId];
         }
         // RTCPeerConnection
@@ -27553,28 +27556,38 @@ class Peernet {
     };
     #peerClose = (peer) => {
         if (this.#connections[peer.peerId]) {
-            this.#connections[peer.peerId].destroy();
+            peer.destroy();
             delete this.#connections[peer.peerId];
         }
         globalThis.debug(`closed ${peer.peerId}'s connection`);
     };
     #peerConnect = (peer) => {
         globalThis.debug(`${peer.peerId} connected`);
-        globalThis.pubsub.publish(this.#connectEvent, peer.peerId);
+        globalThis.pubsub.publishVerbose(this.#connectEvent, peer.peerId);
     };
-    #noticeMessage = (message, id) => {
+    #noticeMessage = (message, id, from, peer) => {
         if (globalThis.pubsub.subscribers[id]) {
-            globalThis.pubsub.publish(id, new Uint8Array(message));
+            globalThis.pubsub.publish(id, {
+                data: new Uint8Array(Object.values(message)),
+                id,
+                from,
+                peer
+            });
         }
         else {
-            globalThis.pubsub.publish('peer:data', new Uint8Array(message));
+            globalThis.pubsub.publish('peer:data', {
+                data: new Uint8Array(Object.values(message)),
+                id,
+                from,
+                peer
+            });
         }
     };
     #peerData = (peer, data) => {
         const { id, size, chunk } = JSON.parse(new TextDecoder().decode(data));
         peer.bw.down += size;
         if (size <= MAX_MESSAGE_SIZE) {
-            this.#noticeMessage(chunk, id);
+            this.#noticeMessage(chunk, id, peer.peerId, peer);
         }
         else {
             if (!this.#messagesToHandle[id])
@@ -27584,7 +27597,7 @@ class Peernet {
                 ...Object.values(chunk)
             ];
             if (this.#messagesToHandle[id].length === Number(size)) {
-                this.#noticeMessage(this.#messagesToHandle[id], id);
+                this.#noticeMessage(this.#messagesToHandle[id], id, peer.peerId, peer);
                 delete this.#messagesToHandle[id];
             }
         }
@@ -27602,7 +27615,7 @@ class Peernet {
             Object.values(this.#connections).map((connection) => connection.destroy()),
             Object.values(this.#stars).map((connection) => connection.close(0))
         ];
-        await Promise.allSettled(promises);
+        return Promise.allSettled(promises);
     }
 };
         /**
@@ -27635,9 +27648,23 @@ class Peernet {
         if (peer.connected) {
             await peer.send(data, id);
             this.bw.up += data.length;
+            return id;
+        }
+        else {
+            return new Promise((resolve, reject) => {
+                const onError = (error) => {
+                    this.removePeer(peer);
+                    reject(error);
+                };
+                peer.once('error', onError);
+                peer.once('connect', async () => {
+                    await peer.send(data, id);
+                    this.bw.up += data.length;
+                    peer.removeListener('error', onError);
+                    resolve(id);
+                });
+            });
         }
-        else
-            this.removePeer(peer);
     }
     async handleDHT(peer, id, proto) {
         let { hash, store } = proto.decoded;

package/exports/browser/peernet.d.ts

@@ -106,7 +106,7 @@ export default class Peernet {
     }, password: string): Promise<Peernet>;
     start(): Promise<void>;
     addRequestHandler(name: any, method: any): void;
-    sendMessage(peer: any, id: any, data: any): Promise<void>;
+    sendMessage(peer: any, id: any, data: any): Promise<any>;
     handleDHT(peer: any, id: any, proto: any): Promise<void>;
     handleData(peer: any, id: any, proto: any): Promise<void>;
     handleRequest(peer: any, id: any, proto: any): Promise<void>;

package/exports/browser/peernet.js

@@ -1,2 +1,2 @@
-export { P as default } from './peernet-509d1c89.js';
+export { P as default } from './peernet-fa94440c.js';
 import './value-4e80eeeb.js';

package/exports/peernet.js

@@ -665,9 +665,23 @@ class Peernet {
         if (peer.connected) {
             await peer.send(data, id);
             this.bw.up += data.length;
+            return id;
+        }
+        else {
+            return new Promise((resolve, reject) => {
+                const onError = (error) => {
+                    this.removePeer(peer);
+                    reject(error);
+                };
+                peer.once('error', onError);
+                peer.once('connect', async () => {
+                    await peer.send(data, id);
+                    this.bw.up += data.length;
+                    peer.removeListener('error', onError);
+                    resolve(id);
+                });
+            });
         }
-        else
-            this.removePeer(peer);
     }
     async handleDHT(peer, id, proto) {
         let { hash, store } = proto.decoded;

package/exports/types/peernet.d.ts

@@ -106,7 +106,7 @@ export default class Peernet {
     }, password: string): Promise<Peernet>;
     start(): Promise<void>;
     addRequestHandler(name: any, method: any): void;
-    sendMessage(peer: any, id: any, data: any): Promise<void>;
+    sendMessage(peer: any, id: any, data: any): Promise<any>;
     handleDHT(peer: any, id: any, proto: any): Promise<void>;
     handleData(peer: any, id: any, proto: any): Promise<void>;
     handleRequest(peer: any, id: any, proto: any): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.1.70",
+  "version": "1.1.72",
   "description": "",
   "main": "src/peernet.js",
   "exports": {

package/src/peernet.ts

@@ -348,7 +348,22 @@ export default class Peernet {
     if (peer.connected) {
       await peer.send(data, id)
       this.bw.up += data.length
-    } else this.removePeer(peer)
+      return id
+    } else {
+      return new Promise((resolve, reject) => {
+        const onError = (error) => {
+          this.removePeer(peer)
+          reject(error)
+        }
+        peer.once('error', onError)
+        peer.once('connect', async () => {
+          await peer.send(data, id)
+          this.bw.up += data.length
+          peer.removeListener('error', onError)
+          resolve(id)
+        })
+      })
+    }
   }
 
   async handleDHT(peer, id, proto) {