From f8978ff79652d413e8dd2fa63139f0d13104e31c Mon Sep 17 00:00:00 2001 From: sravan Date: Thu, 2 Jul 2026 08:58:26 +0530 Subject: [PATCH] =?UTF-8?q?fix(desktop):=20drop=20crashing=20SnoreToast=20?= =?UTF-8?q?reply=20path=20=E2=80=94=20clean=20click-to-open=20toast?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The bundled SnoreToast crashes (0xC0000409) handling a text reply, and that crash triggered a second (fallback) toast. Removed the direct-SnoreToast reply path entirely; the chat toast now reliably shows avatar + message via node-notifier and opens the chat on click. Inline text reply needs a different toast engine (deferred). Co-Authored-By: Claude Opus 4.8 --- desktop/main.js | 112 ++++++++++-------------------------------------- 1 file changed, 22 insertions(+), 90 deletions(-) diff --git a/desktop/main.js b/desktop/main.js index 61ae564..8e4494e 100644 --- a/desktop/main.js +++ b/desktop/main.js @@ -35,19 +35,15 @@ ipcMain.on('get-install-info', (e) => { // on the next restart. No-op in dev (unpackaged). let autoUpdater = null; try { ({ autoUpdater } = require('electron-updater')); } catch (_) { /* not installed in dev */ } -// Native Windows toast WITH a reply box. node-notifier's WindowsToaster reliably SHOWS the -// toast (avatar + reply box) but its option whitelist has no `-w`, so SnoreToast never waits -// and the typed reply is lost. So we drive the bundled SnoreToast binary DIRECTLY with `-w` + -// our own named pipe to capture the reply — and fall back to WindowsToaster (display only) if -// the binary can't be found/spawned, so a toast always appears. Installed-app only (AppUserModelID). -const { spawn } = require('child_process'); -const net = require('net'); -let WindowsToaster = null; -try { WindowsToaster = require('node-notifier').WindowsToaster; } catch (_) { /* optional */ } +// Chat toast: shows the sender/group avatar + message; clicking it opens the chat. Uses +// node-notifier's WindowsToaster for reliable DISPLAY. Inline text reply is intentionally not +// used — the bundled SnoreToast crashes (0xC0000409) handling a text reply — so this is a clean +// click-to-open toast. Installed-app only (needs the AppUserModelID shortcut the installer sets). +let notifier = null; +try { notifier = require('node-notifier'); } catch (_) { /* optional */ } const APP_ID = 'com.bizgaze.connect.desktop'; -const dbg = (o) => { try { fs.appendFileSync(path.join(app.getPath('userData'), 'toast-debug.log'), JSON.stringify(Object.assign({ t: Date.now() }, o)) + '\n'); } catch (_) {} }; -// Write the avatar the renderer drew (a data: URL) to a temp PNG for SnoreToast's -p image. +// Write the avatar the renderer drew (a data: URL) to a temp PNG for the toast image. function writeTempPng(dataUrl) { try { if (!dataUrl || !/^data:image\/png;base64,/.test(dataUrl)) return null; @@ -56,87 +52,23 @@ function writeTempPng(dataUrl) { return p; } catch (_) { return null; } } -// Locate the SnoreToast binary node-notifier bundles (handles asar.unpacked in a packaged app). -function snoreExe() { - try { - const dir = path.dirname(require.resolve('node-notifier')); - const exe = os.arch() === 'ia32' ? 'snoretoast-x86.exe' : 'snoretoast-x64.exe'; - let p = path.join(dir, 'vendor', 'snoreToast', exe); - // In a packaged app the module resolves inside app.asar, but binaries live in - // app.asar.unpacked — and fs.existsSync falsely reports the asar path exists, so we can't - // test it; map to the unpacked copy unconditionally (that's the real, spawnable file). - if (p.includes('app.asar' + path.sep) && !p.includes('app.asar.unpacked')) { - p = p.replace('app.asar' + path.sep, 'app.asar.unpacked' + path.sep); - } - return p; - } catch (_) {} - return null; -} -// Direct SnoreToast: with -pipeName it blocks and waits for the interaction on its own, then -// writes the result (incl. the typed reply) to our pipe (do NOT pass -w — it fails on this -// build; and no -application). Rejects if the binary is missing/fails so the caller can fall back. -function directToast(payload, img) { - return new Promise((resolve, reject) => { - const exe = snoreExe(); - if (!exe) return reject(new Error('snoretoast not found')); - const pipe = '\\\\.\\pipe\\bizc-' + crypto.randomBytes(6).toString('hex'); - let raw = Buffer.alloc(0), settled = false, server = null; - const settle = (fn, v) => { if (!settled) { settled = true; try { server && server.close(); } catch (_) {} fn(v); } }; - server = net.createServer((sock) => { sock.on('data', (d) => { raw = Buffer.concat([raw, d]); }); }); - server.on('error', (e) => settle(reject, e)); - server.listen(pipe, () => { - const args = ['-appID', APP_ID, '-tb', '-pipeName', pipe]; - if (img) args.push('-p', img); - args.push('-m', payload.body || ' ', '-t', payload.title || 'Biz Connect'); - const child = spawn(exe, args, { windowsHide: true }); - child.on('error', (e) => settle(reject, e)); - child.on('exit', (code) => { - const s = raw.toString('utf16le').replace(/[\u0000\r\n]+/g, '').trim(); - dbg({ code, raw: s }); - const r = {}; - s.split(';').forEach((kv) => { const i = kv.indexOf('='); if (i > 0) r[kv.slice(0, i).trim().toLowerCase()] = kv.slice(i + 1); }); - let text = String(r.text || r.value || r.userinput || r.textbox || r.reply || '').trim(); - if (!text && code === 5 && s) { const parts = s.split('='); text = (parts.length > 1 ? parts.slice(1).join('=') : s).trim(); } - if (text) return settle(resolve, { kind: payload.kind, id: payload.id, text }); - // 0=activated, 1=hidden, 2=dismissed, 3=timedout, 4=button, 5=text. Anything else = failed → fall back. - if (![0, 1, 2, 3, 4, 5].includes(code)) return settle(reject, new Error('snoretoast exit ' + code)); - const act = String(r.action || '').toLowerCase(); - if (code === 0 || act.includes('activat') || act.includes('click')) return settle(resolve, { kind: payload.kind, id: payload.id, open: true }); - settle(resolve, null); - }); - }); - }); -} -// Fallback: node-notifier shows the toast (avatar + reply box) but can't capture the reply. -function fallbackToast(payload, img) { - return new Promise((resolve) => { - if (!WindowsToaster) return resolve(null); - try { - new WindowsToaster({ withFallback: false }).notify( - Object.assign({ title: payload.title || 'Biz Connect', message: payload.body || ' ', appID: APP_ID, tb: true }, img ? { icon: img } : {}), - (err, response, metadata) => { - const act = String(response || (metadata && metadata.action) || '').toLowerCase(); - resolve(act.includes('activat') || act === 'click' ? { kind: payload.kind, id: payload.id, open: true } : null); - } - ); - } catch (_) { resolve(null); } - }); -} -// Resolves with {text} (replied), {open} (toast clicked), or null (dismissed/timeout). -ipcMain.handle('reply-notification', async (_e, payload = {}) => { + +// Resolves {open} when the toast is clicked (the renderer then opens that chat), else null. +ipcMain.handle('reply-notification', (_e, payload = {}) => new Promise((resolve) => { + if (!notifier) return resolve(null); const img = writeTempPng(payload.avatar); - const cleanup = () => { if (img) { try { fs.unlinkSync(img); } catch (_) {} } }; + let done = false; + const finish = (v) => { if (!done) { done = true; if (img) { try { fs.unlinkSync(img); } catch (_) {} } resolve(v); } }; try { - const r = await directToast(payload, img); - cleanup(); - return r; - } catch (e) { - dbg({ fallback: String(e && e.message) }); - const r = await fallbackToast(payload, img); - cleanup(); - return r; - } -}); + notifier.notify( + Object.assign({ appID: APP_ID, title: payload.title || 'Biz Connect', message: payload.body || ' ' }, img ? { icon: img } : {}), + (err, response, metadata) => { + const act = String(response || (metadata && metadata.action) || '').toLowerCase(); + finish(act.includes('activat') || act === 'click' ? { kind: payload.kind, id: payload.id, open: true } : null); + } + ); + } catch (_) { finish(null); } +})); // Windows attributes notifications to the AppUserModelID. Without setting it, toasts read // "electron.app."; setting it to the installer's appId makes Windows resolve the