Merge pull request #229 from supabase/eszip-extractor

Feat: Eszip extractor

Author: laktek

Cargo.lock

@@ -27,7 +27,7 @@ deno_core = { version = "0.222.0" }
 deno_console = { version = "0.121.0" }
 deno_crypto =  { version = "0.135.0" }
 deno_fetch = { version = "0.145.0" }
-deno_fs = "0.31.0"
+deno_fs = { version = "0.31.0", features = ["sync_fs"] }
 deno_config = "=0.3.1"
 deno_io = "0.31.0"
 deno_graph = "=0.55.0"

Cargo.toml

@@ -17,7 +17,7 @@ anyhow = { workspace = true }
 bytes = { version = "1.2.1" }
 cityhash = { version = "0.1.1" }
 deno_ast = { workspace = true }
-deno_fs = { workspace = true, features = ["sync_fs"] }
+deno_fs.workspace = true
 deno_io = { workspace = true }
 deno_core = { workspace = true }
 deno_console = { workspace = true }
@@ -69,7 +69,7 @@ sb_node = { version = "0.1.0", path = "../node" }
 anyhow = { workspace = true }
 bytes = { version = "1.2.1" }
 deno_ast = { workspace = true }
-deno_fs = { workspace = true, features = ["sync_fs"] }
+deno_fs.workspace = true
 deno_io = { workspace = true }
 deno_core = { workspace = true }
 deno_console = { workspace = true }

crates/base/Cargo.toml

@@ -9,7 +9,7 @@ use tokio::sync::oneshot::Receiver;
 
 impl WorkerHandler for Worker {
     fn handle_error(&self, error: Error) -> Result<WorkerEvents, Error> {
-        println!("{}", error);
+        log::error!("{}", error);
         Ok(WorkerEvents::BootFailure(BootFailureEvent {
             msg: error.to_string(),
         }))

crates/base/src/rt_worker/implementation/default_handler.rs

@@ -0,0 +1,4 @@
+export const numbers = {
+    "Uno": 1,
+    "Dos": 2
+}

crates/base/test_cases/npm/folder1/folder2/numbers.ts

@@ -0,0 +1 @@
+export const hello = "";

crates/base/test_cases/npm/hello.js

@@ -1,9 +1,11 @@
 import isEven from "npm:is-even";
 import { serve } from "https://deno.land/[email protected]/http/server.ts"
+import { hello } from "./hello.js";
+import { numbers } from "./folder1/folder2/numbers.ts"
 
 serve(async (req: Request) => {
     return new Response(
-        JSON.stringify({ is_even: isEven(10) }),
+        JSON.stringify({ is_even: isEven(10), hello, numbers }),
         { status: 200, headers: { "Content-Type": "application/json" } },
     )
 })

crates/base/test_cases/npm/index.ts

@@ -71,5 +71,8 @@ async fn test_user_imports_npm() {
 
     let body_bytes = hyper::body::to_bytes(res.into_body()).await.unwrap();
 
-    assert_eq!(body_bytes, r#"{"is_even":true}"#);
+    assert_eq!(
+        body_bytes,
+        r#"{"is_even":true,"hello":"","numbers":{"Uno":1,"Dos":2}}"#
+    );
 }

crates/base/tests/user_worker_tests.rs

@@ -7,8 +7,8 @@ use clap::builder::FalseyValueParser;
 use clap::{arg, crate_version, value_parser, ArgAction, Command};
 use deno_core::url::Url;
 use sb_graph::emitter::EmitterFactory;
-use sb_graph::generate_binary_eszip;
 use sb_graph::import_map::load_import_map;
+use sb_graph::{extract_from_file, generate_binary_eszip};
 use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
@@ -58,7 +58,12 @@ fn cli() -> Command {
                 .arg(arg!(--"output" <DIR> "Path to output eszip file").default_value("bin.eszip"))
                 .arg(arg!(--"entrypoint" <Path> "Path to entrypoint to bundle as an eszip").required(true))
                 .arg(arg!(--"import-map" <Path> "Path to import map file"))
-        )
+        ).subcommand(
+        Command::new("unbundle")
+            .about("Unbundles an .eszip file into the specified directory")
+            .arg(arg!(--"output" <DIR> "Path to extract the ESZIP content").default_value("./"))
+            .arg(arg!(--"eszip" <DIR> "Path of eszip to extract").required(true))
+    )
 }
 
 //async fn exit_with_code(result: Result<(), Error>) {
@@ -167,6 +172,20 @@ fn main() -> Result<(), anyhow::Error> {
                 let mut file = File::create(output_path.as_str()).unwrap();
                 file.write_all(&bin).unwrap();
             }
+            Some(("unbundle", sub_matches)) => {
+                let output_path = sub_matches.get_one::<String>("output").cloned().unwrap();
+                let eszip_path = sub_matches.get_one::<String>("eszip").cloned().unwrap();
+
+                let output_path = PathBuf::from(output_path.as_str());
+                let eszip_path = PathBuf::from(eszip_path.as_str());
+
+                extract_from_file(eszip_path, output_path.clone()).await;
+
+                println!(
+                    "Eszip extracted successfully inside path {}",
+                    output_path.to_str().unwrap()
+                );
+            }
             _ => {
                 // unrecognized command
             }

crates/cli/src/main.rs

@@ -77,7 +77,7 @@ impl CPUTimer {
 
     #[cfg(not(target_os = "linux"))]
     pub fn start(_: u64, _: u64, _: CPUAlarmVal) -> Result<Self, Error> {
-        println!("CPU timer: not enabled (need Linux)");
+        log::error!("CPU timer: not enabled (need Linux)");
         Ok(Self {})
     }
 }