Support asyncapi http proxy using asyncapi.yaml

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/config/client.http.secure.yaml

@@ -38,4 +38,4 @@ bindings:
         sni:
           - http.example.net
         alpn:
-          - http
+          - h2

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/config/http/asyncapi.yaml

@@ -16,33 +16,41 @@
 
 asyncapi: 3.0.0
 info:
-  title: HTTP Zilla Proxy
-  version: 1.0.0
+  title: Swagger Petstore
   license:
-    name:  Aklivity Community License
+    name: MIT
+  version: 1.0.0
 servers:
   plain:
     host: http://localhost:8080
     protocol: http
-    protocolVersion: '1.1'
+    protocolVersion: '2.0'
 defaultContentType: application/json
 
 channels:
-  items:
-    address: /items
-  itemsbyid:
-    address: /items/{id}
+  pets:
+    address: /pets
+  showPetById:
+    address: /pets/{id}
 
 operations:
-  postEvents:
+  createPets:
     action: send
     bindings:
       http:
         type: request
         method: POST
     channel:
-      $ref: '#/channels/items'
-  getEvents:
+      $ref: '#/channels/pets'
+  listPets:
+    action: receive
+    bindings:
+      http:
+        type: request
+        method: GET
+    channel:
+      $ref: '#/channels/pets'
+  getPets:
     action: receive
     bindings:
       http:
@@ -54,9 +62,9 @@ operations:
             limit:
               type: number
     channel:
-      $ref: '#/channels/itemsbyid'
+      $ref: '#/channels/showPetById'
 
 components:
   correlationIds:
-    itemsCorrelationId:
+    petsCorrelationId:
       location: '$message.header#/idempotency-key'

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/config/server.http.secure.yaml

@@ -33,5 +33,5 @@ bindings:
         sni:
           - http.example.net
         alpn:
-          - http
+          - h2
     exit: asyncapi0

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/streams/asyncapi/create.item/client.rpt → incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/streams/asyncapi/http/create.pets/client.rpt

@@ -20,12 +20,12 @@ connect "zilla://streams/asyncapi0"
 
 write zilla:begin.ext ${asyncapi:beginEx()
                              .typeId(zilla:id("asyncapi"))
-                             .operationId("postEvents")
+                             .operationId("createPets")
                              .extension(http:beginEx()
                                   .typeId(zilla:id("http"))
                                   .header(":method", "POST")
                                   .header(":scheme", "http")
-                                  .header(":path", "/items")
+                                  .header(":path", "/pets")
                                   .header(":authority", "localhost:8080")
                                   .header("content-type", "application/json")
                                   .header("content-length", "8")
@@ -38,7 +38,7 @@ write close
 
 read zilla:begin.ext ${asyncapi:matchBeginEx()
                              .typeId(zilla:id("asyncapi"))
-                             .operationId("postEvents")
+                             .operationId("createPets")
                              .extension(http:beginEx()
                                  .typeId(zilla:id("http"))
                                  .header(":status", "200")

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/streams/asyncapi/create.item/server.rpt → incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/streams/asyncapi/http/create.pets/server.rpt

@@ -22,12 +22,12 @@ accepted
 
 read zilla:begin.ext ${asyncapi:matchBeginEx()
                              .typeId(zilla:id("asyncapi"))
-                             .operationId("postEvents")
+                             .operationId("createPets")
                              .extension(http:beginEx()
                                   .typeId(zilla:id("http"))
                                   .header(":method", "POST")
                                   .header(":scheme", "http")
-                                  .header(":path", "/items")
+                                  .header(":path", "/pets")
                                   .header(":authority", "localhost:8080")
                                   .header("content-type", "application/json")
                                   .header("content-length", "8")
@@ -40,7 +40,7 @@ read closed
 
 write zilla:begin.ext ${asyncapi:beginEx()
                              .typeId(zilla:id("asyncapi"))
-                             .operationId("postEvents")
+                             .operationId("createPets")
                              .extension(http:beginEx()
                                  .typeId(zilla:id("http"))
                                  .header(":status", "200")

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/streams/asyncapi/mqtt/publish.and.subscribe/client.rpt

@@ -0,0 +1,92 @@
+#
+# Copyright 2021-2023 Aklivity Inc.
+#
+# Aklivity licenses this file to you under the Apache License,
+# version 2.0 (the "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at:
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+
+connect "zilla://streams/asyncapi0"
+        option zilla:window 8192
+        option zilla:transmission "duplex"
+
+write zilla:begin.ext ${asyncapi:beginEx()
+                             .typeId(zilla:id("asyncapi"))
+                             .extension(mqtt:beginEx()
+                                            .typeId(zilla:id("mqtt"))
+                                            .session()
+                                              .clientId("client")
+                                              .build()
+                                            .build())
+                             .build()}
+
+read zilla:begin.ext ${asyncapi:matchBeginEx()
+                             .typeId(zilla:id("asyncapi"))
+                             .extension(mqtt:beginEx()
+                                            .typeId(zilla:id("mqtt"))
+                                            .session()
+                                              .clientId("client")
+                                              .build()
+                                            .build())
+                             .build()}
+
+connected
+
+read zilla:data.empty
+
+
+connect "zilla://streams/asyncapi0"
+        option zilla:window 8192
+        option zilla:transmission "duplex"
+
+write zilla:begin.ext ${asyncapi:beginEx()
+                                   .typeId(zilla:id("asyncapi"))
+                                   .extension(mqtt:beginEx()
+                                                    .typeId(zilla:id("mqtt"))
+                                                    .publish()
+                                                      .clientId("client")
+                                                      .topic("sensor/one")
+                                                      .build()
+                                                    .build())
+                                   .build()}
+
+connected
+
+write zilla:data.ext ${mqtt:dataEx()
+                             .typeId(zilla:id("mqtt"))
+                             .publish()
+                                .qos("AT_MOST_ONCE")
+                                .expiryInterval(15)
+                                .contentType("asyncapiMessage")
+                                .format("TEXT")
+                                .responseTopic("sensor/one")
+                                .correlation("info")
+                                .build()
+                             .build()}
+write "asyncapiMessage"
+write flush
+
+
+connect "zilla://streams/asyncapi0"
+        option zilla:window 8192
+        option zilla:transmission "duplex"
+
+write zilla:begin.ext ${asyncapi:beginEx()
+                             .typeId(zilla:id("asyncapi"))
+                             .extension(mqtt:beginEx()
+                                             .typeId(zilla:id("mqtt"))
+                                             .subscribe()
+                                                 .clientId("client")
+                                                 .filter("sensor/two", 1, "AT_MOST_ONCE", "SEND_RETAINED")
+                                                 .build()
+                                             .build())
+                             .build()}
+connected

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/streams/asyncapi/mqtt/publish.and.subscribe/server.rpt

@@ -0,0 +1,91 @@
+#
+# Copyright 2021-2023 Aklivity Inc.
+#
+# Aklivity licenses this file to you under the Apache License,
+# version 2.0 (the "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at:
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+
+accept "zilla://streams/asyncapi0"
+        option zilla:window 8192
+        option zilla:transmission "duplex"
+
+accepted
+
+read zilla:begin.ext ${asyncapi:matchBeginEx()
+                             .typeId(zilla:id("asyncapi"))
+                             .extension(mqtt:beginEx()
+                                            .typeId(zilla:id("mqtt"))
+                                            .session()
+                                              .clientId("client")
+                                              .build()
+                                            .build())
+                             .build()}
+
+write zilla:begin.ext ${asyncapi:beginEx()
+                             .typeId(zilla:id("asyncapi"))
+                             .extension(mqtt:beginEx()
+                                            .typeId(zilla:id("mqtt"))
+                                            .session()
+                                              .clientId("client")
+                                              .build()
+                                            .build())
+                             .build()}
+
+connected
+
+write zilla:data.empty
+write flush
+
+
+accepted
+
+read zilla:begin.ext ${asyncapi:matchBeginEx()
+                             .typeId(zilla:id("asyncapi"))
+                             .extension(mqtt:beginEx()
+                                              .typeId(zilla:id("mqtt"))
+                                              .publish()
+                                                .clientId("client")
+                                                .topic("sensor/one")
+                                                .build()
+                                              .build())
+                             .build()}
+
+connected
+
+read zilla:data.ext ${mqtt:dataEx()
+                             .typeId(zilla:id("mqtt"))
+                             .publish()
+                                .qos("AT_MOST_ONCE")
+                                .expiryInterval(15)
+                                .contentType("asyncapiMessage")
+                                .format("TEXT")
+                                .responseTopic("sensor/one")
+                                .correlation("info")
+                                .build()
+                             .build()}
+read "asyncapiMessage"
+
+
+accepted
+
+read zilla:begin.ext ${asyncapi:matchBeginEx()
+                             .typeId(zilla:id("asyncapi"))
+                             .extension(mqtt:beginEx()
+                                             .typeId(zilla:id("mqtt"))
+                                             .subscribe()
+                                                 .clientId("client")
+                                                 .filter("sensor/two", 1, "AT_MOST_ONCE", "SEND_RETAINED")
+                                                 .build()
+                                             .build())
+                             .build()}
+
+connected

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/streams/http/create.item/client.rpt → incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/streams/http/create.pets/client.rpt

@@ -23,7 +23,7 @@ write zilla:begin.ext ${http:beginEx()
                               .typeId(zilla:id("http"))
                               .header(":method", "POST")
                               .header(":scheme", "http")
-                              .header(":path", "/items")
+                              .header(":path", "/pets")
                               .header(":authority", "localhost:8080")
                               .header("content-type", "application/json")
                               .header("content-length", "8")

incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/streams/http/create.item/server.rpt → incubator/binding-asyncapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/streams/http/create.pets/server.rpt

@@ -26,7 +26,7 @@ read zilla:begin.ext ${http:matchBeginEx()
                               .typeId(zilla:id("http"))
                               .header(":method", "POST")
                               .header(":scheme", "http")
-                              .header(":path", "/items")
+                              .header(":path", "/pets")
                               .header(":authority", "localhost:8080")
                               .header("content-type", "application/json")
                               .header("content-length", "8")

incubator/binding-asyncapi.spec/src/test/java/io/aklivity/zilla/specs/binding/asyncapi/streams/asyncapi/AsyncapiIT.java

@@ -38,8 +38,8 @@ public class AsyncapiIT
 
     @Test
     @Specification({
-        "${asyncapi}/publish.and.subscribe/client",
-        "${asyncapi}/publish.and.subscribe/server"
+        "${asyncapi}/mqtt/publish.and.subscribe/client",
+        "${asyncapi}/mqtt/publish.and.subscribe/server"
     })
     public void shouldPublishAndSubscribe() throws Exception
     {
@@ -48,8 +48,8 @@ public void shouldPublishAndSubscribe() throws Exception
 
     @Test
     @Specification({
-        "${asyncapi}/create.item/client",
-        "${asyncapi}/create.item/server"
+        "${asyncapi}/http/create.pets/client",
+        "${asyncapi}/http/create.pets/server"
     })
     public void shouldCreateItem() throws Exception
     {

incubator/binding-asyncapi.spec/src/test/java/io/aklivity/zilla/specs/binding/asyncapi/streams/mqtt/HttpIT.java

@@ -39,8 +39,8 @@ public class HttpIT
 
     @Test
     @Specification({
-        "${http}/create.item/client",
-        "${http}/create.item/server"
+        "${http}/create.pets/client",
+        "${http}/create.pets/server"
     })
     public void shouldCreateItem() throws Exception
     {

incubator/binding-asyncapi/src/main/java/io/aklivity/zilla/runtime/binding/asyncapi/internal/AsyncapiClientCompositeBindingAdapter.java

@@ -19,6 +19,7 @@
 import io.aklivity.zilla.runtime.binding.asyncapi.config.AsyncapiConfig;
 import io.aklivity.zilla.runtime.binding.asyncapi.config.AsyncapiOptionsConfig;
 import io.aklivity.zilla.runtime.binding.asyncapi.internal.view.AsyncapiServerView;
+import io.aklivity.zilla.runtime.binding.asyncapi.internal.view.AsyncapiView;
 import io.aklivity.zilla.runtime.engine.config.BindingConfig;
 import io.aklivity.zilla.runtime.engine.config.CompositeBindingAdapterSpi;
 import io.aklivity.zilla.runtime.engine.config.NamespaceConfigBuilder;
@@ -39,13 +40,14 @@ public BindingConfig adapt(
         AsyncapiOptionsConfig options = (AsyncapiOptionsConfig) binding.options;
         AsyncapiConfig asyncapiConfig = options.specs.get(0);
         this.asyncApi = asyncapiConfig.asyncApi;
+        AsyncapiView asyncapiView = AsyncapiView.of(asyncApi);
 
         //TODO: add composite for all servers
         AsyncapiServerView firstServer = AsyncapiServerView.of(asyncApi.servers.entrySet().iterator().next().getValue());
         this.qname = binding.qname;
-        this.qvault = String.format("%s:%s", binding.namespace, binding.vault);
+        this.qvault = binding.qvault;
         this.protocol = resolveProtocol(firstServer.protocol(), options);
-        int[] compositeSecurePorts = resolvePortsForScheme(protocol.secureScheme);
+        int[] compositeSecurePorts = asyncapiView.resolvePortsForScheme(protocol.secureScheme);
         this.isTlsEnabled = compositeSecurePorts != null;
         return BindingConfig.builder(binding)
             .composite()