fix: show the actual deno cli version in Deno.version

(cherry picked from commit b4b5b9e)

Author: nyannyacha

crates/base/src/deno_runtime.rs

@@ -18,6 +18,7 @@ use deno_tls::rustls::RootCertStore;
 use deno_tls::RootCertStoreProvider;
 use futures_util::future::poll_fn;
 use log::{error, trace};
+use once_cell::sync::OnceCell;
 use sb_core::conn_sync::ConnSync;
 use sb_core::util::sync::AtomicFlag;
 use serde::de::DeserializeOwned;
@@ -78,6 +79,8 @@ fn get_error_class_name(e: &AnyError) -> &'static str {
     sb_core::errors_rt::get_error_class_name(e).unwrap_or("Error")
 }
 
+pub static MAYBE_DENO_VERSION: OnceCell<String> = OnceCell::new();
+
 pub struct DenoRuntime {
     pub js_runtime: JsRuntime,
     pub env_vars: HashMap<String, String>, // TODO: does this need to be pub?
@@ -303,11 +306,16 @@ impl DenoRuntime {
 
         // Bootstrapping stage
         let script = format!(
-            "globalThis.bootstrapSBEdge({}, {}, {}, '{}')",
+            // opts, isUserWorker, isEventsWorker, edgeRuntimeVersion, denoVersion
+            "globalThis.bootstrapSBEdge({}, {}, {}, '{}', '{}')",
             deno_core::serde_json::json!({ "target": env!("TARGET") }),
             conf.is_user_worker(),
             conf.is_events_worker(),
-            version.unwrap_or("0.1.0")
+            version.unwrap_or("0.1.0"),
+            MAYBE_DENO_VERSION
+                .get()
+                .map(|it| &**it)
+                .unwrap_or("UNKNOWN")
         );
 
         js_runtime
@@ -903,7 +911,7 @@ mod test {
             .to_vec();
         assert_eq!(
             deno_version_array.first().unwrap().as_str().unwrap(),
-            "supabase-edge-runtime-0.1.0"
+            "supabase-edge-runtime-0.1.0 (compatible with Deno vUNKNOWN)"
         );
         assert_eq!(
             deno_version_array.get(1).unwrap().as_str().unwrap(),

crates/cli/src/main.rs

@@ -2,6 +2,7 @@ mod logger;
 
 use anyhow::{anyhow, bail, Error};
 use base::commands::start_server;
+use base::deno_runtime::MAYBE_DENO_VERSION;
 use base::rt_worker::worker_pool::{SupervisorPolicy, WorkerPoolPolicy};
 use base::server::WorkerEntrypoints;
 use clap::builder::{FalseyValueParser, TypedValueParser};
@@ -102,6 +103,8 @@ fn cli() -> Command {
 //}
 
 fn main() -> Result<(), anyhow::Error> {
+    MAYBE_DENO_VERSION.get_or_init(|| env!("DENO_VERSION").to_string());
+
     let runtime = tokio::runtime::Builder::new_current_thread()
         .enable_all()
         .build()

crates/sb_core/js/bootstrap.js

@@ -233,7 +233,7 @@ const deleteDenoApis = (apis) => {
 	});
 };
 
-globalThis.bootstrapSBEdge = (opts, isUserWorker, isEventsWorker, version) => {
+globalThis.bootstrapSBEdge = (opts, isUserWorker, isEventsWorker, edgeRuntimeVersion, denoVersion) => {
 	// We should delete this after initialization,
 	// Deleting it during bootstrapping can backfire
 	delete globalThis.__bootstrap;
@@ -255,7 +255,8 @@ globalThis.bootstrapSBEdge = (opts, isUserWorker, isEventsWorker, version) => {
 		...opts,
 	});
 
-	ObjectDefineProperty(globalThis, 'SUPABASE_VERSION', readOnly(String(version)));
+	ObjectDefineProperty(globalThis, 'SUPABASE_VERSION', readOnly(String(edgeRuntimeVersion)));
+	ObjectDefineProperty(globalThis, 'DENO_VERSION', readOnly(denoVersion))
 
 	// set these overrides after runtimeStart
 	ObjectDefineProperties(denoOverrides, {
@@ -265,7 +266,7 @@ globalThis.bootstrapSBEdge = (opts, isUserWorker, isEventsWorker, version) => {
 		args: readOnly([]), // args are set to be empty
 		mainModule: getterOnly(() => ops.op_main_module()),
 		version: getterOnly(() => ({
-			deno: `supabase-edge-runtime-${globalThis.SUPABASE_VERSION}`,
+			deno: `supabase-edge-runtime-${globalThis.SUPABASE_VERSION} (compatible with Deno v${globalThis.DENO_VERSION})`,
 			v8: '11.6.189.12',
 			typescript: '5.1.6',
 		})),