fix loading TypeScript main modules

Author: laktek

README.md

@@ -17,8 +17,6 @@ Also, this enables portability of edge functions to those users who want to self
 * Hot reload when a service changes
 * Support import maps
 * Check verify-jwt
-* configuarble memory limit (update via flag)
-* configurable wall clock limit (update via flag)
 * better error messages for incorrect module loading paths (local)
 * handle 404 errors
 * Support snapshotting the runtime

base/src/js_worker.rs

@@ -137,7 +137,6 @@ fn start_runtime(
 
     let module_path = service_path.join("index.ts");
     // TODO: handle file missing error
-    let main_module_code = fs::read_to_string(&module_path).unwrap();
     let main_module_url = Url::from_file_path(
         std::env::current_dir()
             .map(|p| p.join(&module_path))
@@ -153,9 +152,7 @@ fn start_runtime(
         .unwrap();
 
     let future = async move {
-        let mod_id = js_runtime
-            .load_main_module(&main_module_url, Some(main_module_code))
-            .await?;
+        let mod_id = js_runtime.load_main_module(&main_module_url, None).await?;
         let result = js_runtime.mod_evaluate(mod_id);
         js_runtime.run_event_loop(false).await?;
 
@@ -165,7 +162,7 @@ fn start_runtime(
     let res = local.block_on(&runtime, future);
 
     if res.is_err() {
-        debug!("worker thread panicked {:?}", res.as_ref().err().unwrap());
+        error!("worker thread panicked {:?}", res.as_ref().err().unwrap());
     }
     shutdown_tx
         .send(())
@@ -183,14 +180,13 @@ fn start_controller_thread(
             .build()
             .unwrap();
 
-        // TODO: make it configurable
         let future = async move {
             tokio::select! {
                 _ = tokio::time::sleep(Duration::from_millis(worker_timeout_ms)) => {
-                    error!("worker timed out. (duration {})", human_elapsed(worker_timeout_ms))
+                    debug!("max duration reached for the worker. terminating the worker. (duration {})", human_elapsed(worker_timeout_ms))
                 }
                 Some(val) = memory_limit_rx.recv() => {
-                    error!("memory limit reached for worker. (used: {})", bytes_to_display(val))
+                    error!("memory limit reached for the worker. terminating the worker. (used: {})", bytes_to_display(val))
                 }
             }
         };
@@ -199,6 +195,8 @@ fn start_controller_thread(
         let ok = v8_thread_safe_handle.terminate_execution();
         if ok {
             debug!("worker terminated");
+        } else {
+            debug!("worker already terminated");
         }
     });
 }

base/src/js_worker/js/bootstrap.js

@@ -3,10 +3,11 @@
 ((window) => {
   const core = Deno.core;
   const ops = core.ops;
-  const { ObjectDefineProperties }= window.__bootstrap.primordials;
+  const { ObjectDefineProperties, ObjectPrototypeIsPrototypeOf }= window.__bootstrap.primordials;
 
   const base64 = window.__bootstrap.base64;
   const Console = window.__bootstrap.console.Console;
+  const colors = window.__bootstrap.colors;
   const crypto = window.__bootstrap.crypto;
   const domException = window.__bootstrap.domException;
   const encoding = window.__bootstrap.encoding;
@@ -19,6 +20,7 @@
   const fileReader = window.__bootstrap.fileReader;
   const formData = window.__bootstrap.formData;
   const headers = window.__bootstrap.headers;
+  const inspectArgs = window.__bootstrap.console.inspectArgs;
   const streams = window.__bootstrap.streams;
   const timers = window.__bootstrap.timers;
   const url = window.__bootstrap.url;
@@ -260,6 +262,23 @@
   //    },
   //  );
   //}
+  //
+
+  function formatException(error) {
+    if (ObjectPrototypeIsPrototypeOf(ErrorPrototype, error)) {
+      return null;
+    } else if (typeof error == "string") {
+      return `Uncaught ${
+        inspectArgs([quoteString(error)], {
+          colors: !colors.getNoColor(),
+        })
+      }`;
+    } else {
+      return `Uncaught ${
+        inspectArgs([error], { colors: !colors.getNoColor() })
+      }`;
+    }
+  }
 
   function runtimeStart(runtimeOptions, source) {
     core.setMacrotaskCallback(timers.handleTimerMacrotask);
@@ -274,7 +293,7 @@
     //);
     //build.setBuildInfo(runtimeOptions.target);
     //util.setLogDebug(runtimeOptions.debugFlag, source);
-    //colors.setNoColor(runtimeOptions.noColor || !runtimeOptions.isTty);
+    colors.setNoColor(runtimeOptions.noColor || !runtimeOptions.isTty);
 
     // deno-lint-ignore prefer-primordials
     Error.prepareStackTrace = core.prepareStackTrace;
@@ -299,7 +318,8 @@
     denoVersion: "NA",
     v8Version: "NA",
     tsVersion: "NA",
-    noColor: false,
+    noColor: true,
+    isTty: false
   });
 })(this);
 

examples/foo/index.ts

@@ -1,9 +1,13 @@
 import { serve } from "https://deno.land/[email protected]/http/server.ts"
 
-Deno.env.set("foo", "bar");
+interface reqPayload {
+  name: string;
+}
 
-serve(async (req) => {
-  const { name } = await req.json()
+console.log('server started');
+
+serve(async (req: Request) => {
+  const { name } : reqPayload = await req.json()
   const data = {
     message: `Hello ${name} from foo!`,
   }
@@ -12,4 +16,4 @@ serve(async (req) => {
     JSON.stringify(data),
     { headers: { "Content-Type": "application/json", "Connection": "keep-alive" } },
   )
-})
+}, { port: 9005 })