Keep long YouTube imports alive

Author: skyhong2002

chrome-extension/background.js

@@ -228,12 +228,6 @@ async function startHistoryImport() {
         observedAt,
       });
       if (!result?.ok) throw new Error(result?.error || 'YouTube History import failed');
-      await historyStatus({
-        state: 'complete',
-        videos: result.videos,
-        completedAt: new Date().toISOString(),
-        lastError: '',
-      });
     } catch (error) {
       const storedStatus = await chrome.storage.local.get(HISTORY_STATUS_KEY);
       if (storedStatus[HISTORY_STATUS_KEY]?.state === 'cancelled') return;
@@ -260,6 +254,17 @@ async function cancelHistoryImport() {
   });
 }
 
+async function finishHistoryImport(scanId, patch) {
+  const stored = await chrome.storage.local.get(HISTORY_STATUS_KEY);
+  const status = stored[HISTORY_STATUS_KEY] ?? {};
+  if (status.scanId !== scanId || status.state !== 'running') return false;
+  await historyStatus({
+    ...patch,
+    completedAt: new Date().toISOString(),
+  });
+  return true;
+}
+
 chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
   if (message?.type === 'capture' && message.payload) {
     enqueue(message.payload)
@@ -306,6 +311,25 @@ chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
       .catch((error) => sendResponse({ ok: false, error: String(error) }));
     return true;
   }
+  if (message?.type === 'history-import-complete') {
+    finishHistoryImport(message.scanId, {
+      state: 'complete',
+      videos: message.videos,
+      lastError: '',
+    })
+      .then((updated) => sendResponse({ ok: true, updated }))
+      .catch((error) => sendResponse({ ok: false, error: String(error) }));
+    return true;
+  }
+  if (message?.type === 'history-import-error') {
+    finishHistoryImport(message.scanId, {
+      state: 'error',
+      lastError: String(message.error || 'YouTube History import failed'),
+    })
+      .then((updated) => sendResponse({ ok: true, updated }))
+      .catch((error) => sendResponse({ ok: false, error: String(error) }));
+    return true;
+  }
   return false;
 });
 

chrome-extension/content.js

@@ -242,12 +242,18 @@
   chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
     if (message?.type === 'start-history-import') {
       runHistoryImport(message.scanId, message.observedAt)
-        .then((videos) => sendResponse({ ok: true, videos }))
-        .catch((error) => sendResponse({
-          ok: false,
+        .then((videos) => chrome.runtime.sendMessage({
+          type: 'history-import-complete',
+          scanId: message.scanId,
+          videos,
+        }))
+        .catch((error) => chrome.runtime.sendMessage({
+          type: 'history-import-error',
+          scanId: message.scanId,
           error: error instanceof Error ? error.message : String(error),
         }));
-      return true;
+      sendResponse({ ok: true, started: true });
+      return false;
     }
     if (message?.type === 'cancel-history-import') {
       historyImportCancelled = true;

chrome-extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "infovore YouTube Capture",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Privately records measured YouTube watch time and imports saved viewing progress to infovore.",
   "minimum_chrome_version": "120",
   "permissions": [

tests/extension.test.js

@@ -11,7 +11,7 @@ test('Chrome extension manifest is least-privilege and captures YouTube SPA page
     'utf8',
   ));
   assert.equal(manifest.manifest_version, 3);
-  assert.equal(manifest.version, '1.2.0');
+  assert.equal(manifest.version, '1.3.0');
   assert.deepEqual(manifest.permissions.sort(), ['alarms', 'storage']);
   assert.deepEqual(manifest.host_permissions, ['https://infovore.skyhong.tw/*']);
   assert.deepEqual(manifest.content_scripts[0].matches, [
@@ -34,6 +34,23 @@ test('dashboard bridge exposes import status without exposing capture credential
   assert.doesNotMatch(source, /captureSettings|captureToken|authorization|Bearer/);
 });
 
+test('history import reports long-running completion without holding the start message open', () => {
+  const background = readFileSync(
+    new URL('../chrome-extension/background.js', import.meta.url),
+    'utf8',
+  );
+  const content = readFileSync(
+    new URL('../chrome-extension/content.js', import.meta.url),
+    'utf8',
+  );
+  assert.match(content, /history-import-complete/);
+  assert.match(content, /history-import-error/);
+  assert.match(content, /sendResponse\(\{ ok: true, started: true \}\)/);
+  assert.match(background, /status\.scanId !== scanId \|\| status\.state !== 'running'/);
+  assert.match(background, /finishHistoryImport\(message\.scanId/);
+  assert.doesNotMatch(background, /videos: result\.videos/);
+});
+
 test('capture retry queue keeps only the newest cumulative session update', () => {
   const first = {
     sessionId: 'capture-session-123456',