fix: backports (#521)

* chore: add old eszip migration test (#512)

* chore(base): add a dependency

* chore(base): add `.gitignore`

* chore: add scripts

* chore(ci): add a step that brings test eszip binaries

* chore(base): update `.gitignore`

* chore(base): add old eszip migration test

* chore(base): add snapshots for old eszip migration tests

* stamp(ci): change bucket name

* stamp: update snapshots

* stamp: polishing

* fix(base): triggering `beforeunload` event may cause `Uncaught null` (#520)

* fix(base): triggering `beforeunload` event may cause `Uncaught null`

* chore: add an integration test

Author: nyannyacha

crates/base/src/runtime/mod.rs

@@ -1373,10 +1373,12 @@ where
           if accumulated_cpu_time_ns >= threshold_ns {
             beforeunload_cpu_threshold.store(None);
 
-            if let Err(err) = MaybeDenoRuntime::DenoRuntime(&mut this)
-              .dispatch_beforeunload_event(WillTerminateReason::CPU)
-            {
-              return Poll::Ready(Err(err));
+            if !state.is_terminated() {
+              if let Err(err) = MaybeDenoRuntime::DenoRuntime(&mut this)
+                .dispatch_beforeunload_event(WillTerminateReason::CPU)
+              {
+                return Poll::Ready(Err(err));
+              }
             }
           }
         }
@@ -1397,7 +1399,7 @@ where
           if total_malloced_bytes >= threshold_bytes {
             beforeunload_mem_threshold.store(None);
 
-            if !mem_state.is_exceeded() {
+            if !state.is_terminated() && !mem_state.is_exceeded() {
               if let Err(err) = MaybeDenoRuntime::DenoRuntime(&mut this)
                 .dispatch_beforeunload_event(WillTerminateReason::Memory)
               {

crates/base/src/worker/supervisor/strategy_per_worker.rs

@@ -223,13 +223,17 @@ pub async fn supervise(args: Arguments) -> (ShutdownReason, i64) {
   });
 
   let terminate_fn = {
+    let state = state.runtime.clone();
     let thread_safe_handle = thread_safe_handle.clone();
     move |should_terminate: bool| {
       let data_ptr_mut = Box::into_raw(Box::new(V8HandleTerminationData {
         should_terminate,
         isolate_memory_usage_tx: Some(isolate_memory_usage_tx),
       }));
 
+      if should_terminate {
+        state.terminated.raise();
+      }
       if !thread_safe_handle.request_interrupt(
         v8_handle_termination,
         data_ptr_mut as *mut std::ffi::c_void,

crates/base/test_cases/issue-func-205/index.ts

@@ -0,0 +1,27 @@
+import { FFmpeg } from "npm:@ffmpeg.wasm/main";
+import {
+  default as core,
+  type FFmpegCoreConstructor,
+} from "npm:@ffmpeg.wasm/core-st";
+
+const ff = await FFmpeg.create({
+  core: core as FFmpegCoreConstructor,
+});
+
+Deno.serve(async (_req) => {
+  const resp = await fetch(
+    "https://raw.githubusercontent.com/ffmpegwasm/testdata/master/Big_Buck_Bunny_180_10s.webm",
+  );
+  const buf = new Uint8Array(await resp.arrayBuffer());
+
+  ff.fs.writeFile("meow.webm", buf);
+
+  await ff.run("-i", "meow.webm", "meow.mp4");
+  const data = ff.fs.readFile("meow.mp4");
+
+  return new Response(data, {
+    headers: {
+      "content-type": "video/mp4",
+    },
+  });
+});

crates/base/test_cases/main/index.ts

@@ -62,6 +62,7 @@ Deno.serve((req: Request) => {
     const envVars = Object.keys(envVarsObj).map((k) => [k, envVarsObj[k]]);
     const context = {
       sourceMap: req.headers.get("x-context-source-map") == "true",
+      useReadSyncFileAPI: req.headers.get("x-use-read-sync-file-api") == "true",
     };
 
     return await EdgeRuntime.userWorkers.create({

crates/base/tests/fixture/testdata/fdqdoblxppxtigtdfhbh_c1bfd9f7-0bdc-4c1e-9794-8cc8160e4069_12.out.snapshot

@@ -0,0 +1 @@
+migration is not supported for this version: 2.0

crates/base/tests/fixture/testdata/tzqeounajgztphucxgjw_537a54e4-f242-48f4-9563-4717d6fd22b3_2.out.snapshot

@@ -0,0 +1 @@
+migration is not supported for this version: 2.0

crates/base/tests/fixture/testdata/tzqeounajgztphucxgjw_7e659cb3-e8fa-4845-83ad-26bbd798b3ab_2.out.snapshot

@@ -0,0 +1 @@
+migration is not supported for this version: 2.0

crates/base/tests/integration_tests.rs

@@ -43,6 +43,7 @@ use deno_facade::EmitterFactory;
 use deno_facade::EszipPayloadKind;
 use deno_facade::Metadata;
 use ext_event_worker::events::LogLevel;
+use ext_event_worker::events::ShutdownReason;
 use ext_event_worker::events::WorkerEvents;
 use ext_runtime::SharedMetricSource;
 use ext_workers::context::MainWorkerRuntimeOpts;
@@ -2494,6 +2495,49 @@ async fn test_supabase_issue_29583() {
   );
 }
 
+#[tokio::test]
+#[serial]
+async fn test_issue_func_205() {
+  let (tx, mut rx) = mpsc::unbounded_channel();
+  let tb = TestBedBuilder::new("./test_cases/main")
+    .with_per_worker_policy(None)
+    .with_worker_event_sender(Some(tx))
+    .with_server_flags(ServerFlags {
+      beforeunload_wall_clock_pct: Some(90),
+      beforeunload_cpu_pct: Some(90),
+      beforeunload_memory_pct: Some(90),
+      ..Default::default()
+    })
+    .build()
+    .await;
+
+  let resp = tb
+    .request(|b| {
+      b.uri("/issue-func-205")
+        .header("x-cpu-time-soft-limit-ms", HeaderValue::from_static("500"))
+        .header("x-cpu-time-hard-limit-ms", HeaderValue::from_static("1000"))
+        .header("x-use-read-sync-file-api", HeaderValue::from_static("true"))
+        .body(Body::empty())
+        .context("can't make request")
+    })
+    .await
+    .unwrap();
+
+  assert_eq!(resp.status().as_u16(), StatusCode::INTERNAL_SERVER_ERROR);
+
+  tb.exit(Duration::from_secs(TESTBED_DEADLINE_SEC)).await;
+
+  while let Some(ev) = rx.recv().await {
+    let WorkerEvents::Shutdown(ev) = ev.event else {
+      continue;
+    };
+    assert_eq!(ev.reason, ShutdownReason::CPUTime);
+    return;
+  }
+
+  unreachable!("test failed");
+}
+
 #[tokio::test]
 #[serial]
 async fn test_should_render_detailed_failed_to_create_graph_error() {

ext/event_worker/events.rs

@@ -21,7 +21,7 @@ pub struct WorkerMemoryUsed {
   pub mem_check_captured: MemCheckState,
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
 pub enum ShutdownReason {
   EventLoopCompleted,
   WallClockTime,