Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(web): handle failures that voided promises dropped (#8269)
teo1a76ce0fcb2d
diff --git a/apps/web/src/components/view-shell/AiFilterInput.tsx b/apps/web/src/components/view-shell/AiFilterInput.tsxindex 0e41080095..cb05f78642 100644--- a/apps/web/src/components/view-shell/AiFilterInput.tsx+++ b/apps/web/src/components/view-shell/AiFilterInput.tsx@@ -1,4 +1,5 @@import { fireAndForget } from '@core/util/fireAndForget';+import { Telemetry } from '@macro-inc/observability';import SparkleIcon from '@phosphor/sparkle.svg';import SpinnerIcon from '@phosphor/spinner-gap.svg';import { cn } from '@ui';@@ -20,6 +21,8 @@ export type AiFilterInputProps = {type Feedback = { tone: 'note' | 'error'; text: string };+const AI_FILTER_FAILED_MESSAGE = "Couldn't apply that filter. Try again.";+/*** Plain-English filter box for list filter menus: type a description, press* Enter, and the host resolves it into concrete filters. Lives inside a@@ -43,7 +46,13 @@ export function AiFilterInput(props: AiFilterInputProps) {const id = requestId;setPending(true);setFeedback(undefined);- const outcome = await props.onSubmit(query);+ let outcome: AiFilterOutcome;+ try {+ outcome = await props.onSubmit(query);+ } catch (error) {+ Telemetry.error(error, { surface: 'ai-filter' });+ outcome = { status: 'error', message: AI_FILTER_FAILED_MESSAGE };+ }if (id !== requestId) return;setPending(false);@@ -107,7 +116,7 @@ export function AiFilterInput(props: AiFilterInputProps) {case 'Enter':event.preventDefault();event.stopPropagation();- fireAndForget(submit(), 'view-shell');+ fireAndForget(submit(), 'ai-filter');return;case 'Escape':case 'ArrowDown':diff --git a/apps/web/src/features/block-call/component/use-call-again.ts b/apps/web/src/features/block-call/component/use-call-again.tsindex 02c061b170..ea33efd700 100644--- a/apps/web/src/features/block-call/component/use-call-again.ts+++ b/apps/web/src/features/block-call/component/use-call-again.ts@@ -1,7 +1,9 @@import { useQuickCallsFlag } from '@app/features/meetings/use-quick-calls-flag';import { getMeetingPath } from '@channel/Call/call-link';import { joinChannelCall } from '@channel/Call/join-channel-call';+import { toast } from '@core/component/Toast/Toast';import { fireAndForget } from '@core/util/fireAndForget';+import { Telemetry } from '@macro-inc/observability';import { useCallLinkQuery } from '@queries/call/meetings';import { useNavigate } from '@solidjs/router';import type { Accessor } from 'solid-js';@@ -22,10 +24,18 @@ export function useCallAgain(? meeting.data?.shareToken: undefined;const canCallAgain = () => Boolean(channelId() || shareToken());+ const rejoin = async (channel: string) => {+ try {+ await joinChannelCall(channel);+ } catch (error) {+ toast.failure('Failed to join call');+ Telemetry.error(error, { surface: 'call-again' });+ }+ };const callAgain = () => {const channel = channelId();if (channel) {- fireAndForget(joinChannelCall(channel), 'block-call');+ fireAndForget(rejoin(channel), 'call-again');return;}const token = shareToken();diff --git a/apps/web/src/features/block-channel/component/Compose.tsx b/apps/web/src/features/block-channel/component/Compose.tsxindex 2e3bb7b4d8..f7ac24ae56 100644--- a/apps/web/src/features/block-channel/component/Compose.tsx+++ b/apps/web/src/features/block-channel/component/Compose.tsx@@ -42,6 +42,7 @@ import {handleFileFolderDrop,uploadFile,} from '@core/util/upload';+import { Telemetry } from '@macro-inc/observability';import InfoIcon from '@phosphor/info.svg';import { useCreateChannelMutation } from '@queries/channel/channels';import { useGetOrCreateDirectMessageMutation } from '@queries/channel/get-or-create-dm';@@ -214,6 +215,17 @@ export function ChannelCompose() {callbacks: { onSend: handleSend },});+ const send = async () => {+ try {+ await inputState.commands.send();+ } catch (sendError) {+ // `handleSend` shows its own failures in the compose error and rethrows.+ if (error()) return;+ setError('Failed to send message');+ Telemetry.error(sendError, { surface: 'channel-compose' });+ }+ };+const [scrollContainer, setScrollContainer] = createSignal<HTMLElement>();const markdownEditor = createConfiguredChannelMarkdownEditor({@@ -226,17 +238,16 @@ export function ChannelCompose() {onChange: (markdown) => inputState.setValue(markdown),onEnter: () => {if (isTouchDevice()) return false;- fireAndForget(inputState.commands.send(), 'block-channel');+ fireAndForget(send(), 'channel-compose');return true;},- sendMessage: () =>- fireAndForget(inputState.commands.send(), 'block-channel'),+ sendMessage: () => fireAndForget(send(), 'channel-compose'),onPasteFilesAndDirs: (files, directories) => {fireAndForget(handleFileFolderDrop(files, directories, (entries) =>inputState.commands.attachFiles(entries.map((e) => e.file))),- 'block-channel'+ 'channel-compose');},});diff --git a/apps/web/src/features/block-fig/primitives/create-fig-editor.ts b/apps/web/src/features/block-fig/primitives/create-fig-editor.tsindex f095024abb..9f7a1fa01c 100644--- a/apps/web/src/features/block-fig/primitives/create-fig-editor.ts+++ b/apps/web/src/features/block-fig/primitives/create-fig-editor.ts@@ -22,6 +22,7 @@ import type {VectorNetwork,} from '@core/fig-engine/types';import { fireAndForget } from '@core/util/fireAndForget';+import { Telemetry } from '@macro-inc/observability';import { createSignal, onCleanup } from 'solid-js';import type { FigSharing } from '../context/fig-viewer-context';import { type Alignment, alignOffset, distributeOffsets } from '../core/align';@@ -346,14 +347,14 @@ export function createFigEditor(options: FigEditorOptions) {if (!stores()) return;setSaveState('unsaved');saveTimer = setTimeout(- () => fireAndForget(saveNow(), 'block-fig'),+ () => fireAndForget(saveNow(), 'fig-editor'),SAVE_DELAY_MS);};const onHidden = () => {if (document.visibilityState === 'hidden')- fireAndForget(saveNow(), 'block-fig');+ fireAndForget(saveNow(), 'fig-editor');};document.addEventListener('visibilitychange', onHidden);// Whoever stores the file now (the one who did may have left) stores@@ -1001,7 +1002,7 @@ export function createFigEditor(options: FigEditorOptions) {to(network: VectorNetwork) {setVectorEdit((v) => v && { ...v, network });wanted = network;- fireAndForget(pump(), 'block-fig');+ fireAndForget(pump(), 'fig-editor');},async end() {await pump();@@ -1059,7 +1060,7 @@ export function createFigEditor(options: FigEditorOptions) {/** Total page-space offset from the drag's start. */to(dx: number, dy: number) {wanted = { x: dx, y: dy };- fireAndForget(pump(), 'block-fig');+ fireAndForget(pump(), 'fig-editor');},async end(at?: Point) {await pump();@@ -1111,7 +1112,7 @@ export function createFigEditor(options: FigEditorOptions) {if (!sharing || timer) return;timer = setTimeout(() => {timer = undefined;- fireAndForget(step(false), 'block-fig');+ fireAndForget(step(false), 'fig-editor');}, GESTURE_PUSH_MS);},async end(at?: Point) {@@ -1133,10 +1134,19 @@ export function createFigEditor(options: FigEditorOptions) {const startResize = (ids: string[], start: Rect, known?: NodeInfo) => {const key = `resize-${++dragKey}`;const page = viewer.page();- const infos: Promise<NodeInfo[]> =- known && ids.length === 1 && ids[0] === known.id- ? Promise.resolve([known])- : Promise.all(ids.map((id) => engine.nodeInfo(page, id)));+ const loadInfos = async (): Promise<NodeInfo[]> => {+ if (known && ids.length === 1 && ids[0] === known.id) return [known];+ try {+ return await Promise.all(ids.map((id) => engine.nodeInfo(page, id)));+ } catch (e) {+ // Every step of the drag awaits this: rejecting would leave+ // `running` set and the drag stuck.+ Telemetry.error(e, { surface: 'fig-editor' });+ options.notifyError(e instanceof Error ? e.message : String(e));+ return [];+ }+ };+ const infos = loadInfos();let wanted: Rect | undefined;let running = false;const pump = async () => {@@ -1179,7 +1189,7 @@ export function createFigEditor(options: FigEditorOptions) {return {to(rect: Rect) {wanted = rect;- fireAndForget(pump(), 'block-fig');+ fireAndForget(pump(), 'fig-editor');},async end() {await pump();@@ -1206,7 +1216,7 @@ export function createFigEditor(options: FigEditorOptions) {return {to(degrees: number) {wanted = degrees;- fireAndForget(pump(), 'block-fig');+ fireAndForget(pump(), 'fig-editor');},async end() {await pump();diff --git a/apps/web/src/features/block-fig/views/fig-viewer.tsx b/apps/web/src/features/block-fig/views/fig-viewer.tsxindex ebbdd1a563..7132ce7dc0 100644--- a/apps/web/src/features/block-fig/views/fig-viewer.tsx+++ b/apps/web/src/features/block-fig/views/fig-viewer.tsx@@ -8,6 +8,7 @@ import { IS_MAC } from '@core/constant/isMac';import type { NodeInfo, Rect } from '@core/fig-engine/types';import { fireAndForget } from '@core/util/fireAndForget';import { Tabs } from '@kobalte/core/tabs';+import { Telemetry } from '@macro-inc/observability';import {createEffect,createSignal,@@ -108,6 +109,20 @@ export function FigViewer() {: undefined,online: collab ? () => collab.status() === 'connected' : undefined,});+ /**+ * Edits whose engine reads (hit tests, layer rows) run before the editor's+ * queue, which is where edit failures are otherwise reported.+ */+ const runEdit = async (work: Promise<unknown>) => {+ try {+ await work;+ } catch (error) {+ Telemetry.error(error, { surface: 'fig-viewer' });+ context.notifyError(+ error instanceof Error ? error.message : String(error)+ );+ }+ };const review = createFigReview({context,@@ -155,7 +170,7 @@ export function FigViewer() {let focusSearch: (() => void) | undefined;onMount(() => {- fireAndForget(viewer.openPage(0), 'block-fig');+ fireAndForget(viewer.openPage(0), 'fig-viewer');if (document.activeElement === document.body)root.focus({ preventScroll: true });});@@ -189,9 +204,11 @@ export function FigViewer() {// it is edited.const fonts = createFontRegistry({ engine, source: context.fonts });createEffect(- on(viewer.editsSettled, () => fireAndForget(fonts.refresh(), 'block-fig'), {- defer: true,- })+ on(+ viewer.editsSettled,+ () => fireAndForget(fonts.refresh(), 'fig-viewer'),+ { defer: true }+ ));let mixedRequest = 0;const loadMixed = async (ids: string[], request: number) => {@@ -214,7 +231,7 @@ export function FigViewer() {selected.map((s) => s.id),request),- 'block-fig'+ 'fig-viewer');}));@@ -243,7 +260,7 @@ export function FigViewer() {: patch;const text = info()?.text;if (!text || (!patch.fontFamily && !patch.fontStyle)) {- fireAndForget(editor.setProps(ranged, what), 'block-fig');+ fireAndForget(editor.setProps(ranged, what), 'fig-viewer');return;}const style = rangeStyle(text, range?.start ?? 0, range?.end ?? 0);@@ -261,7 +278,7 @@ export function FigViewer() {await editor.setProps(ranged, what);await fonts.refresh();})(),- 'block-fig'+ 'fig-viewer');};@@ -318,7 +335,7 @@ export function FigViewer() {[{ op: 'set', ids: [page.id], props: { fills: [{ color: hex }] } }],gestureKey('page-color', live)),- 'block-fig'+ 'fig-viewer');};@@ -402,7 +419,7 @@ export function FigViewer() {const openStep = (step: 1 | -1) => {const next = stepPage(viewer.pages, viewer.page(), step);- if (next !== undefined) fireAndForget(viewer.openPage(next), 'block-fig');+ if (next !== undefined) fireAndForget(viewer.openPage(next), 'fig-viewer');};/**@@ -421,7 +438,7 @@ export function FigViewer() {{ opacity: (first.digit * 10 + digit) / 100 },first.key),- 'block-fig'+ 'fig-viewer');return;}@@ -429,7 +446,7 @@ export function FigViewer() {typedOpacity = { digit, at: now, key };fireAndForget(editor.setProps({ opacity: digit === 0 ? 1 : digit / 10 }, key),- 'block-fig'+ 'fig-viewer');};@@ -446,10 +463,12 @@ export function FigViewer() {const v = viewer.viewport();const at = { x: c.x + v.w / 2 / c.zoom, y: c.y + v.h / 2 / c.zoom };fireAndForget(- viewer- .containerAt(at)- .then((parent) => editor.importImages(files, at, parent)),- 'block-fig'+ runEdit(+ viewer+ .containerAt(at)+ .then((parent) => editor.importImages(files, at, parent))+ ),+ 'fig-viewer');};input.click();@@ -468,7 +487,7 @@ export function FigViewer() {.with('previous-frame', () => viewer.stepFrame(-1)).with('next-page', () => openStep(1)).with('previous-page', () => openStep(-1))- .with('select-all', () => fireAndForget(viewer.selectAll(), 'block-fig'))+ .with('select-all', () => fireAndForget(viewer.selectAll(), 'fig-viewer')).with('escape', () => {if (showShortcuts()) setShowShortcuts(false);else if (viewer.tool() !== 'move' && viewer.tool() !== 'hand')@@ -477,13 +496,13 @@ export function FigViewer() {}).with('select-parent', () => viewer.selectParent()).with('select-children', () =>- fireAndForget(viewer.selectChildren(), 'block-fig')+ fireAndForget(viewer.selectChildren(), 'fig-viewer')).with('next-sibling', () =>- fireAndForget(viewer.selectSibling(1), 'block-fig')+ fireAndForget(viewer.selectSibling(1), 'fig-viewer')).with('previous-sibling', () =>- fireAndForget(viewer.selectSibling(-1), 'block-fig')+ fireAndForget(viewer.selectSibling(-1), 'fig-viewer')).with('toggle-ui', () => viewer.setUiHidden((h) => !h)).with('toggle-outline', () => viewer.setOutlineView((o) => !o))@@ -499,9 +518,9 @@ export function FigViewer() {viewer.setDesignOpen((o) => !o);}).with('collapse-layers', () => viewer.collapseLayers())- .with('copy-png', () => fireAndForget(copyPng(), 'block-fig'))+ .with('copy-png', () => fireAndForget(copyPng(), 'fig-viewer')).with('export', () =>- fireAndForget(handoff.exportSelection(), 'block-fig')+ fireAndForget(handoff.exportSelection(), 'fig-viewer')).with('find', () => {viewer.setUiHidden(false);@@ -538,105 +557,107 @@ export function FigViewer() {.with('place-image', () => placeImage()).with('undo', () => {editor.endVectorEdit();- fireAndForget(editor.undo(), 'block-fig');+ fireAndForget(editor.undo(), 'fig-viewer');}).with('redo', () => {editor.endVectorEdit();- fireAndForget(editor.redo(), 'block-fig');+ fireAndForget(editor.redo(), 'fig-viewer');}).with('delete', () =>- fireAndForget(editor.deleteSelection(), 'block-fig')+ fireAndForget(editor.deleteSelection(), 'fig-viewer')).with('duplicate', () =>- fireAndForget(editor.duplicateSelection(), 'block-fig')+ fireAndForget(editor.duplicateSelection(), 'fig-viewer')).with('copy', () => editor.copy())- .with('cut', () => fireAndForget(editor.cut(), 'block-fig'))- .with('paste', () => fireAndForget(editor.paste(), 'block-fig'))+ .with('cut', () => fireAndForget(editor.cut(), 'fig-viewer'))+ .with('paste', () => fireAndForget(runEdit(editor.paste()), 'fig-viewer')).with('paste-replace', () =>- fireAndForget(editor.pasteToReplace(), 'block-fig')+ fireAndForget(runEdit(editor.pasteToReplace()), 'fig-viewer'))- .with('group', () => fireAndForget(editor.group(), 'block-fig'))- .with('ungroup', () => fireAndForget(editor.ungroup(), 'block-fig'))+ .with('group', () => fireAndForget(editor.group(), 'fig-viewer'))+ .with('ungroup', () => fireAndForget(editor.ungroup(), 'fig-viewer')).with('frame-selection', () =>- fireAndForget(editor.group(true), 'block-fig')+ fireAndForget(editor.group(true), 'fig-viewer')).with('add-auto-layout', () =>- fireAndForget(editor.addAutoLayout(), 'block-fig')+ fireAndForget(editor.addAutoLayout(), 'fig-viewer')).with('create-component', () =>- fireAndForget(editor.createComponent(), 'block-fig')+ fireAndForget(editor.createComponent(), 'fig-viewer')).with('detach-instance', () =>- fireAndForget(editor.detachInstance(), 'block-fig')+ fireAndForget(editor.detachInstance(), 'fig-viewer')).with('remove-auto-layout', () =>- fireAndForget(editor.removeAutoLayout(), 'block-fig')+ fireAndForget(editor.removeAutoLayout(), 'fig-viewer')).with('boolean-union', () =>- fireAndForget(editor.booleanOp('UNION'), 'block-fig')+ fireAndForget(editor.booleanOp('UNION'), 'fig-viewer')).with('boolean-subtract', () =>- fireAndForget(editor.booleanOp('SUBTRACT'), 'block-fig')+ fireAndForget(editor.booleanOp('SUBTRACT'), 'fig-viewer')).with('boolean-intersect', () =>- fireAndForget(editor.booleanOp('INTERSECT'), 'block-fig')+ fireAndForget(editor.booleanOp('INTERSECT'), 'fig-viewer')).with('boolean-exclude', () =>- fireAndForget(editor.booleanOp('XOR'), 'block-fig')+ fireAndForget(editor.booleanOp('XOR'), 'fig-viewer'))- .with('flatten', () => fireAndForget(editor.flatten(), 'block-fig'))+ .with('flatten', () => fireAndForget(editor.flatten(), 'fig-viewer')).with('bring-forward', () =>- fireAndForget(editor.arrange('forward'), 'block-fig')+ fireAndForget(editor.arrange('forward'), 'fig-viewer')).with('send-backward', () =>- fireAndForget(editor.arrange('backward'), 'block-fig')+ fireAndForget(editor.arrange('backward'), 'fig-viewer')).with('bring-to-front', () =>- fireAndForget(editor.arrange('front'), 'block-fig')+ fireAndForget(editor.arrange('front'), 'fig-viewer')).with('send-to-back', () =>- fireAndForget(editor.arrange('back'), 'block-fig')+ fireAndForget(editor.arrange('back'), 'fig-viewer')).with('toggle-visible', () => {const visible = info()?.visible ?? true;- fireAndForget(editor.setProps({ visible: !visible }), 'block-fig');+ fireAndForget(editor.setProps({ visible: !visible }), 'fig-viewer');}).with('toggle-locked', () => {- fireAndForget(editor.toggleLocked(), 'block-fig');+ fireAndForget(editor.toggleLocked(), 'fig-viewer');}).with('flip-horizontal', () =>- fireAndForget(editor.flip(false), 'block-fig')+ fireAndForget(editor.flip(false), 'fig-viewer')).with('flip-vertical', () =>- fireAndForget(editor.flip(true), 'block-fig')+ fireAndForget(editor.flip(true), 'fig-viewer')).with('rename', () => viewer.requestRename()).with('align-left', () =>- fireAndForget(editor.align('left'), 'block-fig')+ fireAndForget(runEdit(editor.align('left')), 'fig-viewer')).with('align-center', () =>- fireAndForget(editor.align('center'), 'block-fig')+ fireAndForget(runEdit(editor.align('center')), 'fig-viewer')).with('align-right', () =>- fireAndForget(editor.align('right'), 'block-fig')+ fireAndForget(runEdit(editor.align('right')), 'fig-viewer')+ )+ .with('align-top', () =>+ fireAndForget(runEdit(editor.align('top')), 'fig-viewer'))- .with('align-top', () => fireAndForget(editor.align('top'), 'block-fig')).with('align-middle', () =>- fireAndForget(editor.align('middle'), 'block-fig')+ fireAndForget(runEdit(editor.align('middle')), 'fig-viewer')).with('align-bottom', () =>- fireAndForget(editor.align('bottom'), 'block-fig')+ fireAndForget(runEdit(editor.align('bottom')), 'fig-viewer')).with('distribute-horizontal', () =>- fireAndForget(editor.distribute('horizontal'), 'block-fig')+ fireAndForget(editor.distribute('horizontal'), 'fig-viewer')).with('distribute-vertical', () =>- fireAndForget(editor.distribute('vertical'), 'block-fig')+ fireAndForget(editor.distribute('vertical'), 'fig-viewer')).with('swap-fill-stroke', () => {const i = info();- if (i) fireAndForget(editor.swapFillStroke(i), 'block-fig');+ if (i) fireAndForget(editor.swapFillStroke(i), 'fig-viewer');}).with('opacity-0',@@ -651,21 +672,25 @@ export function FigViewer() {'opacity-9',(a) => typeOpacity(Number(a.slice('opacity-'.length))))- .with('nudge-left', () => fireAndForget(editor.nudge(-1, 0), 'block-fig'))- .with('nudge-right', () => fireAndForget(editor.nudge(1, 0), 'block-fig'))- .with('nudge-up', () => fireAndForget(editor.nudge(0, -1), 'block-fig'))- .with('nudge-down', () => fireAndForget(editor.nudge(0, 1), 'block-fig'))+ .with('nudge-left', () =>+ fireAndForget(editor.nudge(-1, 0), 'fig-viewer')+ )+ .with('nudge-right', () =>+ fireAndForget(editor.nudge(1, 0), 'fig-viewer')+ )+ .with('nudge-up', () => fireAndForget(editor.nudge(0, -1), 'fig-viewer'))+ .with('nudge-down', () => fireAndForget(editor.nudge(0, 1), 'fig-viewer')).with('nudge-left-10', () =>- fireAndForget(editor.nudge(-10, 0), 'block-fig')+ fireAndForget(editor.nudge(-10, 0), 'fig-viewer')).with('nudge-right-10', () =>- fireAndForget(editor.nudge(10, 0), 'block-fig')+ fireAndForget(editor.nudge(10, 0), 'fig-viewer')).with('nudge-up-10', () =>- fireAndForget(editor.nudge(0, -10), 'block-fig')+ fireAndForget(editor.nudge(0, -10), 'fig-viewer')).with('nudge-down-10', () =>- fireAndForget(editor.nudge(0, 10), 'block-fig')+ fireAndForget(editor.nudge(0, 10), 'fig-viewer')).exhaustive();@@ -696,7 +721,7 @@ export function FigViewer() {const finish = e.key === 'Enter' || e.key === 'Escape';if (editor.penPath()) {if (!finish) return false;- fireAndForget(editor.penFinish(false), 'block-fig');+ fireAndForget(runEdit(editor.penFinish(false)), 'fig-viewer');return true;}const edit = editor.vectorEdit();@@ -711,7 +736,7 @@ export function FigViewer() {) {fireAndForget(editor.setVectorNetwork(deleteVertex(edit.network, edit.selected)),- 'block-fig'+ 'fig-viewer');return true;}@@ -763,7 +788,7 @@ export function FigViewer() {if (following()) setFollowing(undefined);return;}- fireAndForget(showPeerView(peer), 'block-fig');+ fireAndForget(showPeerView(peer), 'fig-viewer');}));/** Panning, zooming, or clicking the canvas stops following. */@@ -855,7 +880,7 @@ export function FigViewer() {if (resolved === 'edit-text') setTextEditing(info()?.id);else if (resolved === 'edit-vector') {const id = info()?.id;- if (id) fireAndForget(editor.editVector(id), 'block-fig');+ if (id) fireAndForget(runEdit(editor.editVector(id)), 'fig-viewer');} else run(resolved);};@@ -900,8 +925,10 @@ export function FigViewer() {if (files.length === 0) {// Layers copied here, in another file, or in Figma.fireAndForget(- editor.paste(e.clipboardData?.getData('text/html') || undefined),- 'block-fig'+ runEdit(+ editor.paste(e.clipboardData?.getData('text/html') || undefined)+ ),+ 'fig-viewer');return;}@@ -909,10 +936,12 @@ export function FigViewer() {const v = viewer.viewport();const at = { x: c.x + v.w / 2 / c.zoom, y: c.y + v.h / 2 / c.zoom };fireAndForget(- viewer- .containerAt(at)- .then((parent) => editor.importImages(files, at, parent)),- 'block-fig'+ runEdit(+ viewer+ .containerAt(at)+ .then((parent) => editor.importImages(files, at, parent))+ ),+ 'fig-viewer');};@@ -1024,7 +1053,7 @@ export function FigViewer() {zoomItems={zoomItems()}onRun={run}onExportFramesPdf={() =>- fireAndForget(handoff.exportFramesPdf(), 'block-fig')+ fireAndForget(handoff.exportFramesPdf(), 'fig-viewer')}/><span@@ -1119,7 +1148,7 @@ export function FigViewer() {onDrop: (data, at, parent) =>fireAndForget(libraries.dropAsset(data, at, parent),- 'block-fig'+ 'fig-viewer'),}}@@ -1173,7 +1202,7 @@ export function FigViewer() {fonts={fonts.missing()}canUseLocal={fonts.canUseLocalFonts()}onUseLocal={() =>- fireAndForget(fonts.useLocalFonts(), 'block-fig')+ fireAndForget(fonts.useLocalFonts(), 'fig-viewer')}/></Show>@@ -1198,7 +1227,7 @@ export function FigViewer() {><PresentButtonmac={IS_MAC}- onPresent={() => fireAndForget(review.present(), 'block-fig')}+ onPresent={() => fireAndForget(review.present(), 'fig-viewer')}/><ViewerZoomlabel={zoomLabel(viewer.camera().zoom)}@@ -1285,7 +1314,7 @@ export function FigViewer() {<PresentButtonmac={IS_MAC}onPresent={() =>- fireAndForget(review.present(), 'block-fig')+ fireAndForget(review.present(), 'fig-viewer')}/><PanelToggle@@ -1319,7 +1348,9 @@ export function FigViewer() {<><PresentButtonmac={IS_MAC}- onPresent={() => fireAndForget(review.present(), 'block-fig')}+ onPresent={() =>+ fireAndForget(review.present(), 'fig-viewer')+ }/><PanelToggleside="right"@@ -1349,11 +1380,12 @@ export function FigViewer() {: undefined,preview: fonts.preview,onFontsOpen: () =>- fireAndForget(fonts.loadCatalog(), 'block-fig'),+ fireAndForget(fonts.loadCatalog(), 'fig-viewer'),}}onAlign={editor.enabled()- ? (how) => fireAndForget(editor.align(how), 'block-fig')+ ? (how) =>+ fireAndForget(runEdit(editor.align(how)), 'fig-viewer'): undefined}onFlip={@@ -1370,11 +1402,11 @@ export function FigViewer() {onPageColor={editor.enabled() ? setPageColor : undefined}swatches={swatches()}mixed={mixed()}- onPickerOpen={() => fireAndForget(loadSwatches(), 'block-fig')}+ onPickerOpen={() => fireAndForget(loadSwatches(), 'fig-viewer')}onAddImage={editor.enabled() ? addImage : undefined}onAddAutoLayout={editor.enabled()- ? () => fireAndForget(editor.addAutoLayout(), 'block-fig')+ ? () => fireAndForget(editor.addAutoLayout(), 'fig-viewer'): undefined}selectionCount={viewer.selected().length}@@ -1394,12 +1426,12 @@ export function FigViewer() {onExport={(settings) =>fireAndForget(handoff.exportSelection(settings),- 'block-fig'+ 'fig-viewer')}preview={handoff.preview}- onCopyPng={() => fireAndForget(copyPng(), 'block-fig')}- onCopySvg={() => fireAndForget(copySvg(), 'block-fig')}+ onCopyPng={() => fireAndForget(copyPng(), 'fig-viewer')}+ onCopySvg={() => fireAndForget(copySvg(), 'fig-viewer')}/>)}</Show>@@ -1423,7 +1455,7 @@ export function FigViewer() {}swatches={swatches()}onPickerOpen={() =>- fireAndForget(loadSwatches(), 'block-fig')+ fireAndForget(loadSwatches(), 'fig-viewer')}/></Show>@@ -1436,10 +1468,10 @@ export function FigViewer() {design={designSystem.info()}assets={handoff.assets()}onCopy={(text) =>- fireAndForget(copyText(text), 'block-fig')+ fireAndForget(copyText(text), 'fig-viewer')}onDownload={(id, s) =>- fireAndForget(handoff.downloadAsset(id, s), 'block-fig')+ fireAndForget(handoff.downloadAsset(id, s), 'fig-viewer')}/>)}@@ -1447,17 +1479,17 @@ export function FigViewer() {}onBoolean={editor.enabled()- ? (op) => fireAndForget(editor.booleanOp(op), 'block-fig')+ ? (op) => fireAndForget(editor.booleanOp(op), 'fig-viewer'): undefined}- onFlatten={() => fireAndForget(editor.flatten(), 'block-fig')}+ onFlatten={() => fireAndForget(editor.flatten(), 'fig-viewer')}onCreateComponent={editor.enabled() &&!viewer.selected().some((node) => node.id.startsWith('I'))- ? () => fireAndForget(editor.createComponent(), 'block-fig')+ ? () => fireAndForget(editor.createComponent(), 'fig-viewer'): undefined}- onCopyText={(text) => fireAndForget(copyText(text), 'block-fig')}+ onCopyText={(text) => fireAndForget(copyText(text), 'fig-viewer')}onTabChange={review.setPanelTab}prototype={<PrototypePanel@@ -1472,13 +1504,13 @@ export function FigViewer() {? (id, index, edited) =>fireAndForget(review.setInteraction(id, index, edited),- 'block-fig'+ 'fig-viewer'): undefined}onFlowStart={editor.enabled() ? review.setFlowStart : undefined}onPresent={(frame) =>- fireAndForget(review.present(frame), 'block-fig')+ fireAndForget(review.present(frame), 'fig-viewer')}/>}@@ -1501,7 +1533,7 @@ export function FigViewer() {onTool={(tool) => {review.comments?.setActive(false);if (editor.penPath())- fireAndForget(editor.penFinish(), 'block-fig');+ fireAndForget(runEdit(editor.penFinish()), 'fig-viewer');viewer.setTool(tool);}}editable={editor.enabled()}diff --git a/apps/web/src/features/block-md/component/MarkdownPopup.tsx b/apps/web/src/features/block-md/component/MarkdownPopup.tsxindex 400e33df6e..039a7edb5e 100644--- a/apps/web/src/features/block-md/component/MarkdownPopup.tsx+++ b/apps/web/src/features/block-md/component/MarkdownPopup.tsx@@ -54,6 +54,7 @@ import { fireAndForget } from '@core/util/fireAndForget';import { getScrollParentElement } from '@core/util/scrollParent';import type { NodeIdMappings } from '@macro-inc/lexical-core';import { $getId } from '@macro-inc/lexical-core/plugins/nodeIdPlugin';+import { Telemetry } from '@macro-inc/observability';import ChatTeardrop from '@phosphor/chat-teardrop.svg';import GridIcon from '@phosphor/grid-four.svg';import CheckIcon from '@phosphor-icons/core/bold/check-bold.svg?component-solid';@@ -414,7 +415,13 @@ export function MarkdownPopup(props: {const handleShare = async () => {const location = editor.read(() => $getLocationUrl('md', blockId));if (!location) return;- await navigator.clipboard.writeText(location);+ try {+ await navigator.clipboard.writeText(location);+ } catch (error) {+ Telemetry.error(error, { surface: 'markdown-editor' });+ toast.failure('Could not copy link');+ return;+ }// Desktop gets the inline check-icon flip; on touch the toolbar is// small and easily dismissed, so confirm with a toast as well.if (isTouchDevice()) toast.success('Link copied to clipboard');@@ -599,7 +606,7 @@ export function MarkdownPopup(props: {<Toolbar.Buttonsize="icon-sm"depth={3}- onClick={() => fireAndForget(handleShare(), 'block-md')}+ onClick={() => fireAndForget(handleShare(), 'markdown-editor')}tooltip="Copy link to snippet"label="Copy link to snippet">@@ -729,9 +736,9 @@ export function MarkdownPopup(props: {onConvertToTasks={handleConvertToTasks}onConvertListToTable={handleConvertListToTable}onOpenComment={handleShowComment}- onShare={() => fireAndForget(handleShare(), 'block-md')}+ onShare={() => fireAndForget(handleShare(), 'markdown-editor')}onInsertComment={handleInsertComment}- onPaste={() => fireAndForget(handlePaste(), 'block-md')}+ onPaste={() => fireAndForget(handlePaste(), 'markdown-editor')}onEditWithAi={handleOpenAiEditDrawer}/></GeneralizedPopup>diff --git a/apps/web/src/features/block-pdf/component/PdfDocument.test.tsx b/apps/web/src/features/block-pdf/component/PdfDocument.test.tsxindex 629be44be9..41a9089bbe 100644--- a/apps/web/src/features/block-pdf/component/PdfDocument.test.tsx+++ b/apps/web/src/features/block-pdf/component/PdfDocument.test.tsx@@ -1,3 +1,5 @@+import { Telemetry } from '@macro-inc/observability';+import type { BeforeLeaveEventArgs } from '@solidjs/router';import { cleanup, render } from '@solidjs/testing-library';import { createSignal, type JSX } from 'solid-js';import { afterEach, beforeEach, expect, it, vi } from 'vitest';@@ -7,20 +9,28 @@ import { PdfDocument, type PdfDocumentMethods } from './PdfDocument';const state = vi.hoisted(() => ({ready: (): boolean => false,visible: (): boolean => false,+ nested: true,navigate: vi.fn(),initial: vi.fn(),clearOverlays: vi.fn(),+ save: vi.fn(),+ beforeLeave: undefined as ((event: BeforeLeaveEventArgs) => void) | undefined,}));-vi.mock('@solidjs/router', () => ({ useBeforeLeave: () => {} }));+vi.mock('@solidjs/router', () => ({+ useBeforeLeave: (handler: (event: BeforeLeaveEventArgs) => void) => {+ state.beforeLeave = handler;+ },+}));vi.mock('@macro/tauri', () => ({ useTauri: () => undefined }));vi.mock('../context/pdf-document-context', () => ({PdfDocumentProvider: (props: { children: JSX.Element }) => props.children,usePdfDocument: () => ({- isNested: () => true,+ isNested: () => state.nested,documentVersionId: () => undefined,setPersistedViewLocation: () => {},locationParams: () => ({ pageNumber: '3', yPos: '0' }),+ persistence: { isSaving: () => false },}),}));vi.mock('../context/pdf-viewer-context', () => ({@@ -41,7 +51,7 @@ vi.mock('../signal/location', () => ({useGoToLinkLocation: () => state.initial,useGoToLinkLocationFromParams: () => state.navigate,}));-vi.mock('../signal/save', () => ({ usePdfSave: () => vi.fn() }));+vi.mock('../signal/save', () => ({ usePdfSave: () => state.save }));vi.mock('../signal/setting', () => ({ useUpdateColorsEffect: () => {} }));vi.mock('../store/comments/commentStore', () => ({usePdfCommentProjection: () => ({}),@@ -52,8 +62,15 @@ vi.mock('../store/placeables', () => ({vi.mock('../websocket/preprocess', () => ({ preprocess: vi.fn() }));vi.mock('./Document', () => ({ Document: () => null }));-beforeEach(() => vi.clearAllMocks());-afterEach(cleanup);+beforeEach(() => {+ vi.clearAllMocks();+ state.nested = true;+ state.beforeLeave = undefined;+});+afterEach(() => {+ cleanup();+ vi.restoreAllMocks();+});function setup(initialTarget?: LocationBlockParams, initiallyReady = false) {const [target, setTarget] = createSignal(initialTarget);@@ -141,3 +158,30 @@ it('keeps legacy initial-location navigation when there is no route target', ()});expect(state.navigate).not.toHaveBeenCalled();});++it('reports a location navigation that fails', async () => {+ const report = vi.spyOn(Telemetry, 'error').mockImplementation(() => {});+ const failure = new Error('viewer gone');+ state.initial.mockRejectedValueOnce(failure);+ const test = setup();+ test.setReady(true);+ await vi.waitFor(() =>+ expect(report).toHaveBeenCalledWith(failure, { surface: 'pdf-location' })+ );+});++it('still leaves the page when the save before leaving fails', async () => {+ const report = vi.spyOn(Telemetry, 'error').mockImplementation(() => {});+ const failure = new Error('offline');+ state.nested = false;+ state.save.mockRejectedValueOnce(failure);+ setup();+ const event = {+ preventDefault: vi.fn(),+ retry: vi.fn(),+ } as unknown as BeforeLeaveEventArgs;+ state.beforeLeave?.(event);+ expect(event.preventDefault).toHaveBeenCalledOnce();+ await vi.waitFor(() => expect(event.retry).toHaveBeenCalledWith(true));+ expect(report).toHaveBeenCalledWith(failure, { surface: 'pdf-save' });+});diff --git a/apps/web/src/features/block-pdf/component/PdfDocument.tsx b/apps/web/src/features/block-pdf/component/PdfDocument.tsxindex ef652c41f9..9681b077cd 100644--- a/apps/web/src/features/block-pdf/component/PdfDocument.tsx+++ b/apps/web/src/features/block-pdf/component/PdfDocument.tsx@@ -3,6 +3,7 @@ import './block.css';import type { PortalScope } from '@core/component/ScopedPortal';import { fireAndForget } from '@core/util/fireAndForget';import { useTauri } from '@macro/tauri';+import { Telemetry } from '@macro-inc/observability';import type { GetDocumentResponseDataViewLocation } from '@service-storage/generated/schemas/getDocumentResponseDataViewLocation';import { debounce, leading } from '@solid-primitives/scheduled';import { type BeforeLeaveEventArgs, useBeforeLeave } from '@solidjs/router';@@ -169,7 +170,7 @@ function PdfDocumentBehavior(props: PdfDocumentProps) {!pdfViewer.root.isReady())return;- fireAndForget(goToInitialLocation(pdf.locationParams()), 'block-pdf');+ fireAndForget(goToInitialLocation(pdf.locationParams()), 'pdf-location');});createEffect(() => {@@ -184,7 +185,7 @@ function PdfDocumentBehavior(props: PdfDocumentProps) {targetedNavigationStarted = true;setPendingLocationParams(undefined);pdfViewer.root.instance()?.clearAllOverlays();- fireAndForget(goToLocationFromParams(params), 'block-pdf');+ fireAndForget(goToLocationFromParams(params), 'pdf-location');});const [preprocessResource] = createResource(() => {@@ -206,14 +207,22 @@ function PdfDocumentBehavior(props: PdfDocumentProps) {pdfViewer.replaceOverlays(coparse.overlays);});+ const saveThenLeave = async (event: BeforeLeaveEventArgs) => {+ try {+ await savePdf();+ } catch (error) {+ Telemetry.error(error, { surface: 'pdf-save' });+ } finally {+ // A failed save must not trap the user on the page.+ event.retry(true);+ }+ };+const debouncedSave = leading(debounce,(event: BeforeLeaveEventArgs) => {event.preventDefault();- fireAndForget(- savePdf().then(() => event.retry(true)),- 'block-pdf'- );+ fireAndForget(saveThenLeave(event), 'pdf-save');},500);diff --git a/apps/web/src/features/block-pptx/components/effects-pane.tsx b/apps/web/src/features/block-pptx/components/effects-pane.tsxindex fb21c2ce66..68e2fe5b2f 100644--- a/apps/web/src/features/block-pptx/components/effects-pane.tsx+++ b/apps/web/src/features/block-pptx/components/effects-pane.tsx@@ -76,12 +76,15 @@ function liveApplier(apply: (value: number, group?: string) => unknown) {let drags = 0;const run = async () => {running = true;- while (pending !== undefined) {- const value = pending;- pending = undefined;- await apply(value, group);+ try {+ while (pending !== undefined) {+ const value = pending;+ pending = undefined;+ await apply(value, group);+ }+ } finally {+ running = false;}- running = false;};return {start: () => {@@ -92,7 +95,7 @@ function liveApplier(apply: (value: number, group?: string) => unknown) {},set: (value: number) => {pending = value;- if (!running) fireAndForget(run(), 'block-pptx');+ if (!running) fireAndForget(run(), 'pptx-editor');},};}@@ -603,7 +606,7 @@ export function PicturePaneSections(props: { env: RibbonEnv }) {onClick={() =>fireAndForget(c.formatPicture({ brightness: 0, contrast: 0 }),- 'block-pptx'+ 'pptx-editor')}>@@ -624,7 +627,7 @@ export function PicturePaneSections(props: { env: RibbonEnv }) {c.formatPicture({recolor: e.currentTarget.value as PictureRecolor,}),- 'block-pptx'+ 'pptx-editor')}>@@ -683,7 +686,7 @@ export function PicturePaneSections(props: { env: RibbonEnv }) {onCommit={(v) =>fireAndForget(c.cropPictures(() => ({ [edge]: v / 100 })),- 'block-pptx'+ 'pptx-editor')}/>@@ -695,7 +698,9 @@ export function PicturePaneSections(props: { env: RibbonEnv }) {size="sm"variant="outline"disabled={ro()}- onClick={() => fireAndForget(c.fitPictures('fill'), 'block-pptx')}+ onClick={() =>+ fireAndForget(c.fitPictures('fill'), 'pptx-editor')+ }>Fill</Button>@@ -703,7 +708,7 @@ export function PicturePaneSections(props: { env: RibbonEnv }) {size="sm"variant="outline"disabled={ro()}- onClick={() => fireAndForget(c.fitPictures('fit'), 'block-pptx')}+ onClick={() => fireAndForget(c.fitPictures('fit'), 'pptx-editor')}>Fit</Button>@@ -715,7 +720,7 @@ export function PicturePaneSections(props: { env: RibbonEnv }) {variant="outline"disabled={ro()}data-testid="pptx-pane-picture-reset"- onClick={() => fireAndForget(c.resetPictures(true), 'block-pptx')}+ onClick={() => fireAndForget(c.resetPictures(true), 'pptx-editor')}>Reset Picture & Size</Button>diff --git a/apps/web/src/features/block-pptx/components/stage-context-menu.tsx b/apps/web/src/features/block-pptx/components/stage-context-menu.tsxindex 16e323aad6..b8b3bb3732 100644--- a/apps/web/src/features/block-pptx/components/stage-context-menu.tsx+++ b/apps/web/src/features/block-pptx/components/stage-context-menu.tsx@@ -10,8 +10,10 @@ import {MenuSeparator,SubTrigger,} from '@core/component/ContextMenu';+import { toast } from '@core/component/Toast/Toast';import { fireAndForget } from '@core/util/fireAndForget';import { ContextMenu } from '@kobalte/core/context-menu';+import { Telemetry } from '@macro-inc/observability';import AlignBottom from '@phosphor/align-bottom.svg';import AlignCenterHorizontal from '@phosphor/align-center-horizontal.svg';import AlignCenterVertical from '@phosphor/align-center-vertical.svg';@@ -166,6 +168,15 @@ function GridAndGuides(props: {);}+async function copyLink(link: string) {+ try {+ await navigator.clipboard.writeText(link.replace(/^mailto:/i, ''));+ } catch (error) {+ Telemetry.error(error, { surface: 'pptx-editor' });+ toast.failure('Could not copy link');+ }+}+/** Link…, or Edit/Open/Copy/Remove Link for something linked. */function LinkItems(props: { a: StageMenuActions }) {const ro = () => props.a.readonly;@@ -200,14 +211,7 @@ function LinkItems(props: { a: StageMenuActions }) {<MenuItemtext="Copy link"icon={CopyIcon}- onClick={() =>- fireAndForget(- navigator.clipboard.writeText(- link().replace(/^mailto:/i, '')- ),- 'block-pptx'- )- }+ onClick={() => fireAndForget(copyLink(link()), 'pptx-editor')}/></Show><MenuItem@@ -287,13 +291,13 @@ function ArrangeItems(props: { a: StageMenuActions }) {text="Group"shortcut="cmd+g"disabled={props.a.selectionCount < 2}- onClick={() => fireAndForget(c().group(), 'block-pptx')}+ onClick={() => fireAndForget(c().group(), 'pptx-editor')}/><MenuItemtext="Ungroup"shortcut="cmd+shift+g"disabled={!props.a.isGroup}- onClick={() => fireAndForget(c().ungroup(), 'block-pptx')}+ onClick={() => fireAndForget(c().ungroup(), 'pptx-editor')}/></Sub><Sub@@ -454,7 +458,7 @@ export function StageMenuItems(props: {text={layout}icon={layout === a().currentLayout ? CheckIcon : undefined}onClick={() =>- fireAndForget(c().setLayout(layout), 'block-pptx')+ fireAndForget(c().setLayout(layout), 'pptx-editor')}/>)}@@ -536,7 +540,7 @@ export function StageMenuItems(props: {<MenuItemtext="None"onClick={() =>- fireAndForget(c().setBullets({ kind: 'none' }), 'block-pptx')+ fireAndForget(c().setBullets({ kind: 'none' }), 'pptx-editor')}/><For each={['•', '○', '▪', '➢', '✓', '–']}>@@ -546,7 +550,7 @@ export function StageMenuItems(props: {onClick={() =>fireAndForget(c().setBullets({ kind: 'char', char }),- 'block-pptx'+ 'pptx-editor')}/>@@ -557,7 +561,7 @@ export function StageMenuItems(props: {<MenuItemtext="None"onClick={() =>- fireAndForget(c().setBullets({ kind: 'none' }), 'block-pptx')+ fireAndForget(c().setBullets({ kind: 'none' }), 'pptx-editor')}/><For@@ -575,7 +579,7 @@ export function StageMenuItems(props: {onClick={() =>fireAndForget(c().setBullets({ kind: 'number', scheme, start: 1 }),- 'block-pptx'+ 'pptx-editor')}/>@@ -599,43 +603,43 @@ export function StageMenuItems(props: {text="Insert rows above"icon={Rows}onClick={() =>- fireAndForget(c().insertRows('above'), 'block-pptx')+ fireAndForget(c().insertRows('above'), 'pptx-editor')}/><MenuItemtext="Insert rows below"icon={Rows}onClick={() =>- fireAndForget(c().insertRows('below'), 'block-pptx')+ fireAndForget(c().insertRows('below'), 'pptx-editor')}/><MenuItemtext="Insert columns left"icon={Columns}onClick={() =>- fireAndForget(c().insertColumns('left'), 'block-pptx')+ fireAndForget(c().insertColumns('left'), 'pptx-editor')}/><MenuItemtext="Insert columns right"icon={Columns}onClick={() =>- fireAndForget(c().insertColumns('right'), 'block-pptx')+ fireAndForget(c().insertColumns('right'), 'pptx-editor')}/></Sub><Sub text="Delete" icon={<Trash class="size-4" />} disabled={ro()}><MenuItemtext="Delete rows"- onClick={() => fireAndForget(c().deleteRows(), 'block-pptx')}+ onClick={() => fireAndForget(c().deleteRows(), 'pptx-editor')}/><MenuItemtext="Delete columns"- onClick={() => fireAndForget(c().deleteColumns(), 'block-pptx')}+ onClick={() => fireAndForget(c().deleteColumns(), 'pptx-editor')}/><MenuItemtext="Delete table"- onClick={() => fireAndForget(c().deleteTable(), 'block-pptx')}+ onClick={() => fireAndForget(c().deleteTable(), 'pptx-editor')}/></Sub><Sub text="Select" icon={<TableIcon class="size-4" />}>@@ -649,12 +653,12 @@ export function StageMenuItems(props: {<MenuItemtext="Merge cells"disabled={ro() || !c().canMerge()}- onClick={() => fireAndForget(c().mergeCells(), 'block-pptx')}+ onClick={() => fireAndForget(c().mergeCells(), 'pptx-editor')}/><MenuItemtext="Split cells"disabled={ro() || !c().canSplit()}- onClick={() => fireAndForget(c().splitCells(), 'block-pptx')}+ onClick={() => fireAndForget(c().splitCells(), 'pptx-editor')}/><MenuSeparator /><ColorSub@@ -663,7 +667,7 @@ export function StageMenuItems(props: {swatches={a().swatches}noneLabel="No fill"disabled={ro()}- onPick={(v) => fireAndForget(c().fillCells(v), 'block-pptx')}+ onPick={(v) => fireAndForget(c().fillCells(v), 'pptx-editor')}/><Sub text="Borders" disabled={ro()}><For@@ -685,7 +689,7 @@ export function StageMenuItems(props: {<MenuItemtext={label}onClick={() =>- fireAndForget(c().borderCells(edges), 'block-pptx')+ fireAndForget(c().borderCells(edges), 'pptx-editor')}/>)}@@ -694,7 +698,7 @@ export function StageMenuItems(props: {<MenuItemtext="No border"onClick={() =>- fireAndForget(c().borderCells('all', true), 'block-pptx')+ fireAndForget(c().borderCells('all', true), 'pptx-editor')}/></Sub>@@ -703,21 +707,21 @@ export function StageMenuItems(props: {text="Left"icon={AlignLeft}onClick={() =>- fireAndForget(c().alignCells('left'), 'block-pptx')+ fireAndForget(c().alignCells('left'), 'pptx-editor')}/><MenuItemtext="Center"icon={AlignCenterHorizontal}onClick={() =>- fireAndForget(c().alignCells('center'), 'block-pptx')+ fireAndForget(c().alignCells('center'), 'pptx-editor')}/><MenuItemtext="Right"icon={AlignRight}onClick={() =>- fireAndForget(c().alignCells('right'), 'block-pptx')+ fireAndForget(c().alignCells('right'), 'pptx-editor')}/><MenuSeparator />@@ -725,33 +729,35 @@ export function StageMenuItems(props: {text="Top"icon={AlignTop}onClick={() =>- fireAndForget(c().anchorCells('top'), 'block-pptx')+ fireAndForget(c().anchorCells('top'), 'pptx-editor')}/><MenuItemtext="Middle"icon={AlignCenterVertical}onClick={() =>- fireAndForget(c().anchorCells('middle'), 'block-pptx')+ fireAndForget(c().anchorCells('middle'), 'pptx-editor')}/><MenuItemtext="Bottom"icon={AlignBottom}onClick={() =>- fireAndForget(c().anchorCells('bottom'), 'block-pptx')+ fireAndForget(c().anchorCells('bottom'), 'pptx-editor')}/></Sub><MenuItemtext="Distribute rows"disabled={ro()}- onClick={() => fireAndForget(c().distributeRows(), 'block-pptx')}+ onClick={() => fireAndForget(c().distributeRows(), 'pptx-editor')}/><MenuItemtext="Distribute columns"disabled={ro()}- onClick={() => fireAndForget(c().distributeColumns(), 'block-pptx')}+ onClick={() =>+ fireAndForget(c().distributeColumns(), 'pptx-editor')+ }/><MenuSeparator /><ArrangeItems a={a()} />@@ -796,7 +802,7 @@ export function StageMenuItems(props: {shortcut="delete"disabled={ro()}onClick={() =>- fireAndForget(a().commands.deleteSelection(), 'block-pptx')+ fireAndForget(a().commands.deleteSelection(), 'pptx-editor')}/></Match>@@ -818,7 +824,7 @@ export function StageMenuItems(props: {shortcut="delete"disabled={ro()}onClick={() =>- fireAndForget(a().commands.deleteSelection(), 'block-pptx')+ fireAndForget(a().commands.deleteSelection(), 'pptx-editor')}/></Match>@@ -830,7 +836,7 @@ export function StageMenuItems(props: {shortcut="cmd+d"disabled={ro()}onClick={() =>- fireAndForget(c().duplicateSelection(), 'block-pptx')+ fireAndForget(c().duplicateSelection(), 'pptx-editor')}/><MenuSeparator />@@ -881,7 +887,7 @@ export function StageMenuItems(props: {swatches={a().swatches}noneLabel="No fill"disabled={ro()}- onPick={(v) => fireAndForget(c().fillColor(v), 'block-pptx')}+ onPick={(v) => fireAndForget(c().fillColor(v), 'pptx-editor')}/><ColorSubtext="Outline"@@ -892,7 +898,7 @@ export function StageMenuItems(props: {onPick={(v) =>fireAndForget(c().setLine(v ? { color: v } : { none: true }),- 'block-pptx'+ 'pptx-editor')}/>@@ -922,7 +928,7 @@ export function StageMenuItems(props: {icon={Trash}shortcut="delete"disabled={ro()}- onClick={() => fireAndForget(c().deleteSelection(), 'block-pptx')}+ onClick={() => fireAndForget(c().deleteSelection(), 'pptx-editor')}/></Match></Switch>diff --git a/apps/web/src/features/block-pptx/primitives/create-slide-editor.ts b/apps/web/src/features/block-pptx/primitives/create-slide-editor.tsindex 0eb9f2d4f7..a481060356 100644--- a/apps/web/src/features/block-pptx/primitives/create-slide-editor.ts+++ b/apps/web/src/features/block-pptx/primitives/create-slide-editor.ts@@ -16,6 +16,7 @@ import type {TextPos,} from '@core/pptx-engine/types';import { fireAndForget } from '@core/util/fireAndForget';+import { Telemetry } from '@macro-inc/observability';import {type Accessor,batch,@@ -233,7 +234,7 @@ export function createSlideEditor(options: SlideEditorOptions) {if (id === undefined) return;// While typing, the stage shows layers; the base catches up afterwards.if (untrack(editing)) return;- fireAndForget(renderBase(), 'block-pptx');+ fireAndForget(renderBase(), 'pptx-editor');}));@@ -292,7 +293,7 @@ export function createSlideEditor(options: SlideEditorOptions) {setSelectedIds(ids);fireAndForget(loadSelectedLayout(ids.length === 1 ? ids[0] : null),- 'block-pptx'+ 'pptx-editor');}@@ -322,7 +323,7 @@ export function createSlideEditor(options: SlideEditorOptions) {if (!result.structureChanged && !result.changedSlides.includes(s.id))return;void renderLayers(edit.shape, true).catch(() => {});- fireAndForget(refreshEditing(), 'block-pptx');+ fireAndForget(refreshEditing(), 'pptx-editor');});onCleanup(() => unsubscribeRemote?.());@@ -456,7 +457,7 @@ export function createSlideEditor(options: SlideEditorOptions) {const active = d.active || distance >= DRAG_THRESHOLD_PX;const layered = d.kind === 'move' && d.shape !== undefined;if (active && !d.active && layered) {- fireAndForget(renderLayers(d.shape!, true), 'block-pptx');+ fireAndForget(renderLayers(d.shape!, true), 'pptx-editor');}let current = at;if (d.kind === 'move' && active) {@@ -731,7 +732,10 @@ export function createSlideEditor(options: SlideEditorOptions) {editReady = (async () => {const [layout] = await Promise.all([engine.textLayout(index(), shapeId, cell?.ref).catch(() => null),- renderLayers(shapeId, true),+ // Text commands wait on this; without layers the stage shows the base.+ renderLayers(shapeId, true).catch((error: unknown) =>+ Telemetry.error(error, { surface: 'pptx-editor' })+ ),]);const pos = layout && at ? positionAt(layout, at) : null;const selection: TextSelection = pos@@ -759,8 +763,8 @@ export function createSlideEditor(options: SlideEditorOptions) {textDragAnchor = null;session.breakGroup();// The base render drops the layers when it lands.- fireAndForget(renderBase(), 'block-pptx');- fireAndForget(loadSelectedLayout(selected()), 'block-pptx');+ fireAndForget(renderBase(), 'pptx-editor');+ fireAndForget(loadSelectedLayout(selected()), 'pptx-editor');}// Coalesced refresh of the edited shape's layout and layer after a change.@@ -1042,7 +1046,7 @@ export function createSlideEditor(options: SlideEditorOptions) {setSelectedIds(kept);fireAndForget(loadSelectedLayout(kept.length === 1 ? kept[0] : null),- 'block-pptx'+ 'pptx-editor');});})diff --git a/apps/web/src/features/block-pptx/views/pptx-editor.tsx b/apps/web/src/features/block-pptx/views/pptx-editor.tsxindex f1145991aa..79604c041f 100644--- a/apps/web/src/features/block-pptx/views/pptx-editor.tsx+++ b/apps/web/src/features/block-pptx/views/pptx-editor.tsx@@ -17,6 +17,7 @@ import type {} from '@core/pptx-engine/types';import { fireAndForget } from '@core/util/fireAndForget';import { ContextMenu } from '@kobalte/core/context-menu';+import { Telemetry } from '@macro-inc/observability';import ArrowClockwise from '@phosphor/arrow-clockwise.svg';import ArrowCounterClockwise from '@phosphor/arrow-counter-clockwise.svg';import ClipboardIcon from '@phosphor/clipboard.svg';@@ -528,7 +529,7 @@ export function PptxEditor() {const point = equationPoint();if (!point) return;equations.openNew(point.where, latex, point.display);- fireAndForget(equations.commit(), 'block-pptx');+ fireAndForget(equations.commit(), 'pptx-editor');};/** Selects the equation under a point of the text being edited. */const pickEquationAt = (at: Point, focusText = false): boolean => {@@ -603,7 +604,7 @@ export function PptxEditor() {context,slideSize: () => ({ w: slideW(), h: slideH() }),refocus,- startEditing: (id) => fireAndForget(startEditing(id), 'block-pptx'),+ startEditing: (id) => fireAndForget(startEditing(id), 'pptx-editor'),tableTarget,slideSelection: selectedSlideIds,collaborative: () => !!engine.collaborative,@@ -829,7 +830,7 @@ export function PptxEditor() {(document.getElementById('pptx-cell-input') as HTMLTextAreaElement)?.value ?? ''),- 'block-pptx'+ 'pptx-editor');const at = toSlide(e);if (painter.active() && paintAt(at)) {@@ -960,7 +961,7 @@ export function PptxEditor() {if (edit) editor.stopEditing();editor.select(hit.id);focusStage();- fireAndForget(painter.paintShapes([hit]), 'block-pptx');+ fireAndForget(painter.paintShapes([hit]), 'pptx-editor');return true;};@@ -1010,7 +1011,7 @@ export function PptxEditor() {if (stage.hasPointerCapture(e.pointerId))stage.releasePointerCapture(e.pointerId);if (guides.drag()) {- fireAndForget(guides.end(), 'block-pptx');+ fireAndForget(guides.end(), 'pptx-editor');return;}const g = tableGesture;@@ -1022,7 +1023,7 @@ export function PptxEditor() {if (Math.abs(delta) > 0.5)fireAndForget(commands.resizeGrid?.(g.shape, g.axis, g.index, delta),- 'block-pptx'+ 'pptx-editor');return;}@@ -1032,23 +1033,24 @@ export function PptxEditor() {editor.pointerUp().then(() => {if (moved) return;const shape = editor.findShape(g.shape);- if (shape) fireAndForget(editCell(shape, g.from, g.at), 'block-pptx');+ if (shape)+ fireAndForget(editCell(shape, g.from, g.at), 'pptx-editor');}),- 'block-pptx'+ 'pptx-editor');return;}if (g?.kind === 'cells') {- fireAndForget(editor.pointerUp(), 'block-pptx');+ fireAndForget(editor.pointerUp(), 'pptx-editor');if (!g.moved && !editor.editing()?.cell) {const shape = editor.findShape(g.shape);- if (shape) fireAndForget(editCell(shape, g.from, g.at), 'block-pptx');+ if (shape) fireAndForget(editCell(shape, g.from, g.at), 'pptx-editor');}return;}- fireAndForget(editor.pointerUp(), 'block-pptx');+ fireAndForget(editor.pointerUp(), 'pptx-editor');if (painter.active() && editor.editing())- fireAndForget(painter.paintSelection(), 'block-pptx');+ fireAndForget(painter.paintSelection(), 'pptx-editor');};const onDoubleClick = (e: MouseEvent) => {@@ -1070,7 +1072,7 @@ export function PptxEditor() {if (hit.textEditable)fireAndForget(startEditing(hit.id, at).then(() => pickEquationAt(at)),- 'block-pptx'+ 'pptx-editor');};@@ -1093,7 +1095,7 @@ export function PptxEditor() {// Right-clicking a misspelled word puts the caret in it, as in PowerPoint.if (misspelled && !misspelled.cell && !editor.editing()) {setTableRange(null);- fireAndForget(editor.startEditing(misspelled.shape, at), 'block-pptx');+ fireAndForget(editor.startEditing(misspelled.shape, at), 'pptx-editor');setMenuTarget({ kind: 'text' });return;}@@ -1193,40 +1195,40 @@ export function PptxEditor() {return true;}if (!mod) return false;- if (key === 'c' && e.shiftKey) fireAndForget(painter.copy(), 'block-pptx');+ if (key === 'c' && e.shiftKey) fireAndForget(painter.copy(), 'pptx-editor');else if (key === 'v' && e.shiftKey && !readonly())- fireAndForget(painter.pasteToSelection(), 'block-pptx');+ fireAndForget(painter.pasteToSelection(), 'pptx-editor');else if (key === 'z')- fireAndForget(e.shiftKey ? redo() : undo(), 'block-pptx');- else if (key === 'y') fireAndForget(redo(), 'block-pptx');+ fireAndForget(e.shiftKey ? redo() : undo(), 'pptx-editor');+ else if (key === 'y') fireAndForget(redo(), 'pptx-editor');else if (key === 's') void session.save().catch(() => {});else if (key === 'p') setPrinting(true);else if ((key === 'f' || key === 'h') && masterActive()) return true;else if (key === 'f') setFind({ replace: false });else if (key === 'h') setFind({ replace: true });else if (key === 'k' && !readonly())- fireAndForget(openLinkDialog(), 'block-pptx');+ fireAndForget(openLinkDialog(), 'pptx-editor');else if (key === 'm' && !readonly())fireAndForget(masterActive() ? master.insertLayout() : commands.addSlide(),- 'block-pptx'+ 'pptx-editor');else if (key === 'e' && !readonly())- fireAndForget(commands.align('center'), 'block-pptx');+ fireAndForget(commands.align('center'), 'pptx-editor');else if (key === 'l' && !readonly())- fireAndForget(commands.align('left'), 'block-pptx');+ fireAndForget(commands.align('left'), 'pptx-editor');else if (key === 'r' && !readonly())- fireAndForget(commands.align('right'), 'block-pptx');+ fireAndForget(commands.align('right'), 'pptx-editor');else if (key === 'j' && !readonly())- fireAndForget(commands.align('justify'), 'block-pptx');+ fireAndForget(commands.align('justify'), 'pptx-editor');else if ((e.key === '>' || e.key === '.') && e.shiftKey && !readonly())- fireAndForget(commands.stepSize(1), 'block-pptx');+ fireAndForget(commands.stepSize(1), 'pptx-editor');else if ((e.key === '<' || e.key === ',') && e.shiftKey && !readonly())- fireAndForget(commands.stepSize(-1), 'block-pptx');+ fireAndForget(commands.stepSize(-1), 'pptx-editor');else if ((e.key === '=' || e.key === '+') && e.shiftKey && !readonly())- fireAndForget(commands.toggleBaseline('super'), 'block-pptx');+ fireAndForget(commands.toggleBaseline('super'), 'pptx-editor');else if (e.key === '=' && !readonly())- fireAndForget(commands.toggleBaseline('sub'), 'block-pptx');+ fireAndForget(commands.toggleBaseline('sub'), 'pptx-editor');else if (['b', 'i', 'u'].includes(key) && !readonly())fireAndForget(commands.toggle(@@ -1234,7 +1236,7 @@ export function PptxEditor() {key as 'b' | 'i' | 'u']),- 'block-pptx'+ 'pptx-editor');else return false;return true;@@ -1261,11 +1263,11 @@ export function PptxEditor() {e.preventDefault();fireAndForget(e.shiftKey ? commands.ungroup() : commands.group(),- 'block-pptx'+ 'pptx-editor');} else if (lower === 'd' && !readonly()) {e.preventDefault();- fireAndForget(editor.duplicateSelected(), 'block-pptx');+ fireAndForget(editor.duplicateSelected(), 'pptx-editor');} else if ((key === ']' || key === '}') && !readonly()) {e.preventDefault();commands.arrange(e.shiftKey ? 'front' : 'forward');@@ -1329,28 +1331,28 @@ export function PptxEditor() {text: '',}))),- 'block-pptx'+ 'pptx-editor');} else {- fireAndForget(editor.deleteSelected(), 'block-pptx');+ fireAndForget(editor.deleteSelected(), 'pptx-editor');}} else if (key.startsWith('Arrow')) {e.preventDefault();const step = e.shiftKey ? 10 : e.altKey ? 0.5 : 1;const dx = key === 'ArrowLeft' ? -step : key === 'ArrowRight' ? step : 0;const dy = key === 'ArrowUp' ? -step : key === 'ArrowDown' ? step : 0;- fireAndForget(editor.nudge(dx, dy), 'block-pptx');+ fireAndForget(editor.nudge(dx, dy), 'pptx-editor');} else if (key === 'Enter' || key === 'F2') {const shape = editor.selectedShape();if (shape?.kind === 'table') {e.preventDefault();fireAndForget(editCell(shape, tableRange()?.from ?? { row: 0, col: 0 }),- 'block-pptx'+ 'pptx-editor');} else if (shape?.textEditable) {e.preventDefault();- fireAndForget(startEditing(shape.id), 'block-pptx');+ fireAndForget(startEditing(shape.id), 'pptx-editor');}} else if (key.length === 1 &&@@ -1366,7 +1368,7 @@ export function PptxEditor() {await startEditing(id);await editor.typeText(key);})(),- 'block-pptx'+ 'pptx-editor');}};@@ -1398,7 +1400,7 @@ export function PptxEditor() {if (await smartArt.deleteNode(node))smartArt.setActiveNode(undefined);})(),- 'block-pptx'+ 'pptx-editor');return true;}@@ -1454,19 +1456,19 @@ export function PptxEditor() {if (edit) editor.select(edit.shape);} else if (key === 'Tab' && editor.editing()?.cell) {handled();- fireAndForget(tabCell(e.shiftKey ? -1 : 1), 'block-pptx');+ fireAndForget(tabCell(e.shiftKey ? -1 : 1), 'pptx-editor');} else if (key === 'Enter') {handled();fireAndForget(editor.typeText(e.shiftKey ? '\u000b' : '\n'),- 'block-pptx'+ 'pptx-editor');} else if (key === 'Backspace' || key === 'Delete') {handled();const unit = e.metaKey ? 'line' : e.altKey || e.ctrlKey ? 'word' : 'char';fireAndForget(editor.deleteText(key === 'Backspace' ? -1 : 1, unit),- 'block-pptx'+ 'pptx-editor');} else if (key.startsWith('Arrow') || key === 'Home' || key === 'End') {handled();@@ -1484,7 +1486,7 @@ export function PptxEditor() {word: e.altKey || e.ctrlKey,line: e.metaKey,}),- 'block-pptx'+ 'pptx-editor');} else if (key === 'Tab') {handled();@@ -1495,7 +1497,7 @@ export function PptxEditor() {level: Math.max(0, Math.min(8, level + (e.shiftKey ? -1 : 1))),})),- 'block-pptx'+ 'pptx-editor');} else if (mod && key.toLowerCase() === 'a') {handled();@@ -1510,11 +1512,11 @@ export function PptxEditor() {e.preventDefault();const text = e.data ?? e.dataTransfer?.getData('text/plain') ?? '';if (e.inputType.startsWith('insert') && text)- fireAndForget(editor.typeText(text), 'block-pptx');+ fireAndForget(editor.typeText(text), 'pptx-editor');};const onCompositionEnd = (e: CompositionEvent) => {- if (e.data) fireAndForget(editor.typeText(e.data), 'block-pptx');+ if (e.data) fireAndForget(editor.typeText(e.data), 'pptx-editor');input.value = '';};@@ -1527,12 +1529,12 @@ export function PptxEditor() {onTextCopy(e);// A collapsed caret has nothing to cut; deleting would eat a character.if (editor.selectedText())- fireAndForget(editor.deleteText(-1), 'block-pptx');+ fireAndForget(editor.deleteText(-1), 'pptx-editor');};const onTextPaste = (e: ClipboardEvent) => {e.preventDefault();const text = e.clipboardData?.getData('text/plain');- if (text) fireAndForget(editor.typeText(text), 'block-pptx');+ if (text) fireAndForget(editor.typeText(text), 'pptx-editor');};// Shape and slide clipboard.@@ -1543,12 +1545,12 @@ export function PptxEditor() {const onStageCut = (e: ClipboardEvent) => {if (e.target === input || readonly()) return;e.preventDefault();- fireAndForget(clipboard.cut(e.clipboardData), 'block-pptx');+ fireAndForget(clipboard.cut(e.clipboardData), 'pptx-editor');};const onStagePaste = (e: ClipboardEvent) => {if (e.target === input || readonly()) return;e.preventDefault();- fireAndForget(clipboard.pasteEvent(e.clipboardData), 'block-pptx');+ fireAndForget(clipboard.pasteEvent(e.clipboardData), 'pptx-editor');};const copyCommand = () => {if (editor.editing()) {@@ -1562,10 +1564,10 @@ export function PptxEditor() {document.execCommand('cut');return;}- fireAndForget(clipboard.cut(), 'block-pptx');+ fireAndForget(clipboard.cut(), 'pptx-editor');};const pasteCommand = () =>- fireAndForget(clipboard.pasteCommand(), 'block-pptx');+ fireAndForget(clipboard.pasteCommand(), 'pptx-editor');// ---- panes, find, slide show -----------------------------------------------@@ -1767,12 +1769,22 @@ export function PptxEditor() {const d = comments.draft();return d && d.slide === session.currentSlide()?.id ? d : undefined;};+ const startSpelling = async () => {+ try {+ await spellingPane.start();+ } catch (error) {+ Telemetry.error(error, { surface: 'pptx-spelling' });+ // The pane opens once the dictionary has loaded.+ if (!spellingPane.open())+ context.notifyError('Spelling could not be checked.');+ }+ };/** Review ▸ Spelling (F7). */const openSpelling = () => {if (readonly()) return;makeWayForReview();comments.setPaneOpen(false);- fireAndForget(spellingPane.start(), 'block-pptx');+ fireAndForget(startSpelling(), 'pptx-spelling');};/** The misspelled word right-clicked, for the menu's corrections. */const [spellHit, setSpellHit] = createSignal<Squiggle>();@@ -1784,7 +1796,7 @@ export function PptxEditor() {suggestions: spell.suggest(hit.word),readonly: readonly(),replace: (suggestion: string) =>- fireAndForget(spell.replace([hit], suggestion), 'block-pptx'),+ fireAndForget(spell.replace([hit], suggestion), 'pptx-spelling'),ignoreAll: () => spell.ignoreAll(hit.word),addToDictionary: () => spell.addToDictionary(hit.word),};@@ -1938,14 +1950,14 @@ export function PptxEditor() {standardColors: STANDARD_SWATCHES,presetPaths: engine.presetPaths,history: session.history,- undo: () => fireAndForget(undo(), 'block-pptx'),- redo: () => fireAndForget(redo(), 'block-pptx'),+ undo: () => fireAndForget(undo(), 'pptx-editor'),+ redo: () => fireAndForget(redo(), 'pptx-editor'),copy: copyCommand,cut: cutCommand,paste: pasteCommand,formatPainter: painter,openFormatPane: (section) => setPane(section ?? 'shape'),- openLink: () => fireAndForget(openLinkDialog(), 'block-pptx'),+ openLink: () => fireAndForget(openLinkDialog(), 'pptx-editor'),selectionPane: { open: selectionPane, toggle: toggleSelectionPane },view,present,@@ -1957,15 +1969,15 @@ export function PptxEditor() {animation: animationEnv,notesVisible,toggleNotes: () => setNotesVisible((v) => !v),- download: () => fireAndForget(download(), 'block-pptx'),+ download: () => fireAndForget(download(), 'pptx-download'),recentFonts,deckSetup,- openSlideMaster: () => fireAndForget(openSlideMaster(), 'block-pptx'),+ openSlideMaster: () => fireAndForget(openSlideMaster(), 'pptx-editor'),review: { comments, spelling: openSpelling },shapeGeometry: {- toggleEditPoints: () => fireAndForget(editPoints.toggle(), 'block-pptx'),+ toggleEditPoints: () => fireAndForget(editPoints.toggle(), 'pptx-editor'),editingPoints: editPoints.active,- merge: (mode) => fireAndForget(commands.mergeShapes(mode), 'block-pptx'),+ merge: (mode) => fireAndForget(commands.mergeShapes(mode), 'pptx-editor'),},...(engine.renderEquation? {@@ -2004,7 +2016,7 @@ export function PptxEditor() {);if (id !== undefined) setChartDataShape(id);})(),- 'block-pptx'+ 'pptx-editor');}}/>@@ -2211,17 +2223,17 @@ export function PptxEditor() {onSelectAll={selectAllSlides}onOpen={props.grid ? openFromSorter : undefined}onMove={(ids, at) =>- fireAndForget(commands.moveSlides(ids, at), 'block-pptx')+ fireAndForget(commands.moveSlides(ids, at), 'pptx-editor')}- onAdd={() => fireAndForget(commands.addSlide(), 'block-pptx')}+ onAdd={() => fireAndForget(commands.addSlide(), 'pptx-editor')}onDuplicate={(id) =>- fireAndForget(commands.duplicateSlide(id), 'block-pptx')+ fireAndForget(commands.duplicateSlide(id), 'pptx-editor')}onDelete={(ids) =>- fireAndForget(commands.deleteSlides(ids), 'block-pptx')+ fireAndForget(commands.deleteSlides(ids), 'pptx-editor')}onToggleHidden={(s) =>- fireAndForget(commands.toggleHidden(s), 'block-pptx')+ fireAndForget(commands.toggleHidden(s), 'pptx-editor')}peersOn={collaboration ? peersOn : undefined}menu={railMenu}@@ -2231,14 +2243,14 @@ export function PptxEditor() {onCut={(e) => {if (readonly()) return;e.preventDefault();- fireAndForget(clipboard.cut(e.clipboardData), 'block-pptx');+ fireAndForget(clipboard.cut(e.clipboardData), 'pptx-editor');}}onPaste={(e) => {if (readonly()) return;e.preventDefault();fireAndForget(clipboard.pasteEvent(e.clipboardData),- 'block-pptx'+ 'pptx-editor');}}onFocusChange={setRailFocused}@@ -2302,7 +2314,7 @@ export function PptxEditor() {shortcut="cmd+m"disabled={readonly()}onClick={() =>- fireAndForget(commands.addSlide(undefined, slide?.id), 'block-pptx')+ fireAndForget(commands.addSlide(undefined, slide?.id), 'pptx-editor')}/><Show when={slide}>@@ -2313,7 +2325,7 @@ export function PptxEditor() {icon={CopySimple}disabled={readonly()}onClick={() =>- fireAndForget(commands.duplicateSlide(s().id), 'block-pptx')+ fireAndForget(commands.duplicateSlide(s().id), 'pptx-editor')}/><MenuItem@@ -2327,7 +2339,7 @@ export function PptxEditor() {onClick={() =>fireAndForget(commands.deleteSlides(selectedSlideIds()),- 'block-pptx'+ 'pptx-editor')}/>@@ -2335,7 +2347,7 @@ export function PptxEditor() {text="Add Section"disabled={readonly()}onClick={() =>- fireAndForget(deckSetup.sections.add(s().id), 'block-pptx')+ fireAndForget(deckSetup.sections.add(s().id), 'pptx-editor')}/><MenuSeparator />@@ -2353,7 +2365,7 @@ export function PptxEditor() {onClick={() =>fireAndForget(commands.setLayout(layout.name),- 'block-pptx'+ 'pptx-editor')}/>@@ -2376,7 +2388,7 @@ export function PptxEditor() {icon={EyeSlash}disabled={readonly()}onClick={() =>- fireAndForget(commands.toggleHidden(s()), 'block-pptx')+ fireAndForget(commands.toggleHidden(s()), 'pptx-editor')}/></>@@ -2396,7 +2408,9 @@ export function PptxEditor() {text="Insert Layout"icon={Layout}disabled={readonly()}- onClick={() => fireAndForget(master.insertLayout(page), 'block-pptx')}+ onClick={() =>+ fireAndForget(master.insertLayout(page), 'pptx-editor')+ }/><Show when={page?.layout}><MenuItem@@ -2404,7 +2418,7 @@ export function PptxEditor() {icon={CopySimple}disabled={readonly()}onClick={() =>- fireAndForget(master.duplicateLayout(page), 'block-pptx')+ fireAndForget(master.duplicateLayout(page), 'pptx-editor')}/></Show>@@ -2413,7 +2427,9 @@ export function PptxEditor() {text={`Delete ${what()}`}icon={Trash}disabled={readonly() || !!blocked()}- onClick={() => fireAndForget(master.deletePage(page), 'block-pptx')}+ onClick={() =>+ fireAndForget(master.deletePage(page), 'pptx-editor')+ }/><MenuItemtext={`Rename ${what()}`}@@ -2454,7 +2470,7 @@ export function PptxEditor() {label="Undo"tooltip="Undo (⌘Z)"disabled={!session.history().canUndo}- onClick={() => fireAndForget(undo(), 'block-pptx')}+ onClick={() => fireAndForget(undo(), 'pptx-editor')}><ArrowCounterClockwise /></RibbonButton>@@ -2462,7 +2478,7 @@ export function PptxEditor() {label="Redo"tooltip="Redo (⇧⌘Z)"disabled={!session.history().canRedo}- onClick={() => fireAndForget(redo(), 'block-pptx')}+ onClick={() => fireAndForget(redo(), 'pptx-editor')}><ArrowClockwise /></RibbonButton>@@ -2509,7 +2525,7 @@ export function PptxEditor() {<RibbonButtonlabel="Download"tooltip="Download .pptx"- onClick={() => fireAndForget(download(), 'block-pptx')}+ onClick={() => fireAndForget(download(), 'pptx-download')}><DownloadSimple /></RibbonButton>@@ -2548,7 +2564,7 @@ export function PptxEditor() {readonly={readonly()}onSelect={(index) => editor.goToSlide(index)}onDelete={(page) =>- fireAndForget(master.deletePage(page), 'block-pptx')+ fireAndForget(master.deletePage(page), 'pptx-editor')}menu={masterMenu}/>@@ -2781,7 +2797,7 @@ export function PptxEditor() {e.preventDefault();fireAndForget(commitCell(e.currentTarget.value),- 'block-pptx'+ 'pptx-editor');} else if (e.key === 'Escape') {e.preventDefault();@@ -2791,7 +2807,7 @@ export function PptxEditor() {onBlur={(e) =>fireAndForget(commitCell(e.currentTarget.value),- 'block-pptx'+ 'pptx-editor')}/>@@ -2832,7 +2848,7 @@ export function PptxEditor() {if (s)fireAndForget(startEditing(s.id),- 'block-pptx'+ 'pptx-editor');},openFormatPane: (section) =>@@ -2840,14 +2856,14 @@ export function PptxEditor() {replacePicture: () =>replacePictureInput.click(),crop: () =>- fireAndForget(crop.enter(), 'block-pptx'),+ fireAndForget(crop.enter(), 'pptx-editor'),editPoints: canEditPoints(editor.selectedShape())? () =>fireAndForget(editPoints.enter(),- 'block-pptx'+ 'pptx-editor'): undefined,editChartData: () => {@@ -2875,14 +2891,14 @@ export function PptxEditor() {newSlide: () =>fireAndForget(commands.addSlide(),- 'block-pptx'+ 'pptx-editor'),hideSlide: () => {const s = session.currentSlide();if (s)fireAndForget(commands.toggleHidden(s),- 'block-pptx'+ 'pptx-editor');},slideHidden: !!session.currentSlide()?.hidden,@@ -2897,11 +2913,14 @@ export function PptxEditor() {savePicture: () =>fireAndForget(saveShapePicture(),- 'block-pptx'+ 'pptx-editor'),link: menuLink(),editLink: () =>- fireAndForget(openLinkDialog(), 'block-pptx'),+ fireAndForget(+ openLinkDialog(),+ 'pptx-editor'+ ),openLink: followLink,guides: {shown: view.options().drawingGuides,@@ -2923,17 +2942,17 @@ export function PptxEditor() {add: (orient) =>fireAndForget(guides.add(orient),- 'block-pptx'+ 'pptx-editor'),remove: (index) =>fireAndForget(guides.remove(index),- 'block-pptx'+ 'pptx-editor'),recolor: (index, color) =>fireAndForget(guides.recolor(index, color),- 'block-pptx'+ 'pptx-editor'),},removeLink: () => {@@ -2941,7 +2960,7 @@ export function PptxEditor() {if (target)fireAndForget(commands.applyLink(target, ''),- 'block-pptx'+ 'pptx-editor');},newComment: readonly()@@ -3119,18 +3138,18 @@ export function PptxEditor() {toggle ? editor.toggleSelected(id) : editor.select(id)}onRename={(id, name) =>- fireAndForget(commands.renameShape(id, name), 'block-pptx')+ fireAndForget(commands.renameShape(id, name), 'pptx-editor')}onHide={(ids, hidden) =>fireAndForget(commands.setShapesHidden(ids, hidden),- 'block-pptx'+ 'pptx-editor')}onMove={(id, steps) =>fireAndForget(commands.moveInZOrder(id, steps),- 'block-pptx'+ 'pptx-editor')}onClose={() => {@@ -3193,7 +3212,7 @@ export function PptxEditor() {if ((current?.notes ?? '') !== text)fireAndForget(session.apply([{ op: 'setNotes', slide: slideId, text }]),- 'block-pptx'+ 'pptx-editor');}}/>@@ -3306,7 +3325,7 @@ export function PptxEditor() {onChange={(e) => {const file = e.currentTarget.files?.[0];e.currentTarget.value = '';- if (file) fireAndForget(replacePicture(file), 'block-pptx');+ if (file) fireAndForget(replacePicture(file), 'pptx-editor');}}/><Show@@ -3333,7 +3352,7 @@ export function PptxEditor() {catalog={smartArt.catalog()}preview={smartArt.preview}onInsert={(layout) =>- fireAndForget(smartArt.insert(layout), 'block-pptx')+ fireAndForget(smartArt.insert(layout), 'pptx-editor')}onClose={() => {smartArt.dialog.setOpen(false);@@ -3353,7 +3372,7 @@ export function PptxEditor() {if (target)fireAndForget(commands.applyLink(target, link, tip, text),- 'block-pptx'+ 'pptx-editor');}}onClose={() => {@@ -3406,7 +3425,7 @@ export function PptxEditor() {master={!page().layout}name={page().layout?.name ?? page().master.name}onRename={(name) =>- fireAndForget(master.rename(page(), name), 'block-pptx')+ fireAndForget(master.rename(page(), name), 'pptx-editor')}onClose={() => {master.stopRename();diff --git a/apps/web/src/features/block-psd/primitives/create-canvas-tools.ts b/apps/web/src/features/block-psd/primitives/create-canvas-tools.tsindex 77979cdf5f..673ef39b31 100644--- a/apps/web/src/features/block-psd/primitives/create-canvas-tools.ts+++ b/apps/web/src/features/block-psd/primitives/create-canvas-tools.ts@@ -14,6 +14,7 @@import type { Point } from '@app/features/block-fig/core/camera';import type { IRect, Op, SelectMode, Target } from '@core/psd-engine/types';import { fireAndForget } from '@core/util/fireAndForget';+import { Telemetry } from '@macro-inc/observability';import { createSignal } from 'solid-js';import { brushFor, newStrokeId, type PaintingTool } from '../core/brush';import { twoColorGradient } from '../core/gradient';@@ -289,7 +290,7 @@ export function createCanvasTools(options: CanvasToolsOptions) {}if (s.buffer.length > 0 || s.done) flushStroke();};- fireAndForget(send(), 'block-psd');+ fireAndForget(send(), 'psd-editor');};let frame: number | undefined;@@ -392,14 +393,20 @@ export function createCanvasTools(options: CanvasToolsOptions) {g.inFlight = false;flushMove();};- fireAndForget(run(), 'block-psd');+ fireAndForget(run(), 'psd-editor');};/** The layers a Move drag takes: the one under the pointer, or the chosen. */const pickForMove = async (p: CanvasPointer): Promise<MovePick> => {let ids = editor.selected();if (view.toolOptions().autoSelect && !p.shift) {- const hit = await engine.hitTest(p.at.x, p.at.y);+ let hit: number | null = null;+ try {+ hit = await engine.hitTest(p.at.x, p.at.y);+ } catch (error) {+ // The chosen layers, then. A click never awaits the pick.+ Telemetry.error(error, { surface: 'psd-editor' });+ }if (hit !== null && !ids.includes(hit)) {editor.chooseLayers([hit]);ids = [hit];@@ -437,7 +444,7 @@ export function createCanvasTools(options: CanvasToolsOptions) {[{ op: 'translate', ids: rows.map((r) => r.id), dx, dy }],gestureKey('nudge', nudgeKey)),- 'block-psd'+ 'psd-editor');};@@ -689,7 +696,7 @@ export function createCanvasTools(options: CanvasToolsOptions) {if (!poly) {setPolygon({ points: [p.at], mode });} else if (closesPolygon(poly.points, p.at, CLOSE_SLOP / zoom())) {- fireAndForget(finishPolygon(true), 'block-psd');+ fireAndForget(finishPolygon(true), 'psd-editor');} else setPolygon({ ...poly, points: [...poly.points, p.at] });refreshOverlay();return;@@ -707,12 +714,12 @@ export function createCanvasTools(options: CanvasToolsOptions) {layer: editor.active() ?? null,mode,}),- 'block-psd'+ 'psd-editor');return;case 'eyedropper':gesture = { kind: 'eyedropper' };- fireAndForget(sampleColor(p), 'block-psd');+ fireAndForget(sampleColor(p), 'psd-editor');return;case 'brush':case 'pencil':@@ -738,7 +745,7 @@ export function createCanvasTools(options: CanvasToolsOptions) {sampleAll: view.toolOptions().sampleAll,},]),- 'block-psd'+ 'psd-editor');return;}@@ -749,7 +756,7 @@ export function createCanvasTools(options: CanvasToolsOptions) {return;case 'type':options.onTypeStart?.();- fireAndForget(typeAt(p), 'block-psd');+ fireAndForget(typeAt(p), 'psd-editor');return;case 'rectangle':case 'ellipse':@@ -822,7 +829,7 @@ export function createCanvasTools(options: CanvasToolsOptions) {g.current = p.at;break;case 'eyedropper':- fireAndForget(sampleColor(p), 'block-psd');+ fireAndForget(sampleColor(p), 'psd-editor');return;case 'crop-draw': {const r = marqueeRect(g.start, p.at, {@@ -885,7 +892,7 @@ export function createCanvasTools(options: CanvasToolsOptions) {if (!g.dragged || rect.w < 1 || rect.h < 1) {// A click deselects (unless it adds to or subtracts from it).if (g.mode === 'replace')- fireAndForget(editor.select({ type: 'none' }), 'block-psd');+ fireAndForget(editor.select({ type: 'none' }), 'psd-editor');break;}fireAndForget(@@ -898,7 +905,7 @@ export function createCanvasTools(options: CanvasToolsOptions) {? { antialias: view.toolOptions().antialias }: {}),}),- 'block-psd'+ 'psd-editor');break;}@@ -912,10 +919,10 @@ export function createCanvasTools(options: CanvasToolsOptions) {feather: view.toolOptions().feather,antialias: view.toolOptions().antialias,}),- 'block-psd'+ 'psd-editor');else if (g.mode === 'replace')- fireAndForget(editor.select({ type: 'none' }), 'block-psd');+ fireAndForget(editor.select({ type: 'none' }), 'psd-editor');break;case 'gradient': {const t = fillTarget();@@ -942,7 +949,7 @@ export function createCanvasTools(options: CanvasToolsOptions) {opacity: 1,},]),- 'block-psd'+ 'psd-editor');break;}@@ -956,7 +963,7 @@ export function createCanvasTools(options: CanvasToolsOptions) {shapeLayer(g.shape, rect, view.foreground())),]),- 'block-psd'+ 'psd-editor');break;}@@ -990,19 +997,19 @@ export function createCanvasTools(options: CanvasToolsOptions) {const doubleClick = (p: CanvasPointer) => {if (polygon()) {- fireAndForget(finishPolygon(true), 'block-psd');+ fireAndForget(finishPolygon(true), 'psd-editor');return;}if (transform()) {- fireAndForget(finishTransform(true), 'block-psd');+ fireAndForget(finishTransform(true), 'psd-editor');return;}if (view.tool() === 'crop' && crop()) {- fireAndForget(finishCrop(true), 'block-psd');+ fireAndForget(finishCrop(true), 'psd-editor');return;}if (view.tool() === 'move' && editable())- fireAndForget(editTextAt(p), 'block-psd');+ fireAndForget(editTextAt(p), 'psd-editor');};/** Double-click with the Move tool on text edits it. */@@ -1051,15 +1058,15 @@ export function createCanvasTools(options: CanvasToolsOptions) {/** Enter: commits Free Transform, the crop, or a polygon. */const commit = (): boolean => {if (transform()) {- fireAndForget(finishTransform(true), 'block-psd');+ fireAndForget(finishTransform(true), 'psd-editor');return true;}if (crop() && view.tool() === 'crop') {- fireAndForget(finishCrop(true), 'block-psd');+ fireAndForget(finishCrop(true), 'psd-editor');return true;}if (polygon()) {- fireAndForget(finishPolygon(true), 'block-psd');+ fireAndForget(finishPolygon(true), 'psd-editor');return true;}return false;@@ -1068,15 +1075,15 @@ export function createCanvasTools(options: CanvasToolsOptions) {/** Escape: cancels them. */const cancel = (): boolean => {if (transform()) {- fireAndForget(finishTransform(false), 'block-psd');+ fireAndForget(finishTransform(false), 'psd-editor');return true;}if (crop()) {- fireAndForget(finishCrop(false), 'block-psd');+ fireAndForget(finishCrop(false), 'psd-editor');return true;}if (polygon()) {- fireAndForget(finishPolygon(false), 'block-psd');+ fireAndForget(finishPolygon(false), 'psd-editor');return true;}return false;@@ -1085,10 +1092,10 @@ export function createCanvasTools(options: CanvasToolsOptions) {/** The tool changed: boxes that belong to the previous one end. */const toolChanged = (tool: Tool) => {if (tool !== 'crop' && crop())- fireAndForget(finishCrop(false), 'block-psd');+ fireAndForget(finishCrop(false), 'psd-editor');if (tool === 'crop' && editable()) startCrop();if (tool !== 'polygonLasso' && polygon())- fireAndForget(finishPolygon(false), 'block-psd');+ fireAndForget(finishPolygon(false), 'psd-editor');refreshOverlay();};diff --git a/apps/web/src/features/block-psd/primitives/create-psd-commands.ts b/apps/web/src/features/block-psd/primitives/create-psd-commands.tsindex ea9c63faa7..acfede2434 100644--- a/apps/web/src/features/block-psd/primitives/create-psd-commands.ts+++ b/apps/web/src/features/block-psd/primitives/create-psd-commands.ts@@ -13,6 +13,7 @@ import type {Op,} from '@core/psd-engine/types';import { fireAndForget } from '@core/util/fireAndForget';+import { Telemetry } from '@macro-inc/observability';import { createSignal } from 'solid-js';import {defaultAdjustment,@@ -131,7 +132,14 @@ export function createPsdCommands(options: PsdCommandsOptions) {options.notifyInfo('There is no image to paste.');return;}- const bytes = await blob.arrayBuffer();+ let bytes: ArrayBuffer;+ try {+ bytes = await blob.arrayBuffer();+ } catch (error) {+ Telemetry.error(error, { surface: 'psd-editor' });+ options.notifyError('The image could not be pasted.');+ return;+ }const camera = view.camera();const v = view.viewport();const center = {diff --git a/apps/web/src/features/block-psd/views/layers-panel.tsx b/apps/web/src/features/block-psd/views/layers-panel.tsxindex fff098cb42..7f417a2aac 100644--- a/apps/web/src/features/block-psd/views/layers-panel.tsx+++ b/apps/web/src/features/block-psd/views/layers-panel.tsx@@ -546,7 +546,7 @@ export function LayersPanel(props: {);async function toggleEffects(id: number) {- const info = await editor.engine.layerInfo(id);+ const info = await editor.enqueue(() => editor.engine.layerInfo(id));if (!info?.effects) return;await editor.apply([{diff --git a/apps/web/src/features/block-psd/views/psd-editor.tsx b/apps/web/src/features/block-psd/views/psd-editor.tsxindex 3d8854db10..abc39ae8ba 100644--- a/apps/web/src/features/block-psd/views/psd-editor.tsx+++ b/apps/web/src/features/block-psd/views/psd-editor.tsx@@ -11,6 +11,7 @@ import { paletteColor } from '@app/features/block-fig/primitives/create-peer-oveimport { IS_MAC } from '@core/constant/isMac';import type { IRect } from '@core/psd-engine/types';import { fireAndForget } from '@core/util/fireAndForget';+import { Telemetry } from '@macro-inc/observability';import ArrowUUpLeft from '@phosphor/arrow-u-up-left.svg';import ArrowUUpRight from '@phosphor/arrow-u-up-right.svg';import CloudArrowUp from '@phosphor/cloud-arrow-up.svg';@@ -164,7 +165,7 @@ export function PsdEditor() {let root!: HTMLDivElement;onMount(() => {- fireAndForget(editor.start(), 'block-psd');+ fireAndForget(editor.start(), 'psd-editor');if (document.activeElement === document.body)root.focus({ preventScroll: true });});@@ -210,7 +211,7 @@ export function PsdEditor() {opacity: Math.round(value * 255),},]),- 'block-psd'+ 'psd-editor');return true;})@@ -334,19 +335,28 @@ export function PsdEditor() {f.type.startsWith('image/'));if (files.length === 0) {- fireAndForget(commands.paste(), 'block-psd');+ fireAndForget(commands.paste(), 'psd-editor');return;}- for (const file of files) fireAndForget(commands.paste(file), 'block-psd');+ for (const file of files) fireAndForget(commands.paste(file), 'psd-editor');};const dropFiles = async (files: File[], at: Point) => {- for (const file of files)+ for (const file of files) {+ let bytes: ArrayBuffer;+ try {+ bytes = await file.arrayBuffer();+ } catch (error) {+ Telemetry.error(error, { surface: 'psd-editor' });+ context.notifyError(`${file.name} could not be added.`);+ continue;+ }await commands.placeImage(- await file.arrayBuffer(),+ bytes,file.name.replace(/\.[^.]+$/, '') || 'Layer',at);+ }};// ---- other people ----------------------------------------------------------@@ -411,7 +421,7 @@ export function PsdEditor() {if (!ready) return;clearTimeout(fontsTimer);fontsTimer = setTimeout(- () => fireAndForget(loadFonts(), 'block-psd'),+ () => fireAndForget(loadFonts(), 'psd-editor'),400);})@@ -452,8 +462,8 @@ export function PsdEditor() {let previewed: string | undefined;const preview = (ops: Parameters<typeof editor.apply>[0] | null) => {previewed = ops ? JSON.stringify(ops) : undefined;- if (ops) fireAndForget(editor.preview(ops), 'block-psd');- else fireAndForget(editor.cancelPreview(), 'block-psd');+ if (ops) fireAndForget(editor.preview(ops), 'psd-editor');+ else fireAndForget(editor.cancelPreview(), 'psd-editor');};/** Keeps the preview when it shows these operations, else applies them. */const applyPreviewed = async (ops: Parameters<typeof editor.apply>[0]) => {@@ -491,7 +501,7 @@ export function PsdEditor() {tooltip={`Undo · ${IS_MAC ? '⌘Z' : 'Ctrl+Z'}`}disabled={!editor.canUndo()}data-testid="psd-undo"- onClick={() => fireAndForget(editor.undo(), 'block-psd')}+ onClick={() => fireAndForget(editor.undo(), 'psd-editor')}><ArrowUUpLeft /></Button>@@ -502,7 +512,7 @@ export function PsdEditor() {tooltip={`Redo · ${IS_MAC ? '⇧⌘Z' : 'Ctrl+⇧Z'}`}disabled={!editor.canRedo()}data-testid="psd-redo"- onClick={() => fireAndForget(editor.redo(), 'block-psd')}+ onClick={() => fireAndForget(editor.redo(), 'psd-editor')}><ArrowUUpRight /></Button>@@ -596,7 +606,7 @@ export function PsdEditor() {onDropFiles={editor.enabled()? (files, at) =>- fireAndForget(dropFiles(files, at), 'block-psd')+ fireAndForget(dropFiles(files, at), 'psd-editor'): undefined}>@@ -730,7 +740,7 @@ export function PsdEditor() {editor.apply([{ op: 'imageSize', width, height, interpolation },]),- 'block-psd'+ 'psd-editor');}}/>@@ -744,7 +754,7 @@ export function PsdEditor() {commands.closeDialog();fireAndForget(editor.apply([{ op: 'canvasSize', width, height, anchor }]),- 'block-psd'+ 'psd-editor');}}/>@@ -764,7 +774,7 @@ export function PsdEditor() {commands.closeDialog();fireAndForget(applyPreviewed(commands.filterOp(spec)),- 'block-psd'+ 'psd-editor');}}/>@@ -791,7 +801,7 @@ export function PsdEditor() {applyPreviewed(commands.filterOp({ type: 'adjust', adjustment })),- 'block-psd'+ 'psd-editor');}}/>@@ -811,7 +821,7 @@ export function PsdEditor() {commands.closeDialog();fireAndForget(editor.select({ type: 'feather', radius }),- 'block-psd'+ 'psd-editor');}}/>@@ -834,7 +844,7 @@ export function PsdEditor() {type: 'expand',pixels: Math.round(d().contract ? -pixels : pixels),}),- 'block-psd'+ 'psd-editor');}}/>@@ -854,7 +864,7 @@ export function PsdEditor() {commands.closeDialog();fireAndForget(editor.apply([{ op: 'setResolution', ppi }]),- 'block-psd'+ 'psd-editor');}}/>diff --git a/apps/web/src/features/block-psd/views/text-editor.tsx b/apps/web/src/features/block-psd/views/text-editor.tsxindex fd0d55692b..9b77a90839 100644--- a/apps/web/src/features/block-psd/views/text-editor.tsx+++ b/apps/web/src/features/block-psd/views/text-editor.tsx@@ -11,6 +11,7 @@ import { type Point, pageToScreen } from '@app/features/block-fig/core/camera';import { IS_MAC } from '@core/constant/isMac';import type { Op, TextLayer } from '@core/psd-engine/types';import { fireAndForget } from '@core/util/fireAndForget';+import { Telemetry } from '@macro-inc/observability';import { createSignal, onCleanup, onMount, Show } from 'solid-js';import { gestureKey, newLayerOp } from '../core/ops';import {@@ -59,7 +60,16 @@ export function TextEditor(props: {onMount(() => {const load = async () => {if (layerId !== undefined) {- const info = await editor.engine.layerInfo(layerId);+ let info: Awaited<ReturnType<typeof editor.engine.layerInfo>>;+ try {+ info = await editor.engine.layerInfo(layerId);+ } catch (error) {+ Telemetry.error(error, { surface: 'psd-editor' });+ // Nothing was typed: finishing now would delete the layer.+ finished = true;+ props.onDone();+ return;+ }if (!info?.text) {props.onDone();return;@@ -75,7 +85,7 @@ export function TextEditor(props: {input.select();if (props.initialText) update(props.initialText);};- fireAndForget(load(), 'block-psd');+ fireAndForget(load(), 'psd-editor');});const update = (text: string) => {@@ -112,7 +122,7 @@ export function TextEditor(props: {}await editor.apply(ops, key);}),- 'block-psd'+ 'psd-editor');};@@ -131,7 +141,7 @@ export function TextEditor(props: {};onCleanup(() => {- if (!finished) fireAndForget(finish(), 'block-psd');+ if (!finished) fireAndForget(finish(), 'psd-editor');});const at = () => pageToScreen(view.camera(), anchor());@@ -158,10 +168,10 @@ export function TextEditor(props: {const mod = IS_MAC ? e.metaKey : e.ctrlKey;if (e.key === 'Escape' || (e.key === 'Enter' && mod)) {e.preventDefault();- fireAndForget(finish(), 'block-psd');+ fireAndForget(finish(), 'psd-editor');}}}- onBlur={() => fireAndForget(finish(), 'block-psd')}+ onBlur={() => fireAndForget(finish(), 'psd-editor')}/><div class="mt-1 flex items-center justify-between text-[11px] text-ink-muted"><Show when={editing()} fallback={<span>New text</span>}>diff --git a/apps/web/src/features/block-write/primitives/create-docx-editor.ts b/apps/web/src/features/block-write/primitives/create-docx-editor.tsindex 5d9b6629a9..ded72dcc36 100644--- a/apps/web/src/features/block-write/primitives/create-docx-editor.ts+++ b/apps/web/src/features/block-write/primitives/create-docx-editor.ts@@ -237,7 +237,7 @@ export function createDocxEditor(options: DocxEditorOptions) {);if (editing && !options.editable) return;queue.push({ ops, group });- fireAndForget(pump(), 'block-write');+ fireAndForget(pump(), 'docx-editor');}async function undo() {@@ -245,7 +245,11 @@ export function createDocxEditor(options: DocxEditorOptions) {collab.undo();return;}- take(await engine.undo(docKey));+ try {+ take(await engine.undo(docKey));+ } catch (error) {+ options.onError?.(error);+ }}async function redo() {@@ -253,7 +257,11 @@ export function createDocxEditor(options: DocxEditorOptions) {collab.redo();return;}- take(await engine.redo(docKey));+ try {+ take(await engine.redo(docKey));+ } catch (error) {+ options.onError?.(error);+ }}async function setMarkup(next: boolean) {diff --git a/apps/web/src/features/channel/Call/CallStartedNotifier.tsx b/apps/web/src/features/channel/Call/CallStartedNotifier.tsxindex e9354fee29..96d59aadd2 100644--- a/apps/web/src/features/channel/Call/CallStartedNotifier.tsx+++ b/apps/web/src/features/channel/Call/CallStartedNotifier.tsx@@ -1,6 +1,8 @@+import { toast } from '@core/component/Toast/Toast';import { useChannelsContext } from '@core/context/channels';import { useUserId } from '@core/context/user';import { fireAndForget } from '@core/util/fireAndForget';+import { Telemetry } from '@macro-inc/observability';import { usePlatformNotificationState } from '@notifications';import { DefaultUserNameResolver } from '@notifications/notification-resolvers';import {@@ -254,7 +256,7 @@ export function CallStartedNotifier() {closeCallNotification(resolution.callId);// The creator's other devices never receive call_started; a refetch// picks the now-answered call up for their active-call badges.- fireAndForget(invalidateActiveCallQueries(), 'channel');+ fireAndForget(invalidateActiveCallQueries(), 'channel-call');return;}@@ -276,7 +278,7 @@ export function CallStartedNotifier() {channelId: resolution.channelId,callId: resolution.callId,});- fireAndForget(invalidateActiveCallQueries(), 'channel');+ fireAndForget(invalidateActiveCallQueries(), 'channel-call');});createCallEventsEffect({@@ -312,7 +314,7 @@ export function CallStartedNotifier() {createdAt,createdBy: createdBy ?? '',});- fireAndForget(invalidateActiveCallQueries(), 'channel');+ fireAndForget(invalidateActiveCallQueries(), 'channel-call');// The cache above is updated for every call, including our own; only the// ring and the toast are skipped when we're already in it or started it.@@ -328,7 +330,7 @@ export function CallStartedNotifier() {notif,isJoined: () => callCtx.activeCallId() === callId,}),- 'channel'+ 'channel-call');},});@@ -336,6 +338,15 @@ export function CallStartedNotifier() {return null;}+async function joinFromNotification(channelId: string) {+ try {+ await joinChannelCall(channelId);+ } catch (error) {+ Telemetry.error(error, { surface: 'channel-call' });+ toast.failure('Failed to join call');+ }+}+async function emitCallStartedNotification(args: {channelId: string;callId: string;@@ -400,7 +411,7 @@ async function emitCallStartedNotification(args: {};handle.onClick(() => {window.focus();- fireAndForget(joinChannelCall(channelId), 'channel');+ fireAndForget(joinFromNotification(channelId), 'channel-call');handle.close();untrack();ringer.stop();diff --git a/apps/web/src/features/drive-view/views/PdfDetail.tsx b/apps/web/src/features/drive-view/views/PdfDetail.tsxindex c84a7c0743..b473ec17eb 100644--- a/apps/web/src/features/drive-view/views/PdfDetail.tsx+++ b/apps/web/src/features/drive-view/views/PdfDetail.tsx@@ -29,8 +29,10 @@ import {hasPermissions,Permissions,} from '@core/component/SharePermissions';+import { toast } from '@core/component/Toast/Toast';import { openLoginModal } from '@core/component/TopBar/LoginButton';import { fireAndForget } from '@core/util/fireAndForget';+import { Telemetry } from '@macro-inc/observability';import DownloadIcon from '@phosphor/download-simple.svg';import Printer from '@phosphor/printer.svg';import { useSearchParams } from '@solidjs/router';@@ -56,6 +58,21 @@ function PdfDetailContent(props: {isAuthenticated: !!isAuth(),openLogin: openLoginModal,});+ const download = async () => {+ try {+ await downloadPdfDocument({+ ...auth(),+ documentProxy: pdf.documentProxy(),+ hasModifications: hasModificationData(),+ hasComments: hasComments(),+ documentId: pdf.documentId(),+ fileName,+ });+ } catch (error) {+ Telemetry.error(error, { surface: 'pdf-file-actions' });+ toast.failure('Unable to download file');+ }+ };const operations: FileOperation[] = [{label: 'Print',@@ -66,7 +83,7 @@ function PdfDetailContent(props: {...auth(),documentProxy: pdf.documentProxy(),}),- 'drive-view'+ 'pdf-file-actions');},},@@ -75,17 +92,7 @@ function PdfDetailContent(props: {label: 'Download',icon: DownloadIcon,action: () => {- fireAndForget(- downloadPdfDocument({- ...auth(),- documentProxy: pdf.documentProxy(),- hasModifications: hasModificationData(),- hasComments: hasComments(),- documentId: pdf.documentId(),- fileName,- }),- 'drive-view'- );+ fireAndForget(download(), 'pdf-file-actions');},},...(props.data.documentMetadata.fileType === 'docx'@@ -101,7 +108,7 @@ function PdfDetailContent(props: {documentId: pdf.documentId(),fileName,}),- 'drive-view'+ 'pdf-file-actions');},},diff --git a/apps/web/src/lib/core/collab-surface/createCollabSurface.ts b/apps/web/src/lib/core/collab-surface/createCollabSurface.tsindex 969701c78b..8574f3e1f6 100644--- a/apps/web/src/lib/core/collab-surface/createCollabSurface.ts+++ b/apps/web/src/lib/core/collab-surface/createCollabSurface.ts@@ -12,6 +12,7 @@ import {LORO_WAL_DB_NAME,} from '@macro-inc/collaboration/collab/wal';import { MARKDOWN_LORO_SCHEMA } from '@macro-inc/lexical-core/markdown-loro-schema';+import { Telemetry } from '@macro-inc/observability';import { storageServiceClient } from '@service-storage/client';import type { CollabSurfaceResponse } from '@service-storage/service';import { createCollabSurfaceSource } from '@service-sync/source';@@ -136,53 +137,62 @@ export function createCollabSurfaceSession(});- fireAndForget(- (async () => {- // Load-or-create. Idempotent on the backend, so mounting the same- // surface in several places (or racing another client) is fine.- const ensured = await storageServiceClient.collabSurfaces.ensure({- id: surfaceId,- parentEntityType: opts.parent.entityType,- parentEntityId: opts.parent.entityId,- initialMarkdown: opts.initialMarkdown,- });- if (disposed) return;- if (ensured.isErr()) {- console.error('collab surface: ensure failed', ensured.error);- setConnectionError('failed to load or create the surface');- return;- }+ const connect = async () => {+ // Load-or-create. Idempotent on the backend, so mounting the same+ // surface in several places (or racing another client) is fine.+ const ensured = await storageServiceClient.collabSurfaces.ensure({+ id: surfaceId,+ parentEntityType: opts.parent.entityType,+ parentEntityId: opts.parent.entityId,+ initialMarkdown: opts.initialMarkdown,+ });+ if (disposed) return;+ if (ensured.isErr()) {+ console.error('collab surface: ensure failed', ensured.error);+ setConnectionError('failed to load or create the surface');+ return;+ }- const token = await getCollabSurfaceToken(surfaceId);- if (disposed) return;- if (!token) {- setConnectionError('failed to mint a sync connection token');- return;- }+ const token = await getCollabSurfaceToken(surfaceId);+ if (disposed) return;+ if (!token) {+ setConnectionError('failed to mint a sync connection token');+ return;+ }++ const { source, doInitialSync } = createCollabSurfaceSource(+ surfaceId,+ token,+ () => getCollabSurfaceToken(surfaceId)+ );+ if (disposed) {+ source.cleanup();+ return;+ }+ setSyncSource(source);- const { source, doInitialSync } = createCollabSurfaceSource(- surfaceId,- token,- () => getCollabSurfaceToken(surfaceId)+ const sync = await doInitialSync();+ if (sync.isErr()) {+ console.error(+ 'collab surface: failed to receive initial sync',+ sync.error);- if (disposed) {- source.cleanup();- return;- }- setSyncSource(source);-- const sync = await doInitialSync();- if (sync.isErr()) {- console.error(- 'collab surface: failed to receive initial sync',- sync.error- );- return;+ return;+ }+ await loroManager.ingest({ kind: 'dss', snapshot: sync.value.snapshot });+ };++ const start = async () => {+ try {+ await connect();+ } catch (error) {+ Telemetry.error(error, { surface: 'collab-surface' });+ if (!disposed && !syncSource()) {+ setConnectionError('failed to load or create the surface');}- await loroManager.ingest({ kind: 'dss', snapshot: sync.value.snapshot });- })(),- 'collab-surface'- );+ }+ };+ fireAndForget(start(), 'collab-surface');return {surfaceId,diff --git a/apps/web/src/lib/core/component/Emoji/emojis.ts b/apps/web/src/lib/core/component/Emoji/emojis.tsindex 962a8c01cc..7e57e240ff 100644--- a/apps/web/src/lib/core/component/Emoji/emojis.ts+++ b/apps/web/src/lib/core/component/Emoji/emojis.ts@@ -9,21 +9,26 @@ type EmojiCatalog = typeof import('./emoji-catalog');// The emoji tables are several hundred KB, so they load as their own chunk the// first time a picker or the `:` menu reads them rather than at app start.const [catalog, setCatalog] = createSignal<EmojiCatalog>();-let catalogLoad: Promise<EmojiCatalog> | undefined;--function loadEmojiCatalog(): Promise<EmojiCatalog> {- catalogLoad ??= import('./emoji-catalog').then((module) => {- setCatalog(() => module);- return module;- });- return catalogLoad;+let catalogRequested = false;++async function importEmojiCatalog(): Promise<void> {+ const module = await import('./emoji-catalog');+ setCatalog(() => module);+}++// Every read starts the load, so the guard keeps a failed chunk to one report+// rather than one per reader.+function loadEmojiCatalog(): void {+ if (catalogRequested) return;+ catalogRequested = true;+ fireAndForget(importEmojiCatalog(), 'emoji-catalog');}/** Resolves `:shortcode:` once the catalog has loaded; starts the load otherwise. */export function resolveEmoji(key: string): string | undefined {const loaded = catalog();if (!loaded) {- fireAndForget(loadEmojiCatalog(), 'emoji');+ loadEmojiCatalog();return undefined;}return loaded.resolveEmoji(key);@@ -39,11 +44,11 @@ export const useEmojiData = () => {return {groups: () => {- fireAndForget(loadEmojiCatalog(), 'emoji');+ loadEmojiCatalog();return groups();},emojis: () => {- fireAndForget(loadEmojiCatalog(), 'emoji');+ loadEmojiCatalog();return emojis();},filter: (query: string) => {diff --git a/apps/web/src/lib/core/fig-engine/client.ts b/apps/web/src/lib/core/fig-engine/client.tsindex 791c7612c7..3b14648b5c 100644--- a/apps/web/src/lib/core/fig-engine/client.ts+++ b/apps/web/src/lib/core/fig-engine/client.ts@@ -749,10 +749,16 @@ export class FigEngine {*/retain(work: Promise<unknown>) {this.holds.add(work);- fireAndForget(- work.finally(() => this.holds.delete(work)),- 'fig-engine'- );+ const release = async () => {+ try {+ await work;+ } catch {+ // Its own caller reports failures.+ } finally {+ this.holds.delete(work);+ }+ };+ fireAndForget(release(), 'fig-engine');}close() {