@glyphteck/veyl 0.31.0 → 0.31.1

package/dist/cli.js

@@ -979,7 +979,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "veyl",
-    version: "0.31.0",
+    version: "0.31.1",
     private: true,
     license: "Apache-2.0",
     workspaces: {
@@ -174256,6 +174256,12 @@ function findByKey(messages, target) {
   return (messages || []).find((message) => message?.id === key || message?.cid === key || getMessageKey(message) === key) || null;
 }
 function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
+  let activeReadWindow = null;
+  function releaseActiveWindow() {
+    const window2 = activeReadWindow;
+    activeReadWindow = null;
+    window2?.release?.();
+  }
   async function readyRuntime() {
     const runtime = await getRuntime();
     await waitFor2(runtime.chat, (snapshot) => snapshot?.isChatDataReady === true);
@@ -174344,13 +174350,20 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
   }
   async function read(peer, options2 = {}) {
     const window2 = await messageWindow(peer, options2);
-    if (!window2.chat)
+    if (!window2.chat) {
+      releaseActiveWindow();
       return { chat: null, messages: [] };
+    }
+    let retained = false;
     try {
       const { runtime, session, chat, messages } = window2;
       const lastPeer = [...messages].reverse().find((message) => isPeerMsg(message, session.chatPK));
       if (lastPeer)
         await runtime.chat.getSnapshot().markChatReadReceipt(chat.id, lastPeer, { messages });
+      const previousWindow = activeReadWindow;
+      activeReadWindow = window2;
+      retained = true;
+      previousWindow?.release?.();
       return {
         chat: simplifyAccountChat(chat, profileForChat(runtime, chat)),
         messages: messages.map((message) => simplifyAccountMessage(message, chat, session.chatPK, options2)),
@@ -174358,7 +174371,8 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
         nextOlderThan: window2.history?.nextOlderThan || null
       };
     } finally {
-      window2.release?.();
+      if (!retained)
+        window2.release?.();
     }
   }
   async function markRead(peer, options2 = {}) {
@@ -174381,9 +174395,17 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     }
   }
   async function messageForPeer(peer, messageId, options2 = {}) {
-    const window2 = await messageWindow(peer, { ...options2, count: Math.max(positiveLimit2(options2.count, 100), 100), loadOlder: false });
-    if (!window2.chat)
+    const { runtime, chat } = await chatForPeer(peer);
+    if (!chat)
       throw new Error("chat not found");
+    const retained = activeReadWindow;
+    if (retained?.runtime === runtime && retained.chat?.id === chat.id) {
+      const message = findByKey(retained.batch?.sourceMessages, messageId) || findByKey(retained.messages, messageId);
+      if (message) {
+        return { ...retained, release: undefined, message, target: getMessageKey(message) || cleanText(messageId) };
+      }
+    }
+    const window2 = await messageWindow(peer, { ...options2, count: Math.max(positiveLimit2(options2.count, 100), 100), loadOlder: false });
     try {
       let message = findByKey(window2.batch?.sourceMessages, messageId) || findByKey(window2.messages, messageId);
       if (!message) {
@@ -174563,6 +174585,9 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     if (!chat)
       return { deleted: false, chat: null };
     const deleted = await runtime.chat.getSnapshot().deleteChat(chat, { cleanup: options2.cleanup !== false });
+    if (deleted === true && activeReadWindow?.runtime === runtime && activeReadWindow.chat?.id === chat.id) {
+      releaseActiveWindow();
+    }
     return { deleted: deleted === true, chat: simplifyAccountChat(chat, profile) };
   }
   async function retention(peer, value) {
@@ -174596,7 +174621,8 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     deleteChat,
     retention,
     messageWindow,
-    messageForPeer
+    messageForPeer,
+    releaseActiveWindow
   };
 }
 function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }) {
@@ -174616,6 +174642,17 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
       return fees || null;
     return { ...fees, spark: stripRaw(fees.spark, options2) };
   }
+  function summarizePaymentResult(value) {
+    if (!value || typeof value !== "object")
+      return value ?? null;
+    const transfer = value.transfer && typeof value.transfer === "object" ? simplifyAccountTransfer(value.transfer) : null;
+    return {
+      kind: value.kind || null,
+      id: value.id || value.transfer?.id || null,
+      status: value.status || value.transfer?.status || null,
+      transfer
+    };
+  }
   function cleanWithdrawal(withdrawal, options2 = {}) {
     if (!withdrawal)
       return null;
@@ -174723,8 +174760,8 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
     return {
       id: result.result?.id || result.payment?.id || null,
       fees,
-      result: stripRaw(result.result, options2),
-      raw: options2.raw ? jsonSafe(result.payment) : undefined
+      result: summarizePaymentResult(result.result),
+      raw: options2.raw ? jsonSafe(result) : undefined
     };
   }
   async function lightningReceive(id, options2 = {}) {
@@ -174735,7 +174772,10 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
   async function lightningSend(id, options2 = {}) {
     const { snapshot } = await readyWallet();
     const result = throwIfFailed(await snapshot.value.getLightningSendRequest(id), "could not read lightning send request");
-    return stripRaw(result.result, options2);
+    return {
+      ...summarizePaymentResult(result.result),
+      raw: options2.raw ? jsonSafe(result.result) : undefined
+    };
   }
   async function payInvoice(value, options2 = {}) {
     const raw = cleanText(value);
@@ -174757,7 +174797,8 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
       type,
       id: result?.id || result?.result?.id || null,
       fees: result?.fees || null,
-      result: stripRaw(result?.result, options2)
+      result: summarizePaymentResult(result?.result),
+      raw: options2.raw ? jsonSafe(result) : undefined
     };
   }
   async function withdrawQuote(onchainAddress, sats, options2 = {}) {
@@ -175265,6 +175306,7 @@ class VeylHeadlessClient {
   }
   async createAccount(options2 = {}) {
     const username = cleanUsername3(options2.username);
+    const profileName = this.store.profile || username;
     const network = String(options2.network || this.network).toUpperCase();
     const termsVersion = requireCurrentTermsVersion(options2.termsVersion);
     const machine = options2.credential || createMachineCredential();
@@ -175280,7 +175322,7 @@ class VeylHeadlessClient {
     await signInHeadless(this.auth, finish.token);
     this.autoLogin = true;
     const profile = await this.saveProfile({
-      profile: username,
+      profile: profileName,
       username,
       uid: finish.uid,
       network,
@@ -175300,7 +175342,7 @@ class VeylHeadlessClient {
   }
   async loginAccount(options2 = {}) {
     const username = cleanOptionalUsername(options2.username);
-    const profile = await this.loadProfile(username);
+    const profile = await this.loadProfile(this.store.profile || username);
     const credentialId = options2.credentialId || profile.credentialId;
     const privateKeyPem = options2.privateKeyPem || profile.privateKeyPem;
     if (!credentialId || !privateKeyPem) {
@@ -175339,6 +175381,7 @@ class VeylHeadlessClient {
   }
   async createPasskeyAccount(options2 = {}) {
     const username = cleanUsername3(options2.username);
+    const profileName = this.store.profile || username;
     const network = String(options2.network || this.network).toUpperCase();
     const termsVersion = requireCurrentTermsVersion(options2.termsVersion);
     const flow = await runPasskeyBrowserFlow({
@@ -175355,7 +175398,7 @@ class VeylHeadlessClient {
     const machine = options2.credential || createMachineCredential();
     const credential = machine ? await this.addMachineCredential(machine) : null;
     const profile = await this.saveProfile({
-      profile: username,
+      profile: profileName,
       username,
       uid: user.uid,
       network,
@@ -175375,7 +175418,7 @@ class VeylHeadlessClient {
   }
   async loginPasskeyAccount(options2 = {}) {
     const requested = cleanOptionalUsername(options2.username);
-    const stored = requested ? await this.store.load(requested) : await this.store.load();
+    const stored = await this.store.load(this.store.profile || requested);
     const flow = await runPasskeyBrowserFlow({
       mode: "login",
       uid: options2.uid || stored?.uid,
@@ -175391,7 +175434,7 @@ class VeylHeadlessClient {
     const credential = machine ? await this.addMachineCredential(machine) : null;
     const profile = await this.saveProfile({
       ...stored || {},
-      profile: username || stored?.profile || user.uid,
+      profile: this.store.profile || stored?.profile || username || user.uid,
       username: username || stored?.username || null,
       uid: user.uid,
       network: String(stored?.network || options2.network || this.network).toUpperCase(),
@@ -175700,6 +175743,7 @@ class VeylHeadlessClient {
   }
   closeVaultSession() {
     const session = this.session;
+    this.runtimeChat.releaseActiveWindow();
     this.session = null;
     this.runtime = null;
     closeAccountSession(session);

package/dist/index.js

@@ -173633,6 +173633,12 @@ function findByKey(messages, target) {
   return (messages || []).find((message) => message?.id === key || message?.cid === key || getMessageKey(message) === key) || null;
 }
 function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
+  let activeReadWindow = null;
+  function releaseActiveWindow() {
+    const window2 = activeReadWindow;
+    activeReadWindow = null;
+    window2?.release?.();
+  }
   async function readyRuntime() {
     const runtime = await getRuntime();
     await waitFor2(runtime.chat, (snapshot) => snapshot?.isChatDataReady === true);
@@ -173721,13 +173727,20 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
   }
   async function read(peer, options2 = {}) {
     const window2 = await messageWindow(peer, options2);
-    if (!window2.chat)
+    if (!window2.chat) {
+      releaseActiveWindow();
       return { chat: null, messages: [] };
+    }
+    let retained = false;
     try {
       const { runtime, session, chat, messages } = window2;
       const lastPeer = [...messages].reverse().find((message) => isPeerMsg(message, session.chatPK));
       if (lastPeer)
         await runtime.chat.getSnapshot().markChatReadReceipt(chat.id, lastPeer, { messages });
+      const previousWindow = activeReadWindow;
+      activeReadWindow = window2;
+      retained = true;
+      previousWindow?.release?.();
       return {
         chat: simplifyAccountChat(chat, profileForChat(runtime, chat)),
         messages: messages.map((message) => simplifyAccountMessage(message, chat, session.chatPK, options2)),
@@ -173735,7 +173748,8 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
         nextOlderThan: window2.history?.nextOlderThan || null
       };
     } finally {
-      window2.release?.();
+      if (!retained)
+        window2.release?.();
     }
   }
   async function markRead(peer, options2 = {}) {
@@ -173758,9 +173772,17 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     }
   }
   async function messageForPeer(peer, messageId, options2 = {}) {
-    const window2 = await messageWindow(peer, { ...options2, count: Math.max(positiveLimit2(options2.count, 100), 100), loadOlder: false });
-    if (!window2.chat)
+    const { runtime, chat } = await chatForPeer(peer);
+    if (!chat)
       throw new Error("chat not found");
+    const retained = activeReadWindow;
+    if (retained?.runtime === runtime && retained.chat?.id === chat.id) {
+      const message = findByKey(retained.batch?.sourceMessages, messageId) || findByKey(retained.messages, messageId);
+      if (message) {
+        return { ...retained, release: undefined, message, target: getMessageKey(message) || cleanText(messageId) };
+      }
+    }
+    const window2 = await messageWindow(peer, { ...options2, count: Math.max(positiveLimit2(options2.count, 100), 100), loadOlder: false });
     try {
       let message = findByKey(window2.batch?.sourceMessages, messageId) || findByKey(window2.messages, messageId);
       if (!message) {
@@ -173940,6 +173962,9 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     if (!chat)
       return { deleted: false, chat: null };
     const deleted = await runtime.chat.getSnapshot().deleteChat(chat, { cleanup: options2.cleanup !== false });
+    if (deleted === true && activeReadWindow?.runtime === runtime && activeReadWindow.chat?.id === chat.id) {
+      releaseActiveWindow();
+    }
     return { deleted: deleted === true, chat: simplifyAccountChat(chat, profile) };
   }
   async function retention(peer, value) {
@@ -173973,7 +173998,8 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     deleteChat,
     retention,
     messageWindow,
-    messageForPeer
+    messageForPeer,
+    releaseActiveWindow
   };
 }
 function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }) {
@@ -173993,6 +174019,17 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
       return fees || null;
     return { ...fees, spark: stripRaw(fees.spark, options2) };
   }
+  function summarizePaymentResult(value) {
+    if (!value || typeof value !== "object")
+      return value ?? null;
+    const transfer = value.transfer && typeof value.transfer === "object" ? simplifyAccountTransfer(value.transfer) : null;
+    return {
+      kind: value.kind || null,
+      id: value.id || value.transfer?.id || null,
+      status: value.status || value.transfer?.status || null,
+      transfer
+    };
+  }
   function cleanWithdrawal(withdrawal, options2 = {}) {
     if (!withdrawal)
       return null;
@@ -174100,8 +174137,8 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
     return {
       id: result.result?.id || result.payment?.id || null,
       fees,
-      result: stripRaw(result.result, options2),
-      raw: options2.raw ? jsonSafe(result.payment) : undefined
+      result: summarizePaymentResult(result.result),
+      raw: options2.raw ? jsonSafe(result) : undefined
     };
   }
   async function lightningReceive(id, options2 = {}) {
@@ -174112,7 +174149,10 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
   async function lightningSend(id, options2 = {}) {
     const { snapshot } = await readyWallet();
     const result = throwIfFailed(await snapshot.value.getLightningSendRequest(id), "could not read lightning send request");
-    return stripRaw(result.result, options2);
+    return {
+      ...summarizePaymentResult(result.result),
+      raw: options2.raw ? jsonSafe(result.result) : undefined
+    };
   }
   async function payInvoice(value, options2 = {}) {
     const raw = cleanText(value);
@@ -174134,7 +174174,8 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
       type,
       id: result?.id || result?.result?.id || null,
       fees: result?.fees || null,
-      result: stripRaw(result?.result, options2)
+      result: summarizePaymentResult(result?.result),
+      raw: options2.raw ? jsonSafe(result) : undefined
     };
   }
   async function withdrawQuote(onchainAddress, sats, options2 = {}) {
@@ -174824,7 +174865,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "veyl",
-    version: "0.31.0",
+    version: "0.31.1",
     private: true,
     license: "Apache-2.0",
     workspaces: {
@@ -175264,6 +175305,7 @@ class VeylHeadlessClient {
   }
   async createAccount(options2 = {}) {
     const username = cleanUsername3(options2.username);
+    const profileName = this.store.profile || username;
     const network = String(options2.network || this.network).toUpperCase();
     const termsVersion = requireCurrentTermsVersion(options2.termsVersion);
     const machine = options2.credential || createMachineCredential();
@@ -175279,7 +175321,7 @@ class VeylHeadlessClient {
     await signInHeadless(this.auth, finish.token);
     this.autoLogin = true;
     const profile = await this.saveProfile({
-      profile: username,
+      profile: profileName,
       username,
       uid: finish.uid,
       network,
@@ -175299,7 +175341,7 @@ class VeylHeadlessClient {
   }
   async loginAccount(options2 = {}) {
     const username = cleanOptionalUsername(options2.username);
-    const profile = await this.loadProfile(username);
+    const profile = await this.loadProfile(this.store.profile || username);
     const credentialId = options2.credentialId || profile.credentialId;
     const privateKeyPem = options2.privateKeyPem || profile.privateKeyPem;
     if (!credentialId || !privateKeyPem) {
@@ -175338,6 +175380,7 @@ class VeylHeadlessClient {
   }
   async createPasskeyAccount(options2 = {}) {
     const username = cleanUsername3(options2.username);
+    const profileName = this.store.profile || username;
     const network = String(options2.network || this.network).toUpperCase();
     const termsVersion = requireCurrentTermsVersion(options2.termsVersion);
     const flow = await runPasskeyBrowserFlow({
@@ -175354,7 +175397,7 @@ class VeylHeadlessClient {
     const machine = options2.credential || createMachineCredential();
     const credential = machine ? await this.addMachineCredential(machine) : null;
     const profile = await this.saveProfile({
-      profile: username,
+      profile: profileName,
       username,
       uid: user.uid,
       network,
@@ -175374,7 +175417,7 @@ class VeylHeadlessClient {
   }
   async loginPasskeyAccount(options2 = {}) {
     const requested = cleanOptionalUsername(options2.username);
-    const stored = requested ? await this.store.load(requested) : await this.store.load();
+    const stored = await this.store.load(this.store.profile || requested);
     const flow = await runPasskeyBrowserFlow({
       mode: "login",
       uid: options2.uid || stored?.uid,
@@ -175390,7 +175433,7 @@ class VeylHeadlessClient {
     const credential = machine ? await this.addMachineCredential(machine) : null;
     const profile = await this.saveProfile({
       ...stored || {},
-      profile: username || stored?.profile || user.uid,
+      profile: this.store.profile || stored?.profile || username || user.uid,
       username: username || stored?.username || null,
       uid: user.uid,
       network: String(stored?.network || options2.network || this.network).toUpperCase(),
@@ -175699,6 +175742,7 @@ class VeylHeadlessClient {
   }
   closeVaultSession() {
     const session = this.session;
+    this.runtimeChat.releaseActiveWindow();
     this.session = null;
     this.runtime = null;
     closeAccountSession(session);

package/package.json

@@ -32,5 +32,5 @@
         "start": "node src/cli.js",
         "lint": "eslint src --quiet"
     },
-    "version": "0.31.0"
+    "version": "0.31.1"
 }