change azle reject and resolve ids to a better name

demergent-labs · Jan 4, 2025 · f9b0d46 · f9b0d46
1 parent cbe3768
commit f9b0d46
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/canister_templates/experimental.wasm b/canister_templates/experimental.wasm
diff --git a/canister_templates/stable.wasm b/canister_templates/stable.wasm
diff --git a/...ental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/call_raw.rs b/...ental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/call_raw.rs
@@ -55,11 +55,11 @@ impl JsFn for NativeFunction {
                 let reject_id = format!("_reject_{}", promise_id);
                 let resolve_id = format!("_resolve_{}", promise_id);
 
-                let reject_ids = global.get("_azleRejectIds");
-                let resolve_ids = global.get("_azleResolveIds");
+                let reject_callbacks = global.get("_azleRejectCallbacks");
+                let resolve_callbacks = global.get("_azleResolveCallbacks");
 
-                reject_ids.to_obj().unwrap().delete(&reject_id);
-                resolve_ids.to_obj().unwrap().delete(&resolve_id);
+                reject_callbacks.to_obj().unwrap().delete(&reject_id);
+                resolve_callbacks.to_obj().unwrap().delete(&resolve_id);
             });
 
             let call_result =
@@ -89,7 +89,7 @@ impl JsFn for NativeFunction {
 
             if should_resolve {
                 let resolve = global
-                    .get("_azleResolveIds")
+                    .get("_azleResolveCallbacks")
                     .to_obj()
                     .unwrap()
                     .get(format!("_resolve_{promise_id}").as_str())
@@ -111,7 +111,7 @@ impl JsFn for NativeFunction {
                 };
             } else {
                 let reject = global
-                    .get("_azleRejectIds")
+                    .get("_azleRejectCallbacks")
                     .to_obj()
                     .unwrap()
                     .get(format!("_reject_{promise_id}").as_str())

diff --git a/...uild/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/call_raw.rs b/...uild/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/call_raw.rs
@@ -84,8 +84,8 @@ fn cleanup(ctx: Ctx, promise_id: &str) -> Result<(), Box<dyn Error>> {
 
     let globals = ctx.clone().globals();
 
-    let reject_ids = globals.get::<_, Object>("_azleRejectIds")?;
-    let resolve_ids = globals.get::<_, Object>("_azleResolveIds")?;
+    let reject_ids = globals.get::<_, Object>("_azleRejectCallbacks")?;
+    let resolve_ids = globals.get::<_, Object>("_azleResolveCallbacks")?;
 
     reject_ids.remove(&reject_id)?;
     resolve_ids.remove(&resolve_id)?;
@@ -147,9 +147,9 @@ fn get_resolve_or_reject_global_object(
     let globals = ctx.globals();
 
     if should_resolve {
-        Ok(globals.get("_azleResolveIds")?)
+        Ok(globals.get("_azleResolveCallbacks")?)
     } else {
-        Ok(globals.get("_azleRejectIds")?)
+        Ok(globals.get("_azleRejectCallbacks")?)
     }
 }
 

diff --git a/src/lib/experimental/ic/call_raw.ts b/src/lib/experimental/ic/call_raw.ts
@@ -37,13 +37,15 @@ export function callRaw(
         const globalResolveId = `_resolve_${promiseId}`;
         const globalRejectId = `_reject_${promiseId}`;
 
-        globalThis._azleResolveIds[globalResolveId] = (
+        globalThis._azleResolveCallbacks[globalResolveId] = (
             bytes: ArrayBuffer
         ): void => {
             resolve(new Uint8Array(bytes));
         };
 
-        globalThis._azleRejectIds[globalRejectId] = (error: any): void => {
+        globalThis._azleRejectCallbacks[globalRejectId] = (
+            error: any
+        ): void => {
             reject(error);
         };
 

diff --git a/src/lib/stable/globals.ts b/src/lib/stable/globals.ts
@@ -31,9 +31,11 @@ declare global {
     // eslint-disable-next-line no-var
     var _azleRecordBenchmarks: boolean;
     // eslint-disable-next-line no-var
-    var _azleRejectIds: { [key: string]: (err: any) => void };
+    var _azleRejectCallbacks: { [key: string]: (err: any) => void };
     // eslint-disable-next-line no-var
-    var _azleResolveIds: { [key: string]: (buf: Uint8Array) => void };
+    var _azleResolveCallbacks: {
+        [key: string]: (buf: Uint8Array | ArrayBuffer) => void;
+    };
     // eslint-disable-next-line no-var
     var _azleTimerCallbacks: { [key: string]: () => void };
 }
@@ -54,9 +56,9 @@ if (globalThis._azleInsideCanister === true) {
 
     globalThis._azleIcTimers = {};
 
-    globalThis._azleRejectIds = {};
+    globalThis._azleRejectCallbacks = {};
 
-    globalThis._azleResolveIds = {};
+    globalThis._azleResolveCallbacks = {};
 
     globalThis.TextDecoder = TextDecoder;
     globalThis.TextEncoder = TextEncoder;

diff --git a/src/lib/stable/ic_apis/call.ts b/src/lib/stable/ic_apis/call.ts
@@ -31,7 +31,7 @@ export async function call<Args extends any[] | undefined, Return = any>(
         const returnTypeIdl = options?.returnIdlType;
         const raw = options?.raw;
 
-        globalThis._azleResolveIds[globalResolveId] = (
+        globalThis._azleResolveCallbacks[globalResolveId] = (
             result: Uint8Array | ArrayBuffer
         ): void => {
             if (raw !== undefined) {
@@ -45,7 +45,9 @@ export async function call<Args extends any[] | undefined, Return = any>(
             }
         };
 
-        globalThis._azleRejectIds[globalRejectId] = (error: any): void => {
+        globalThis._azleRejectCallbacks[globalRejectId] = (
+            error: any
+        ): void => {
             reject(error);
         };