@leofcoin/peernet 1.1.71 → 1.1.73

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

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

package/exports/browser/{peernet-509d1c89.js → peernet-0298b289.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
@@ -696,7 +700,7 @@ var _nodeResolve_empty$1 = /*#__PURE__*/Object.freeze({
   default: _nodeResolve_empty
 });
 
-var require$$0$1 = /*@__PURE__*/getAugmentedNamespace(_nodeResolve_empty$1);
+var require$$3 = /*@__PURE__*/getAugmentedNamespace(_nodeResolve_empty$1);
 
 bn$1.exports;
 
@@ -755,7 +759,7 @@ bn$1.exports;
 	    if (typeof window !== 'undefined' && typeof window.Buffer !== 'undefined') {
 	      Buffer = window.Buffer;
 	    } else {
-	      Buffer = require$$0$1.Buffer;
+	      Buffer = require$$3.Buffer;
 	    }
 	  } catch (e) {
 	  }
@@ -13467,7 +13471,7 @@ bn.exports;
 	    if (typeof window !== 'undefined' && typeof window.Buffer !== 'undefined') {
 	      Buffer = window.Buffer;
 	    } else {
-	      Buffer = require$$0$1.Buffer;
+	      Buffer = require$$3.Buffer;
 	    }
 	  } catch (e) {
 	  }
@@ -17111,7 +17115,7 @@ if (typeof self === 'object') {
 } else {
   // Node.js or Web worker with no crypto support
   try {
-    var crypto$1 = require$$0$1;
+    var crypto$1 = require$$3;
     if (typeof crypto$1.randomBytes !== 'function')
       throw new Error('Not supported');
 
@@ -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-81687e93.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-cccb78db.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -27373,238 +27377,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = class Client {
-    #peerId;
-    #connections = {};
-    #stars = {};
-    #connectEvent = 'peer:connected';
-    id;
-    networkVersion;
-    starsConfig;
-    socketClient;
-    messageSize = 262144;
-    version;
-    #messagesToHandle = {};
-    get peerId() {
-        return this.#peerId;
-    }
-    get connections() {
-        return { ...this.#connections };
-    }
-    get peers() {
-        return Object.entries(this.#connections);
-    }
-    getPeer(peerId) {
-        return this.#connections[peerId];
-    }
-    /**
-     *
-     * @param options {object}
-     * @param options.peerId {string}
-     * @param options.networkVersion {string}
-     * @param options.version {string}
-     * @param options.stars {string[]}
-     * @param options.connectEvent {string} defaults to peer:connected, can be renamed to handle different protocols, like peer:discovered (setup peer props before fireing the connect event)
-     */
-    constructor(options) {
-        const { peerId, networkVersion, version, connectEvent, stars } = {
-            ...defaultOptions,
-            ...options
-        };
-        this.#peerId = peerId;
-        this.networkVersion = networkVersion;
-        this.version = version;
-        this.#connectEvent = connectEvent;
-        this.starsConfig = stars;
-        this._init();
-    }
-    async _init() {
-        // reconnectJob()
-        if (!globalThis.RTCPeerConnection)
-            globalThis.wrtc = (await import('./browser-2c73e2ef.js').then(function (n) { return n.b; })).default;
-        for (const star of this.starsConfig) {
-            try {
-                const client = new SocketRequestClient(star, this.networkVersion);
-                this.#stars[star] = await client.init();
-                this.setupStarListeners(this.#stars[star]);
-                this.#stars[star].send({
-                    url: 'join',
-                    params: { version: this.version, peerId: this.peerId }
-                });
-            }
-            catch (e) {
-                if (this.starsConfig.indexOf(star) === this.starsConfig.length - 1 &&
-                    !this.socketClient)
-                    throw new Error(`No star available to connect`);
-            }
-        }
-        if (globalThis.navigator) {
-            globalThis.addEventListener('beforeunload', async () => this.close());
-        }
-        else {
-            process.on('SIGINT', async () => {
-                process.stdin.resume();
-                await this.close();
-                process.exit();
-            });
-        }
-    }
-    setupStarListeners(star) {
-        star.pubsub.subscribe('peer:joined', (id) => this.#peerJoined(id, star));
-        star.pubsub.subscribe('peer:left', (id) => this.#peerLeft(id, star));
-        star.pubsub.subscribe('star:joined', this.#starJoined);
-        star.pubsub.subscribe('star:left', this.#starLeft);
-        star.pubsub.subscribe('signal', (message) => this.#inComingSignal(message, star));
-    }
-    #starJoined = (id) => {
-        if (this.#stars[id]) {
-            this.#stars[id].close(0);
-            delete this.#stars[id];
-        }
-        console.log(`star ${id} joined`);
-    };
-    #starLeft = async (id) => {
-        if (this.#stars[id]) {
-            this.#stars[id].close(0);
-            delete this.#stars[id];
-        }
-        if (Object.keys(this.#stars).length === 0) {
-            for (const star of this.starsConfig) {
-                try {
-                    const socketClient = await new SocketRequestClient(star, this.networkVersion).init();
-                    if (!socketClient?.client?.OPEN)
-                        return;
-                    this.#stars[star] = socketClient;
-                    this.#stars[star].send({
-                        url: 'join',
-                        params: { peerId: this.peerId, version: this.version }
-                    });
-                    this.setupStarListeners(socketClient);
-                }
-                catch (e) {
-                    if (this.starsConfig.indexOf(star) === this.starsConfig.length - 1)
-                        throw new Error(`No star available to connect`);
-                }
-            }
-        }
-        globalThis.debug(`star ${id} left`);
-    };
-    #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,
-            from: this.peerId,
-            to: peerId,
-            version
-        });
-        peer.on('signal', (signal) => this.#peerSignal(peer, signal, star, this.version));
-        peer.on('connect', () => this.#peerConnect(peer));
-        peer.on('close', () => this.#peerClose(peer));
-        peer.on('data', (data) => this.#peerData(peer, data));
-        peer.on('error', (error) => this.#peerError(peer, error));
-        this.#connections[peerId] = peer;
-    };
-    #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();
-            delete this.#connections[peerId];
-        }
-        // RTCPeerConnection
-        this.#createRTCPeerConnection(peerId, star, version, true);
-        globalThis.debug(`peer ${peerId} joined`);
-    };
-    #inComingSignal = async ({ from, signal, channelName, version }, star) => {
-        if (version !== this.version) {
-            console.warn(`${from} joined using the wrong version.\nexpected: ${this.version} but got:${version}`);
-            return;
-        }
-        let peer = this.#connections[from];
-        if (!peer) {
-            this.#createRTCPeerConnection(from, star, version);
-            peer = this.#connections[from];
-        }
-        if (String(peer.channelName) !== String(channelName))
-            console.warn(`channelNames don't match: got ${peer.channelName}, expected: ${channelName}`);
-        peer.signal(signal);
-    };
-    #peerSignal = (peer, signal, star, version) => {
-        let client = this.#stars[star];
-        if (!client)
-            client = this.#stars[Object.keys(this.#stars)[0]];
-        client.send({
-            url: 'signal',
-            params: {
-                from: this.peerId,
-                to: peer.peerId,
-                channelName: peer.channelName,
-                version,
-                signal
-            }
-        });
-    };
-    #peerClose = (peer) => {
-        if (this.#connections[peer.peerId]) {
-            this.#connections[peer.peerId].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);
-    };
-    #noticeMessage = (message, id) => {
-        if (globalThis.pubsub.subscribers[id]) {
-            globalThis.pubsub.publish(id, new Uint8Array(message));
-        }
-        else {
-            globalThis.pubsub.publish('peer:data', new Uint8Array(message));
-        }
-    };
-    #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);
-        }
-        else {
-            if (!this.#messagesToHandle[id])
-                this.#messagesToHandle[id] = [];
-            this.#messagesToHandle[id] = [
-                ...this.#messagesToHandle[id],
-                ...Object.values(chunk)
-            ];
-            if (this.#messagesToHandle[id].length === Number(size)) {
-                this.#noticeMessage(this.#messagesToHandle[id], id);
-                delete this.#messagesToHandle[id];
-            }
-        }
-    };
-    #peerError = (peer, error) => {
-        console.warn(`Connection error: ${error.message}`);
-        peer.destroy();
-    };
-    async close() {
-        for (const star in this.#stars) {
-            if (this.#stars[star].connectionState() === 'open')
-                await this.#stars[star].send({ url: 'leave', params: this.peerId });
-        }
-        const promises = [
-            Object.values(this.#connections).map((connection) => connection.destroy()),
-            Object.values(this.#stars).map((connection) => connection.close(0))
-        ];
-        await Promise.allSettled(promises);
-    }
-};
+        const importee = await import('./client-f193279c.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -27635,9 +27408,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;
@@ -28064,4 +27851,4 @@ class Peernet {
 }
 globalThis.Peernet = Peernet;
 
-export { FormatInterface as F, MultiWallet as M, Peernet as P, base58$1 as b, encrypt as e };
+export { FormatInterface as F, LittlePubSub as L, MultiWallet as M, Peernet as P, base58$1 as b, commonjsGlobal as c, encrypt as e, getDefaultExportFromCjs as g, inherits_browserExports as i, require$$3 as r };

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-0298b289.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,8 +1,8 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.1.71",
+  "version": "1.1.73",
   "description": "",
-  "main": "src/peernet.js",
+  "browser": "./exports/browser/peernet.js",
   "exports": {
     ".": {
       "import": "./exports/peernet.js",
@@ -66,7 +66,6 @@
     "eslint-plugin-unicorn": "^45.0.1",
     "node-stdlib-browser": "^1.2.0",
     "rollup": "^3.12.0",
-    "rollup-plugin-modify": "^3.0.0",
     "webpack-cli": "^5.0.1"
   }
 }

package/rollup.config.js

@@ -1,10 +1,9 @@
-import resolve, { nodeResolve } from '@rollup/plugin-node-resolve'
+import resolve from '@rollup/plugin-node-resolve'
 import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import wasm from '@rollup/plugin-wasm'
 import rimraf from 'rimraf'
 import typescript from '@rollup/plugin-typescript'
-import modify from 'rollup-plugin-modify'
 
 rimraf.sync('./exports/**')
 
@@ -18,9 +17,6 @@ export default [
     plugins: [
       json(),
       wasm(),
-      modify({
-        "await import('@netpeer/swarm/client')": (await import('@netpeer/swarm/browser')).default.toString()
-      }),
       resolve({
         browser: true,
         preferBuiltins: false,
@@ -41,9 +37,6 @@ export default [
       dir: './exports'
     },
     plugins: [
-      modify({
-        '@netpeer/swarm/client': '@netpeer/swarm/client'
-      }),
       typescript({
         compilerOptions: {
           outDir: './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) {