@leofcoin/chain 1.7.112 → 1.7.113

package/exports/browser/{client-DgmVTCEc-WVRX01s7.js → client-bgSiSUVr-WviWWZtO.js}

@@ -1,4 +1,4 @@
-import { L as LittlePubSub } from './node-browser-Dk2CzshW.js';
+import { L as LittlePubSub } from './node-browser-B7Z9OIT2.js';
 import './identity-Cn0iQbY3-CeW0giQS.js';
 import './index-DUfUgiQY.js';
 
@@ -428,7 +428,6 @@ class Client {
     #connections = {};
     #stars = {};
     #starListeners = {};
-    #handlersSetup = false;
     #reinitLock = null;
     #connectEvent = 'peer:connected';
     #retryOptions = { retries: 5, factor: 2, minTimeout: 1000, maxTimeout: 30000 };
@@ -451,15 +450,6 @@ class Client {
     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,
@@ -486,7 +476,6 @@ class Client {
             debug('reinit: start');
             try {
                 await this.close();
-                // clear internal maps so setupStar starts fresh
                 this.#stars = {};
                 this.#connections = {};
                 for (const star of this.starsConfig) {
@@ -495,8 +484,7 @@ class Client {
                     }
                     catch (e) {
                         // If last star fails and none connected, surface error
-                        if (this.starsConfig.indexOf(star) === this.starsConfig.length - 1 &&
-                            Object.keys(this.#stars).length === 0)
+                        if (Object.keys(this.#stars).length === 0)
                             throw new Error(`No star available to connect`);
                     }
                 }
@@ -538,7 +526,6 @@ class Client {
         throw lastErr;
     }
     async _init() {
-        // reconnectJob()
         if (!globalThis.RTCPeerConnection)
             globalThis.wrtc = (await import('./browser-Cjcx-T47-D0KbGYCz.js').then(function (n) { return n.b; })).default;
         for (const star of this.starsConfig) {
@@ -561,8 +548,6 @@ class Client {
         else {
             globalThis.addEventListener('beforeunload', this.close.bind(this));
         }
-        // Setup resume/sleep detection so we can reinit connections after wake
-        this._setupResumeHandler();
     }
     setupStarListeners(starConnection, starId) {
         // create stable references to handlers so we can unsubscribe later
@@ -584,46 +569,6 @@ class Client {
             { topic: 'signal', handler: onSignal }
         ];
     }
-    _setupResumeHandler() {
-        if (this.#handlersSetup)
-            return;
-        this.#handlersSetup = true;
-        const THRESHOLD = 10 * 1000; // 10s gap indicates sleep/wake
-        let last = Date.now();
-        const check = () => {
-            const now = Date.now();
-            const delta = now - last;
-            last = now;
-            if (delta > THRESHOLD) {
-                debug(`resume detected (gap ${delta}ms)`);
-                this.reinit().catch((e) => debug('reinit error', e));
-            }
-        };
-        // Start interval checker
-        const iv = setInterval(check, 2000);
-        // Browser specific events
-        if (typeof document !== 'undefined' && document.addEventListener) {
-            document.addEventListener('visibilitychange', () => {
-                if (document.visibilityState === 'visible') {
-                    // small delay to let timers update
-                    setTimeout(() => check(), 50);
-                }
-            });
-            window.addEventListener('online', () => setTimeout(() => check(), 50));
-        }
-        // Node: listen for SIGCONT (process continued) as well
-        if (globalThis.process?.on) {
-            try {
-                process.on('SIGCONT', () => setTimeout(() => check(), 50));
-            }
-            catch (e) {
-                // ignore
-            }
-        }
-        // keep reference so it can be cleared on close
-        // @ts-ignore
-        this._resumeInterval = iv;
-    }
     #starJoined = (id) => {
         if (this.#stars[id]) {
             this.#stars[id].close(0);
@@ -719,6 +664,7 @@ class Client {
             debug(`peer ${from} already connected`);
             return;
         }
+        // peer.channels[channelName]
         if (String(peer.channelName) !== String(channelName)) {
             console.warn(`channelNames don't match: got ${peer.channelName}, expected: ${channelName}.`);
             // Destroy the existing peer connection
@@ -742,7 +688,8 @@ class Client {
                 to: peer.peerId,
                 channelName: peer.channelName,
                 version,
-                signal
+                signal,
+                initiator: peer.initiator
             }
         });
     };
@@ -799,35 +746,30 @@ class Client {
         peer.destroy();
     };
     async close() {
-        // clear resume interval if set
-        // @ts-ignore
-        if (this._resumeInterval) {
-            // @ts-ignore
-            clearInterval(this._resumeInterval);
-            // @ts-ignore
-            this._resumeInterval = null;
+        for (const peerId in this.#connections) {
+            const peer = this.#connections[peerId];
+            if (peer) {
+                peer.destroy();
+                delete this.#connections[peerId];
+            }
         }
         for (const star in this.#stars) {
-            if (this.#stars[star].connectionState() === 'open') {
-                await this.#stars[star].send({ url: 'leave', params: this.peerId });
-                // unsubscribe handlers we registered earlier
-                const listeners = this.#starListeners[star];
-                if (listeners && listeners.length) {
-                    for (const { topic, handler } of listeners) {
-                        try {
-                            this.#stars[star].pubsub.unsubscribe(topic, handler);
-                        }
-                        catch (e) {
-                            // ignore
-                        }
+            // unsubscribe handlers we registered earlier
+            const listeners = this.#starListeners[star];
+            if (listeners && listeners.length) {
+                for (const { topic, handler } of listeners) {
+                    try {
+                        this.#stars[star].pubsub.unsubscribe(topic, handler);
+                    }
+                    catch (e) {
+                        // ignore
                     }
                 }
             }
+            if (this.#stars[star].connectionState() === 'open') {
+                await this.#stars[star].send({ url: 'leave', params: this.peerId });
+            }
         }
-        // Ensure we wait for all peer and star close/destroy operations.
-        // Previous code passed an array of arrays to Promise.allSettled which
-        // resolves immediately; flatten into a single array of promises (or
-        // values) so we actually wait for async close operations.
         const peerClosers = Object.values(this.#connections).map((connection) => {
             try {
                 // destroy() may be sync or return a promise

package/exports/browser/{messages-Bx4w-Pqo-DSXPMvjy.js → messages-C3VxYRj3-pcgSwlQ_.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-Dk2CzshW.js';
+import { F as FormatInterface } from './node-browser-B7Z9OIT2.js';
 import './identity-Cn0iQbY3-CeW0giQS.js';
 import './index-DUfUgiQY.js';
 

package/exports/browser/{node-browser-Dk2CzshW.js → node-browser-B7Z9OIT2.js}

@@ -8490,7 +8490,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-Bx4w-Pqo-DSXPMvjy.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-C3VxYRj3-pcgSwlQ_.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -8584,7 +8584,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-DgmVTCEc-WVRX01s7.js');
+        const importee = await import('./client-bgSiSUVr-WviWWZtO.js');
         /**
          * @access public
          * @type {PeernetClient}

package/exports/browser/node-browser.js

@@ -1,3 +1,3 @@
-export { N as default } from './node-browser-Dk2CzshW.js';
+export { N as default } from './node-browser-B7Z9OIT2.js';
 import './identity-Cn0iQbY3-CeW0giQS.js';
 import './index-DUfUgiQY.js';

package/exports/browser/workers/block-worker.js

@@ -1,33 +1,23 @@
 import { E as EasyWorker, B as BlockMessage } from './worker-CPvGlmOu-CPvGlmOu.js';
 
 const worker = new EasyWorker();
-
 globalThis.BigNumber = BigNumber;
 globalThis.contracts = {};
-
 const run = async (blocks) => {
-  blocks = await Promise.all(blocks.map((block) => new BlockMessage(block)));
-  blocks = blocks.sort((a, b) => a.decoded.timestamp - b.decoded.timestamp);
-
-  blocks = await Promise.all(
-    blocks.map(
-      (block) =>
-        new Promise(async (resolve, reject) => {
-          // todo: tx worker or nah?
-          await block.encode();
-          const size = block.encoded.length || block.encoded.byteLength;
-          const hash = await block.hash();
-          const index = block.decoded.index;
-          resolve({ ...block.decoded, hash, blockInfo: { hash, size, index } });
-        })
-    )
-  );
-  return blocks
+    blocks = await Promise.all(blocks.map((block) => new BlockMessage(block)));
+    blocks = blocks.sort((a, b) => a.decoded.timestamp - b.decoded.timestamp);
+    blocks = await Promise.all(blocks.map((block) => new Promise(async (resolve, reject) => {
+        // todo: tx worker or nah?
+        await block.encode();
+        const size = block.encoded.length || block.encoded.byteLength;
+        const hash = await block.hash();
+        const index = block.decoded.index;
+        resolve({ ...block.decoded, hash, blockInfo: { hash, size, index } });
+    })));
+    return blocks;
 };
-
 const tasks = async (blocks) => {
-  blocks = await run(blocks);
-  worker.postMessage(blocks);
+    blocks = await run(blocks);
+    worker.postMessage(blocks);
 };
-
 worker.onmessage((data) => tasks(data));

package/exports/workers/block-worker.js

@@ -1,33 +1,23 @@
 import { E as EasyWorker, B as BlockMessage } from './worker-CPvGlmOu-CPvGlmOu.js';
 
 const worker = new EasyWorker();
-
 globalThis.BigNumber = BigNumber;
 globalThis.contracts = {};
-
 const run = async (blocks) => {
-  blocks = await Promise.all(blocks.map((block) => new BlockMessage(block)));
-  blocks = blocks.sort((a, b) => a.decoded.timestamp - b.decoded.timestamp);
-
-  blocks = await Promise.all(
-    blocks.map(
-      (block) =>
-        new Promise(async (resolve, reject) => {
-          // todo: tx worker or nah?
-          await block.encode();
-          const size = block.encoded.length || block.encoded.byteLength;
-          const hash = await block.hash();
-          const index = block.decoded.index;
-          resolve({ ...block.decoded, hash, blockInfo: { hash, size, index } });
-        })
-    )
-  );
-  return blocks
+    blocks = await Promise.all(blocks.map((block) => new BlockMessage(block)));
+    blocks = blocks.sort((a, b) => a.decoded.timestamp - b.decoded.timestamp);
+    blocks = await Promise.all(blocks.map((block) => new Promise(async (resolve, reject) => {
+        // todo: tx worker or nah?
+        await block.encode();
+        const size = block.encoded.length || block.encoded.byteLength;
+        const hash = await block.hash();
+        const index = block.decoded.index;
+        resolve({ ...block.decoded, hash, blockInfo: { hash, size, index } });
+    })));
+    return blocks;
 };
-
 const tasks = async (blocks) => {
-  blocks = await run(blocks);
-  worker.postMessage(blocks);
+    blocks = await run(blocks);
+    worker.postMessage(blocks);
 };
-
 worker.onmessage((data) => tasks(data));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.7.112",
+  "version": "1.7.113",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -49,7 +49,7 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.8",
+    "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
@@ -69,7 +69,7 @@
     "@leofcoin/messages": "^1.4.40",
     "@leofcoin/multi-wallet": "^3.1.8",
     "@leofcoin/networks": "^1.1.25",
-    "@leofcoin/peernet": "^1.1.101",
+    "@leofcoin/peernet": "^1.1.102",
     "@leofcoin/storage": "^3.5.38",
     "@leofcoin/utils": "^1.1.40",
     "@leofcoin/workers": "^1.5.27",