Skip to content

The free and privacy-friendly screen recorder with no limits πŸŽ₯

Harden recording keepalive and fix cleanup paths

Alyssa Xe852b30286fa
diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..df3434a
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+export PORT=3001
diff --git a/src/manifest.json b/src/manifest.json
index 27ac1f6..b5af946 100755
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,7 +3,7 @@
"name": "__MSG_extName__",
"description": "__MSG_extDesc__",
"default_locale": "en",
- "version": "4.3.4",
+ "version": "4.3.5",
"background": {
"service_worker": "background.bundle.js"
},
diff --git a/src/pages/Background/alarms/handleAlarm.js b/src/pages/Background/alarms/handleAlarm.js
index f59ef93..e2df230 100644
--- a/src/pages/Background/alarms/handleAlarm.js
+++ b/src/pages/Background/alarms/handleAlarm.js
@@ -9,6 +9,8 @@ import {
CLOUD_LOCAL_PLAYBACK_ALARM,
} from "../recording/cloudLocalPlaybackConstants";
+export const FIRST_CHUNK_WATCHDOG_ALARM = "first-chunk-watchdog";
+
// Utility to handle tab messaging logic.
// `tab` is an optional Chrome Tab object used as a fallback when the stored
// activeTab is no longer valid (e.g. when called from an action-button click).
@@ -50,6 +52,22 @@ export const handleAlarm = async (alarm) => {
return;
}
+ if (alarm.name === FIRST_CHUNK_WATCHDOG_ALARM) {
+ // No data received from MediaRecorder within the timeout
+ const { recording } = await chrome.storage.local.get(["recording"]);
+ if (recording) {
+ diagEvent("error", { note: "first-chunk-watchdog-fired" });
+ sendMessageRecord({
+ type: "recording-error",
+ error: "stream-error",
+ why: "Recording failed β€” no video data received within 8 seconds. The tab may have been throttled. Please try again.",
+ errorCode: "no-first-chunk",
+ }).catch(() => {});
+ }
+ await chrome.alarms.clear(FIRST_CHUNK_WATCHDOG_ALARM);
+ return;
+ }
+
if (alarm.name === CLOUD_LOCAL_PLAYBACK_ALARM) {
const {
[CLOUD_LOCAL_PLAYBACK_KEY]: localPlaybackOffer,
diff --git a/src/pages/Background/index.js b/src/pages/Background/index.js
index 562a49b..4567b69 100644
--- a/src/pages/Background/index.js
+++ b/src/pages/Background/index.js
@@ -13,12 +13,21 @@ import { hydrateDiagnosticLog, diagEvent } from "../utils/diagnosticLog";
// complete well before any queued event is dispatched to the worker.
const clearStaleLocks = async () => {
try {
- const { sendingChunks, postStopEditorOpening, postStopEditorOpened } =
- await chrome.storage.local.get([
- "sendingChunks",
- "postStopEditorOpening",
- "postStopEditorOpened",
- ]);
+ const {
+ sendingChunks,
+ postStopEditorOpening,
+ postStopEditorOpened,
+ recording,
+ multiMode,
+ region,
+ } = await chrome.storage.local.get([
+ "sendingChunks",
+ "postStopEditorOpening",
+ "postStopEditorOpened",
+ "recording",
+ "multiMode",
+ "region",
+ ]);
const stale = {};
if (sendingChunks) {
@@ -34,6 +43,19 @@ const clearStaleLocks = async () => {
console.warn("[Screenity][BG] Stale lock found on startup: postStopEditorOpened β€” clearing");
}
+ if (multiMode && !recording) {
+ stale.multiMode = false;
+ stale.multiSceneCount = 0;
+ stale.multiProjectId = null;
+ stale.multiLastSceneId = null;
+ console.warn("[Screenity][BG] Stale multi-mode state found on startup β€” clearing");
+ }
+
+ if (region && !recording) {
+ stale.region = false;
+ console.warn("[Screenity][BG] Stale region state found on startup β€” clearing");
+ }
+
if (Object.keys(stale).length > 0) {
await chrome.storage.local.set(stale);
console.info(
diff --git a/src/pages/Background/listeners/onInstalledListener.js b/src/pages/Background/listeners/onInstalledListener.js
index d9d3396..8f49f36 100644
--- a/src/pages/Background/listeners/onInstalledListener.js
+++ b/src/pages/Background/listeners/onInstalledListener.js
@@ -72,7 +72,9 @@ export const onInstalledListener = () => {
}
}
- chrome.storage.local.set({ systemAudio: true });
+ if (details.reason === "install") {
+ chrome.storage.local.set({ systemAudio: true });
+ }
const { backupTab } = await chrome.storage.local.get(["backupTab"]);
if (backupTab) {
diff --git a/src/pages/Background/listeners/onTabRemovedListener.js b/src/pages/Background/listeners/onTabRemovedListener.js
index 8dc0a47..a32fae4 100644
--- a/src/pages/Background/listeners/onTabRemovedListener.js
+++ b/src/pages/Background/listeners/onTabRemovedListener.js
@@ -92,6 +92,10 @@ export const onTabRemovedListener = () => {
crashedAt: Date.now(),
},
recording: false,
+ multiMode: false,
+ multiSceneCount: 0,
+ multiProjectId: null,
+ multiLastSceneId: null,
});
endDiagSession("crashed");
}
@@ -138,6 +142,10 @@ export const onTabRemovedListener = () => {
recorderSession: recorderSession
? { ...recorderSession, status: "crashed", crashedAt: Date.now() }
: null,
+ multiMode: false,
+ multiSceneCount: 0,
+ multiProjectId: null,
+ multiLastSceneId: null,
});
chrome.action.setIcon({ path: "assets/icon-34.png" });
}
diff --git a/src/pages/Background/messaging/handlers.js b/src/pages/Background/messaging/handlers.js
index 38a7365..b4de815 100644
--- a/src/pages/Background/messaging/handlers.js
+++ b/src/pages/Background/messaging/handlers.js
@@ -49,6 +49,7 @@ import {
CLOUD_LOCAL_PLAYBACK_EVENT_KEY,
CLOUD_LOCAL_PLAYBACK_ALARM,
} from "../recording/cloudLocalPlaybackConstants";
+import { FIRST_CHUNK_WATCHDOG_ALARM } from "../alarms/handleAlarm";
import { desktopCapture } from "../recording/desktopCapture";
import {
writeFile,
@@ -425,6 +426,12 @@ const handleFinishMultiRecording = async () => {
if (!multiProjectId) {
console.warn("No project ID found for finishing multi recording.");
+ await chrome.storage.local.set({
+ multiMode: false,
+ multiSceneCount: 0,
+ multiProjectId: null,
+ multiLastSceneId: null,
+ });
return;
}
@@ -446,7 +453,6 @@ const handleFinishMultiRecording = async () => {
if (!res.ok) {
console.warn("Failed to auto-publish multi recording", res.status);
- return;
}
// Open the editor directly
@@ -505,7 +511,9 @@ const handleFinishMultiRecording = async () => {
activeSceneId: null,
recordingToScene: false,
multiMode: false,
+ multiSceneCount: 0,
multiProjectId: null,
+ multiLastSceneId: null,
editorTab: null,
editorTabMeta: null,
});
@@ -523,9 +531,16 @@ const handleFinishMultiRecording = async () => {
multiMode: false,
multiSceneCount: 0,
multiProjectId: null,
+ multiLastSceneId: null,
});
} catch (err) {
console.warn("Failed to finish multi recording", err);
+ await chrome.storage.local.set({
+ multiMode: false,
+ multiSceneCount: 0,
+ multiProjectId: null,
+ multiLastSceneId: null,
+ }).catch(() => {});
}
};
@@ -2153,4 +2168,26 @@ export const setupHandlers = () => {
return true;
},
);
+
+ registerMessage("activate-recorder-tab", async (message, sender) => {
+ const tabId = sender?.tab?.id;
+ if (tabId) {
+ try {
+ await chrome.tabs.update(tabId, { active: true });
+ } catch (err) {
+ console.warn("[Screenity] activate-recorder-tab failed:", String(err));
+ }
+ }
+ });
+
+ registerMessage("start-first-chunk-watchdog", async () => {
+ await chrome.alarms.clear(FIRST_CHUNK_WATCHDOG_ALARM).catch(() => {});
+ await chrome.alarms.create(FIRST_CHUNK_WATCHDOG_ALARM, {
+ delayInMinutes: 8 / 60,
+ });
+ });
+
+ registerMessage("cancel-first-chunk-watchdog", async () => {
+ await chrome.alarms.clear(FIRST_CHUNK_WATCHDOG_ALARM).catch(() => {});
+ });
};
diff --git a/src/pages/Background/offscreen/offscreenDocument.js b/src/pages/Background/offscreen/offscreenDocument.js
index 000f461..b789a47 100644
--- a/src/pages/Background/offscreen/offscreenDocument.js
+++ b/src/pages/Background/offscreen/offscreenDocument.js
@@ -16,8 +16,8 @@ const openRecorderTab = async (
// Check subscription status
const { authenticated, subscribed, cached, transient, error: authError } = await loginWithWebsite();
- const recorderUrl =
- authenticated && subscribed
+ const isCloudRecorder = authenticated && subscribed;
+ const recorderUrl = isCloudRecorder
? chrome.runtime.getURL("cloudrecorder.html")
: chrome.runtime.getURL("recorder.html");
if (!isRegion) {
@@ -30,6 +30,11 @@ const openRecorderTab = async (
);
}
+ // Cloud recordings need the tab active briefly so keepalive can start
+ if (isCloudRecorder && !switchTab) {
+ switchTab = true;
+ }
+
// Close any leftover recorder tab from a previous recording so we don't
// end up with two pinned tabs. Only close actual extension recorder pages β€”
// for region recordings, recordingTab can temporarily point to the user's
@@ -53,9 +58,11 @@ const openRecorderTab = async (
chrome.storage.local.set({ recordingTab: null });
}
+ const finalUrl = isRegion ? `${recorderUrl}?tab=true` : recorderUrl;
+
chrome.tabs
.create({
- url: recorderUrl,
+ url: finalUrl,
pinned: true,
index: 0,
// FLAG: Check this is ok?
diff --git a/src/pages/Background/recording/cancelRecording.js b/src/pages/Background/recording/cancelRecording.js
index 94c4257..141f084 100644
--- a/src/pages/Background/recording/cancelRecording.js
+++ b/src/pages/Background/recording/cancelRecording.js
@@ -17,7 +17,13 @@ export const handleDismiss = async () => {
chrome.action.setIcon({ path: "assets/icon-34.png" });
chrome.runtime.sendMessage({ type: "turn-off-pip" });
chrome.storage.local.set({ pipForceClose: Date.now() });
- chrome.storage.local.set({ recordingUiTabId: null });
+ chrome.storage.local.set({
+ recordingUiTabId: null,
+ multiMode: false,
+ multiSceneCount: 0,
+ multiProjectId: null,
+ multiLastSceneId: null,
+ });
chrome.storage.local.remove(["recordingMeta"]);
} catch (error) {
console.error("Failed to handle dismiss:", error);
@@ -54,7 +60,13 @@ export const cancelRecording = async () => {
discardOffscreenDocuments();
chrome.runtime.sendMessage({ type: "turn-off-pip" });
chrome.storage.local.set({ pipForceClose: Date.now() });
- chrome.storage.local.set({ recordingUiTabId: null });
+ chrome.storage.local.set({
+ recordingUiTabId: null,
+ multiMode: false,
+ multiSceneCount: 0,
+ multiProjectId: null,
+ multiLastSceneId: null,
+ });
chrome.storage.local.remove(["recordingMeta"]);
} catch (error) {
console.error("Failed to cancel recording:", error.message);
diff --git a/src/pages/Background/recording/discardRecording.js b/src/pages/Background/recording/discardRecording.js
index 55bbea7..431308a 100644
--- a/src/pages/Background/recording/discardRecording.js
+++ b/src/pages/Background/recording/discardRecording.js
@@ -1,4 +1,5 @@
import { sendMessageRecord } from "./sendMessageRecord";
+import { removeTab } from "../tabManagement/removeTab";
import { discardOffscreenDocuments } from "../offscreen/discardOffscreenDocuments";
export const discardRecording = async () => {
@@ -8,6 +9,39 @@ export const discardRecording = async () => {
// Clear offscreen documents if they exist
discardOffscreenDocuments();
+ const { multiMode, multiSceneCount, recordingTab } =
+ await chrome.storage.local.get([
+ "multiMode",
+ "multiSceneCount",
+ "recordingTab",
+ ]);
+
+ // Close the recorder tab if it's an extension page
+ if (recordingTab) {
+ try {
+ const tab = await chrome.tabs.get(recordingTab);
+ if (tab?.url?.startsWith(chrome.runtime.getURL(""))) {
+ removeTab(recordingTab);
+ }
+ } catch {}
+ }
+
+ // Keep multiMode on but reset project state if no scenes were saved
+ const multiState = multiMode
+ ? {
+ multiMode: true,
+ ...(multiSceneCount > 0 ? {} : {
+ multiProjectId: null,
+ multiLastSceneId: null,
+ }),
+ }
+ : {
+ multiMode: false,
+ multiSceneCount: 0,
+ multiProjectId: null,
+ multiLastSceneId: null,
+ };
+
chrome.storage.local.set({
recordingTab: null,
sandboxTab: null,
@@ -16,6 +50,7 @@ export const discardRecording = async () => {
pendingRecording: false,
offscreen: false,
postStopEditorOpened: false,
+ ...multiState,
});
chrome.storage.local.set({ pipForceClose: Date.now() });
chrome.storage.local.set({ recordingUiTabId: null });
diff --git a/src/pages/Background/recording/recordingHelpers.js b/src/pages/Background/recording/recordingHelpers.js
index eaeb7f1..4fd0c1f 100644
--- a/src/pages/Background/recording/recordingHelpers.js
+++ b/src/pages/Background/recording/recordingHelpers.js
@@ -144,6 +144,8 @@ export const handleRecordingError = async (request) => {
tabRecordedID: null,
offscreen: false,
postStopEditorOpened: false,
+ region: false,
+ customRegion: false,
});
chrome.runtime
@@ -171,10 +173,15 @@ export const handleRecordingError = async (request) => {
});
const { recordingTab } = await chrome.storage.local.get(["recordingTab"]);
- const { region } = await chrome.storage.local.get(["region"]);
- if (recordingTab && !region) {
- // FLAG: For testing purposes -> comment to debug
- removeTab(recordingTab);
+ if (recordingTab) {
+ try {
+ const tab = await chrome.tabs.get(recordingTab);
+ if (tab?.url?.startsWith(chrome.runtime.getURL(""))) {
+ removeTab(recordingTab);
+ }
+ } catch {
+ // Tab doesn't exist
+ }
}
chrome.storage.local.set({ recordingTab: null });
discardOffscreenDocuments();
diff --git a/src/pages/CloudRecorder/CloudRecorder.jsx b/src/pages/CloudRecorder/CloudRecorder.jsx
index 70dff9b..b41ab1b 100644
--- a/src/pages/CloudRecorder/CloudRecorder.jsx
+++ b/src/pages/CloudRecorder/CloudRecorder.jsx
@@ -932,6 +932,11 @@ const CloudRecorder = () => {
discardable: true,
});
+ // Cancel first-chunk watchdog
+ chrome.runtime
+ .sendMessage({ type: "cancel-first-chunk-watchdog" })
+ .catch(() => {});
+
if (globalThis.SCREENITY_VERBOSE_LOGS) {
if (DEBUG_START_FLOW) {
console.log("[CloudRecorder] Tab keep-alive stopped");
@@ -2233,7 +2238,7 @@ const CloudRecorder = () => {
setInitProject(false);
await cleanupIfEmptyUploads(restarting ? "restart" : "dismiss");
- // Stop the silent audio keep-alive
+ // Stop keepalive (also cancels first-chunk watchdog)
stopTabKeepAlive();
await setRecordingTimingState({
recording: false,
@@ -2649,7 +2654,7 @@ const CloudRecorder = () => {
const startRecording = async () => {
setInitProject(false);
await clearLocalScreenPlaybackOffer("start-recording");
- // Start silent audio to prevent Chrome from freezing this background tab
+ // Ensure keepalive is running
startTabKeepAlive();
const storageReady = await ensureChunkStoreReady();
@@ -2820,6 +2825,10 @@ const CloudRecorder = () => {
hasChunks.current = true;
lastTimecode.current = timestamp;
firstChunkTime.current = timestamp;
+ // Cancel first-chunk watchdog
+ chrome.runtime
+ .sendMessage({ type: "cancel-first-chunk-watchdog" })
+ .catch(() => {});
if (!firstChunkLoggedRef.current) {
firstChunkLoggedRef.current = true;
logStartFlow("first_chunk", { type: "screen" });
@@ -2891,6 +2900,11 @@ const CloudRecorder = () => {
// Start recording with 2-second time slices
screenRecorder.current.start(2000);
+ // Start first-chunk watchdog (8s, via chrome.alarms)
+ chrome.runtime
+ .sendMessage({ type: "start-first-chunk-watchdog" })
+ .catch(() => {});
+
if (screenTrack) {
bindScreenTrack(screenTrack);
}
@@ -4783,6 +4797,17 @@ const CloudRecorder = () => {
};
const startStreaming = async (data) => {
+ startTabKeepAlive();
+
+ if (document.visibilityState === "hidden") {
+ if (globalThis.SCREENITY_VERBOSE_LOGS) {
+ console.warn("[CloudRecorder] Tab is hidden at recording start, requesting activation");
+ }
+ try {
+ await chrome.runtime.sendMessage({ type: "activate-recorder-tab" });
+ } catch {}
+ }
+
try {
const permissions = await navigator.permissions.query({ name: "camera" });
const permissions2 = await navigator.permissions.query({
diff --git a/src/pages/Content/context/ContentState.jsx b/src/pages/Content/context/ContentState.jsx
index 419c051..e20fc91 100644
--- a/src/pages/Content/context/ContentState.jsx
+++ b/src/pages/Content/context/ContentState.jsx
@@ -260,12 +260,13 @@ const ContentState = (props) => {
cursorMode: "none",
cursorEffects: [],
});
+ const isMulti = contentStateRef.current.multiMode;
setContentState((prevContentState) => ({
...prevContentState,
recording: false,
paused: false,
timeWarning: false,
- showExtension: false,
+ showExtension: isMulti ? true : false,
blurMode: false,
showPopup: true,
pendingRecording: false,
@@ -273,7 +274,7 @@ const ContentState = (props) => {
pipEnded: false,
time: 0,
timer: 0,
- preparingRecording: false,
+ preparingRecording: isMulti ? true : false,
drawingMode: false,
blurMode: false,
toolbarMode: "",
diff --git a/src/pages/Content/context/messaging/handlers.js b/src/pages/Content/context/messaging/handlers.js
index 2c573eb..ed21df5 100644
--- a/src/pages/Content/context/messaging/handlers.js
+++ b/src/pages/Content/context/messaging/handlers.js
@@ -429,6 +429,7 @@ export const setupHandlers = () => {
if (document.hidden || !document.hasFocus()) {
return;
}
+ if (contentStateRef.current.recordingType === "camera") return;
const nextDrawingMode = !contentStateRef.current.drawingMode;
setContentState((prev) => ({
...prev,
@@ -441,6 +442,7 @@ export const setupHandlers = () => {
if (now - lastToggleDrawingAt < TOGGLE_DRAWING_COOLDOWN_MS) return;
lastToggleDrawingAt = now;
if (document.hidden || !document.hasFocus()) return;
+ if (contentStateRef.current.recordingType === "camera") return;
const nextDrawingMode = !contentStateRef.current.drawingMode;
@@ -458,6 +460,7 @@ export const setupHandlers = () => {
});
registerMessage("toggle-blur-mode", () => {
+ if (contentStateRef.current.recordingType === "camera") return;
const nextBlurMode = !contentStateRef.current.blurMode;
setContentState((prev) => ({
...prev,
@@ -485,6 +488,7 @@ export const setupHandlers = () => {
});
registerMessage("toggle-cursor-mode", () => {
+ if (contentStateRef.current.recordingType === "camera") return;
const state = getState();
const nextMode =
contentStateRef.current.cursorMode === "none" ? "cursor" : "";
@@ -858,6 +862,7 @@ export const setupHandlers = () => {
...prev,
showExtension: true,
showPopup: true,
+ preparingRecording: false,
}));
updateFromStorage(false, message.senderId);
diff --git a/src/pages/Content/popup/layout/RecordingTab.jsx b/src/pages/Content/popup/layout/RecordingTab.jsx
index f40772c..f6c6884 100644
--- a/src/pages/Content/popup/layout/RecordingTab.jsx
+++ b/src/pages/Content/popup/layout/RecordingTab.jsx
@@ -98,45 +98,42 @@ const RecordingTab = (props) => {
{chrome.i18n.getMessage("addingToLabel") || "Adding to: "}
{contentState.recordingProjectTitle}
</div>
- {(!contentState.multiMode ||
- contentState.multiSceneCount === 0) && (
- <div className="projectActiveBannerRight">
- <div className="projectActiveBannerDivider"></div>
- <div
- className="projectActiveBannerClose"
- onClick={() => {
- setContentState((prev) => ({
- ...prev,
- projectTitle: "",
- projectId: null,
- activeSceneId: null,
- recordingToScene: false,
- multiMode: false,
- multiSceneCount: 0,
- multiProjectId: null,
- }));
+ <div className="projectActiveBannerRight">
+ <div className="projectActiveBannerDivider"></div>
+ <div
+ className="projectActiveBannerClose"
+ onClick={() => {
+ setContentState((prev) => ({
+ ...prev,
+ projectTitle: "",
+ projectId: null,
+ activeSceneId: null,
+ recordingToScene: false,
+ multiMode: false,
+ multiSceneCount: 0,
+ multiProjectId: null,
+ }));
- // also in chrome local storage
- chrome.storage.local.set({
- recordingProjectTitle: "",
- projectId: null,
- activeSceneId: null,
- recordingToScene: false,
- multiMode: false,
- multiProjectId: null,
- });
+ chrome.storage.local.set({
+ recordingProjectTitle: "",
+ projectId: null,
+ activeSceneId: null,
+ recordingToScene: false,
+ multiMode: false,
+ multiSceneCount: 0,
+ multiProjectId: null,
+ multiLastSceneId: null,
+ });
- // show toast
- contentState.openToast(
- chrome.i18n.getMessage("projectRecordingCancelledToast"),
- 3000
- );
- }}
- >
- <img src={CloseWhiteIcon} alt="Close" />
- </div>
+ contentState.openToast(
+ chrome.i18n.getMessage("projectRecordingCancelledToast"),
+ 3000
+ );
+ }}
+ >
+ <img src={CloseWhiteIcon} alt="Close" />
</div>
- )}
+ </div>
</div>
)}
<Tabs.List
diff --git a/src/pages/Content/region/styles/_Region.scss b/src/pages/Content/region/styles/_Region.scss
index b26e729..efa408a 100644
--- a/src/pages/Content/region/styles/_Region.scss
+++ b/src/pages/Content/region/styles/_Region.scss
@@ -75,4 +75,7 @@
}
.region-recording * {
pointer-events: none!important;
+}
+.region-recording .resize-handle {
+ visibility: hidden!important;
}
\ No newline at end of file
diff --git a/src/pages/Content/toolbar/layout/ToolbarWrap.jsx b/src/pages/Content/toolbar/layout/ToolbarWrap.jsx
index 39603c3..2cf7e06 100644
--- a/src/pages/Content/toolbar/layout/ToolbarWrap.jsx
+++ b/src/pages/Content/toolbar/layout/ToolbarWrap.jsx
@@ -582,6 +582,7 @@ const ToolbarWrap = () => {
content={chrome.i18n.getMessage("toggleDrawingToolsTooltip")}
value="draw"
shortcut={contentState.toggleDrawingModeShortcut}
+ disabled={contentState.recordingType === "camera"}
>
{mode === "draw" && <CloseButtonToolbar />}
{mode !== "draw" && <DrawIcon />}
@@ -594,6 +595,7 @@ const ToolbarWrap = () => {
content={chrome.i18n.getMessage("toggleBlurToolTooltip")}
value="blur"
shortcut={contentState.toggleBlurModeShortcut}
+ disabled={contentState.recordingType === "camera"}
>
{mode === "blur" && <CloseButtonToolbar />}
{mode !== "blur" && <BlurIcon />}
@@ -607,6 +609,7 @@ const ToolbarWrap = () => {
content={chrome.i18n.getMessage("toggleCursorOptionsTooltip")}
value="cursor"
shortcut={contentState.toggleCursorModeShortcut}
+ disabled={contentState.recordingType === "camera"}
>
{contentState.cursorMode === "target" && <TargetCursorIcon />}
{contentState.cursorMode === "highlight" && (
diff --git a/src/pages/Recorder/Recorder.jsx b/src/pages/Recorder/Recorder.jsx
index 1f5c235..8faa6fb 100644
--- a/src/pages/Recorder/Recorder.jsx
+++ b/src/pages/Recorder/Recorder.jsx
@@ -374,6 +374,11 @@ const Recorder = () => {
.sendMessage({ type: "set-tab-auto-discardable", discardable: true })
.catch(() => {});
+ // Cancel first-chunk watchdog
+ chrome.runtime
+ .sendMessage({ type: "cancel-first-chunk-watchdog" })
+ .catch(() => {});
+
debug("Tab keep-alive stopped");
} catch (err) {
debugWarn("Failed to stop tab keep-alive:", err);
@@ -769,7 +774,7 @@ const Recorder = () => {
recordingGeneration.current += 1;
const runGeneration = recordingGeneration.current;
- // Start silent audio to prevent Chrome from freezing this background tab
+ // Ensure keepalive is running
startTabKeepAlive();
// Record the start time for session tracking
@@ -981,6 +986,12 @@ const Recorder = () => {
timestamp: ts,
});
index.current = i + 1;
+ if (!hasChunks.current) {
+ // Cancel first-chunk watchdog
+ chrome.runtime
+ .sendMessage({ type: "cancel-first-chunk-watchdog" })
+ .catch(() => {});
+ }
hasChunks.current = true;
savedCount.current += 1;
@@ -1014,6 +1025,10 @@ const Recorder = () => {
};
if (!hasChunks.current) {
+ // Cancel first-chunk watchdog
+ chrome.runtime
+ .sendMessage({ type: "cancel-first-chunk-watchdog" })
+ .catch(() => {});
hasChunks.current = true;
lastTimecode.current = e.timecode;
lastSize.current = e.data.size;
@@ -1290,6 +1305,11 @@ const Recorder = () => {
recorder.current.start(1000);
debug("MediaRecorder.start(1000) called");
+
+ // Start first-chunk watchdog (8s, via chrome.alarms)
+ chrome.runtime
+ .sendMessage({ type: "start-first-chunk-watchdog" })
+ .catch(() => {});
} catch (err) {
debugError("Failed to start MediaRecorder", err);
sendRecordingError("Failed to start recording: " + String(err));
@@ -2230,6 +2250,15 @@ const Recorder = () => {
}
async function startStreaming(data) {
+ startTabKeepAlive();
+
+ if (document.visibilityState === "hidden") {
+ debugWarn("Tab is hidden at recording start, requesting activation");
+ try {
+ await chrome.runtime.sendMessage({ type: "activate-recorder-tab" });
+ } catch {}
+ }
+
debug("startStreaming()", { data });
slLog("startStreaming-enter", { recordingType: data?.recordingType });
const permissions = await navigator.permissions.query({
diff --git a/src/pages/Recorder/RecorderUI.jsx b/src/pages/Recorder/RecorderUI.jsx
index 71d5e6d..04ae6f2 100644
--- a/src/pages/Recorder/RecorderUI.jsx
+++ b/src/pages/Recorder/RecorderUI.jsx
@@ -2,6 +2,8 @@
import React from "react";
import Warning from "./warning/Warning";
+const isTabFromUrl = new URLSearchParams(window.location.search).has("tab");
+
const RecorderUI = ({ started, isTab }) => {
return (
<div className="wrap">
@@ -16,9 +18,11 @@ const RecorderUI = ({ started, isTab }) => {
alt="Recording icon"
/>
<div className="title">
- {!started
- ? chrome.i18n.getMessage("recorderSelectTitle")
- : chrome.i18n.getMessage("recorderSelectProgressTitle")}
+ {started
+ ? chrome.i18n.getMessage("recorderSelectProgressTitle")
+ : (isTab || isTabFromUrl)
+ ? chrome.i18n.getMessage("preparingLabel")
+ : chrome.i18n.getMessage("recorderSelectTitle")}
</div>
<div className="subtitle">
{chrome.i18n.getMessage("recorderSelectDescription")}