Merge branch 'main' of github.com:demergent-labs/azle into dependabot…

…/cargo/rquickjs-0.8.1

dfx/index.ts

@@ -19,7 +19,7 @@ export function getWebServerPort(): string {
 export function getCanisterOrigin(canisterName: string): string {
     return `http://${getCanisterId(
         canisterName
-    )}.localhost:${getWebServerPort()}`;
+    )}.raw.localhost:${getWebServerPort()}`;
 }
 
 export function getAgentHost(): string {

examples/experimental/demo/hello_world_http_server/package.json

@@ -1,6 +1,6 @@
 {
     "scripts": {
-        "build": "cd src/frontend && VITE_CANISTER_ORIGIN=http://$(dfx canister id backend).localhost:8000 vite build",
+        "build": "cd src/frontend && VITE_CANISTER_ORIGIN=http://$(dfx canister id backend).raw.localhost:8000 vite build",
         "pretest": "tsx test/pretest.ts",
         "test": "jest"
     },

examples/experimental/test/end_to_end/http_server/express/src/frontend/index.ts

@@ -5,7 +5,7 @@ import { customElement, property } from 'lit/decorators.js';
 export class AzleApp extends LitElement {
     canisterOrigin: string = `http://${
         import.meta.env.VITE_CANISTER_ID
-    }.localhost:8000`;
+    }.raw.localhost:8000`;
 
     @property()
     resSendResponse: string = '';

examples/experimental/test/end_to_end/http_server/express/test/tests.ts

@@ -95,7 +95,8 @@ export function getTests(canisterId: string): Test {
             expect(getResponseJson).toEqual(json);
         });
 
-        it('handles patches', async () => {
+        // TODO enable this tests once https://github.com/demergent-labs/azle/issues/2404 is resolved
+        it.skip('handles patches', async () => {
             const json = {
                 hello: 'patch'
             };

examples/experimental/test/end_to_end/http_server/fetch_ic/package.json

@@ -1,6 +1,6 @@
 {
     "scripts": {
-        "build": "cd src/frontend && VITE_CANISTER_ORIGIN=http://$(dfx canister id backend).localhost:$(dfx info webserver-port) VITE_IDENTITY_PROVIDER=http://$(dfx canister id internet_identity).localhost:$(dfx info webserver-port) vite build",
+        "build": "cd src/frontend && VITE_CANISTER_ORIGIN=http://$(dfx canister id backend).raw.localhost:$(dfx info webserver-port) VITE_IDENTITY_PROVIDER=http://$(dfx canister id internet_identity).localhost:$(dfx info webserver-port) vite build",
         "pretest": "tsx test/pretest.ts",
         "test": "jest"
     },

examples/experimental/test/end_to_end/http_server/file_protocol/test/tests.ts

@@ -39,7 +39,8 @@ export function getTests(canisterId: string): Test {
             expect(responseText.trim()).toBe('test3');
         });
 
-        it('reads in a file in a grandchild directory', async () => {
+        // TODO enable this tests once https://github.com/demergent-labs/azle/issues/2404 is resolved
+        it.skip('reads in a file in a grandchild directory', async () => {
             const response = await fetch(`${origin}/read-test5`, {
                 method: 'PATCH',
                 headers: [['Content-Type', 'application/json']],

examples/experimental/test/end_to_end/http_server/internet_identity/package.json

@@ -1,6 +1,6 @@
 {
     "scripts": {
-        "build": "cd src/frontend && VITE_CANISTER_ORIGIN=http://$(dfx canister id backend).localhost:$(dfx info webserver-port) VITE_IDENTITY_PROVIDER=http://$(dfx canister id internet_identity).localhost:$(dfx info webserver-port) vite build",
+        "build": "cd src/frontend && VITE_CANISTER_ORIGIN=http://$(dfx canister id backend).raw.localhost:$(dfx info webserver-port) VITE_IDENTITY_PROVIDER=http://$(dfx canister id internet_identity).localhost:$(dfx info webserver-port) vite build",
         "pretest": "tsx test/pretest.ts",
         "test": "jest"
     },

examples/experimental/test/end_to_end/http_server/nest/test/tests.ts

@@ -29,7 +29,8 @@ export function getTests(canisterId: string): Test {
             expect(responseText).toBe('put');
         });
 
-        it('app patch', async () => {
+        // TODO enable this tests once https://github.com/demergent-labs/azle/issues/2404 is resolved
+        it.skip('app patch', async () => {
             const response = await fetch(`${origin}/patch`, {
                 method: 'PATCH'
             });
@@ -133,7 +134,8 @@ export function getTests(canisterId: string): Test {
             expect(responseText).toBe('dogs put');
         });
 
-        it('dogs patch', async () => {
+        // TODO enable this tests once https://github.com/demergent-labs/azle/issues/2404 is resolved
+        it.skip('dogs patch', async () => {
             const response = await fetch(`${origin}/dogs/patch`, {
                 method: 'PATCH'
             });
@@ -239,7 +241,8 @@ export function getTests(canisterId: string): Test {
             expect(responseText).toBe('cats put');
         });
 
-        it('cats patch', async () => {
+        // TODO enable this tests once https://github.com/demergent-labs/azle/issues/2404 is resolved
+        it.skip('cats patch', async () => {
             const response = await fetch(`${origin}/cats/patch`, {
                 method: 'PATCH'
             });

examples/experimental/test/end_to_end/http_server/sqlite/batch_create_users.sh

@@ -4,7 +4,7 @@
 count=1000  # Change this number as needed
 
 # URL to which the POST request will be sent
-url="http://$(dfx canister id sqlite).localhost:8000/users/batch/1000"
+url="http://$(dfx canister id sqlite).raw.localhost:8000/users/batch/1000"
 
 # Loop as many times as specified in the count variable
 for ((i=0; i<count; i++))

examples/experimental/test/end_to_end/http_server/sqlite_drizzle/batch_create_users.sh

@@ -4,7 +4,7 @@
 count=1000  # Change this number as needed
 
 # URL to which the POST request will be sent
-url="http://$(dfx canister id sqlite_drizzle).localhost:8000/users/batch/800"
+url="http://$(dfx canister id sqlite_drizzle).raw.localhost:8000/users/batch/800"
 
 # Loop as many times as specified in the count variable
 for ((i=0; i<count; i++))

examples/experimental/test/end_to_end/http_server/sqlite_typeorm/batch_create_users.sh

@@ -4,7 +4,7 @@
 count=1000  # Change this number as needed
 
 # URL to which the POST request will be sent
-url="http://$(dfx canister id sqlite_typeorm).localhost:8000/users/batch/800"
+url="http://$(dfx canister id sqlite_typeorm).raw.localhost:8000/users/batch/800"
 
 # Loop as many times as specified in the count variable
 for ((i=0; i<count; i++))

examples/experimental/test/property/candid_rpc/canister_methods/http_request/test/fletch.ts

@@ -59,8 +59,8 @@ export function fletchSync(canisterName: string, options: HttpRequest) {
         --data "${escapeForExecSync(
             Buffer.from(options.body).toString('utf-8')
         )}"\
-        "${canisterId}.localhost:8000${options.url}" \
-        --resolve "${canisterId}.localhost:8000:127.0.0.1"`;
+        "${canisterId}.raw.localhost:8000${options.url}" \
+        --resolve "${canisterId}.raw.localhost:8000:127.0.0.1"`;
 
     const responseBuffer = execSync(curlCommand);
 

examples/experimental/test/property/candid_rpc/canister_methods/http_request/test/generate_tests.ts

@@ -28,7 +28,10 @@ export function generateTests(
                             ([name]) =>
                                 name !== 'x-ic-streaming-response' &&
                                 name !== 'content-length' &&
-                                name !== 'date'
+                                name !== 'date' &&
+                                name !== 'access-control-allow-origin' &&
+                                name !== 'access-control-expose-headers' &&
+                                name !== 'vary'
                         )
                         .sort();
                     const processedResponse = {

examples/experimental/test/property/candid_rpc/canister_methods/http_request_update/test/generate_tests.ts

@@ -38,7 +38,10 @@ export function generateTests(
                             ([name]) =>
                                 name !== 'x-ic-streaming-response' &&
                                 name !== 'content-length' &&
-                                name !== 'date'
+                                name !== 'date' &&
+                                name !== 'access-control-allow-origin' &&
+                                name !== 'access-control-expose-headers' &&
+                                name !== 'vary'
                         )
                         .sort();
                     const processedResponse = {

examples/stable/test/property/candid_rpc/canister_methods/http_request/test/fletch.ts

@@ -59,8 +59,8 @@ export function fletchSync(canisterName: string, options: HttpRequest) {
         --data "${escapeForExecSync(
             Buffer.from(options.body).toString('utf-8')
         )}"\
-        "${canisterId}.localhost:8000${options.url}" \
-        --resolve "${canisterId}.localhost:8000:127.0.0.1"`;
+        "${canisterId}.raw.localhost:8000${options.url}" \
+        --resolve "${canisterId}.raw.localhost:8000:127.0.0.1"`;
 
     const responseBuffer = execSync(curlCommand);
 

examples/stable/test/property/candid_rpc/canister_methods/http_request/test/generate_tests.ts

@@ -28,7 +28,10 @@ export function generateTests(
                             ([name]) =>
                                 name !== 'x-ic-streaming-response' &&
                                 name !== 'content-length' &&
-                                name !== 'date'
+                                name !== 'date' &&
+                                name !== 'access-control-allow-origin' &&
+                                name !== 'access-control-expose-headers' &&
+                                name !== 'vary'
                         )
                         .sort();
                     const processedResponse = {

examples/stable/test/property/candid_rpc/canister_methods/http_request_update/test/fletch.ts

@@ -59,8 +59,8 @@ export function fletchSync(canisterName: string, options: HttpRequest) {
         --data "${escapeForExecSync(
             Buffer.from(options.body).toString('utf-8')
         )}"\
-        "${canisterId}.localhost:8000${options.url}" \
-        --resolve "${canisterId}.localhost:8000:127.0.0.1"`;
+        "${canisterId}.raw.localhost:8000${options.url}" \
+        --resolve "${canisterId}.raw.localhost:8000:127.0.0.1"`;
 
     const responseBuffer = execSync(curlCommand);
 

examples/stable/test/property/candid_rpc/canister_methods/http_request_update/test/generate_tests.ts

@@ -38,7 +38,10 @@ export function generateTests(
                             ([name]) =>
                                 name !== 'x-ic-streaming-response' &&
                                 name !== 'content-length' &&
-                                name !== 'date'
+                                name !== 'date' &&
+                                name !== 'access-control-allow-origin' &&
+                                name !== 'access-control-expose-headers' &&
+                                name !== 'vary'
                         )
                         .sort();
                     const processedResponse = {

examples/stable/test/property/ic_api/cycles_burn/test/tests.ts

@@ -36,7 +36,7 @@ export function getTests(): Test {
                             cycleBalanceBefore -
                                 cycleBalanceAfter -
                                 cyclesBurned
-                        ).toBeLessThanOrEqual(250_000n);
+                        ).toBeLessThanOrEqual(1_000_000n);
                     }
                 ),
                 defaultPropTestParams()

package.json

@@ -91,7 +91,7 @@
             "wasi2ic": "https://github.com/wasm-forge/wasi2ic?rev=676508667a0c3b9fb900ce19cb33bfafa2ae8f8e#67650866",
             "node": "22.12.0",
             "rust": "1.83.0",
-            "dfx": "0.22.0"
+            "dfx": "0.24.3"
         }
     }
 }

src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_contains_key.rs

@@ -22,7 +22,10 @@ impl JsFn for NativeFunction {
             .with(|stable_b_tree_maps| {
                 let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-                stable_b_tree_maps[&memory_id].contains_key(&AzleStableBTreeMapKey { bytes: key })
+                stable_b_tree_maps
+                    .get(&memory_id)
+                    .unwrap()
+                    .contains_key(&AzleStableBTreeMapKey { bytes: key })
             })
             .into()
     }

src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_get.rs

@@ -21,7 +21,10 @@ impl JsFn for NativeFunction {
         let value_option = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-            stable_b_tree_maps[&memory_id].get(&AzleStableBTreeMapKey { bytes: key })
+            stable_b_tree_maps
+                .get(&memory_id)
+                .unwrap()
+                .get(&AzleStableBTreeMapKey { bytes: key })
         });
 
         // TODO could we somehow encode the entire option here more easily

src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_is_empty.rs

@@ -16,7 +16,7 @@ impl JsFn for NativeFunction {
             .with(|stable_b_tree_maps| {
                 let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-                stable_b_tree_maps[&memory_id].is_empty()
+                stable_b_tree_maps.get(&memory_id).unwrap().is_empty()
             })
             .into()
     }

src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_items.rs

@@ -29,7 +29,7 @@ impl JsFn for NativeFunction {
 
         let items: Vec<Vec<Vec<u8>>> = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
-            let stable_b_tree_map = &stable_b_tree_maps[&memory_id];
+            let stable_b_tree_map = stable_b_tree_maps.get(&memory_id).unwrap();
 
             stable_b_tree_map
                 .iter()

src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_keys.rs

@@ -29,7 +29,7 @@ impl JsFn for NativeFunction {
 
         let keys: Vec<Vec<u8>> = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
-            let stable_b_tree_map = &stable_b_tree_maps[&memory_id];
+            let stable_b_tree_map = stable_b_tree_maps.get(&memory_id).unwrap();
 
             stable_b_tree_map
                 .iter()

src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_len.rs

@@ -15,7 +15,7 @@ impl JsFn for NativeFunction {
         let len = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-            stable_b_tree_maps[&memory_id].len()
+            stable_b_tree_maps.get(&memory_id).unwrap().len()
         });
 
         context.new_string(&len.to_string()).into()

src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_values.rs

@@ -29,7 +29,7 @@ impl JsFn for NativeFunction {
 
         let values: Vec<Vec<u8>> = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
-            let stable_b_tree_map = &stable_b_tree_maps[&memory_id];
+            let stable_b_tree_map = stable_b_tree_maps.get(&memory_id).unwrap();
 
             stable_b_tree_map
                 .iter()

test/property/arbitraries/http/request_arb.ts

@@ -23,10 +23,11 @@ const RequestMethodArb = fc.constantFrom<RequestMethod>(
     'GET',
     'POST',
     'PUT',
-    'DELETE',
-    'OPTIONS',
-    'TRACE',
-    'PATCH'
+    'DELETE'
+    // TODO add back in when resolved https://github.com/demergent-labs/azle/issues/2404
+    // 'OPTIONS',
+    // 'TRACE',
+    // 'PATCH'
 );
 
 const UrlPathArb = fc.webUrl({ withQueryParameters: true }).map((url) => {

the_azle_book/src/authentication.md

@@ -12,7 +12,7 @@ Then you use `fetch` and construct an `Authorization` header using an [@dfinity/
 
 ```typescript
 const response = await fetch(
-    `http://bkyz2-fmaaa-aaaaa-qaaaq-cai.localhost:8000/whoami`,
+    `http://bkyz2-fmaaa-aaaaa-qaaaq-cai.raw.localhost:8000/whoami`,
     {
         method: 'GET',
         headers: [['Authorization', toJwt(this.identity)]]

the_azle_book/src/deployment.md

@@ -69,7 +69,7 @@ dfx deploy [canisterName]
 
 ## Interacting with your canister
 
-You will generally interact with your canister through an HTTP client such as `curl`, `fetch`, or a web browser. The URL of your canister locally will look like this: `http://[canisterId].localhost:[replicaPort]`. Azle will print your canister's URL in the terminal after a successful deploy.
+You will generally interact with your canister through an HTTP client such as `curl`, `fetch`, or a web browser. The URL of your canister locally will look like this: `http://[canisterId].raw.localhost:[replicaPort]`. Azle will print your canister's URL in the terminal after a successful deploy.
 
 ```bash
 # You can obtain the canisterId like this
@@ -79,10 +79,10 @@ dfx canister id [canisterName]
 dfx info webserver-port
 
 # An example of performing a GET request to a canister
-curl http://a3shf-5eaaa-aaaaa-qaafa-cai.localhost:8000
+curl http://a3shf-5eaaa-aaaaa-qaafa-cai.raw.localhost:8000
 
 # An example of performing a POST request to a canister
-curl -X POST -H "Content-Type: application/json" -d "{ \"hello\": \"world\" }" http://a3shf-5eaaa-aaaaa-qaafa-cai.localhost:8000
+curl -X POST -H "Content-Type: application/json" -d "{ \"hello\": \"world\" }" http://a3shf-5eaaa-aaaaa-qaafa-cai.raw.localhost:8000
 ```
 
 ## Deploying to mainnet

the_azle_book/src/servers.md

@@ -68,7 +68,7 @@ Azle supports building HTTP servers on ICP using the [Node.js http.Server](https
 
 Azle currently has good but not comprehensive support for [Node.js http.Server](https://nodejs.org/api/http.html#class-httpserver) and [Express](https://expressjs.com/). Support for other libraries like [Nest](https://nestjs.com/) are works-in-progress.
 
-Once [deployed](./deployment.md) you can access your server at a URL like this locally `http://bkyz2-fmaaa-aaaaa-qaaaq-cai.localhost:8000` or like this on mainnet `https://bkyz2-fmaaa-aaaaa-qaaaq-cai.raw.icp0.io`.
+Once [deployed](./deployment.md) you can access your server at a URL like this locally `http://bkyz2-fmaaa-aaaaa-qaaaq-cai.raw.localhost:8000` or like this on mainnet `https://bkyz2-fmaaa-aaaaa-qaaaq-cai.raw.icp0.io`.
 
 You can use any HTTP client to interact with your server, such as `curl`, `fetch`, or a web browser. See the [Interacting with your canister section](./deployment.md#interacting-with-your-canister) of the [deployment chapter](./deployment.md) for help in constructing your canister URL.