Merge pull request #36 from supabase/fix-edge-runtime-global

Fix edge runtime global

Author: laktek

crates/base/src/js_worker.rs

@@ -28,7 +28,7 @@ use sb_core::http_start::sb_core_http;
 use sb_core::net::sb_core_net;
 use sb_core::permissions::{sb_core_permissions, Permissions};
 use sb_core::runtime::sb_core_runtime;
-use sb_core::sb_core_main;
+use sb_core::{sb_core_main_js, sb_core_user_js};
 use sb_env::sb_env;
 use sb_worker_context::essentials::UserWorkerMsgs;
 use sb_workers::sb_user_workers;
@@ -124,7 +124,7 @@ impl MainWorker {
             deno_tls::deno_tls::init_ops_and_esm(),
             sb_env::init_ops_and_esm(),
             sb_user_workers::init_ops_and_esm(),
-            sb_core_main::init_ops_and_esm(),
+            sb_core_main_js::init_ops_and_esm(),
             sb_core_net::init_ops_and_esm(),
             sb_core_http::init_ops_and_esm(),
             sb_core_runtime::init_ops_and_esm(Some(main_module_url.clone())),
@@ -264,7 +264,7 @@ impl UserWorker {
             deno_tls::deno_tls::init_ops_and_esm(),
             sb_env::init_ops_and_esm(),
             sb_user_workers::init_ops_and_esm(),
-            sb_core_main::init_ops_and_esm(),
+            sb_core_user_js::init_ops_and_esm(),
             sb_core_net::init_ops_and_esm(),
             sb_core_http::init_ops_and_esm(),
             sb_core_runtime::init_ops_and_esm(Some(main_module_url.clone())),

crates/sb_core/js/bootstrap.js

@@ -23,7 +23,6 @@ import * as net from "ext:deno_net/01_net.js";
 import * as response from "ext:deno_fetch/23_response.js";
 import * as request from "ext:deno_fetch/23_request.js";
 import * as globalInterfaces from "ext:deno_web/04_global_interfaces.js";
-import { SUPABASE_USER_WORKERS } from "ext:sb_user_workers/user_workers.js";
 import { SUPABASE_ENV } from "ext:sb_env/env.js";
 
 
@@ -390,6 +389,28 @@ class NotSupported extends Error {
   }
 }
 
+const errors = {
+  NotFound,
+  PermissionDenied,
+  ConnectionRefused,
+  ConnectionReset,
+  ConnectionAborted,
+  NotConnected,
+  AddrInUse,
+  AddrNotAvailable,
+  BrokenPipe,
+  AlreadyExists,
+  InvalidData,
+  TimedOut,
+  Interrupted: core.Interrupted,
+  WriteZero,
+  UnexpectedEof,
+  BadResource: core.BadResource,
+  Http,
+  Busy,
+  NotSupported,
+}
+
 function registerErrors() {
   core.registerErrorClass("NotFound", NotFound);
   core.registerErrorClass("PermissionDenied", PermissionDenied);
@@ -526,12 +547,6 @@ Deno.startTls = tls.startTls;
 Deno.resolveDns = net.resolveDns;
 Deno.serveHttp = serveHttp;
 
-// EdgeRuntime namespace
-// FIXME: Make the object read-only
-globalThis.EdgeRuntime = {
-  userWorkers: SUPABASE_USER_WORKERS
-};
-
 const __bootstrap = globalThis.__bootstrap;
 delete globalThis.__bootstrap;
 delete globalThis.bootstrap;
@@ -575,7 +590,9 @@ ObjectDefineProperties(Deno, {
   env: readOnly(SUPABASE_ENV),
   pid: readOnly(globalThis.__pid),
   args: readOnly([]), // args are set to be empty
-  mainModule: getterOnly(opMainModule)
+  mainModule: getterOnly(opMainModule),
+  errors,
+
 });
 
 // TODO: Abstract this file into multiple files. There's too much boilerplate

crates/sb_core/js/main_worker.js

@@ -0,0 +1,7 @@
+import { SUPABASE_USER_WORKERS } from "ext:sb_user_workers/user_workers.js";
+
+// EdgeRuntime namespace
+// FIXME: Make the object read-only
+globalThis.EdgeRuntime = {
+  userWorkers: SUPABASE_USER_WORKERS
+};

crates/sb_core/lib.rs

@@ -2,4 +2,10 @@ pub mod http_start;
 pub mod net;
 pub mod permissions;
 pub mod runtime;
-deno_core::extension!(sb_core_main, esm = ["js/bootstrap.js"]);
+
+deno_core::extension!(
+    sb_core_main_js,
+    esm = ["js/bootstrap.js", "js/main_worker.js"]
+);
+
+deno_core::extension!(sb_core_user_js, esm = ["js/bootstrap.js"]);

examples/main/index.ts

@@ -23,7 +23,10 @@ serve(async (req: Request) => {
   const workerTimeoutMs = 5 * 60 * 1000;
   const noModuleCache = false;
   const importMapPath = null;
-  const envVars = [];
+  const envVars = [
+    ["STRIPE_API_KEY", Deno.env.get("STRIPE_API_KEY")]
+  ];
+
   try {
     const worker = await EdgeRuntime.userWorkers.create({
       servicePath,