Test: Add HTTP request update property tests

examples/motoko_examples/http_counter/dfx.json

@@ -7,10 +7,6 @@
             "build": "npx azle http_counter",
             "wasm": ".azle/http_counter/http_counter.wasm",
             "gzip": true,
-            "declarations": {
-                "output": "test/dfx_generated/http_counter",
-                "node_compatibility": true
-            },
             "metadata": [
                 {
                     "name": "candid:service",

examples/motoko_examples/http_counter/src/index.ts

@@ -29,8 +29,6 @@ export default Canister({
         stableStorage.insert('counter', 0n);
     }),
     http_request: query([HttpRequest], HttpResponse(Token), (req) => {
-        console.log('Hello from http_request');
-
         if (req.method === 'GET') {
             if (req.headers.find(isGzip) === undefined) {
                 if (req.url === '/stream') {
@@ -161,7 +159,6 @@ export default Canister({
         [Token],
         StreamingCallbackHttpResponse(Token),
         (token) => {
-            console.log('Hello from http_streaming');
             switch (token.arbitrary_data) {
                 case 'start': {
                     return {

examples/motoko_examples/http_counter/test/pretest.ts

@@ -10,10 +10,6 @@ async function pretest() {
     execSync(`dfx deploy http_counter`, {
         stdio: 'inherit'
     });
-
-    execSync(`dfx generate http_counter`, {
-        stdio: 'inherit'
-    });
 }
 
 pretest();

property_tests/arbitraries/http/response_arb.ts

@@ -20,14 +20,13 @@ export function HttpResponseValueArb<T>() {
     return fc
         .tuple(StatusCodeArb, HttpHeadersArb(), BodyArb())
         .map(([status_code, headers, body]): HttpResponse<T> => {
-            const thing: HttpResponse<T> = {
+            return {
                 status_code,
                 headers,
                 body,
                 upgrade: None,
                 streaming_strategy: None
             };
-            return thing;
         });
 }
 export function HttpResponseArb<T extends CorrespondingJSType = any>(

src/lib/canister_methods/index.ts

@@ -1,3 +1,2 @@
-export * from './http_gateway';
 export * from './methods';
 export * from './types';

src/lib/server.ts

@@ -1,6 +1,7 @@
 import {
     blob,
     bool,
+    CandidType,
     Canister,
     Func,
     ic,
@@ -27,38 +28,65 @@ import { IncomingMessageForServer } from 'http';
 
 const httpMessageParser = require('http-message-parser');
 
-// TODO double-check all of these
-export const Token = Record({
-    // add whatever fields you'd like
-    arbitrary_data: text
-});
-
-export const StreamingCallbackHttpResponse = Record({
-    body: blob,
-    token: Opt(Token)
-});
+export const DefaultToken = Record({});
+export function StreamingCallbackHttpResponse<Token extends CandidType>(
+    token: Token
+) {
+    return Record({
+        body: blob,
+        token: Opt(token)
+    });
+}
+type StreamingCallbackHttpResponse<Token> = {
+    body: Uint8Array;
+    token: Opt<Token>;
+};
 
-export const Callback = Func([text], StreamingCallbackHttpResponse, 'query');
+function Callback<Token extends CandidType>(token: Token) {
+    return Func([token], Opt(StreamingCallbackHttpResponse(token)), 'query');
+}
+type Callback = Func;
 
-export const CallbackStrategy = Record({
-    callback: Callback,
-    token: Token
-});
+function CallbackStrategy<Token extends CandidType>(token: Token) {
+    return Record({
+        callback: Callback(token),
+        token
+    });
+}
+export type CallbackStrategy<Token> = {
+    callback: Callback;
+    token: Token;
+};
+
+function StreamingStrategy<Token extends CandidType>(token: Token) {
+    return Variant({
+        Callback: CallbackStrategy(token)
+    });
+}
 
-export const StreamingStrategy = Variant({
-    Callback: CallbackStrategy
-});
+export type StreamingStrategy<Token> = Variant<{
+    Callback: CallbackStrategy<Token>;
+}>;
 
 export type HeaderField = [text, text];
 export const HeaderField = Tuple(text, text);
 
-export const HttpResponse = Record({
-    status_code: nat16,
-    headers: Vec(HeaderField),
-    body: blob,
-    streaming_strategy: Opt(StreamingStrategy),
-    upgrade: Opt(bool)
-});
+export function HttpResponse<Token extends CandidType>(token?: Token) {
+    return Record({
+        status_code: nat16,
+        headers: Vec(HeaderField),
+        body: blob,
+        streaming_strategy: Opt(StreamingStrategy(token ?? DefaultToken)),
+        upgrade: Opt(bool)
+    });
+}
+export type HttpResponse<Token> = {
+    status_code: number;
+    headers: HeaderField[];
+    body: Uint8Array;
+    upgrade: Opt<boolean>;
+    streaming_strategy: Opt<StreamingStrategy<Token>>;
+};
 
 export const HttpRequest = Record({
     method: text,
@@ -67,6 +95,7 @@ export const HttpRequest = Record({
     body: blob,
     certificate_version: Opt(nat16)
 });
+export type HttpRequest = typeof HttpRequest.tsType;
 
 let server: NodeServer;
 
@@ -80,7 +109,7 @@ export function Server(serverInit: () => NodeServer | Promise<NodeServer>) {
         }),
         http_request: query(
             [HttpRequest],
-            Manual(HttpResponse),
+            Manual(HttpResponse()),
             async (httpRequest) => {
                 await httpHandler(httpRequest, true);
             },
@@ -90,7 +119,7 @@ export function Server(serverInit: () => NodeServer | Promise<NodeServer>) {
         ),
         http_request_update: update(
             [HttpRequest],
-            Manual(HttpResponse),
+            Manual(HttpResponse()),
             async (httpRequest) => {
                 await httpHandler(httpRequest, false);
             },
@@ -120,7 +149,7 @@ export async function httpHandler(
                 streaming_strategy: None,
                 upgrade: Some(true)
             },
-            HttpResponse
+            HttpResponse()
         );
 
         return;
@@ -222,7 +251,7 @@ export async function httpHandler(
                         None: null
                     }
                 },
-                HttpResponse
+                HttpResponse()
             );
         }
     }