Merge branch 'supabase:main' into main

Author: anupriya17

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
   cargo-fmt:
     if: github.event.pull_request.draft == false
     name: 'fmt'
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
       - uses: denoland/setup-deno@v2
@@ -53,7 +53,7 @@ jobs:
   cargo-clippy:
     if: github.event.pull_request.draft == false
     name: 'cargo clippy'
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
       - name: Install deps
@@ -67,7 +67,7 @@ jobs:
   cargo-test:
     if: github.event.pull_request.draft == false
     name: 'cargo test'
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - name: Install deps
         run: |

.github/workflows/mirror.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   mirror:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       packages: write

.github/workflows/release.yml

@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     outputs:
       published: ${{ steps.semantic.outputs.new_release_published }}
       version: ${{ steps.semantic.outputs.new_release_version }}
@@ -37,7 +37,7 @@ jobs:
     needs:
       - release
     if: needs.release.outputs.published == 'true'
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     env:
       arch: amd64
     outputs:
@@ -124,7 +124,7 @@ jobs:
 
   merge_manifest:
     needs: [release, publish_x86, publish_arm]
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       packages: write

Cargo.lock

@@ -40,18 +40,6 @@ docker build -t supabase/edge-runtime .
 docker run -it --rm -p 9000:9000 -v ./examples/:/examples supabase/edge-runtime start --main-service /examples/main
 ```
 
-Another option would be to install [Orb](https://docs.orbstack.dev/install) and
-use an [Orbstack Machine](https://docs.orbstack.dev/machines/) to run a Linux
-Machine.
-
-First create a machine:
-
-```
-orb create ubuntu new-ubuntu
-```
-
-and run `orb` in the base directory to enter the virtual machine.
-
 ## How to run tests
 
 ```sh

DEVELOPERS.md

@@ -42,7 +42,7 @@ We welcome contributions to Supabase Edge Runtime!
 
 To get started either open an issue on
 [GitHub](https://github.com/supabase/edge-runtime/issues) or drop us a message
-on [Discord](https://discord.com/invite/R7bSpeBSJE)
+on [Discord](https://discord.supabase.com)
 
 Edge Runtime follows Supabase's
 [Code of Conduct](https://github.com/supabase/.github/blob/main/CODE_OF_CONDUCT.md).

README.md

@@ -33,8 +33,6 @@ pub(super) fn resolve_deno_runtime_env() {
     })
   };
 
-  runtime::MAYBE_DENO_VERSION.get_or_init(|| deno::version().to_string());
-
   resolve_boolish_env(
     "DENO_NO_DEPRECATION_WARNINGS",
     &runtime::SHOULD_DISABLE_DEPRECATED_API_WARNING,

cli/src/env.rs

@@ -208,7 +208,15 @@ fn get_start_command() -> Command {
         .value_parser(value_parser!(u64)),
     )
     .arg(
-      arg!(--"request-idle-timeout" <MILLISECONDS>)
+      arg!(--"main-worker-request-idle-timeout" <MILLISECONDS>)
+        .help(concat!(
+          "Maximum time in milliseconds that can be waited from when a ",
+          "worker takes over the request (disabled by default)"
+        ))
+        .value_parser(value_parser!(u64)),
+    )
+    .arg(
+      arg!(--"user-worker-request-idle-timeout" <MILLISECONDS>)
         .help(concat!(
           "Maximum time in milliseconds that can be waited from when a ",
           "worker takes over the request (disabled by default)"

cli/src/flags.rs

@@ -13,6 +13,7 @@ use anyhow::Context;
 use anyhow::Error;
 use base::server;
 use base::server::Builder;
+use base::server::RequestIdleTimeout;
 use base::server::ServerFlags;
 use base::server::Tls;
 use base::utils::units::percentage_value;
@@ -180,8 +181,12 @@ fn main() -> Result<ExitCode, anyhow::Error> {
           sub_matches.get_one::<usize>("max-parallelism").cloned();
         let maybe_request_wait_timeout =
           sub_matches.get_one::<u64>("request-wait-timeout").cloned();
-        let maybe_request_idle_timeout =
-          sub_matches.get_one::<u64>("request-idle-timeout").cloned();
+        let maybe_main_worker_request_idle_timeout = sub_matches
+          .get_one::<u64>("main-worker-request-idle-timeout")
+          .cloned();
+        let maybe_user_worker_request_idle_timeout = sub_matches
+          .get_one::<u64>("user-worker-request-idle-timeout")
+          .cloned();
         let maybe_request_read_timeout =
           sub_matches.get_one::<u64>("request-read-timeout").cloned();
 
@@ -249,7 +254,10 @@ fn main() -> Result<ExitCode, anyhow::Error> {
           graceful_exit_keepalive_deadline_ms,
           event_worker_exit_deadline_sec,
           request_wait_timeout_ms: maybe_request_wait_timeout,
-          request_idle_timeout_ms: maybe_request_idle_timeout,
+          request_idle_timeout: RequestIdleTimeout::from_millis(
+            maybe_main_worker_request_idle_timeout,
+            maybe_user_worker_request_idle_timeout,
+          ),
           request_read_timeout_ms: maybe_request_read_timeout,
           request_buffer_size: Some(request_buffer_size),
 
@@ -272,7 +280,7 @@ fn main() -> Result<ExitCode, anyhow::Error> {
                   "{}",
                   concat!(
                     "if `oneshot` policy is enabled, the maximum ",
-                    "parallelism is fixed to `1` as forcibly"
+                    "parallelism is fixed to `1` as forcibly ^^"
                   )
                 );
               }

cli/src/main.rs

@@ -87,6 +87,7 @@ tokio-util = { workspace = true, features = ["rt", "compat"] }
 tracing-subscriber = { workspace = true, features = ["env-filter", "tracing-log"] }
 
 async-tungstenite = { version = "0.25.0", default-features = false }
+diff = "0.1"
 tungstenite = { version = "0.21.0", default-features = false, features = ["handshake"] }
 
 [build-dependencies]