@leofcoin/peernet 0.14.25 → 0.15.0

package/README.md

@@ -1,10 +1,22 @@
-# socket-discovery
+# peernet
 
 ## Usage
 ```js
-import discovery from 'socket-discovery'
+import Peernet from '@leofcoin/peernet'
+
+
+const config = {
+  network: 'leofcoin:peach',
+  stars: ['wss://peach.leofcoin.org']
+}
+
+await new Peernet(config)
+
+console.log(globalThis.peernet)
 ```
 
+
+
 ## API
 #### addRequestHandler
 
@@ -30,6 +42,12 @@ peernet.addRequestHandler('hello', () => {
 ```
 
 ## Development
+
+`note: you need to install jsproject`
+```sh
+npm i -g @vandeurenglenn/project
+```
+
 ### watch
 ```sh
 npm run w
@@ -43,7 +61,3 @@ npm run c
 npm run demo
 ```
 
-`note: you need to install jsproject`
-```sh
-npm i -g @vandeurenglenn/project
-```

package/dist/browser/peernet-swarm.js

@@ -571,22 +571,18 @@ class Client {
     return Object.entries(this.#connections)
   }
 
-  constructor(id, identifiers = ['peernet-v0.1.0'], stars = []) {
+  constructor(id, network = 'leofcoin:peach', stars = ['wss://peach.leofcoin.org']) {
     this.id = id || Math.random().toString(36).slice(-12);
-    if (!Array.isArray(identifiers)) identifiers = [identifiers]
     this.peerJoined = this.peerJoined.bind(this)
     this.peerLeft = this.peerLeft.bind(this)
     this.starLeft = this.starLeft.bind(this)
     this.starJoined = this.starJoined.bind(this)
 
-    this._init(identifiers, stars)
+    this._init(network, stars)
   }
 
-  async _init(identifiers, stars = []) {
-    if (stars.length === 0) {
-      stars.push('wss://star.leofcoin.org')
-    }
-    this.identifiers = identifiers
+  async _init(network, stars = []) {
+    this.network = network
     this.starsConfig = stars
     // reconnectJob()
 
@@ -599,7 +595,7 @@ class Client {
 
     for (const star of stars) {
       try {
-        this.socketClient = await socketRequestClient(star, identifiers[0])
+        this.socketClient = await socketRequestClient(star, network)
         const id = await this.socketClient.request({url: 'id', params: {from: this.id}})
         this.socketClient.peerId = id
         this.#stars[id] = this.socketClient
@@ -643,7 +639,7 @@ class Client {
 
       for (const star of this.starsConfig) {
         try {
-          this.socketClient = await socketRequestClient(star, this.identifiers[0])
+          this.socketClient = await socketRequestClient(star, this.network)
           if (!this.socketClient?.client?._connection.connected) return
           const id = await this.socketClient.request({url: 'id', params: {from: this.id}})
           this.#stars[id] = this.socketClient
@@ -702,6 +698,21 @@ class Client {
     debug(`peer ${id} removed`)
   }
 
+  async close() {
+
+    this.socketClient.unsubscribe('peer:joined', this.peerJoined)
+    this.socketClient.unsubscribe('peer:left', this.peerLeft)
+    this.socketClient.unsubscribe('star:left', this.starLeft)
+
+    const promises = [
+      Object.values(this.#connections).map(connection => connection.close()),
+      Object.values(this.#stars).map(connection => connection.close()),
+      this.socketClient.close()
+    ]
+    
+    return Promise.allSettled(promises)
+    
+  }
 
 }
 

package/dist/browser/peernet-swarm.mjs

@@ -570,22 +570,18 @@ class Client {
     return Object.entries(this.#connections)
   }
 
-  constructor(id, identifiers = ['peernet-v0.1.0'], stars = []) {
+  constructor(id, network = 'leofcoin:peach', stars = ['wss://peach.leofcoin.org']) {
     this.id = id || Math.random().toString(36).slice(-12);
-    if (!Array.isArray(identifiers)) identifiers = [identifiers]
     this.peerJoined = this.peerJoined.bind(this)
     this.peerLeft = this.peerLeft.bind(this)
     this.starLeft = this.starLeft.bind(this)
     this.starJoined = this.starJoined.bind(this)
 
-    this._init(identifiers, stars)
+    this._init(network, stars)
   }
 
-  async _init(identifiers, stars = []) {
-    if (stars.length === 0) {
-      stars.push('wss://star.leofcoin.org')
-    }
-    this.identifiers = identifiers
+  async _init(network, stars = []) {
+    this.network = network
     this.starsConfig = stars
     // reconnectJob()
 
@@ -598,7 +594,7 @@ class Client {
 
     for (const star of stars) {
       try {
-        this.socketClient = await socketRequestClient(star, identifiers[0])
+        this.socketClient = await socketRequestClient(star, network)
         const id = await this.socketClient.request({url: 'id', params: {from: this.id}})
         this.socketClient.peerId = id
         this.#stars[id] = this.socketClient
@@ -642,7 +638,7 @@ class Client {
 
       for (const star of this.starsConfig) {
         try {
-          this.socketClient = await socketRequestClient(star, this.identifiers[0])
+          this.socketClient = await socketRequestClient(star, this.network)
           if (!this.socketClient?.client?._connection.connected) return
           const id = await this.socketClient.request({url: 'id', params: {from: this.id}})
           this.#stars[id] = this.socketClient
@@ -701,6 +697,21 @@ class Client {
     debug(`peer ${id} removed`)
   }
 
+  async close() {
+
+    this.socketClient.unsubscribe('peer:joined', this.peerJoined)
+    this.socketClient.unsubscribe('peer:left', this.peerLeft)
+    this.socketClient.unsubscribe('star:left', this.starLeft)
+
+    const promises = [
+      Object.values(this.#connections).map(connection => connection.close()),
+      Object.values(this.#stars).map(connection => connection.close()),
+      this.socketClient.close()
+    ]
+    
+    return Promise.allSettled(promises)
+    
+  }
 
 }
 

package/dist/browser/peernet.js

@@ -8491,6 +8491,7 @@ class LittlePubSub {
 // EXTERNAL MODULE: ./node_modules/@leofcoin/codec-format-interface/src/index.js + 9 modules
 var src = __webpack_require__(745);
 ;// CONCATENATED MODULE: ./dist/module/peernet.js
+/* provided dependency */ var process = __webpack_require__(155);
 
 
 
@@ -8914,6 +8915,7 @@ class Peernet {
    * @access public
    * @param {Object} options
    * @param {String} options.network - desired network
+   * @param {String} options.stars - star list for selected network (these should match, don't mix networks)
    * @param {String} options.root - path to root directory
    * @param {String} options.storePrefix - prefix for datatores (lfc)
    *
@@ -8928,6 +8930,7 @@ class Peernet {
      * @property {String} network - current network
      */
     this.network = options.network || 'leofcoin';
+    this.stars = options.stars;
     const parts = this.network.split(':');
 
     if (!options.storePrefix) options.storePrefix = 'lfc';
@@ -9094,7 +9097,7 @@ class Peernet {
       let accounts = await walletStore.get('accounts');
       accounts = new TextDecoder().decode(accounts);
       const selected = await walletStore.get('selected-account');
-      globalThis.selectedAccount = new TextDecoder().decode(selected);
+      globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
 
       // fixing account issue (string while needs to be a JSON)
       // TODO: remove when on mainnet
@@ -9115,7 +9118,7 @@ class Peernet {
       await walletStore.put('selected-account', accounts[0][1]);
       await walletStore.put('identity', JSON.stringify(identity));
 
-      globalThis.selectedAccount = accounts[0][1];
+      globalThis.peernet.selectedAccount = accounts[0][1];
       this.id = identity.walletId;
     }
     this._peerHandler = new PeerDiscovery(this.id);
@@ -9144,9 +9147,15 @@ class Peernet {
      * @access public
      * @type {PeernetClient}
      */
-    this.client = new importee.default(this.id);
+    this.client = new importee.default(this.id, this.network, this.stars);
     if (globalThis.onbeforeunload) {
       globalThis.addEventListener('beforeunload', async () => this.client.close());
+    } else {
+      process.on('SIGTERM', async () => {
+        process.stdin.resume();
+        await this.client.close();
+        process.exit();
+      });
     }
     return this
   }

package/dist/browser/peernet.mjs

@@ -8461,6 +8461,7 @@ class LittlePubSub {
 // EXTERNAL MODULE: ./node_modules/@leofcoin/codec-format-interface/src/index.js + 9 modules
 var src = __webpack_require__(745);
 ;// CONCATENATED MODULE: ./dist/module/peernet.js
+/* provided dependency */ var process = __webpack_require__(155);
 
 
 
@@ -8884,6 +8885,7 @@ class Peernet {
    * @access public
    * @param {Object} options
    * @param {String} options.network - desired network
+   * @param {String} options.stars - star list for selected network (these should match, don't mix networks)
    * @param {String} options.root - path to root directory
    * @param {String} options.storePrefix - prefix for datatores (lfc)
    *
@@ -8898,6 +8900,7 @@ class Peernet {
      * @property {String} network - current network
      */
     this.network = options.network || 'leofcoin';
+    this.stars = options.stars;
     const parts = this.network.split(':');
 
     if (!options.storePrefix) options.storePrefix = 'lfc';
@@ -9064,7 +9067,7 @@ class Peernet {
       let accounts = await walletStore.get('accounts');
       accounts = new TextDecoder().decode(accounts);
       const selected = await walletStore.get('selected-account');
-      globalThis.selectedAccount = new TextDecoder().decode(selected);
+      globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
 
       // fixing account issue (string while needs to be a JSON)
       // TODO: remove when on mainnet
@@ -9085,7 +9088,7 @@ class Peernet {
       await walletStore.put('selected-account', accounts[0][1]);
       await walletStore.put('identity', JSON.stringify(identity));
 
-      globalThis.selectedAccount = accounts[0][1];
+      globalThis.peernet.selectedAccount = accounts[0][1];
       this.id = identity.walletId;
     }
     this._peerHandler = new PeerDiscovery(this.id);
@@ -9114,9 +9117,15 @@ class Peernet {
      * @access public
      * @type {PeernetClient}
      */
-    this.client = new importee.default(this.id);
+    this.client = new importee.default(this.id, this.network, this.stars);
     if (globalThis.onbeforeunload) {
       globalThis.addEventListener('beforeunload', async () => this.client.close());
+    } else {
+      process.on('SIGTERM', async () => {
+        process.stdin.resume();
+        await this.client.close();
+        process.exit();
+      });
     }
     return this
   }

package/dist/commonjs/peernet.js

@@ -447,6 +447,7 @@ class Peernet {
    * @access public
    * @param {Object} options
    * @param {String} options.network - desired network
+   * @param {String} options.stars - star list for selected network (these should match, don't mix networks)
    * @param {String} options.root - path to root directory
    * @param {String} options.storePrefix - prefix for datatores (lfc)
    *
@@ -461,6 +462,7 @@ class Peernet {
      * @property {String} network - current network
      */
     this.network = options.network || 'leofcoin';
+    this.stars = options.stars;
     const parts = this.network.split(':');
 
     if (!options.storePrefix) options.storePrefix = 'lfc';
@@ -627,7 +629,7 @@ class Peernet {
       let accounts = await walletStore.get('accounts');
       accounts = new TextDecoder().decode(accounts);
       const selected = await walletStore.get('selected-account');
-      globalThis.selectedAccount = new TextDecoder().decode(selected);
+      globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
 
       // fixing account issue (string while needs to be a JSON)
       // TODO: remove when on mainnet
@@ -648,7 +650,7 @@ class Peernet {
       await walletStore.put('selected-account', accounts[0][1]);
       await walletStore.put('identity', JSON.stringify(identity));
 
-      globalThis.selectedAccount = accounts[0][1];
+      globalThis.peernet.selectedAccount = accounts[0][1];
       this.id = identity.walletId;
     }
     this._peerHandler = new PeerDiscovery(this.id);
@@ -677,9 +679,15 @@ class Peernet {
      * @access public
      * @type {PeernetClient}
      */
-    this.client = new importee.default(this.id);
+    this.client = new importee.default(this.id, this.network, this.stars);
     if (globalThis.onbeforeunload) {
       globalThis.addEventListener('beforeunload', async () => this.client.close());
+    } else {
+      process.on('SIGTERM', async () => {
+        process.stdin.resume();
+        await this.client.close();
+        process.exit();
+      });
     }
     return this
   }

package/dist/module/peernet.js

@@ -421,6 +421,7 @@ class Peernet {
    * @access public
    * @param {Object} options
    * @param {String} options.network - desired network
+   * @param {String} options.stars - star list for selected network (these should match, don't mix networks)
    * @param {String} options.root - path to root directory
    * @param {String} options.storePrefix - prefix for datatores (lfc)
    *
@@ -435,6 +436,7 @@ class Peernet {
      * @property {String} network - current network
      */
     this.network = options.network || 'leofcoin';
+    this.stars = options.stars;
     const parts = this.network.split(':');
 
     if (!options.storePrefix) options.storePrefix = 'lfc';
@@ -601,7 +603,7 @@ class Peernet {
       let accounts = await walletStore.get('accounts');
       accounts = new TextDecoder().decode(accounts);
       const selected = await walletStore.get('selected-account');
-      globalThis.selectedAccount = new TextDecoder().decode(selected);
+      globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
 
       // fixing account issue (string while needs to be a JSON)
       // TODO: remove when on mainnet
@@ -622,7 +624,7 @@ class Peernet {
       await walletStore.put('selected-account', accounts[0][1]);
       await walletStore.put('identity', JSON.stringify(identity));
 
-      globalThis.selectedAccount = accounts[0][1];
+      globalThis.peernet.selectedAccount = accounts[0][1];
       this.id = identity.walletId;
     }
     this._peerHandler = new PeerDiscovery(this.id);
@@ -651,9 +653,15 @@ class Peernet {
      * @access public
      * @type {PeernetClient}
      */
-    this.client = new importee.default(this.id);
+    this.client = new importee.default(this.id, this.network, this.stars);
     if (globalThis.onbeforeunload) {
       globalThis.addEventListener('beforeunload', async () => this.client.close());
+    } else {
+      process.on('SIGTERM', async () => {
+        process.stdin.resume();
+        await this.client.close();
+        process.exit();
+      });
     }
     return this
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.14.25",
+  "version": "0.15.0",
   "description": "",
   "source": "src/peernet.js",
   "main": "dist/commonjs/peernet.js",
@@ -29,7 +29,7 @@
     "@leofcoin/codec-format-interface": "^1.4.0",
     "@leofcoin/generate-account": "^1.0.4",
     "@leofcoin/multi-wallet": "^2.1.2",
-    "@leofcoin/peernet-swarm": "^0.3.10",
+    "@leofcoin/peernet-swarm": "^0.4.0",
     "@leofcoin/storage": "^3.0.0",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",

package/src/peernet.js

@@ -23,6 +23,7 @@ export default class Peernet {
    * @access public
    * @param {Object} options
    * @param {String} options.network - desired network
+   * @param {String} options.stars - star list for selected network (these should match, don't mix networks)
    * @param {String} options.root - path to root directory
    * @param {String} options.storePrefix - prefix for datatores (lfc)
    *
@@ -37,6 +38,7 @@ export default class Peernet {
      * @property {String} network - current network
      */
     this.network = options.network || 'leofcoin'
+    this.stars = options.stars
     const parts = this.network.split(':')
 
     if (!options.storePrefix) options.storePrefix = 'lfc'
@@ -203,7 +205,7 @@ export default class Peernet {
       let accounts = await walletStore.get('accounts')
       accounts = new TextDecoder().decode(accounts)
       const selected = await walletStore.get('selected-account')
-      globalThis.selectedAccount = new TextDecoder().decode(selected)
+      globalThis.peernet.selectedAccount = new TextDecoder().decode(selected)
 
       // fixing account issue (string while needs to be a JSON)
       // TODO: remove when on mainnet
@@ -224,7 +226,7 @@ export default class Peernet {
       await walletStore.put('selected-account', accounts[0][1])
       await walletStore.put('identity', JSON.stringify(identity))
 
-      globalThis.selectedAccount = accounts[0][1]
+      globalThis.peernet.selectedAccount = accounts[0][1]
       this.id = identity.walletId
     }
     this._peerHandler = new PeerDiscovery(this.id)
@@ -253,9 +255,15 @@ export default class Peernet {
      * @access public
      * @type {PeernetClient}
      */
-    this.client = new importee.default(this.id)
+    this.client = new importee.default(this.id, this.network, this.stars)
     if (globalThis.onbeforeunload) {
       globalThis.addEventListener('beforeunload', async () => this.client.close());
+    } else {
+      process.on('SIGTERM', async () => {
+        process.stdin.resume();
+        await this.client.close()
+        process.exit()
+      });
     }
     return this
   }