@leofcoin/peernet 1.2.24 → 1.2.26

package/exports/browser/{browser-BOiH47em.js → browser-D-r0O9Qn.js}

@@ -1,4 +1,4 @@
-import { m as getDefaultExportFromCjs } from './identity-DWchlbmt.js';
+import { m as getDefaultExportFromCjs } from './identity-ChyyZSve.js';
 
 function _mergeNamespaces(n, m) {
 	m.forEach(function (e) {

package/exports/browser/{browser-BuaFyOQj.js → browser-_hiyXwPp.js}

@@ -1,4 +1,4 @@
-import { m as getDefaultExportFromCjs } from './identity-DWchlbmt.js';
+import { m as getDefaultExportFromCjs } from './identity-ChyyZSve.js';
 
 function _mergeNamespaces(n, m) {
 	m.forEach(function (e) {

package/exports/browser/{client-B2wkkpij.js → client-U5AYtQje.js}

@@ -1,5 +1,5 @@
-import { L as LittlePubSub, d as deflate_1, i as inflate_1, c as createDebugger } from './peernet-Coi40mR_.js';
-import './identity-DWchlbmt.js';
+import { L as LittlePubSub, d as deflate_1, i as inflate_1, c as createDebugger } from './peernet-DHQj_MFb.js';
+import './identity-ChyyZSve.js';
 import 'crypto';
 import './value-C3vAp-wb.js';
 
@@ -232,7 +232,7 @@ class SocketRequestClient {
             const init = async () => {
                 // @ts-ignore
                 if (!globalThis.WebSocket && !this.#experimentalWebsocket)
-                    globalThis.WebSocket = (await import('./browser-BuaFyOQj.js').then(function (n) { return n.b; })).default.w3cwebsocket;
+                    globalThis.WebSocket = (await import('./browser-_hiyXwPp.js').then(function (n) { return n.b; })).default.w3cwebsocket;
                 const client = new WebSocket(this.#url, this.#protocol);
                 if (this.#experimentalWebsocket) {
                     client.addEventListener('error', this.onerror);
@@ -1303,7 +1303,7 @@ class Client {
         }
     }
     async #loadNodeWebrtcImplementation() {
-        const koushWrtcModule = await import('./browser-BOiH47em.js').then(function (n) { return n.b; });
+        const koushWrtcModule = await import('./browser-D-r0O9Qn.js').then(function (n) { return n.b; });
         const koushWrtc = koushWrtcModule.default;
         if (!isWrtcImplementation(koushWrtc)) {
             throw new Error('@koush/wrtc does not match required wrtc contract');

package/exports/browser/{identity-DWchlbmt.js → identity-ChyyZSve.js}

@@ -8308,7 +8308,7 @@ class Identity {
         accounts = new TextDecoder().decode(accounts);
         return JSON.parse(accounts);
     }
-    async load(password) {
+    async load(password, fresh = false) {
         if (password && password.includes('.txt')) {
             const { readFile } = await import('fs/promises');
             try {
@@ -8324,15 +8324,19 @@ class Identity {
             password = await importee.default();
         }
         const accountExists = await globalThis.accountStore.has('public');
-        if (accountExists) {
+        if (accountExists && !fresh) {
             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" */ './index-s61gSKAd.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-BD0Anx7_.js');
             const { identity, accounts } = await importee.default(password, this.network);
+            if (fresh) {
+                await globalThis.accountStore.clear();
+                await globalThis.walletStore.clear();
+            }
             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));

package/exports/browser/identity.js

@@ -1,2 +1,2 @@
-export { I as default, r as resolveAccountWallets } from './identity-DWchlbmt.js';
+export { I as default, r as resolveAccountWallets } from './identity-ChyyZSve.js';
 import 'crypto';

package/exports/browser/{index-s61gSKAd.js → index-BD0Anx7_.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, l as encrypt, a as base58$1 } from './identity-DWchlbmt.js';
+import { M as MultiWallet, l as encrypt, a as base58$1 } from './identity-ChyyZSve.js';
 import 'crypto';
 
 /**

package/exports/browser/{messages-CZ-3jxiD.js → messages-Dr5w-bq6.js}

@@ -1,5 +1,5 @@
-import { F as FormatInterface } from './peernet-Coi40mR_.js';
-import './identity-DWchlbmt.js';
+import { F as FormatInterface } from './peernet-DHQj_MFb.js';
+import './identity-ChyyZSve.js';
 import 'crypto';
 import './value-C3vAp-wb.js';
 

package/exports/browser/{peernet-Coi40mR_.js → peernet-DHQj_MFb.js}

@@ -1,4 +1,4 @@
-import { i as index$2, b as base, a as base58$1, c as index$3, d as index$4, e as index$5, f as createSHA512, g as createSHA384, h as createSHA256, j as createSHA224, k as createSHA1, I as Identity } from './identity-DWchlbmt.js';
+import { i as index$2, b as base, a as base58$1, c as index$3, d as index$4, e as index$5, f as createSHA512, g as createSHA384, h as createSHA256, j as createSHA224, k as createSHA1, I as Identity } from './identity-ChyyZSve.js';
 import { K as KeyPath, a as KeyValue } from './value-C3vAp-wb.js';
 
 const getTargets = () => Array.from([]);
@@ -8615,7 +8615,7 @@ class Peernet {
         await getAddress();
         this.storePrefix = options.storePrefix;
         this.root = options.root;
-        const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile } = await import(/* webpackChunkName: "messages" */ './messages-CZ-3jxiD.js');
+        const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile } = await import(/* webpackChunkName: "messages" */ './messages-Dr5w-bq6.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -8646,7 +8646,7 @@ class Peernet {
             await this.addStore(store, options.storePrefix, options.root);
         }
         this.identity = new Identity(this.network);
-        await this.identity.load(password);
+        await this.identity.load(password, options.freshIdentity === true);
         this._peerHandler = new PeerDiscovery(this.id);
         this.peerId = this.id;
         /**
@@ -8662,7 +8662,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-B2wkkpij.js');
+        const importee = await import('./client-U5AYtQje.js');
         /**
          * @access public
          * @type {PeernetClient}

package/exports/browser/peernet.js

@@ -1,4 +1,4 @@
-export { P as default } from './peernet-Coi40mR_.js';
-import './identity-DWchlbmt.js';
+export { P as default } from './peernet-DHQj_MFb.js';
+import './identity-ChyyZSve.js';
 import './value-C3vAp-wb.js';
 import 'crypto';

package/exports/identity.js

@@ -53,7 +53,7 @@ class Identity {
         accounts = new TextDecoder().decode(accounts);
         return JSON.parse(accounts);
     }
-    async load(password) {
+    async load(password, fresh = false) {
         if (password && password.includes('.txt')) {
             const { readFile } = await import('fs/promises');
             try {
@@ -65,11 +65,11 @@ class Identity {
         }
         if (!password) {
             // @ts-ignore
-            const importee = await import('./home/runner/work/peernet/peernet/src/prompts/password.js');
+            const importee = await import('./prompts/password.js');
             password = await importee.default();
         }
         const accountExists = await globalThis.accountStore.has('public');
-        if (accountExists) {
+        if (accountExists && !fresh) {
             const pub = await globalThis.accountStore.get('public');
             this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
             const selected = await globalThis.walletStore.get('selected-account');
@@ -78,6 +78,10 @@ class Identity {
         else {
             const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account');
             const { identity, accounts } = await importee.default(password, this.network);
+            if (fresh) {
+                await globalThis.accountStore.clear();
+                await globalThis.walletStore.clear();
+            }
             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));

package/exports/peernet.js

@@ -487,7 +487,7 @@ class Peernet {
             await this.addStore(store, options.storePrefix, options.root);
         }
         this.identity = new Identity(this.network);
-        await this.identity.load(password);
+        await this.identity.load(password, options.freshIdentity === true);
         this._peerHandler = new PeerDiscovery(this.id);
         this.peerId = this.id;
         /**

package/exports/types/identity.d.ts

@@ -14,7 +14,7 @@ export default class Identity {
     constructor(network: string);
     get accounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
     getAccounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
-    load(password?: string): Promise<void>;
+    load(password?: string, fresh?: boolean): Promise<void>;
     selectAccount(account: string): Promise<unknown>;
     sign(hash: Uint8Array): Promise<Uint8Array<ArrayBufferLike>>;
     lock(password: string): void;

package/exports/types/peernet.d.ts

@@ -105,6 +105,7 @@ export default class Peernet {
     _init(options: {
         storePrefix?: string;
         root?: string;
+        freshIdentity?: boolean;
     }, password: string): Promise<Peernet>;
     start(): Promise<void>;
     addRequestHandler(name: any, method: any): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.2.24",
+  "version": "1.2.26",
   "description": "",
   "repository": {
     "type": "git",

package/rollup.config.js

@@ -27,20 +27,10 @@ const walk = async (dir) => {
 
 const isHashedChunk = (runtimePath) => /-[A-Za-z0-9_-]{8,}\.js$/.test(runtimePath)
 
-const normalizeNodePromptImport = () => ({
-  name: 'normalize-node-prompt-import',
-  writeBundle: async () => {
-    const filePath = 'exports/identity.js'
-    const code = await readFile(filePath, 'utf8')
-    const normalized = code
-      .replaceAll("'./src/prompts/password.js'", "'./prompts/password.js'")
-      .replace(/(["'])\.\/Users\/[^"']*\/src\/prompts\/password\.js\1/g, '$1./prompts/password.js$1')
-
-    if (normalized !== code) {
-      await writeFile(filePath, normalized)
-    }
-  }
-})
+const isPromptImport = (id) =>
+  id === './prompts/password.js' ||
+  id === './src/prompts/password.js' ||
+  id.endsWith('/src/prompts/password.js')
 
 const runtimeFirstExports = ({ exportsDir = 'exports', declarationsDir = 'exports/types' } = {}) => ({
   name: 'runtime-first-exports',
@@ -124,7 +114,7 @@ export default [
     output: {
       format: 'es',
       dir: 'exports',
-      paths: (id) => (id === './src/prompts/password.js' ? './prompts/password.js' : id)
+      paths: (id) => (isPromptImport(id) ? './prompts/password.js' : id)
     },
     plugins: [
       typescript({
@@ -132,15 +122,12 @@ export default [
           outDir: 'exports',
           declarationDir: 'exports/types'
         }
-      }),
-      normalizeNodePromptImport()
+      })
     ],
-    external: [
-      './prompts/password.js',
-      './src/prompts/password.js',
-      './prompts/password/browser.js',
-      './prompts/password/node.js'
-    ]
+    external: (id) =>
+      isPromptImport(id) ||
+      id === './prompts/password/browser.js' ||
+      id === './prompts/password/node.js'
   },
   {
     input: ['./src/prompts/password/browser.js'],

package/src/identity.ts

@@ -72,7 +72,7 @@ export default class Identity {
     return JSON.parse(accounts)
   }
 
-  async load(password?: string): Promise<void> {
+  async load(password?: string, fresh = false): Promise<void> {
     if (password && password.includes('.txt')) {
       const { readFile } = await import('fs/promises')
       try {
@@ -88,7 +88,7 @@ export default class Identity {
     }
 
     const accountExists = await globalThis.accountStore.has('public')
-    if (accountExists) {
+    if (accountExists && !fresh) {
       const pub = await globalThis.accountStore.get('public')
       this.id = JSON.parse(new TextDecoder().decode(pub)).walletId
       const selected = await globalThis.walletStore.get('selected-account')
@@ -96,6 +96,10 @@ export default class Identity {
     } else {
       const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account')
       const { identity, accounts } = await importee.default(password, this.network)
+      if (fresh) {
+        await globalThis.accountStore.clear()
+        await globalThis.walletStore.clear()
+      }
       await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }))
 
       await globalThis.walletStore.put('version', String(1))

package/src/peernet.ts

@@ -199,7 +199,10 @@ export default class Peernet {
    *
    * @return {Promise} instance of Peernet
    */
-  async _init(options: { storePrefix?: string; root?: string }, password: string): Promise<Peernet> {
+  async _init(
+    options: { storePrefix?: string; root?: string; freshIdentity?: boolean },
+    password: string
+  ): Promise<Peernet> {
     await getAddress()
     this.storePrefix = options.storePrefix
     this.root = options.root
@@ -254,7 +257,7 @@ export default class Peernet {
     }
 
     this.identity = new Identity(this.network)
-    await this.identity.load(password)
+    await this.identity.load(password, options.freshIdentity === true)
 
     this._peerHandler = new PeerDiscovery(this.id)
     this.peerId = this.id

package/test/peernet.test.js

@@ -1,5 +1,6 @@
 import test from 'node:test'
 import assert from 'node:assert/strict'
+import { readFile } from 'node:fs/promises'
 
 import Peernet from '../exports/peernet.js'
 import Identity, { resolveAccountWallets } from '../exports/identity.js'
@@ -18,6 +19,12 @@ const options = {
 const password = 'password'
 const peernet = await new Peernet(options, password)
 
+test('node bundle uses a portable password prompt import', async () => {
+  const identityBundle = await readFile(new URL('../exports/identity.js', import.meta.url), 'utf8')
+  assert.match(identityBundle, /import\(['"]\.\/prompts\/password\.js['"]\)/)
+  assert.doesNotMatch(identityBundle, /(?:\/home\/|\/Users\/|[A-Za-z]:\\)/)
+})
+
 test('initializes with provided options', () => {
   assert.equal(peernet.network, options.network)
   assert.equal(peernet.version, options.version)
@@ -28,6 +35,16 @@ test('exposes identity instance', () => {
   assert.ok(peernet.identity instanceof Identity)
 })
 
+test('freshIdentity replaces a persisted identity and signer', async () => {
+  const originalId = peernet.id
+  const originalAccount = peernet.selectedAccount
+  const replacement = await new Peernet({ ...options, freshIdentity: true }, password)
+
+  assert.notEqual(replacement.id, originalId)
+  assert.notEqual(replacement.selectedAccount, originalAccount)
+  assert.equal(new TextDecoder().decode(await globalThis.walletStore.get('selected-account')), replacement.selectedAccount)
+})
+
 test('has a DHT instance', () => {
   assert.ok(peernet.dht)
 })