Safari Compatibility

Author: liruqi

README.md

@@ -31,6 +31,18 @@ The Fluxon icon will appear in your toolbar. Pin it for easy access.
 
 > **Note:** Temporary add-ons are removed when Firefox restarts. For persistent installation, use the official **Firefox Add-ons** link above.
 
+### Safari (macOS & iOS)
+
+1. Ensure you have **Xcode** installed on your Mac.
+2. Open Terminal and run the Safari Web Extension Converter:
+   ```bash
+   xcrun safari-web-extension-converter . --project-location ../FluxonSafari
+   ```
+   *(Run this inside the extracted `fluxon` directory)*
+3. Safari Web Extension Converter will generate an Xcode project and open it.
+4. In Xcode, select your target (macOS or iOS) and click the **Run** (Play) button to build and install the app.
+5. Once installed, open Safari Preferences (or **Settings > Safari > Extensions** on iOS) and enable the **Fluxon** extension.
+
 ## Usage
 
 After installing, navigate to any page with downloadable media. Click the Fluxon icon in the toolbar to see detected resources, then click **Download** or **Merge** (for HLS/m3u8 streams).

offscreen.js

@@ -170,7 +170,21 @@ self.handleOffscreenMessage = (message, sender, sendResponse) => {
         } else {
           dispatchToBackground({ type: 'MERGE_PROGRESS', data: { filename, status: `Finalizing merge & saving: ${filename}` } });
           const result = await downloadViaBackground(blobUrl, filename, true);
-          sendResponse({ success: result.success, downloadId: result.downloadId, error: result.error });
+          if (!result.success) {
+            try {
+              const a = document.createElement('a');
+              a.href = blobUrl;
+              a.download = filename;
+              document.body.appendChild(a);
+              a.click();
+              document.body.removeChild(a);
+              sendResponse({ success: true });
+            } catch (fallbackErr) {
+              sendResponse({ success: false, error: result.error + ' | Fallback err: ' + fallbackErr.message });
+            }
+          } else {
+            sendResponse({ success: result.success, downloadId: result.downloadId, error: result.error });
+          }
         }
         setTimeout(() => URL.revokeObjectURL(blobUrl), 15000);
 
@@ -310,8 +324,19 @@ self.handleOffscreenMessage = (message, sender, sendResponse) => {
         }, (resp) => {
           const err = resp?.error || chrome.runtime.lastError?.message;
           if (err) {
-            dispatchToBackground({ type: 'MERGE_PROGRESS', data: { filename, status: `[ERROR] MUX download failed: ${err}` } });
-            if (itemId) dispatchToBackground({ type: 'UPDATE_ITEM_STATUS', data: { itemId, status: 'Error' } });
+            try {
+              const a = document.createElement('a');
+              a.href = blobUrl;
+              a.download = filename;
+              document.body.appendChild(a);
+              a.click();
+              document.body.removeChild(a);
+              dispatchToBackground({ type: 'MERGE_PROGRESS', data: { filename, status: `[COMPLETE] MUX saved via fallback (${finalMB} MB)` } });
+              if (itemId) dispatchToBackground({ type: 'UPDATE_ITEM_STATUS', data: { itemId, status: 'Complete' } });
+            } catch (fallbackErr) {
+              dispatchToBackground({ type: 'MERGE_PROGRESS', data: { filename, status: `[ERROR] MUX download failed: ${err} | Fallback: ${fallbackErr.message}` } });
+              if (itemId) dispatchToBackground({ type: 'UPDATE_ITEM_STATUS', data: { itemId, status: 'Error' } });
+            }
           } else {
             dispatchToBackground({ type: 'MERGE_PROGRESS', data: { filename, status: `[COMPLETE] MUX saved (${finalMB} MB)` } });
             if (itemId && resp?.downloadId) dispatchToBackground({ type: 'UPDATE_ITEM_STATUS', data: { itemId, status: 'Complete', muxedDownloadId: resp.downloadId } });

plugins/m3u8-plugin.js

@@ -279,34 +279,43 @@ const M3U8_PLUGIN = {
   },
 
   async ensureOffscreen() {
-    // chrome.offscreen is Chrome-only
-    if (!chrome.offscreen) {
-      if (typeof self.handleOffscreenMessage === 'function') {
-        // We are successfully running in a context where offscreen logic is directly available (Firefox background)
-        return;
-      }
-      console.warn('M3U8 Plugin: chrome.offscreen not available. HLS merging requires Chrome.');
-      throw new Error('Offscreen API not available in this browser.');
+    // If successfully running in a context where offscreen logic is directly available (Firefox background)
+    if (typeof self.handleOffscreenMessage === 'function') {
+      return;
     }
 
-    if (this._offscreenPromise) return this._offscreenPromise;
-
-    this._offscreenPromise = (async () => {
-      try {
-        if (await chrome.offscreen.hasDocument()) return;
-        await chrome.offscreen.createDocument({
-          url: 'offscreen.html',
-          reasons: ['BLOBS'],
-          justification: 'Merging video segments into a single file.'
-        });
-      } catch (e) {
-        console.error('Failed to create offscreen document:', e);
-        this._offscreenPromise = null;
-        throw e;
-      }
-    })();
+    if (chrome.offscreen) {
+      if (this._offscreenPromise) return this._offscreenPromise;
+      this._offscreenPromise = (async () => {
+        try {
+          if (await chrome.offscreen.hasDocument()) return;
+          await chrome.offscreen.createDocument({
+            url: 'offscreen.html',
+            reasons: ['BLOBS'],
+            justification: 'Merging video segments into a single file.'
+          });
+        } catch (e) {
+          console.error('Failed to create offscreen document:', e);
+          this._offscreenPromise = null;
+          throw e;
+        }
+      })();
+      return this._offscreenPromise;
+    }
 
-    return this._offscreenPromise;
+    // Fallback for Safari / other browsers without offscreen API
+    if (this._fallbackTabPromise) return this._fallbackTabPromise;
+    this._fallbackTabPromise = new Promise((resolve, reject) => {
+      chrome.tabs.create({ url: chrome.runtime.getURL('offscreen.html'), active: false }, (tab) => {
+        if (chrome.runtime.lastError) {
+          this._fallbackTabPromise = null;
+          reject(new Error(chrome.runtime.lastError.message));
+        } else {
+          resolve();
+        }
+      });
+    });
+    return this._fallbackTabPromise;
   }
 };