Custom error codes for jsfetch

camgaertner · camgaertner · commit 38ec7521a99e · 2025-10-31T12:58:53.000+08:00
diff --git a/dist/libav-6.5.7.1-h264-aac-mp3.wasm.mjs b/dist/libav-6.5.7.1-h264-aac-mp3.wasm.mjs
diff --git a/dist/libav-6.5.7.1-h264-aac-mp3.wasm.wasm b/dist/libav-6.5.7.1-h264-aac-mp3.wasm.wasm
diff --git a/ffmpeg-7.1/fftools/ffmpeg.c b/ffmpeg-7.1/fftools/ffmpeg.c
@@ -1052,6 +1052,18 @@ int main(int argc, char **argv)
     sch_free(&sch);
 
 #ifdef __EMSCRIPTEN__
+    int jsfetch_return_code = jsfetch_get_return_code();
+    // Aborted
+    if (ret == 255) {
+        exit(ret);
+    }
+    // There are some code paths that retry, so only return a jsfetch_return_code
+    // if there is a ret code. 
+    // For example, hls.c can retry segment and manifest fetches.
+    // This avoids returning a jsfetch_return_code when we're successful.
+    if (ret && jsfetch_return_code) {
+        exit(jsfetch_return_code);
+    }
     exit(ret);
 #endif
     return ret;
diff --git a/ffmpeg-7.1/libavformat/jsfetch.c b/ffmpeg-7.1/libavformat/jsfetch.c
@@ -47,6 +47,22 @@ static const AVClass jsfetch_context_class = {
     .version = LIBAVUTIL_VERSION_INT
 };
 
+/**
+ * Get return code
+ * 
+ * 100-600:  Reserved for HTTP (i.e 403, 500)
+ * 1001:     Network Error
+ * 1002:     Read Error
+ */
+EM_JS(int, jsfetch_get_code, (), {
+  return Module.returnCode || 0;
+});
+
+int jsfetch_get_return_code()
+{
+  return jsfetch_get_code();
+}
+
 EM_JS(void, jsfetch_abort, (), {
     var abortController = Module.abortController;
     if (abortController) {
@@ -136,6 +152,11 @@ EM_JS(int, jsfetch_open_js, (const char* url, char* range_header, bool has_range
           return -0x54584945; /* AVERROR_EXIT*/
         }
         if (response instanceof Error) {
+          if (response.status) {
+            Module.returnCode = response.status;
+          } else {
+            Module.returnCode = 1001; /* Network Error*/
+          }
           // Should return a partial file if we've downloaded anything so far.
           return -0x20464f45 /* AVERROR_EOF */;
         }
@@ -346,6 +367,7 @@ EM_JS(int, jsfetch_read_js, (int idx, unsigned char *toBuf, int size), {
           }
 
           // Otherwise, there was an error
+          Module.returnCode = 1002; /* Read Error*/
           Module.fsThrownError = rej;
           console.error(rej);
           return -11 /* ECANCELED */;
diff --git a/ffmpeg-7.1/libavformat/jsfetch.h b/ffmpeg-7.1/libavformat/jsfetch.h
@@ -2,5 +2,6 @@
 #define JSFETCH_H
 
 void jsfetch_abort_request(void);
+int jsfetch_get_return_code(void);
 
 #endif
diff --git a/patches/ffmpeg/07-jsfetch-protocol.diff b/patches/ffmpeg/07-jsfetch-protocol.diff
@@ -406,18 +406,20 @@ Index: ffmpeg-6.0.1/libavformat/hls.c
 ===================================================================
 --- /dev/null
 +++ ffmpeg-6.0.1/libavformat/jsfetch.h
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,7 @@
 +#ifndef JSFETCH_H
 +#define JSFETCH_H
 +
 +void jsfetch_abort_request(void);
++int jsfetch_get_return_code(void);
 +
 +#endif
+
  Index: ffmpeg-6.0.1/libavformat/jsfetch.c
 ===================================================================
 --- /dev/null
 +++ ffmpeg-6.0.1/libavformat/jsfetch.c
-@@ -0,0 +1,458 @@
+@@ -0,0 +1,485 @@
 +/*
 + * JavaScript fetch metaprotocol for ffmpeg client
 + * Copyright (c) 2023 Yahweasel and contributors
@@ -467,10 +469,28 @@ Index: ffmpeg-6.0.1/libavformat/hls.c
 +    .version = LIBAVUTIL_VERSION_INT
 +};
 +
++/**
++ * Get return code
++ * 
++ * 100-600:  Reserved for HTTP (i.e 403, 500)
++ * 1001:     Network Error
++ * 1002:     Read Error
++ */
++EM_JS(int, jsfetch_get_code, (), {
++  return Module.returnCode || 0;
++});
++
++int jsfetch_get_return_code()
++{
++  return jsfetch_get_code();
++}
++
 +EM_JS(void, jsfetch_abort, (), {
-+    var abortController = Module.libavjsJSFetch.abortController;
++    var abortController = Module.abortController;
 +    if (abortController) {
 +        abortController.abort();
++    } else {
++      Module.abortController = new AbortController()
 +    }
 +});
 +
@@ -484,7 +504,10 @@ Index: ffmpeg-6.0.1/libavformat/hls.c
 +EM_JS(int, jsfetch_open_js, (const char* url, char* range_header, bool has_range, int force_idx, bool enable_retries), {
 +    return Asyncify.handleAsync(function() {
 +      if (!Module.libavjsJSFetch)
-+        Module.libavjsJSFetch = {ctr: 1, fetches: {}, abortController: new AbortController()};
++        Module.libavjsJSFetch = {ctr: 1, fetches: {}};
++      if (!Module.abortController) {
++        Module.abortController = new AbortController()
++      }
 +      return Promise.all([]).then(function() {
 +        url = UTF8ToString(url);
 +        var headers = {};
@@ -496,7 +519,7 @@ Index: ffmpeg-6.0.1/libavformat/hls.c
 +        
 +        // Retry function with exponential backoff
 +        function fetchWithRetry(retryCount) {
-+          return fetch(fetchUrl, { headers, signal: Module.libavjsJSFetch.abortController.signal }).then(function(response) {
++          return fetch(fetchUrl, { headers, signal: Module.abortController.signal }).then(function(response) {
 +            // Check for HTTP errors (4xx/5xx status codes)
 +            if (!response.ok) {
 +              var error = new Error('HTTP Error: ' + response.status + ' ' + response.statusText);
@@ -523,7 +546,7 @@ Index: ffmpeg-6.0.1/libavformat/hls.c
 +              var delay = Math.pow(2, retryCount) * 250;
 +              return new Promise(function(resolve) {
 +                let timeoutId = setTimeout(resolve, delay);
-+                Module.libavjsJSFetch.abortController.signal.addEventListener('abort', () => {
++                Module.abortController.signal.addEventListener('abort', () => {
 +                  clearTimeout(timeoutId);
 +                  resolve();
 +                  error.aborted = true
@@ -551,6 +574,11 @@ Index: ffmpeg-6.0.1/libavformat/hls.c
 +          return -0x54584945; /* AVERROR_EXIT*/
 +        }
 +        if (response instanceof Error) {
++          if (response.status) {
++            Module.returnCode = response.status;
++          } else {
++            Module.returnCode = 1001; /* Network Error*/
++          }
 +          // Should return a partial file if we've downloaded anything so far.
 +          return -0x20464f45 /* AVERROR_EOF */;
 +        }
@@ -708,7 +736,7 @@ Index: ffmpeg-6.0.1/libavformat/hls.c
 +      return -1;
 +    }
 +    return Asyncify.handleAsync(function() { return Promise.all([]).then(function() {
-+      if (Module.libavjsJSFetch.abortController.signal.aborted) {
++      if (Module.abortController.signal.aborted) {
 +        return -0x54584945; /* AVERROR_EXIT*/
 +      }
 +      if (jsfo.buf || jsfo.rej) {
@@ -761,6 +789,7 @@ Index: ffmpeg-6.0.1/libavformat/hls.c
 +          }
 +
 +          // Otherwise, there was an error
++          Module.returnCode = 1002; /* Read Error*/
 +          Module.fsThrownError = rej;
 +          console.error(rej);
 +          return -11 /* ECANCELED */;
diff --git a/patches/ffmpeg/08-fftools.diff b/patches/ffmpeg/08-fftools.diff
@@ -2,7 +2,7 @@ Index: ffmpeg-7.1/fftools/ffmpeg.c
 ===================================================================
 --- ffmpeg-7.1.orig/fftools/ffmpeg.c
 +++ ffmpeg-7.1/fftools/ffmpeg.c
-@@ -316,22 +316,29 @@ static void ffmpeg_cleanup(int ret)
+@@ -316,22 +316,29 @@
      for (int i = 0; i < nb_filtergraphs; i++)
          fg_free(&filtergraphs[i]);
      av_freep(&filtergraphs);
@@ -32,7 +32,7 @@ Index: ffmpeg-7.1/fftools/ffmpeg.c
      }
      av_freep(&vstats_filename);
      of_enc_stats_close();
-@@ -544,6 +551,19 @@ void update_benchmark(const char *fmt, ...)
+@@ -544,6 +551,19 @@
          current_time = t;
      }
  }
@@ -52,7 +52,7 @@ Index: ffmpeg-7.1/fftools/ffmpeg.c
  
  static void print_report(int is_last_report, int64_t timer_start, int64_t cur_time, int64_t pts)
  {
-@@ -645,6 +665,9 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
+@@ -645,6 +665,9 @@
  
      if (total_size < 0) av_bprintf(&buf_script, "total_size=N/A\n");
      else                av_bprintf(&buf_script, "total_size=%"PRId64"\n", total_size);
@@ -62,15 +62,15 @@ Index: ffmpeg-7.1/fftools/ffmpeg.c
      if (pts == AV_NOPTS_VALUE) {
          av_bprintf(&buf_script, "out_time_us=N/A\n");
          av_bprintf(&buf_script, "out_time_ms=N/A\n");
-@@ -654,6 +677,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
+@@ -654,6 +677,7 @@
          av_bprintf(&buf_script, "out_time_ms=%"PRId64"\n", pts);
          av_bprintf(&buf_script, "out_time=%s%02"PRId64":%02d:%02d.%06d\n",
                     hours_sign, hours, mins, secs, us);
 +        curr_transcode_pts_ms = (pts / 1000);
      }
  
      if (nb_frames_dup || nb_frames_drop)
-@@ -943,7 +967,21 @@ static int64_t getmaxrss(void)
+@@ -943,7 +967,21 @@
  #endif
  }
  
@@ -92,7 +92,7 @@ Index: ffmpeg-7.1/fftools/ffmpeg.c
  {
      Scheduler *sch = NULL;
  
-@@ -1009,8 +1047,12 @@ finish:
+@@ -1009,8 +1047,24 @@
          ret = 0;
  
      ffmpeg_cleanup(ret);
@@ -101,6 +101,18 @@ Index: ffmpeg-7.1/fftools/ffmpeg.c
      sch_free(&sch);
  
 +#ifdef __EMSCRIPTEN__
++    int jsfetch_return_code = jsfetch_get_return_code();
++    // Aborted
++    if (ret == 255) {
++        exit(ret);
++    }
++    // There are some code paths that retry, so only return a jsfetch_return_code
++    // if there is a ret code. 
++    // For example, hls.c can retry segment and manifest fetches.
++    // This avoids returning a jsfetch_return_code when we're successful.
++    if (ret && jsfetch_return_code) {
++        exit(jsfetch_return_code);
++    }
 +    exit(ret);
 +#endif
      return ret;
