@leofcoin/peernet 1.1.79 → 1.1.81

package/.esdoc.json

@@ -1,10 +1,10 @@
-{
-  "source": "./src",
-  "destination": "./docs",
-  "plugins": [{
-    "name": "esdoc-standard-plugin"
-  }, {
-    "name": "esdoc-ecmascript-proposal-plugin",
-    "option": {"all": true}
-  }]
-}
+{
+  "source": "./src",
+  "destination": "./docs",
+  "plugins": [{
+    "name": "esdoc-standard-plugin"
+  }, {
+    "name": "esdoc-ecmascript-proposal-plugin",
+    "option": {"all": true}
+  }]
+}

package/.gitattributes

@@ -1,2 +1,2 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+# Auto detect text files and perform LF normalization
+* text=auto

package/.prettierrc

@@ -1,7 +1,7 @@
-{
-  "tabWidth": 2,
-  "semi": false,
-  "singleQuote": true,
-  "printWidth": 120,
-  "trailingComma": "none"
-}
+{
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "printWidth": 120,
+  "trailingComma": "none"
+}

package/.travis.yml

@@ -1,27 +1,27 @@
-os:
-  - linux
-  - windows
-  - osx
-
-language: node_js
-node_js:
-  - 14
-  - 16
-  - 19
-
-script:
-  - npm run c
-  - npm run doc
-  - npm run test
-
-after_success:
-  - npm run coverage
-  - npm run coveralls
-  - node deploy.js success $WEBHOOK_URL
-
-after_failure:
-  - node deploy.js failure $WEBHOOK_URL
-
-branches:
-  only:
-    - main
+os:
+  - linux
+  - windows
+  - osx
+
+language: node_js
+node_js:
+  - 14
+  - 16
+  - 19
+
+script:
+  - npm run c
+  - npm run doc
+  - npm run test
+
+after_success:
+  - npm run coverage
+  - npm run coveralls
+  - node deploy.js success $WEBHOOK_URL
+
+after_failure:
+  - node deploy.js failure $WEBHOOK_URL
+
+branches:
+  only:
+    - main

package/BREAKING_CHANGES.md

@@ -1,35 +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()
+# 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/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020 vandeurenglenn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2020 vandeurenglenn
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,72 +1,72 @@
-# peernet
-
-## Usage
-```js
-import Peernet from '@leofcoin/peernet'
-
-
-const config = {
-  network: 'leofcoin:peach',
-  networkVersion: 'peach',
-  stars: ['wss://peach.leofcoin.org']
-}
-
-const node = await new Peernet(config)
-// ... setup some things
-await node.start()
-
-console.log(globalThis.peernet)
-```
-
-
-
-## API
-#### addRequestHandler
-
-examples
-```js
-peernet.addRequestHandler('lastBlock', () => {
-  let response;
-  const height = await chainStore.get('localIndex')
-  const hash = await chainStore.get('localBlock')
-  response = JSON.stringify({ height: height.toString(), hash: hash.toString() })
-  return new ResponseMessage({ response })
-  // or
-  return new peernet.protos['peernet-response']({ response })
-})
-```
-
-```js
-peernet.addRequestHandler('hello', () => {
-  return new ResponseMessage({ response: 'hi' })
-  // or
-  return new peernet.protos['peernet-response']({ response: 'hi' })
-})
-```
-#### add version to peer
-```js
-peernet.addRequestHandler('version', () => {
-  return new ResponseMessage({ response: {version: 1} })
-})
-```
-
-## Development
-
-`note: you need to install jsproject`
-```sh
-npm i -g @vandeurenglenn/project
-```
-
-### watch
-```sh
-npm run w
-```
-### compile
-```sh
-npm run c
-```
-### serve html
-```sh
-npm run demo
-```
-
+# peernet
+
+## Usage
+```js
+import Peernet from '@leofcoin/peernet'
+
+
+const config = {
+  network: 'leofcoin:peach',
+  networkVersion: 'peach',
+  stars: ['wss://peach.leofcoin.org']
+}
+
+const node = await new Peernet(config)
+// ... setup some things
+await node.start()
+
+console.log(globalThis.peernet)
+```
+
+
+
+## API
+#### addRequestHandler
+
+examples
+```js
+peernet.addRequestHandler('lastBlock', () => {
+  let response;
+  const height = await chainStore.get('localIndex')
+  const hash = await chainStore.get('localBlock')
+  response = JSON.stringify({ height: height.toString(), hash: hash.toString() })
+  return new ResponseMessage({ response })
+  // or
+  return new peernet.protos['peernet-response']({ response })
+})
+```
+
+```js
+peernet.addRequestHandler('hello', () => {
+  return new ResponseMessage({ response: 'hi' })
+  // or
+  return new peernet.protos['peernet-response']({ response: 'hi' })
+})
+```
+#### add version to peer
+```js
+peernet.addRequestHandler('version', () => {
+  return new ResponseMessage({ response: {version: 1} })
+})
+```
+
+## Development
+
+`note: you need to install jsproject`
+```sh
+npm i -g @vandeurenglenn/project
+```
+
+### watch
+```sh
+npm run w
+```
+### compile
+```sh
+npm run c
+```
+### serve html
+```sh
+npm run demo
+```
+

package/deploy.js

@@ -1,8 +1,8 @@
-const {execSync} = require('child_process');
-const status = process.argv[2]
-
-if (process.version.split('.')[0] ===  'v19' && process.platform === 'linux') {
-  execSync('wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh')
-  execSync('chmod +x send.sh')
-  execSync(`./send.sh ${status} ` + process.argv[3])
-}
+const {execSync} = require('child_process');
+const status = process.argv[2]
+
+if (process.version.split('.')[0] ===  'v19' && process.platform === 'linux') {
+  execSync('wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh')
+  execSync('chmod +x send.sh')
+  execSync(`./send.sh ${status} ` + process.argv[3])
+}

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

@@ -1,4 +1,4 @@
-import { g as getDefaultExportFromCjs } from './peernet-DULgegxE.js';
+import { g as getDefaultExportFromCjs } from './identity-CQ_ieRiz.js';
 
 var global;
 var hasRequiredGlobal;
@@ -62,7 +62,7 @@ var author = "Brian McKelvey <theturtle32@gmail.com> (https://github.com/theturt
 var contributors = [
 	"Iñaki Baz Castillo <ibc@aliax.net> (http://dev.sipdoc.net)"
 ];
-var version$1 = "1.0.34";
+var version$1 = "1.0.35";
 var repository = {
 	type: "git",
 	url: "https://github.com/theturtle32/WebSocket-Node.git"
@@ -74,7 +74,7 @@ var engines = {
 var dependencies = {
 	bufferutil: "^4.0.1",
 	debug: "^2.2.0",
-	"es5-ext": "^0.10.50",
+	"es5-ext": "^0.10.63",
 	"typedarray-to-buffer": "^3.1.5",
 	"utf-8-validate": "^5.0.2",
 	yaeti: "^0.0.6"

package/exports/browser/browser-store.js

@@ -1,22 +1,57 @@
-import { K as KeyPath, a as KeyValue } from './value-wzPYMxsX.js';
+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);
+}
+
+const debug = globalThis.createDebugger('leofcoin/storage');
 const opfsRoot = await navigator.storage.getDirectory();
 class BrowerStore {
     db;
     name;
     root;
+    inWorker;
     version;
-    async init(name = 'storage', root = '.leofcoin', version = '1') {
-        console.log('init');
+    busy;
+    queue = [];
+    async init(name = 'storage', root = '.leofcoin', version = '1', inWorker = false) {
         this.version = version;
         this.name = name;
         this.root = opfsRoot;
-        console.log(`${this.root}/${this.name}`);
+        this.inWorker = inWorker;
         let directoryHandle;
         try {
             directoryHandle = await opfsRoot.getDirectoryHandle(this.name, {
                 create: true
             });
+            if (inWorker) {
+                // it's in a worker so that's why typings invalid?
+                // @ts-ignore
+                directoryHandle = await directoryHandle.createSyncAccessHandle();
+            }
         }
         catch (error) {
             console.error(error);
@@ -35,6 +70,7 @@ class BrowerStore {
         return value.uint8Array;
     }
     async has(key) {
+        debug(`has ${this.toKeyPath(key)}`);
         try {
             await this.db.getFileHandle(this.toKeyPath(key));
             return true;
@@ -44,39 +80,149 @@ class BrowerStore {
         }
     }
     async get(key) {
-        const handle = await this.db.getFileHandle(this.toKeyPath(key));
-        const file = await handle.getFile();
-        return new Uint8Array(await file.arrayBuffer());
+        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 () => {
+                try {
+                    let handle = await this.db.getFileHandle(this.toKeyPath(key));
+                    let readBuffer;
+                    if (this.inWorker) {
+                        // it's in a worker so that's why typings invalid?
+                        // @ts-ignore
+                        handle = await handle.createSyncAccessHandle();
+                        // @ts-ignore
+                        const fileSize = handle.getSize();
+                        // Read file content to a buffer.
+                        const buffer = new DataView(new ArrayBuffer(fileSize));
+                        // @ts-ignore
+                        readBuffer = handle.read(buffer, { at: 0 });
+                        // @ts-ignore
+                        handle.close();
+                    }
+                    else {
+                        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);
+                }
+            }, 1);
+        });
+        this.queue.push(promise);
+        this.runQueue();
+        return result;
     }
     async put(key, value) {
-        const handle = await this.db.getFileHandle(this.toKeyPath(key), { create: true });
-        const writeable = handle.createWritable();
-        (await writeable).write(this.toKeyValue(value));
-        (await writeable).close();
+        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 () => {
+                try {
+                    let handle = await this.db.getFileHandle(this.toKeyPath(key), { create: true });
+                    let writeable;
+                    if (this.inWorker) {
+                        // it's in a worker so that's why typings invalid?
+                        // @ts-ignore
+                        writeable = await handle.createSyncAccessHandle();
+                    }
+                    else {
+                        writeable = await handle.createWritable();
+                    }
+                    ;
+                    (await writeable).write(this.toKeyValue(value));
+                    (await writeable).close();
+                    this.runQueue();
+                    resolve(true);
+                    promiseResolve(true);
+                }
+                catch (error) {
+                    promiseReject(error);
+                    resolve(false);
+                }
+            }, 5);
+        });
+        this.queue.push(promise);
+        this.runQueue();
+        return result;
+    }
+    async runQueue() {
+        if (this.queue.length > 0 && !this.busy) {
+            this.busy = true;
+            const next = this.queue.shift();
+            await next();
+            this.busy = false;
+            return this.runQueue();
+        }
+        else if (this.queue.length === 0 && this.busy) {
+            this.busy = false;
+        }
     }
     async delete(key) {
-        return this.db.removeEntry(this.toKeyPath(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) {
+                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);
+                }
+            }
+        });
     }
     async clear() {
         for await (const key of this.db.keys()) {
-            await this.db.removeEntry(key);
+            debug(`clear ${this.toKeyPath(key)}`);
+            await this.delete(key);
+        }
+    }
+    async values() {
+        let values = [];
+        for await (const cursor of this.db.values()) {
+            // huh? Outdated typings?
+            // @ts-ignore
+            values.push(cursor.getFile());
         }
+        values = await Promise.all(values);
+        return Promise.all(values.map(async (file) => new Uint8Array(await file.arrayBuffer())));
     }
-    async values(limit = -1) {
-        const values = [];
+    async size() {
+        let size = 0;
         for await (const cursor of this.db.values()) {
-            values.push(cursor);
-            if (limit && values.length === limit)
-                return values;
+            // huh? Outdated typings?
+            // @ts-ignore
+            size += (await cursor.getFile()).size;
         }
-        return values;
+        return size;
     }
-    async keys(limit = -1) {
+    async keys() {
         const keys = [];
         for await (const cursor of this.db.keys()) {
             keys.push(cursor);
-            if (limit && keys.length === limit)
-                return keys;
         }
         return keys;
     }