Merge pull request #2193 from demergent-labs/rquickjs_move_crates

Rquickjs move crates

Cargo.toml

@@ -1,2 +1,6 @@
 [workspace]
-members = ["src/build/rust/canister", "src/build/rust/open_value_sharing"]
+members = [
+    "src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template",
+    "src/build/experimental/commands/compile/wasm_binary/rust/open_value_sharing",
+    "src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template",
+]

src/build/experimental/commands/compile/get_context.ts

@@ -32,6 +32,7 @@ export async function getContext(
         consumer,
         managementDid,
         recordBenchmarks:
+            process.env.npm_lifecycle_event === 'pre_tests' ||
             process.env.npm_lifecycle_event === 'pretest' ||
             process.env.npm_lifecycle_event === 'test'
                 ? process.env.AZLE_RECORD_BENCHMARKS !== 'false'

src/build/experimental/commands/compile/wasm_binary/compile.ts

@@ -13,7 +13,7 @@ export function compile(
     );
 
     execSyncPretty(
-        `wasi2ic target/wasm32-wasi/release/canister.wasm ${wasmDest}`,
+        `wasi2ic target/wasm32-wasi/release/experimental_canister_template.wasm ${wasmDest}`,
         ioType
     );
 }

src/build/rust/canister/Cargo.toml → src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "canister"
+name = "experimental_canister_template"
 version = "0.0.0"
 edition = "2018"
 

src/build/rust/canister/src/benchmarking.rs → src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/benchmarking.rs

@@ -1,5 +1,4 @@
 use std::cell::RefCell;
-use std::collections::BTreeMap;
 
 use candid::CandidType;
 use wasmedge_quickjs::{AsObject, Context};

src/build/rust/canister/src/candid.rs → src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/candid.rs

@@ -37,7 +37,7 @@ pub fn get_candid_and_method_meta_pointer() -> *mut std::os::raw::c_char {
             // TODO what do we do if there is an error in here?
             context.eval_global_str("globalThis.exports = {};".to_string());
             context.eval_global_str(format!("globalThis._azleExperimental = {EXPERIMENTAL};"));
-            context.eval_module_str(std::str::from_utf8(&js).unwrap().to_string(), "azle_main");
+            context.eval_module_str(std::str::from_utf8(&js).unwrap().to_string(), "main");
 
             run_event_loop(context);
 

src/build/rust/canister/src/execute_method_js.rs → src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/execute_method_js.rs

@@ -14,6 +14,7 @@ pub extern "C" fn execute_method_js(function_index: i32, pass_arg_data: i32) {
         runtime.run_with_context(|context| {
             let global = context.get_global();
             let callbacks = global.get("_azleCallbacks");
+
             let method_callback = callbacks.get(&function_name).unwrap();
 
             let candid_args = if pass_arg_data {

src/build/rust/canister/src/ic/mod.rs → src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/mod.rs

@@ -312,5 +312,5 @@ pub fn register(context: &mut wasmedge_quickjs::Context) {
         context.new_function::<trap::NativeFunction>("").into(),
     );
 
-    context.get_global().set("_azleIc", ic.into());
+    context.get_global().set("_azleIcExperimental", ic.into());
 }

src/build/rust/canister/src/init_and_post_upgrade.rs → src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/init_and_post_upgrade.rs

@@ -126,11 +126,11 @@ pub fn initialize_js(js: &str, init: bool, function_index: i32, pass_arg_data: i
         context.eval_global_str(format!(
             "globalThis._azleRecordBenchmarks = {record_benchmarks};"
         ));
-        context.eval_module_str(js.to_string(), "azle_main");
+        context.eval_module_str(js.to_string(), "main");
 
         run_event_loop(context);
 
-        // let temp = context.eval_module_str(std::str::from_utf8(MAIN_JS).unwrap().to_string(), "azle_main");
+        // let temp = context.eval_module_str(std::str::from_utf8(MAIN_JS).unwrap().to_string(), "main");
 
         // match &temp {
         //     wasmedge_quickjs::JsValue::Exception(js_exception) => {

src/build/experimental/commands/template.ts

@@ -14,8 +14,12 @@ export async function runCommand(ioType: IOType): Promise<void> {
             AZLE_PACKAGE_PATH,
             'src',
             'build',
+            'experimental',
+            'commands',
+            'compile',
+            'wasm_binary',
             'rust',
-            'canister',
+            'experimental_canister_template',
             'Cargo.toml'
         ),
         EXPERIMENTAL_STATIC_CANISTER_TEMPLATE_PATH,

src/build/stable/commands/compile/get_context.ts

@@ -28,6 +28,7 @@ export function getContext(
     const wasmData: WasmData = {
         envVars,
         recordBenchmarks:
+            process.env.npm_lifecycle_event === 'pre_tests' ||
             process.env.npm_lifecycle_event === 'pretest' ||
             process.env.npm_lifecycle_event === 'test'
                 ? process.env.AZLE_RECORD_BENCHMARKS !== 'false'

src/build/stable/commands/compile/wasm_binary/compile.ts

@@ -13,7 +13,7 @@ export function compile(
     );
 
     execSyncPretty(
-        `wasi2ic target/wasm32-wasi/release/canister.wasm ${wasmDest}`,
+        `wasi2ic target/wasm32-wasi/release/stable_canister_template.wasm ${wasmDest}`,
         ioType
     );
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "stable_canister_template"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+candid = "0.10.2"
+candid_parser = "0.1.2"
+ic-cdk = "0.12.2"
+ic-cdk-macros = "0.8.4"
+ic-cdk-timers = "0.6.0"
+ic-stable-structures = "0.6.5"
+ic-wasi-polyfill = "0.6.1"
+rquickjs = { version = "0.6.2", features = ["array-buffer"] }
+serde = "1.0.202"
+serde_json = "1.0.107"
+slotmap = "=1.0.6"

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/benchmarking.rs

@@ -0,0 +1,38 @@
+use std::{cell::RefCell, error::Error};
+
+use candid::CandidType;
+
+use crate::quickjs_with_ctx;
+
+#[derive(CandidType, Debug, Clone)]
+pub struct BenchmarkEntry {
+    pub method_name: String,
+    pub instructions: u64,
+    pub timestamp: u64,
+}
+
+thread_local! {
+    pub static BENCHMARKS_REF_CELL: RefCell<Vec<BenchmarkEntry>> = RefCell::new(Vec::new());
+}
+
+pub fn record_benchmark(function_name: &str, instructions: u64) -> Result<(), Box<dyn Error>> {
+    quickjs_with_ctx(|ctx| {
+        let timestamp = ic_cdk::api::time();
+
+        let method_names: rquickjs::Object =
+            ctx.clone().globals().get("_azleCanisterMethodNames")?;
+
+        let method_name: String = method_names.get(function_name)?;
+
+        BENCHMARKS_REF_CELL.with(|benchmarks_ref_cell| {
+            let mut benchmarks = benchmarks_ref_cell.borrow_mut();
+            benchmarks.push(BenchmarkEntry {
+                method_name,
+                instructions,
+                timestamp,
+            });
+        });
+
+        Ok(())
+    })
+}

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/candid.rs

@@ -0,0 +1,66 @@
+use crate::{
+    ic, quickjs_with_ctx, wasm_binary_manipulation::get_js_code, CONTEXT_REF_CELL, MODULE_NAME,
+};
+
+// TODO we might not need any of these panic hooks
+
+// Heavily inspired by https://stackoverflow.com/a/47676844
+#[no_mangle]
+pub fn get_candid_and_method_meta_pointer() -> *mut std::os::raw::c_char {
+    std::panic::set_hook(Box::new(|panic_info| {
+        let msg = match panic_info.payload().downcast_ref::<&str>() {
+            Some(s) => *s,
+            None => "Unknown panic message",
+        };
+        let location = if let Some(location) = panic_info.location() {
+            format!(" at {}:{}", location.file(), location.line())
+        } else {
+            " (unknown location)".to_string()
+        };
+
+        let message = &format!("Panic occurred: {}{}", msg, location);
+
+        ic_cdk::println!("{}", message);
+    }));
+
+    let runtime = rquickjs::Runtime::new().unwrap();
+    let context = rquickjs::Context::full(&runtime).unwrap();
+
+    CONTEXT_REF_CELL.with(|context_ref_cell| {
+        *context_ref_cell.borrow_mut() = Some(context);
+    });
+
+    quickjs_with_ctx(|ctx| {
+        ctx.clone()
+            .globals()
+            .set("_azleNodeWasmEnvironment", true)
+            .unwrap();
+
+        ic::register(ctx.clone());
+
+        ctx.clone()
+            .globals()
+            .set("exports", rquickjs::Object::new(ctx.clone()).unwrap())
+            .unwrap();
+
+        ctx.clone()
+            .globals()
+            .set("_azleExperimental", false)
+            .unwrap();
+
+        let js = get_js_code();
+
+        // TODO is there a better name for this main module?
+        // TODO this returns a promise...make sure we handle it appropriately
+        rquickjs::Module::evaluate(ctx.clone(), MODULE_NAME, js).unwrap();
+
+        let get_candid_and_method_meta: rquickjs::Function =
+            ctx.globals().get("_azleGetCandidAndMethodMeta").unwrap();
+
+        let candid_and_method_meta: String = get_candid_and_method_meta.call(()).unwrap();
+
+        let c_string = std::ffi::CString::new(candid_and_method_meta).unwrap();
+
+        c_string.into_raw()
+    })
+}

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/chunk.rs

@@ -0,0 +1,7 @@
+#[allow(unused)]
+pub async fn chunk() {
+    let id = ic_cdk::id();
+    let method = "_azle_chunk";
+    let args_raw = [68, 73, 68, 76, 0, 0]; // '()' pre encoded
+    let _ = ic_cdk::api::call::call_raw128(id, method, args_raw, 0).await;
+}