@leofcoin/peernet 1.1.82 → 1.1.83

package/exports/browser/{browser-DQJ6xf_F.js → browser-BogfGRzB.js}

@@ -1,4 +1,4 @@
-import { g as getDefaultExportFromCjs } from './identity-CQ_ieRiz.js';
+import { g as getDefaultExportFromCjs } from './identity--VAIVSMm.js';
 
 var global;
 var hasRequiredGlobal;
@@ -44,81 +44,9 @@ function requireGlobal () {
 	return global;
 }
 
-var name = "websocket";
-var description = "Websocket Client & Server Library implementing the WebSocket protocol as specified in RFC 6455.";
-var keywords = [
-	"websocket",
-	"websockets",
-	"socket",
-	"networking",
-	"comet",
-	"push",
-	"RFC-6455",
-	"realtime",
-	"server",
-	"client"
-];
-var author = "Brian McKelvey <theturtle32@gmail.com> (https://github.com/theturtle32)";
-var contributors = [
-	"Iñaki Baz Castillo <ibc@aliax.net> (http://dev.sipdoc.net)"
-];
 var version$1 = "1.0.35";
-var repository = {
-	type: "git",
-	url: "https://github.com/theturtle32/WebSocket-Node.git"
-};
-var homepage = "https://github.com/theturtle32/WebSocket-Node";
-var engines = {
-	node: ">=4.0.0"
-};
-var dependencies = {
-	bufferutil: "^4.0.1",
-	debug: "^2.2.0",
-	"es5-ext": "^0.10.63",
-	"typedarray-to-buffer": "^3.1.5",
-	"utf-8-validate": "^5.0.2",
-	yaeti: "^0.0.6"
-};
-var devDependencies = {
-	"buffer-equal": "^1.0.0",
-	gulp: "^4.0.2",
-	"gulp-jshint": "^2.0.4",
-	"jshint-stylish": "^2.2.1",
-	jshint: "^2.0.0",
-	tape: "^4.9.1"
-};
-var config = {
-	verbose: false
-};
-var scripts = {
-	test: "tape test/unit/*.js",
-	gulp: "gulp"
-};
-var main = "index";
-var directories = {
-	lib: "./lib"
-};
-var browser$3 = "lib/browser.js";
-var license = "Apache-2.0";
 var require$$0 = {
-	name: name,
-	description: description,
-	keywords: keywords,
-	author: author,
-	contributors: contributors,
-	version: version$1,
-	repository: repository,
-	homepage: homepage,
-	engines: engines,
-	dependencies: dependencies,
-	devDependencies: devDependencies,
-	config: config,
-	scripts: scripts,
-	main: main,
-	directories: directories,
-	browser: browser$3,
-	license: license
-};
+	version: version$1};
 
 var version = require$$0.version;
 

package/exports/browser/browser-store.js

@@ -1,30 +1,39 @@
 import { K as KeyPath, a as KeyValue } from './value-C3vAp-wb.js';
 
-if (!globalThis.DEBUG) {
-  let DEBUG = [];
-  if (globalThis.localStorage) {
-    DEBUG = globalThis.localStorage.getItem('DEBUG');
-    globalThis.DEBUG = DEBUG ? DEBUG.split(',') : [DEBUG];
-  }
-}
-
-const debug$1 = (target, text) => {
-  if (!globalThis.DEBUG && globalThis.DEBUG.length === 0) return;
-  if (
-    globalThis.DEBUG === 'true' ||
-    globalThis.DEBUG === true ||
-    globalThis.DEBUG?.indexOf(target) !== -1 ||
-    globalThis.DEBUG?.indexOf('*') !== -1 ||
-    globalThis.DEBUG?.indexOf(target.split('/')[0]) !== -1
-  )
-    if (text) console.log('\x1b[34m\x1b[1m%s', `${target}: ${text}`, '\x1b[0m');
-    else console.log('\x1b[34m\x1b[1m%s', `${target}`, '\x1b[0m');
-};
-
-if (!globalThis.debug) {
-  globalThis.debug = debug$1;
-
-  globalThis.createDebugger = (target) => (text) => debug$1(target, text);
+if (!globalThis.DEBUG) {
+  globalThis.DEBUG = [];
+  if (globalThis.localStorage) {
+    const DEBUG = globalThis.localStorage.getItem("DEBUG");
+    if (DEBUG) {
+      globalThis.DEBUG = DEBUG.startsWith("[")
+        ? JSON.parse(DEBUG).split(",")
+        : [DEBUG];
+    }
+  }
+}
+
+const getLogger = (trace) => (trace ? console.trace : console.log);
+
+const debug$1 = (target, text, trace) => {
+  const _logger = getLogger(trace);
+  if (!globalThis.DEBUG || globalThis.DEBUG?.length === 0) return;
+  if (
+    globalThis.DEBUG === "true" ||
+    globalThis.DEBUG === true ||
+    globalThis.DEBUG?.indexOf(target) !== -1 ||
+    globalThis.DEBUG?.indexOf("*") !== -1 ||
+    globalThis.DEBUG?.indexOf(target.split("/")[0]) !== -1
+  )
+    if (text) _logger("\x1b[34m\x1b[1m%s", `${target}: ${text}`, "\x1b[0m");
+    else _logger("\x1b[34m\x1b[1m%s", `${target}`, "\x1b[0m");
+};
+
+const createDebugger = (target) => (text) => debug$1(target, text);
+
+if (!globalThis.debug) {
+  globalThis.debug = debug$1;
+  // todo: deprecate
+  globalThis.createDebugger = createDebugger;
 }
 
 const debug = globalThis.createDebugger('leofcoin/storage');
@@ -80,15 +89,9 @@ class BrowerStore {
         }
     }
     async get(key) {
-        let promiseResolve;
-        let promiseReject;
-        let result = new Promise((resolve, reject) => {
-            promiseResolve = resolve;
-            promiseReject = reject;
-        });
-        const promise = () => new Promise(async (resolve, reject) => {
-            debug(`get ${this.toKeyPath(key)}`);
-            setTimeout(async () => {
+        return new Promise((resolve, reject) => {
+            const task = async () => {
+                debug(`get ${this.toKeyPath(key)}`);
                 try {
                     let handle = await this.db.getFileHandle(this.toKeyPath(key));
                     let readBuffer;
@@ -109,30 +112,20 @@ class BrowerStore {
                         const file = await handle.getFile();
                         readBuffer = await file.arrayBuffer();
                     }
-                    this.runQueue();
-                    promiseResolve(new Uint8Array(readBuffer));
                     resolve(new Uint8Array(readBuffer));
                 }
                 catch (error) {
-                    promiseReject(error);
-                    resolve(false);
+                    reject(error);
                 }
-            }, 1);
+            };
+            this.queue.push(task);
+            this.runQueue();
         });
-        this.queue.push(promise);
-        this.runQueue();
-        return result;
     }
     async put(key, value) {
-        let promiseResolve;
-        let promiseReject;
-        let result = new Promise((resolve, reject) => {
-            promiseResolve = resolve;
-            promiseReject = reject;
-        });
-        const promise = () => new Promise(async (resolve, reject) => {
-            debug(`put ${this.toKeyPath(key)}`);
-            setTimeout(async () => {
+        return new Promise((resolve, reject) => {
+            const task = async () => {
+                debug(`put ${this.toKeyPath(key)}`);
                 try {
                     let handle = await this.db.getFileHandle(this.toKeyPath(key), { create: true });
                     let writeable;
@@ -144,22 +137,17 @@ class BrowerStore {
                     else {
                         writeable = await handle.createWritable();
                     }
-                    ;
-                    (await writeable).write(this.toKeyValue(value));
-                    (await writeable).close();
-                    this.runQueue();
+                    await (await writeable).write(this.toKeyValue(value));
+                    await (await writeable).close();
                     resolve(true);
-                    promiseResolve(true);
                 }
                 catch (error) {
-                    promiseReject(error);
-                    resolve(false);
+                    reject(error);
                 }
-            }, 5);
+            };
+            this.queue.push(task);
+            this.runQueue();
         });
-        this.queue.push(promise);
-        this.runQueue();
-        return result;
     }
     async runQueue() {
         if (this.queue.length > 0 && !this.busy) {
@@ -174,24 +162,28 @@ class BrowerStore {
         }
     }
     async delete(key) {
-        debug(`delete ${this.toKeyPath(key)}`);
-        return new Promise(async (resolve, reject) => {
-            try {
-                await this.db.getFileHandle(`${this.toKeyPath(key)}.crswap`);
-                setTimeout(() => resolve(this.delete(key)), 5);
-            }
-            catch (error) {
+        return new Promise((resolve, reject) => {
+            const task = async () => {
+                debug(`delete ${this.toKeyPath(key)}`);
                 try {
-                    await this.db.removeEntry(this.toKeyPath(key));
-                    resolve(true);
+                    await this.db.getFileHandle(`${this.toKeyPath(key)}.crswap`);
+                    setTimeout(() => resolve(this.delete(key)), 5);
                 }
                 catch (error) {
-                    if (error.name === 'NoModificationAllowedError')
-                        setTimeout(() => resolve(this.delete(key)), 5);
-                    else
-                        reject(error);
+                    try {
+                        await this.db.removeEntry(this.toKeyPath(key));
+                        resolve(true);
+                    }
+                    catch (error) {
+                        if (error.name === 'NoModificationAllowedError')
+                            setTimeout(() => resolve(this.delete(key)), 5);
+                        else
+                            reject(error);
+                    }
                 }
-            }
+            };
+            this.queue.push(task);
+            this.runQueue();
         });
     }
     async clear() {
@@ -229,6 +221,18 @@ class BrowerStore {
     async iterate() {
         return this.db.entries();
     }
+    async entries() {
+        let values = [];
+        for await (const [key, cursor] of this.db.entries()) {
+            values.push((async () => {
+                // huh? Outdated typings?
+                // @ts-ignore
+                const file = await cursor.getFile();
+                return [key, new Uint8Array(await file.arrayBuffer())];
+            })());
+        }
+        return Promise.all(values);
+    }
 }
 
 export { BrowerStore as default };

package/exports/browser/{client-C0VVXIWm.js → client-DD7vhDK_.js}

@@ -1,5 +1,5 @@
-import { L as LittlePubSub } from './peernet-DEIKLS2i.js';
-import './identity-CQ_ieRiz.js';
+import { L as LittlePubSub } from './peernet-CuzuXSJb.js';
+import './identity--VAIVSMm.js';
 import './value-C3vAp-wb.js';
 
 class Api {
@@ -210,7 +210,7 @@ class SocketRequestClient {
             const init = async () => {
                 // @ts-ignore
                 if (!globalThis.WebSocket && !this.#experimentalWebsocket)
-                    globalThis.WebSocket = (await import('./browser-DQJ6xf_F.js').then(function (n) { return n.b; })).default.w3cwebsocket;
+                    globalThis.WebSocket = (await import('./browser-BogfGRzB.js').then(function (n) { return n.b; })).default.w3cwebsocket;
                 const client = new WebSocket(this.#url, this.#protocol);
                 if (this.#experimentalWebsocket) {
                     client.addEventListener('error', this.onerror);
@@ -314,7 +314,7 @@ const iceServers = [
         credential: 'openrelayproject'
     }
 ];
-const SimplePeer = (await import('./index-CEwkDK9g.js').then(function (n) { return n.i; })).default;
+const SimplePeer = (await import('./index-Vgr1JQcP.js').then(function (n) { return n.i; })).default;
 class Peer extends SimplePeer {
     peerId;
     channelName;
@@ -391,6 +391,14 @@ class Peer extends SimplePeer {
             this.send(data, id);
         });
     }
+    toJSON() {
+        return {
+            peerId: this.peerId,
+            channelName: this.channelName,
+            version: this.version,
+            bw: this.bw
+        };
+    }
 }
 
 const debug = globalThis.createDebugger('@netpeer/swarm/client');
@@ -538,8 +546,8 @@ class Client {
             this.#connections[peerId].destroy();
             delete this.#connections[peerId];
         }
-        // RTCPeerConnection
-        this.#createRTCPeerConnection(peerId, star, version, true);
+        if (this.peerId !== peerId)
+            this.#createRTCPeerConnection(peerId, star, version, true);
         debug(`peer ${peerId} joined`);
     };
     #inComingSignal = async ({ from, signal, channelName, version }, star) => {
@@ -547,13 +555,28 @@ class Client {
             console.warn(`${from} joined using the wrong version.\nexpected: ${this.version} but got:${version}`);
             return;
         }
+        if (from === this.peerId) {
+            console.warn(`${from} tried to connect to itself.`);
+            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}`);
+        if (peer.connected) {
+            debug(`peer ${from} already connected`);
+            return;
+        }
+        if (String(peer.channelName) !== String(channelName)) {
+            console.warn(`channelNames don't match: got ${peer.channelName}, expected: ${channelName}. Recreating connection.`);
+            // Destroy the existing peer connection
+            peer.destroy();
+            delete this.#connections[from];
+            // Create a new peer connection with the correct configuration
+            this.#createRTCPeerConnection(from, star, version, false);
+            peer = this.#connections[from];
+        }
         peer.signal(signal);
     };
     #peerSignal = (peer, signal, star, version) => {