@leofcoin/peernet 1.1.78 → 1.1.80

package/exports/browser/peernet.d.ts

@@ -71,7 +71,7 @@ export default class Peernet {
     get selectedAccount(): string;
     get accounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
     get defaultStores(): string[];
-    selectAccount(account: string): Promise<void> | Promise<any[]>;
+    selectAccount(account: string): Promise<unknown>;
     addProto(name: any, proto: any): void;
     addCodec(codec: any): void;
     addStore(name: any, prefix: any, root: any, isPrivate?: boolean): Promise<void>;
@@ -108,7 +108,7 @@ export default class Peernet {
     addRequestHandler(name: any, method: any): void;
     sendMessage(peer: any, id: any, data: any): Promise<any>;
     handleDHT(peer: any, id: any, proto: any): Promise<void>;
-    handleData(peer: any, id: any, proto: any): Promise<void>;
+    handleData(peer: any, id: any, proto: any): Promise<any>;
     handleRequest(peer: any, id: any, proto: any): Promise<void>;
     /**
      * @private
@@ -131,12 +131,12 @@ export default class Peernet {
     providersFor(hash: string, store?: undefined): Promise<import("./dht/dht.js").DHTProviderMapValue>;
     get block(): {
         get: (hash: string) => Promise<any>;
-        put: (hash: string, data: Uint8Array) => Promise<void | any[]>;
+        put: (hash: string, data: Uint8Array) => Promise<unknown>;
         has: (hash: string) => Promise<boolean | any[]>;
     };
     get transaction(): {
         get: (hash: string) => Promise<any>;
-        put: (hash: string, data: Uint8Array) => Promise<void | any[]>;
+        put: (hash: string, data: Uint8Array) => Promise<unknown>;
         has: (hash: string) => Promise<boolean | any[]>;
     };
     requestData(hash: any, store: any): any;
@@ -153,7 +153,7 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} message
          */
-        put: (hash: any, message: any) => Promise<void | any[]>;
+        put: (hash: any, message: any) => Promise<unknown>;
         /**
          * @param {String} hash
          * @return {Boolean}
@@ -173,7 +173,7 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} data
          */
-        put: (hash: any, data: any) => Promise<void | any[]>;
+        put: (hash: any, data: any) => Promise<unknown>;
         /**
          * @param {String} hash
          * @return {Boolean}
@@ -193,7 +193,7 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} data
          */
-        put: (hash: any, data: any) => Promise<void | any[]>;
+        put: (hash: any, data: any) => Promise<unknown>;
         /**
          * @param {String} hash
          * @return {Boolean}
@@ -223,7 +223,7 @@ export default class Peernet {
      * @param {Buffer} data
      * @param {String} storeName - storeName to access
      */
-    put(hash: string, data: Uint8Array, storeName?: string | LeofcoinStorageClass): Promise<void | any[]>;
+    put(hash: string, data: Uint8Array, storeName?: string | LeofcoinStorageClass): Promise<unknown>;
     /**
      * @param {String} hash
      * @return {Boolean}

package/exports/browser/peernet.js

@@ -1,2 +1,3 @@
-export { P as default } from './peernet-x3p3hKA5.js';
-import './value-wzPYMxsX.js';
+export { P as default } from './peernet-B7TZP-Wg.js';
+import './identity-CQ_ieRiz.js';
+import './value-C3vAp-wb.js';

package/exports/identity.js

@@ -0,0 +1,92 @@
+import MultiWallet from '@leofcoin/multi-wallet';
+import base58 from '@vandeurenglenn/base58';
+import { decrypt } from '@leofcoin/identity-utils';
+import QrScanner from 'qr-scanner';
+import qrcode from 'qrcode';
+
+class Identity {
+    #wallet;
+    network;
+    id;
+    selectedAccount;
+    constructor(network) {
+        this.network = network;
+    }
+    get accounts() {
+        return this.getAccounts();
+    }
+    async getAccounts() {
+        let accounts = await globalThis.walletStore.get('accounts');
+        accounts = new TextDecoder().decode(accounts);
+        return JSON.parse(accounts);
+    }
+    async load(password) {
+        if (password && password.includes('.txt')) {
+            const { readFile } = await import('fs/promises');
+            try {
+                password = (await readFile(password)).toString();
+            }
+            catch (error) {
+                console.error(error);
+            }
+        }
+        if (!password) {
+            // @ts-ignore
+            const importee = await import('./src/prompts/password.js');
+            password = await importee.default();
+        }
+        const accountExists = await globalThis.accountStore.has('public');
+        if (accountExists) {
+            const pub = await globalThis.accountStore.get('public');
+            this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
+            const selected = await globalThis.walletStore.get('selected-account');
+            this.selectedAccount = new TextDecoder().decode(selected);
+        }
+        else {
+            const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account');
+            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));
+            await globalThis.walletStore.put('accounts', JSON.stringify(accounts));
+            await globalThis.walletStore.put('selected-account', accounts[0][1]);
+            await globalThis.walletStore.put('identity', JSON.stringify(identity));
+            this.selectedAccount = accounts[0][1];
+            this.id = identity.walletId;
+        }
+        const identity = JSON.parse(new TextDecoder().decode(await globalThis.walletStore.get('identity')));
+        this.#wallet = new MultiWallet(this.network);
+        const multiWIF = await decrypt(password, base58.decode(identity.multiWIF));
+        await this.#wallet.fromMultiWif(multiWIF);
+    }
+    selectAccount(account) {
+        this.selectedAccount = account;
+        return walletStore.put('selected-account', account);
+    }
+    sign(hash) {
+        return this.#wallet.sign(hash.subarray(0, 32));
+    }
+    lock(password) {
+        this.#wallet.lock(password);
+    }
+    unlock(password) {
+        this.#wallet.unlock(password);
+    }
+    async export(password) {
+        return this.#wallet.export(password);
+    }
+    async import(password, encrypted) {
+        await this.#wallet.import(password, encrypted);
+    }
+    async exportQR(password) {
+        const exported = await this.export(password);
+        return globalThis.navigator
+            ? await qrcode.toDataURL(exported)
+            : await qrcode.toString(exported, { type: 'terminal' });
+    }
+    async importQR(image, password) {
+        const multiWIF = await QrScanner.default.scanImage(image);
+        return this.import(password, multiWIF);
+    }
+}
+
+export { Identity as default };

package/exports/peernet.js

@@ -3,11 +3,12 @@ import PubSub from '@vandeurenglenn/little-pubsub';
 import { Codec } from '@leofcoin/codec-format-interface';
 import { Storage } from '@leofcoin/storage';
 import { utils } from '@leofcoin/codecs';
-import MultiWallet from '@leofcoin/multi-wallet';
-import base58 from '@vandeurenglenn/base58';
-import { decrypt } from '@leofcoin/identity-utils';
-import QrScanner from 'qr-scanner';
-import qrcode from 'qrcode';
+import Identity from './identity.js';
+import '@leofcoin/multi-wallet';
+import '@vandeurenglenn/base58';
+import '@leofcoin/identity-utils';
+import 'qr-scanner';
+import 'qrcode';
 
 const BufferToUint8Array = (data) => {
   if (data.type === 'Buffer') {
@@ -310,91 +311,6 @@ const nothingFoundError = (hash) => {
   return new Error(`nothing found for ${hash}`)
 };
 
-class Identity {
-    #wallet;
-    network;
-    id;
-    selectedAccount;
-    constructor(network) {
-        this.network = network;
-    }
-    get accounts() {
-        return this.getAccounts();
-    }
-    async getAccounts() {
-        let accounts = await globalThis.walletStore.get('accounts');
-        accounts = new TextDecoder().decode(accounts);
-        return JSON.parse(accounts);
-    }
-    async load(password) {
-        if (password && password.includes('.txt')) {
-            const { readFile } = await import('fs/promises');
-            try {
-                password = (await readFile(password)).toString();
-            }
-            catch (error) {
-                console.error(error);
-            }
-        }
-        if (!password) {
-            // @ts-ignore
-            const importee = await import('./src/prompts/password.js');
-            password = await importee.default();
-        }
-        const accountExists = await globalThis.accountStore.has('public');
-        if (accountExists) {
-            const pub = await globalThis.accountStore.get('public');
-            this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
-            const selected = await globalThis.walletStore.get('selected-account');
-            this.selectedAccount = new TextDecoder().decode(selected);
-        }
-        else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account');
-            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));
-            await globalThis.walletStore.put('accounts', JSON.stringify(accounts));
-            await globalThis.walletStore.put('selected-account', accounts[0][1]);
-            await globalThis.walletStore.put('identity', JSON.stringify(identity));
-            this.selectedAccount = accounts[0][1];
-            this.id = identity.walletId;
-        }
-        const identity = JSON.parse(new TextDecoder().decode(await globalThis.walletStore.get('identity')));
-        this.#wallet = new MultiWallet(this.network);
-        const multiWIF = await decrypt(password, base58.decode(identity.multiWIF));
-        await this.#wallet.fromMultiWif(multiWIF);
-    }
-    selectAccount(account) {
-        this.selectedAccount = account;
-        return walletStore.put('selected-account', account);
-    }
-    sign(hash) {
-        return this.#wallet.sign(hash.subarray(0, 32));
-    }
-    lock(password) {
-        this.#wallet.lock(password);
-    }
-    unlock(password) {
-        this.#wallet.unlock(password);
-    }
-    async export(password) {
-        return this.#wallet.export(password);
-    }
-    async import(password, encrypted) {
-        await this.#wallet.import(password, encrypted);
-    }
-    async exportQR(password) {
-        const exported = await this.export(password);
-        return globalThis.navigator
-            ? await qrcode.toDataURL(exported)
-            : await qrcode.toString(exported, { type: 'terminal' });
-    }
-    async importQR(image, password) {
-        const multiWIF = await QrScanner.default.scanImage(image);
-        return this.import(password, multiWIF);
-    }
-}
-
 globalThis.LeofcoinStorage = Storage;
 globalThis.leofcoin = globalThis.leofcoin || {};
 globalThis.pubsub = globalThis.pubsub || new PubSub();
@@ -541,7 +457,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-T3M-Ff1E.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-CRhtDipD.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -704,18 +620,26 @@ class Peernet {
     async handleData(peer, id, proto) {
         let { hash, store } = proto.decoded;
         let data;
-        store = globalThis[`${store}Store`] || (await this.whichStore([...this.stores], hash));
-        if (store && !store.private) {
-            data = await store.get(hash);
-            if (data) {
-                data = await new globalThis.peernet.protos['peernet-data-response']({
-                    hash,
-                    data
-                });
-                const node = await this.prepareMessage(data);
-                this.sendMessage(peer, id, node.encoded);
+        try {
+            store = globalThis[`${store}Store`] || (await this.whichStore([...this.stores], hash));
+            if (store && !store.private) {
+                data = await store.get(hash);
+                if (data) {
+                    data = await new globalThis.peernet.protos['peernet-data-response']({
+                        hash,
+                        data
+                    });
+                    const node = await this.prepareMessage(data);
+                    this.sendMessage(peer, id, node.encoded);
+                }
+            }
+            else {
+                // ban (trying to access private st)
             }
         }
+        catch (error) {
+            return this.requestData(hash, store);
+        }
     }
     async handleRequest(peer, id, proto) {
         const method = this.requestProtos[proto.decoded.request];

package/exports/store.js

@@ -97,9 +97,9 @@ class Store {
     name;
     root;
     version;
-    async init(name, root, version) {
+    async init(name, root, version, inworker, homedir) {
         this.name = name;
-        this.root = await init(root);
+        this.root = await init(root, homedir);
         this.version = version;
         this.db = new ClassicLevel(join(this.root, this.name), { valueEncoding: 'view' });
     }
@@ -153,6 +153,13 @@ class Store {
         }
         return keys;
     }
+    async size() {
+        let size = 0;
+        for await (const [key, value] of this.db.iterator()) {
+            size += value?.length ?? 0;
+        }
+        return size;
+    }
     /**
      *
      * @param {object} options {  limit, gt, lt, reverse }

package/exports/types/identity.d.ts

@@ -8,7 +8,7 @@ export default class Identity {
     get accounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
     getAccounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
     load(password?: string): Promise<void>;
-    selectAccount(account: string): Promise<void> | Promise<any[]>;
+    selectAccount(account: string): Promise<unknown>;
     sign(hash: Uint8Array): any;
     lock(password: string): void;
     unlock(password: string): void;

package/exports/types/peernet.d.ts

@@ -71,7 +71,7 @@ export default class Peernet {
     get selectedAccount(): string;
     get accounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
     get defaultStores(): string[];
-    selectAccount(account: string): Promise<void> | Promise<any[]>;
+    selectAccount(account: string): Promise<unknown>;
     addProto(name: any, proto: any): void;
     addCodec(codec: any): void;
     addStore(name: any, prefix: any, root: any, isPrivate?: boolean): Promise<void>;
@@ -108,7 +108,7 @@ export default class Peernet {
     addRequestHandler(name: any, method: any): void;
     sendMessage(peer: any, id: any, data: any): Promise<any>;
     handleDHT(peer: any, id: any, proto: any): Promise<void>;
-    handleData(peer: any, id: any, proto: any): Promise<void>;
+    handleData(peer: any, id: any, proto: any): Promise<any>;
     handleRequest(peer: any, id: any, proto: any): Promise<void>;
     /**
      * @private
@@ -131,12 +131,12 @@ export default class Peernet {
     providersFor(hash: string, store?: undefined): Promise<import("./dht/dht.js").DHTProviderMapValue>;
     get block(): {
         get: (hash: string) => Promise<any>;
-        put: (hash: string, data: Uint8Array) => Promise<void | any[]>;
+        put: (hash: string, data: Uint8Array) => Promise<unknown>;
         has: (hash: string) => Promise<boolean | any[]>;
     };
     get transaction(): {
         get: (hash: string) => Promise<any>;
-        put: (hash: string, data: Uint8Array) => Promise<void | any[]>;
+        put: (hash: string, data: Uint8Array) => Promise<unknown>;
         has: (hash: string) => Promise<boolean | any[]>;
     };
     requestData(hash: any, store: any): any;
@@ -153,7 +153,7 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} message
          */
-        put: (hash: any, message: any) => Promise<void | any[]>;
+        put: (hash: any, message: any) => Promise<unknown>;
         /**
          * @param {String} hash
          * @return {Boolean}
@@ -173,7 +173,7 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} data
          */
-        put: (hash: any, data: any) => Promise<void | any[]>;
+        put: (hash: any, data: any) => Promise<unknown>;
         /**
          * @param {String} hash
          * @return {Boolean}
@@ -193,7 +193,7 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} data
          */
-        put: (hash: any, data: any) => Promise<void | any[]>;
+        put: (hash: any, data: any) => Promise<unknown>;
         /**
          * @param {String} hash
          * @return {Boolean}
@@ -223,7 +223,7 @@ export default class Peernet {
      * @param {Buffer} data
      * @param {String} storeName - storeName to access
      */
-    put(hash: string, data: Uint8Array, storeName?: string | LeofcoinStorageClass): Promise<void | any[]>;
+    put(hash: string, data: Uint8Array, storeName?: string | LeofcoinStorageClass): Promise<unknown>;
     /**
      * @param {String} hash
      * @return {Boolean}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.1.78",
+  "version": "1.1.80",
   "description": "",
   "browser": "./exports/browser/peernet.js",
   "exports": {
@@ -9,6 +9,11 @@
       "require": "./exports/commonjs/peernet.js",
       "types": "./exports/types/peernet.d.ts"
     },
+    "./identity": {
+      "import": "./exports/identity.js",
+      "require": "./exports/commonjs/identity.js",
+      "types": "./exports/types/identity.d.ts"
+    },
     "./browser": "./exports/browser/peernet.js"
   },
   "type": "module",
@@ -18,7 +23,7 @@
   "scripts": {
     "build": "rollup -c",
     "watch": "rollup -c -w",
-    "test": "node test/index.js",
+    "test": "npx mocha test/peernet.test.ts",
     "server": "discovery-swarm-webrtc --port=4000",
     "demo": "jsproject --serve ./ --port 6868"
   },
@@ -26,37 +31,41 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@leofcoin/codec-format-interface": "^1.6.0",
-    "@leofcoin/codecs": "^1.0.0",
-    "@leofcoin/generate-account": "^2.0.0",
+    "@leofcoin/codec-format-interface": "^1.7.11",
+    "@leofcoin/codecs": "^1.0.6",
+    "@leofcoin/generate-account": "^2.0.3",
     "@leofcoin/identity-utils": "^1.0.2",
-    "@leofcoin/multi-wallet": "^3.1.4",
-    "@leofcoin/storage": "^3.0.0",
-    "@netpeer/p2pt-swarm": "^1.3.5",
-    "@netpeer/swarm": "^0.8.1",
-    "@vandeurenglenn/base32": "^1.1.0",
-    "@vandeurenglenn/base58": "^1.1.0",
-    "@vandeurenglenn/debug": "^1.0.0",
-    "@vandeurenglenn/is-hex": "^1.0.0",
-    "@vandeurenglenn/little-pubsub": "^1.3.1",
-    "inquirer": "^9.1.4",
+    "@leofcoin/multi-wallet": "^3.1.8",
+    "@leofcoin/storage": "^3.5.32",
+    "@netpeer/p2pt-swarm": "^1.3.6",
+    "@netpeer/swarm": "^0.8.16",
+    "@vandeurenglenn/base32": "^1.2.4",
+    "@vandeurenglenn/base58": "^1.1.9",
+    "@vandeurenglenn/debug": "^1.2.5",
+    "@vandeurenglenn/is-hex": "^1.1.1",
+    "@vandeurenglenn/little-pubsub": "^1.5.1",
+    "inquirer": "^10.2.2",
     "multi-signature": "^1.3.1",
     "qr-scanner": "^1.4.2",
-    "qrcode": "^1.5.1",
-    "socket-request-client": "^2.0.6",
-    "socket-request-server": "^1.6.6"
+    "qrcode": "^1.5.4",
+    "socket-request-client": "^2.0.9",
+    "socket-request-server": "^1.6.17"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^25.0.7",
+    "@jest/globals": "^29.7.0",
+    "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@rollup/plugin-wasm": "^6.2.2",
-    "@types/bs58check": "^2.1.0",
-    "@types/node": "^20.11.0",
-    "@types/qrcode": "^1.5.2",
-    "@types/secp256k1": "^4.0.3",
-    "@types/varint": "^6.0.1",
-    "rollup": "^4.9.4"
+    "@types/bs58check": "^2.1.2",
+    "@types/node": "^22.5.5",
+    "@types/qrcode": "^1.5.5",
+    "@types/secp256k1": "^4.0.6",
+    "@types/varint": "^6.0.3",
+    "chai": "^5.1.1",
+    "cross-env": "^7.0.3",
+    "rollup": "^4.21.3",
+    "sinon": "^19.0.2"
   }
 }

package/rollup.config.js

@@ -9,7 +9,7 @@ rimraf.sync('./exports/**')
 
 export default [
   {
-    input: ['./src/peernet.ts', './node_modules/@leofcoin/storage/exports/browser-store.js'],
+    input: ['./src/peernet.ts', './src/identity.ts', './node_modules/@leofcoin/storage/exports/browser-store.js'],
     output: {
       format: 'es',
       dir: './exports/browser'
@@ -31,7 +31,7 @@ export default [
     external: ['./prompts/password.js']
   },
   {
-    input: ['./src/peernet.ts', './node_modules/@leofcoin/storage/exports/store.js'],
+    input: ['./src/peernet.ts', './src/identity.ts', './node_modules/@leofcoin/storage/exports/store.js'],
     output: {
       format: 'es',
       dir: './exports'

package/src/peernet.ts

@@ -390,22 +390,26 @@ export default class Peernet {
   async handleData(peer, id, proto) {
     let { hash, store } = proto.decoded
     let data
-    store = globalThis[`${store}Store`] || (await this.whichStore([...this.stores], hash))
+    try {
+      store = globalThis[`${store}Store`] || (await this.whichStore([...this.stores], hash))
 
-    if (store && !store.private) {
-      data = await store.get(hash)
+      if (store && !store.private) {
+        data = await store.get(hash)
 
-      if (data) {
-        data = await new globalThis.peernet.protos['peernet-data-response']({
-          hash,
-          data
-        })
+        if (data) {
+          data = await new globalThis.peernet.protos['peernet-data-response']({
+            hash,
+            data
+          })
 
-        const node = await this.prepareMessage(data)
-        this.sendMessage(peer, id, node.encoded)
+          const node = await this.prepareMessage(data)
+          this.sendMessage(peer, id, node.encoded)
+        }
+      } else {
+        // ban (trying to access private st)
       }
-    } else {
-      // ban (trying to access private st)
+    } catch (error) {
+      return this.requestData(hash, store)
     }
   }