fix!: async* apis are not compatible with later releases of moc

.github/workflows/e2e-tests.yml

@@ -50,7 +50,7 @@ jobs:
         run: npm run test:e2e
 
       - name: Clean Up
-        run: killall dfx replica
+        run: dfx killall
 
   aggregate:
     name: e2e:required

README.md

@@ -213,7 +213,3 @@ These functions are used internally by the library, but are also exported for us
     - Encodes a request as a blob
 - `public func yieldResponse(b : HttpResponse) : Blob`
     - Encodes a response as a blob
-
-## Credits
-
-This project currently copies the `http-parser` library into its source tree. This is because the `http-parser` library is not currently installable as a package on `mops`. Source code is available at https://github.com/NatLabs/http-parser.mo

canister_ids.json

@@ -7,5 +7,8 @@
   },
   "test": {
     "ic": "qpyq6-kiaaa-aaaab-qaidq-cai"
+  },
+    "http_greet": {
+    "ic": "qg33c-4aaaa-aaaab-qaica-cai"
   }
-}
+}

dfx.json

@@ -19,7 +19,7 @@
   },
   "defaults": {
     "build": {
-      "packtool": "mops sources"
+      "packtool": "npx mops sources"
     }
   }
 }

examples/http_greet/mops.toml

@@ -1,9 +1,10 @@
 [package]
 name = "http_hello"
-version = "0.1.0"
+version = "1.0.0"
 description = ""
 repository = ""
 
 [dependencies]
 certified-cache = "0.2.0"
 assets = "0.2.0"
+http-parser = "0.3.1"

examples/http_greet/src/http_greet/main.mo

@@ -20,7 +20,7 @@ shared ({ caller = creator }) actor class () {
 
   server.post(
     "/greet",
-    func(req : Request, res : ResponseClass) : async* Response {
+    func(req : Request, res : ResponseClass) : async Response {
       let parsedName = req.url.queryObj.get("name");
       var name = "";
       switch parsedName {
@@ -42,7 +42,7 @@ shared ({ caller = creator }) actor class () {
 
   server.get(
     "/foo",
-    func(req : Request, res : ResponseClass) : async* Response {
+    func(req : Request, res : ResponseClass) : async Response {
       res.send({
         status_code = 200;
         headers = [("Content-Type", "text/html")];
@@ -53,14 +53,14 @@ shared ({ caller = creator }) actor class () {
     },
   );
 
-  public shared ({ caller }) func authorize(other : Principal) : async* () {
+  public shared ({ caller }) func authorize(other : Principal) : async () {
     server.authorize({
       caller;
       other;
     });
   };
 
-  public query func retrieve(path : Assets.Path) : async* Assets.Contents {
+  public query func retrieve(path : Assets.Path) : async Assets.Contents {
     assets.retrieve(path);
   };
 
@@ -72,14 +72,14 @@ shared ({ caller = creator }) actor class () {
       content : Blob;
       sha256 : ?Blob;
     }
-  ) : async* () {
+  ) : async () {
     server.store({
       caller;
       arg;
     });
   };
 
-  public query func list(arg : {}) : async* [T.AssetDetails] {
+  public query func list(arg : {}) : async [T.AssetDetails] {
     assets.list(arg);
   };
 
@@ -88,7 +88,7 @@ shared ({ caller = creator }) actor class () {
       key : T.Key;
       accept_encodings : [Text];
     }
-  ) : async* ({
+  ) : async ({
     content : Blob;
     content_type : Text;
     content_encoding : Text;
@@ -98,7 +98,7 @@ shared ({ caller = creator }) actor class () {
     assets.get(arg);
   };
 
-  public shared ({ caller }) func create_batch(arg : {}) : async* ({
+  public shared ({ caller }) func create_batch(arg : {}) : async ({
     batch_id : T.BatchId;
   }) {
     assets.create_batch({
@@ -112,7 +112,7 @@ shared ({ caller = creator }) actor class () {
       batch_id : T.BatchId;
       content : Blob;
     }
-  ) : async* ({
+  ) : async ({
     chunk_id : T.ChunkId;
   }) {
     assets.create_chunk({
@@ -121,42 +121,42 @@ shared ({ caller = creator }) actor class () {
     });
   };
 
-  public shared ({ caller }) func commit_batch(args : T.CommitBatchArguments) : async* () {
+  public shared ({ caller }) func commit_batch(args : T.CommitBatchArguments) : async () {
     assets.commit_batch({
       caller;
       args;
     });
   };
 
-  public shared ({ caller }) func create_asset(arg : T.CreateAssetArguments) : async* () {
+  public shared ({ caller }) func create_asset(arg : T.CreateAssetArguments) : async () {
     assets.create_asset({
       caller;
       arg;
     });
   };
 
-  public shared ({ caller }) func set_asset_content(arg : T.SetAssetContentArguments) : async* () {
+  public shared ({ caller }) func set_asset_content(arg : T.SetAssetContentArguments) : async () {
     assets.set_asset_content({
       caller;
       arg;
     });
   };
 
-  public shared ({ caller }) func unset_asset_content(args : T.UnsetAssetContentArguments) : async* () {
+  public shared ({ caller }) func unset_asset_content(args : T.UnsetAssetContentArguments) : async () {
     assets.unset_asset_content({
       caller;
       args;
     });
   };
 
-  public shared ({ caller }) func delete_asset(args : T.DeleteAssetArguments) : async* () {
+  public shared ({ caller }) func delete_asset(args : T.DeleteAssetArguments) : async () {
     assets.delete_asset({
       caller;
       args;
     });
   };
 
-  public shared ({ caller }) func clear(args : T.ClearArguments) : async* () {
+  public shared ({ caller }) func clear(args : T.ClearArguments) : async () {
     assets.clear({
       caller;
       args;
@@ -165,7 +165,7 @@ shared ({ caller = creator }) actor class () {
 
   public type StreamingStrategy = {
     #Callback : {
-      callback : shared query StreamingCallbackToken -> async* StreamingCallbackHttpResponse;
+      callback : shared query StreamingCallbackToken -> async StreamingCallbackHttpResponse;
       token : StreamingCallbackToken;
     };
   };
@@ -182,14 +182,14 @@ shared ({ caller = creator }) actor class () {
     token : ?StreamingCallbackToken;
   };
 
-  public query func http_request_streaming_callback(token : T.StreamingCallbackToken) : async* StreamingCallbackHttpResponse {
+  public query func http_request_streaming_callback(token : T.StreamingCallbackToken) : async StreamingCallbackHttpResponse {
     assets.http_request_streaming_callback(token);
   };
-  public query func http_request(req : HttpRequest) : async* HttpResponse {
+  public query func http_request(req : HttpRequest) : async HttpResponse {
     server.http_request(req);
   };
-  public func http_request_update(req : HttpRequest) : async* HttpResponse {
-    await* server.http_request_update(req);
+  public func http_request_update(req : HttpRequest) : async HttpResponse {
+    await server.http_request_update(req);
   };
 
   /**

examples/http_greet/src/http_greet/upload.js

@@ -16,7 +16,7 @@ const Ids = require("../../.dfx/local/canister_ids.json");
 const HOST = `http://127.0.0.1:4943`;
 // const HOST = "https://icp-api.io";
 // const canisterId = Ids["http_greet"]["local"];
-const canisterId = "br5f7-7uaaa-aaaaa-qaaca-cai";
+const canisterId = "u6s2n-gx777-77774-qaaba-cai";
 // const canisterId = "qg33c-4aaaa-aaaab-qaica-cai";
 
 console.log(`canisterId: ${canisterId}`);
@@ -30,6 +30,8 @@ seed.fill(0);
 
 const testIdentity = Ed25519KeyIdentity.generate(seed);
 
+console.log(`testIdentity: ${testIdentity.getPrincipal().toText()}`);
+
 // spawn shell command
 const { spawn } = require("child_process");
 const child = spawn("dfx", [

examples/test/test.mo

@@ -20,7 +20,7 @@ shared ({ caller = creator }) actor class () {
 
   server.get(
     "/",
-    func(_ : Request, res : ResponseClass) : async* Response {
+    func(_ : Request, res : ResponseClass) : async Response {
       res.send({
         status_code = 200;
         headers = [("Content-Type", "text/html")];
@@ -36,7 +36,7 @@ shared ({ caller = creator }) actor class () {
   // Cached endpoint
   server.get(
     "/hi",
-    func(_ : Request, res : ResponseClass) : async* Response {
+    func(_ : Request, res : ResponseClass) : async Response {
       res.send({
         headers = [("Content-Type", "text/plain")];
         status_code = 200;
@@ -49,7 +49,7 @@ shared ({ caller = creator }) actor class () {
 
   server.get(
     "/json",
-    func(_ : Request, res : ResponseClass) : async* Response {
+    func(_ : Request, res : ResponseClass) : async Response {
       res.json({
         status_code = 200;
         body = "{\"hello\":\"world\"}";
@@ -60,7 +60,7 @@ shared ({ caller = creator }) actor class () {
 
   server.get(
     "/404",
-    func(_ : Request, res : ResponseClass) : async* Response {
+    func(_ : Request, res : ResponseClass) : async Response {
       res.send({
         status_code = 404;
         headers = [("Content-Type", "text/plain")];
@@ -80,7 +80,7 @@ shared ({ caller = creator }) actor class () {
   // Dynamic endpoint
   server.get(
     "/queryParams",
-    func(req : Request, res : ResponseClass) : async* Response {
+    func(req : Request, res : ResponseClass) : async Response {
       let obj = req.url.queryObj;
       let keys = Iter.fromArray(obj.keys);
 
@@ -129,7 +129,7 @@ shared ({ caller = creator }) actor class () {
 
   server.get(
     "/cats",
-    func(_ : Request, res : ResponseClass) : async* Response {
+    func(_ : Request, res : ResponseClass) : async Response {
       var catJson = "[";
       for (cat in Iter.fromArray(cats)) {
         catJson := catJson # displayCat(cat) # ",";
@@ -147,7 +147,7 @@ shared ({ caller = creator }) actor class () {
 
   server.get(
     "/cats/:name",
-    func(req : Request, res : ResponseClass) : async* Response {
+    func(req : Request, res : ResponseClass) : async Response {
       switch (req.params) {
         case null {
           res.send({
@@ -224,7 +224,7 @@ shared ({ caller = creator }) actor class () {
 
   server.post(
     "/cats",
-    func(req : Request, res : ResponseClass) : async* Response {
+    func(req : Request, res : ResponseClass) : async Response {
       let body = req.body;
       switch body {
         case null {
@@ -271,7 +271,7 @@ shared ({ caller = creator }) actor class () {
     server.http_request(req);
   };
   public func http_request_update(req : HttpRequest) : async HttpResponse {
-    await* server.http_request_update(req);
+    await server.http_request_update(req);
   };
 
   public func invalidate_cache() : async () {