Improve retries, timeouts, and aborting

Makefile

@@ -26,7 +26,7 @@ EFLAGS=\
 	-s MODULARIZE=1 \
 	-s STACK_SIZE=1048576 \
 	-s ASYNCIFY \
-	-s "ASYNCIFY_IMPORTS=['libavjs_wait_reader', 'jsfetch_open_js']" \
+	-s "ASYNCIFY_IMPORTS=['libavjs_wait_reader', 'jsfetch_open_js', 'jsfetch_read', 'jsfetch_read_js']" \
 	-s INITIAL_MEMORY=25165824 \
 	-s ALLOW_MEMORY_GROWTH=1
 

Makefile.m4

@@ -26,7 +26,7 @@ EFLAGS=\
 	-s MODULARIZE=1 \
 	-s STACK_SIZE=1048576 \
 	-s ASYNCIFY \
-	-s "ASYNCIFY_IMPORTS=['libavjs_wait_reader', 'jsfetch_open_js']" \
+	-s "ASYNCIFY_IMPORTS=['libavjs_wait_reader', 'jsfetch_open_js', 'jsfetch_read', 'jsfetch_read_js']" \
 	-s INITIAL_MEMORY=25165824 \
 	-s ALLOW_MEMORY_GROWTH=1
 

dist/libav.types.d.ts

@@ -1823,6 +1823,8 @@ ffprobe_main(a0: number,a1: number): Promise<number>;
 ffmpeg_interrupt(): Promise<void>;
 ffmpeg_get_out_time_ms(): Promise<number>;
 ffmpeg_get_total_size_bytes(): Promise<number>;
+jsfetch_set_read_timeout(a0: number): Promise<void>;
+jsfetch_set_fetch_timeout(a0: number): Promise<void>;
 AVFrame_channel_layout(ptr: number): Promise<number>;
 AVFrame_channel_layout_s(ptr: number, val: number): Promise<void>;
 AVFrame_channel_layouthi(ptr: number): Promise<number>;
@@ -3994,6 +3996,8 @@ ffprobe_main_sync(a0: number,a1: number): number | Promise<number>;
 ffmpeg_interrupt_sync(): void | Promise<void>;
 ffmpeg_get_out_time_ms_sync(): number | Promise<number>;
 ffmpeg_get_total_size_bytes_sync(): number | Promise<number>;
+jsfetch_set_read_timeout_sync(a0: number): void;
+jsfetch_set_fetch_timeout_sync(a0: number): void;
 AVFrame_channel_layout_sync(ptr: number): number;
 AVFrame_channel_layout_s_sync(ptr: number, val: number): void;
 AVFrame_channel_layouthi_sync(ptr: number): number;

ffmpeg-7.1/fftools/ffmpeg.c

@@ -973,8 +973,8 @@ static int64_t getmaxrss(void)
 
 void ffmpeg_interrupt(void);
 void ffmpeg_interrupt() {
-    received_nb_signals++;
     jsfetch_abort_request();
+    received_nb_signals++;
 }
 
 int ffmpeg_main(int argc, char **argv);