@leofcoin/peernet 1.0.10 → 1.1.0

package/BREAKING_CHANGES.md

@@ -0,0 +1,35 @@
+# breaking changes
+## 1.0.10
+### start
+#### before
+```js
+const node = await new Node()
+```
+
+#### now
+```js
+const node = await new Node()
+// gives time to setup things...
+await node.start()
+```
+
+## 1.1.0
+### autoStart
+#### before
+```js
+const node = await new Node()
+// gives time to setup things...
+await node.start()
+```
+
+#### now
+```js
+const node = await new Node()
+```
+or
+
+```js
+const node = await new Node({autoStart: false}) // defaults to true
+// gives time to setup things...
+await node.start()
+```

package/README.md

@@ -11,7 +11,9 @@ const config = {
   stars: ['wss://peach.leofcoin.org']
 }
 
-await new Peernet(config)
+const node = await new Peernet(config)
+// ... setup some things
+await node.start()
 
 console.log(globalThis.peernet)
 ```

package/exports/browser/{client-bbd6e332.js → client-ff436f6a.js}

@@ -1,4 +1,4 @@
-import { L as LittlePubSub } from './peernet-7ba6837f.js';
+import { L as LittlePubSub } from './peernet-4aaa825c.js';
 import './value-157ab062.js';
 
 var clientApi = _pubsub => {
@@ -235,6 +235,9 @@ class Peer {
     #chunkSize = 16 * 1024; // 16384
     #queRunning = false;
     #MAX_BUFFERED_AMOUNT = 16 * 1024 * 1024;
+    initiator = false;
+    state;
+    #makingOffer = false;
     get connection() {
         return this.#connection;
     }
@@ -247,7 +250,7 @@ class Peer {
     /**
      * @params {Object} options
      * @params {string} options.channelName - this peerid : otherpeer id
-     */
+    */
     constructor(options = {}) {
         this._in = this._in.bind(this);
         this.offerOptions = options.offerOptions;
@@ -375,6 +378,69 @@ class Peer {
                     credential: "openrelayproject",
                 }];
             this.#connection = new wrtc.RTCPeerConnection({ iceServers });
+            this.#connection.onnegotiationneeded = async () => {
+                try {
+                    this.#makingOffer = true;
+                    await this.#connection.setLocalDescription();
+                    this._sendMessage({ description: this.#connection.localDescription });
+                    this.#makingOffer = false;
+                }
+                catch (err) {
+                    console.error(err);
+                }
+            };
+            this.#connection.oniceconnectionstatechange = () => {
+                if (this.#connection.iceConnectionState === "failed") {
+                    this.#connection.restartIce();
+                }
+            };
+            this.#connection.onconnectionstatechange = () => {
+                switch (this.#connection.connectionState) {
+                    case "new":
+                    case "checking":
+                        this.state = "connecting";
+                        break;
+                    case "connected":
+                        this.state = 'connected';
+                        break;
+                    case "closed":
+                    case "disconnected":
+                        this.state = "disconnected";
+                        break;
+                    case "failed":
+                        this.state = 'failed';
+                        break;
+                    default:
+                        this.state = this.#connection.connectionState;
+                        break;
+                }
+                if (this.state === 'connected') {
+                    this.#connection.ondatachannel = (message) => {
+                        message.channel.onopen = () => {
+                            this.#connected = true;
+                            //  debug(`peer:connected ${this}`)
+                            pubsub.publish('peer:connected', this);
+                        };
+                        message.channel.onclose = () => this.close.bind(this);
+                        message.channel.onmessage = (message) => {
+                            this._handleMessage(this.id, message);
+                        };
+                        this.#channel = message.channel;
+                    };
+                    if (this.initiator) {
+                        this.#channel = this.#connection.createDataChannel('messageChannel');
+                        this.#channel.onopen = () => {
+                            this.#connected = true;
+                            pubsub.publish('peer:connected', this);
+                            // this.#channel.send('hi')
+                        };
+                        this.#channel.onclose = () => this.close.bind(this);
+                        this.#channel.onmessage = (message) => {
+                            this._handleMessage(this.peerId, message);
+                        };
+                    }
+                }
+            };
             this.#connection.onicecandidate = ({ candidate }) => {
                 if (candidate) {
                     this.address = candidate.address;
@@ -386,33 +452,6 @@ class Peer {
             };
             // if (this.initiator) this.#connection.onnegotiationneeded = () => {
             // console.log('create offer');
-            this.#connection.ondatachannel = (message) => {
-                message.channel.onopen = () => {
-                    this.#connected = true;
-                    //  debug(`peer:connected ${this}`)
-                    pubsub.publish('peer:connected', this);
-                };
-                message.channel.onclose = () => this.close.bind(this);
-                message.channel.onmessage = (message) => {
-                    this._handleMessage(this.id, message);
-                };
-                this.#channel = message.channel;
-            };
-            if (this.initiator) {
-                this.#channel = this.#connection.createDataChannel('messageChannel');
-                this.#channel.onopen = () => {
-                    this.#connected = true;
-                    pubsub.publish('peer:connected', this);
-                    // this.#channel.send('hi')
-                };
-                this.#channel.onclose = () => this.close.bind(this);
-                this.#channel.onmessage = (message) => {
-                    this._handleMessage(this.peerId, message);
-                };
-                const offer = await this.#connection.createOffer();
-                await this.#connection.setLocalDescription(offer);
-                this._sendMessage({ 'sdp': this.#connection.localDescription });
-            }
         }
         catch (e) {
             console.log(e);
@@ -449,39 +488,36 @@ class Peer {
             } });
     }
     async _in(message, data) {
-        // message = JSON.parse(message);
-        if (!this.#connection || message.to !== this.id || message.from !== this.#peerId)
-            return;
-        // if (data.videocall) return this._startStream(true, false); // start video and audio stream
-        // if (data.call) return this._startStream(true, true); // start audio stream
-        if (this.#connection?.signalingState === 'stable' && this.#connection?.remoteDescription !== null && this.#connection?.localDescription !== null)
-            return;
-        if (message.candidate) {
-            // debug(`incoming candidate ${this.#channelName}`)
-            // debug(message.candidate.candidate)
-            this.remoteAddress = message.candidate.address;
-            this.remotePort = message.candidate.port;
-            this.remoteProtocol = message.candidate.protocol;
-            this.remoteIpFamily = this.remoteAddress?.includes('::') ? 'ipv6' : 'ipv4';
-            return this.#connection.addIceCandidate(new wrtc.RTCIceCandidate(message.candidate));
-        }
+        let ignoreOffer = false;
         try {
-            if (message.sdp) {
-                if (message.sdp.type === 'offer') {
-                    // debug(`incoming offer ${this.#channelName}`)
-                    await this.#connection.setRemoteDescription(new wrtc.RTCSessionDescription(message.sdp));
-                    const answer = await this.#connection.createAnswer();
-                    await this.#connection.setLocalDescription(answer);
-                    this._sendMessage({ 'sdp': this.#connection.localDescription });
+            if (message.description) {
+                const offerCollision = message.description.type === "offer" &&
+                    (this.#makingOffer || this.#connection.signalingState !== "stable");
+                ignoreOffer = this.initiator && offerCollision;
+                if (ignoreOffer) {
+                    return;
+                }
+                await this.#connection.setRemoteDescription(message.description);
+                if (message.description.type === "offer") {
+                    await this.#connection.setLocalDescription();
+                    this._sendMessage({ description: this.#connection.localDescription });
+                }
+            }
+            else if (message.candidate) {
+                try {
+                    await this.#connection.addIceCandidate(message.candidate);
                 }
-                if (message.sdp.type === 'answer') {
-                    // debug(`incoming answer ${this.#channelName}`)
-                    await this.#connection.setRemoteDescription(new wrtc.RTCSessionDescription(message.sdp));
+                catch (err) {
+                    if (!ignoreOffer) {
+                        throw err;
+                    }
                 }
             }
         }
         catch (e) {
+            pubsub.publish('connection closed', this);
             console.log(e);
+            this.close();
         }
     }
     close() {
@@ -539,12 +575,18 @@ class Client {
                     throw new Error(`No star available to connect`);
             }
         }
+        this.setupListeners();
         const peers = await this.socketClient.peernet.join({ id: this.id });
         for (const id of peers) {
             if (id !== this.id && !this.#connections[id])
                 this.#connections[id] = await new Peer({ channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id });
         }
-        this.setupListeners();
+        pubsub.subscribe('connection closed', (peer) => {
+            this.removePeer(peer.peerId);
+            setTimeout(() => {
+                this.peerJoined(peer.peerId);
+            }, 1000);
+        });
     }
     setupListeners() {
         this.socketClient.subscribe('peer:joined', this.peerJoined);
@@ -581,15 +623,10 @@ class Client {
                     this.setupListeners();
                     for (const id of peers) {
                         if (id !== this.id) {
-                            // close connection
-                            if (this.#connections[id]) {
-                                if (this.#connections[id].connected)
-                                    await this.#connections[id].close();
-                                delete this.#connections[id];
+                            if (!this.#connections[id]) {
+                                if (id !== this.id)
+                                    this.#connections[id] = await new Peer({ channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id });
                             }
-                            // reconnect
-                            if (id !== this.id)
-                                this.#connections[id] = await new Peer({ channelName: `${id}:${this.id}`, socketClient: this.socketClient, id: this.id, to: id, peerId: id });
                         }
                     }
                 }

package/exports/browser/{index-84ee0e0b.js → index-c0652eae.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-7ba6837f.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './peernet-4aaa825c.js';
 import './value-157ab062.js';
 
 /**

package/exports/browser/{messages-def41fbf.js → messages-0fcc3d4e.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './peernet-7ba6837f.js';
+import { F as FormatInterface } from './peernet-4aaa825c.js';
 import './value-157ab062.js';
 
 var proto$b = {

package/exports/browser/{peernet-7ba6837f.js → peernet-4aaa825c.js}

@@ -16082,7 +16082,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-84ee0e0b.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-c0652eae.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));
@@ -16143,6 +16143,9 @@ class Peernet {
     stars;
     networkVersion;
     bw;
+    autoStart = true;
+    #starting = false;
+    #started = false;
     /**
      * @access public
      * @param {Object} options
@@ -16161,6 +16164,7 @@ class Peernet {
          * @property {String} network - current network
          */
         this.network = options.network || 'leofcoin';
+        this.autoStart = options.autoStart === undefined ? true : options.autoStart;
         this.stars = options.stars;
         const parts = this.network.split(':');
         this.networkVersion = options.networkVersion || parts.length > 1 ? parts[1] : 'mainnet';
@@ -16248,7 +16252,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-def41fbf.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-0fcc3d4e.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -16297,12 +16301,6 @@ class Peernet {
          * @see DataHandler
          */
         pubsub.subscribe('peer:data', dataHandler);
-        const importee = await import('./client-bbd6e332.js');
-        /**
-         * @access public
-         * @type {PeernetClient}
-         */
-        this.client = new importee.default(this.id, this.networkVersion, this.stars);
         if (globalThis.navigator) {
             globalThis.addEventListener('beforeunload', async () => this.client.close());
         }
@@ -16313,8 +16311,23 @@ class Peernet {
                 process.exit();
             });
         }
+        if (this.autoStart)
+            await this.start();
         return this;
     }
+    async start() {
+        if (this.#starting || this.#started)
+            return;
+        this.#starting = true;
+        const importee = await import('./client-ff436f6a.js');
+        /**
+         * @access public
+         * @type {PeernetClient}
+         */
+        this.client = new importee.default(this.id, this.networkVersion, this.stars);
+        this.#started = true;
+        this.#starting = false;
+    }
     addRequestHandler(name, method) {
         this.requestProtos[name] = method;
     }

package/exports/browser/peernet.js

@@ -1,2 +1,2 @@
-export { P as default } from './peernet-7ba6837f.js';
+export { P as default } from './peernet-4aaa825c.js';
 import './value-157ab062.js';

package/exports/peernet.js

@@ -401,6 +401,9 @@ class Peernet {
     stars;
     networkVersion;
     bw;
+    autoStart = true;
+    #starting = false;
+    #started = false;
     /**
      * @access public
      * @param {Object} options
@@ -419,6 +422,7 @@ class Peernet {
          * @property {String} network - current network
          */
         this.network = options.network || 'leofcoin';
+        this.autoStart = options.autoStart === undefined ? true : options.autoStart;
         this.stars = options.stars;
         const parts = this.network.split(':');
         this.networkVersion = options.networkVersion || parts.length > 1 ? parts[1] : 'mainnet';
@@ -555,12 +559,6 @@ class Peernet {
          * @see DataHandler
          */
         pubsub.subscribe('peer:data', dataHandler);
-        const importee = await import('@leofcoin/peernet-swarm/client');
-        /**
-         * @access public
-         * @type {PeernetClient}
-         */
-        this.client = new importee.default(this.id, this.networkVersion, this.stars);
         if (globalThis.navigator) {
             globalThis.addEventListener('beforeunload', async () => this.client.close());
         }
@@ -571,8 +569,23 @@ class Peernet {
                 process.exit();
             });
         }
+        if (this.autoStart)
+            await this.start();
         return this;
     }
+    async start() {
+        if (this.#starting || this.#started)
+            return;
+        this.#starting = true;
+        const importee = await import('@leofcoin/peernet-swarm/client');
+        /**
+         * @access public
+         * @type {PeernetClient}
+         */
+        this.client = new importee.default(this.id, this.networkVersion, this.stars);
+        this.#started = true;
+        this.#starting = false;
+    }
     addRequestHandler(name, method) {
         this.requestProtos[name] = method;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.0.10",
+  "version": "1.1.0",
   "description": "",
   "main": "src/peernet.js",
   "exports": {
@@ -29,7 +29,7 @@
     "@leofcoin/generate-account": "^2.0.0",
     "@leofcoin/identity-utils": "^1.0.0",
     "@leofcoin/multi-wallet": "^3.0.1",
-    "@leofcoin/peernet-swarm": "^0.5.0",
+    "@leofcoin/peernet-swarm": "^1.0.0",
     "@leofcoin/storage": "^3.0.0",
     "@types/node": "^18.11.18",
     "@vandeurenglenn/base32": "^1.1.0",

package/src/peernet.ts

@@ -43,6 +43,10 @@ export default class Peernet {
     up: number
     down: number
   }
+  autoStart: boolean = true
+  #starting: boolean = false
+  #started: boolean = false
+
   /**
    * @access public
    * @param {Object} options
@@ -56,11 +60,12 @@ export default class Peernet {
    * @example
    * const peernet = new Peernet({network: 'leofcoin', root: '.leofcoin'});
    */
-  constructor(options: options, password) {
+  constructor(options, password) {
     /**
      * @property {String} network - current network
      */
     this.network = options.network || 'leofcoin'
+    this.autoStart = options.autoStart === undefined ? true : options.autoStart
     this.stars = options.stars
     const parts = this.network.split(':')
     this.networkVersion = options.networkVersion || parts.length > 1 ? parts[1] : 'mainnet'
@@ -235,13 +240,6 @@ export default class Peernet {
      */
     pubsub.subscribe('peer:data', dataHandler)
 
-
-    const importee = await import('@leofcoin/peernet-swarm/client')
-    /**
-     * @access public
-     * @type {PeernetClient}
-     */
-    this.client = new importee.default(this.id, this.networkVersion, this.stars)
     if (globalThis.navigator) {
       globalThis.addEventListener('beforeunload', async () => this.client.close());
     } else {
@@ -251,9 +249,24 @@ export default class Peernet {
         process.exit()
       });
     }
+    if (this.autoStart) await this.start()
     return this
   }
 
+  async start() {
+    if (this.#starting || this.#started) return
+
+    this.#starting = true
+    const importee = await import('@leofcoin/peernet-swarm/client')
+    /**
+     * @access public
+     * @type {PeernetClient}
+     */
+    this.client = new importee.default(this.id, this.networkVersion, this.stars)
+    this.#started = true
+    this.#starting = false
+  }
+
   addRequestHandler(name, method) {
     this.requestProtos[name] = method
   }