mqtt-plus 0.9.6 → 0.9.8

package/README.md

@@ -42,22 +42,6 @@ communication patterns with type safety:
 
   ![Event Emission](doc/mqtt-plus-1-event-emission.svg)
 
-- **Stream Transfer**:
-
-  Stream Transfer is a *uni-directional* communication pattern.
-  A stream is the combination of a stream name, a `Readable` stream object and optionally zero or more arguments.
-  You *attach* to a stream.
-  When a stream is *transferred*, either a single particular attacher (in case of
-  a directed stream transfer) or all attachers are called and receive the
-  arguments as extra information. The `Readable` stream is available via
-  `info.stream` in the attacher callback.
-
-  In contrast to the regular MQTT message publish/subscribe, this
-  pattern allows to transfer arbitrary amounts of arbitrary data by
-  chunking the data via a stream.
-
-  ![Stream Transfer](doc/mqtt-plus-2-stream-transfer.svg)
-
 - **Service Call**:
 
   Service Call is a *bi-directional* communication pattern.
@@ -73,18 +57,24 @@ communication patterns with type safety:
   Procedure Call](https://en.wikipedia.org/wiki/Remote_procedure_call)
   (RPC) style communication.
 
-  ![Service Call](doc/mqtt-plus-3-service-call.svg)
+  ![Service Call](doc/mqtt-plus-2-service-call.svg)
 
 - **Resource Transfer**:
 
   Resource Transfer is a *bi-directional* communication pattern.
   A Resource is the combination of a resource name and optionally zero or more arguments.
   You *provision* for a resource transfer.
-  When a resource is *fetched* or *pushed*, a single particular provisioner (in case
+  When a resource is *fetched*, a single particular provisioner (in case
   of a directed resource transfer) or one arbitrary provisioner is called and
-  sends or receives the resource and its arguments.
+  sends the resource and its arguments.
+  When a resource is *pushed*, the provisioner receives the resource data
+  as a stream with arguments.
 
-  ![Resource Transfer](doc/mqtt-plus-4-resource-transfer.svg)
+  In contrast to the regular MQTT message publish/subscribe, this
+  pattern allows to transfer arbitrary amounts of arbitrary data by
+  chunking the data via a stream.
+
+  ![Resource Transfer](doc/mqtt-plus-3-resource-transfer.svg)
 
 Usage
 -----
@@ -92,7 +82,7 @@ Usage
 ### API:
 
 The API type defines the available endpoints. Use the marker types
-`Event<T>`, `Stream<T>`, and `Service<T>` to declare the communication
+`Event<T>`, `Service<T>`, and `Resource<T>` to declare the communication
 pattern of each endpoint:
 
 ```ts
@@ -100,16 +90,15 @@ import type * as MQTTpt from "mqtt-plus"
 
 export type API = {
     "example/sample":   MQTTpt.Event<(a1: string, a2: number) => void>
-    "example/upload":   MQTTpt.Stream<(name: string) => void>
     "example/hello":    MQTTpt.Service<(a1: string, a2: number) => string>
     "example/resource": MQTTpt.Resource<(filename: string) => void>
 }
 ```
 
 The marker types ensure that `subscribe()` and `emit()` only accept
-`Event<T>` endpoints, `attach()` and `transfer()` only accept
-`Stream<T>` endpoints, and `register()` and `call()` only accept
-`Service<T>` endpoints.
+`Event<T>` endpoints, `register()` and `call()` only accept
+`Service<T>` endpoints, and `provision()`, `fetch()` and `push()` only
+accept `Resource<T>` endpoints.
 
 ### Server:
 
@@ -178,18 +167,27 @@ The **MQTT+** API provides the following methods:
   The `mqtt` is the [MQTT.js](https://www.npmjs.com/package/mqtt) instance,
   which has to be established separately.
 
+  Use `destroy()` to clean up when the instance is no longer needed.
+
   The optional `options` object supports the following fields:
   - `id`: Custom MQTT peer identifier (default: auto-generated NanoID).
   - `codec`: Encoding format (default: `cbor`).
   - `timeout`: Communication timeout in milliseconds (default: `10000`).
-  - `chunkSize`: Chunk size in bytes for stream transfers (default: `16384`).
+  - `chunkSize`: Chunk size in bytes for resource transfers (default: `16384`).
   - `topicMake`: Custom topic generation function.
-    The `operation` parameter is one of: `event-emission`, `stream-transfer`, `service-call-request`, `service-call-response`, `resource-transfer-request`, `resource-transfer-response`.
+    The `operation` parameter is one of: `event-emission`, `service-call-request`, `service-call-response`, `resource-transfer-request`, `resource-transfer-response`.
     (default: `` (name, operation, peerId) => `${name}/${operation}` + (peerId ? `/${peerId}` : "/any") ``)
   - `topicMatch`: Custom topic matching function.
     Returns `{ name, operation, peerId? }` or `null` if no match. The `peerId` is `undefined` for broadcast topics (ending with `/any`).
     (default: `` (topic) => { const m = topic.match(/^(.+)\/([^/]+)\/([^/]+)$/); return m ? { name: m[1], operation: m[2], peerId: m[3] === "any" ? undefined : m[3] } : null } ``)
 
+- **Destruction**:<br/>
+
+      destroy(): void
+
+  Clean up the MQTT+ instance by removing all event listeners.
+  Call this method when the instance is no longer needed.
+
 - **Event Subscription**:<br/>
 
       /*  (simplified TypeScript API method signature)  */
@@ -213,30 +211,6 @@ The **MQTT+** API provides the following methods:
   `${event}/event-emission/${peerId}`) are subscribed. Returns a
   `Subscription` object with an `unsubscribe()` method.
 
-- **Stream Attachment**:<br/>
-
-      /*  (simplified TypeScript API method signature)  */
-      attach(
-          stream:   string,
-          options?: MQTT::IClientSubscribeOptions
-          callback: (
-              ...params: any[],
-              info: { sender: string, receiver?: string, stream: stream.Readable }
-          ) => void
-      ): Promise<Attachment>
-
-  Attach to (observe) a stream.
-  The `stream` has to be a valid MQTT topic name.
-  The optional `options` allows setting MQTT.js `subscribe()` options like `qos`.
-  The `callback` is called with the `params` passed to a remote `transfer()`.
-  The `info.stream` provides a Node.js `Readable` stream for consuming the transferred data.
-  There is no return value of `callback`.
-
-  Internally, on the MQTT broker, the topics generated by
-  `topicMake(stream, "stream-transfer")` (default: `${stream}/stream-transfer/any` and
-  `${stream}/stream-transfer/${peerId}`) are subscribed. Returns an
-  `Attachment` object with an `unattach()` method.
-
 - **Service Registration**:<br/>
 
       /*  (simplified TypeScript API method signature)  */
@@ -268,20 +242,32 @@ The **MQTT+** API provides the following methods:
           options?: MQTT::IClientSubscribeOptions
           callback: (
               ...params: any[],
-              info: { sender: string, receiver?: string, resource: Buffer | null }
+              info: {
+                  sender: string,
+                  receiver?: string,
+                  resource: Buffer | Readable | null,
+                  stream?: Readable,
+                  buffer?: Promise<Buffer>
+              }
           ) => void
       ): Promise<Provisioning>
 
-  Provision a resource.
+  Provision a resource for both fetch requests and pushed data.
   The `resource` has to be a valid MQTT topic name.
   The optional `options` allows setting MQTT.js `subscribe()` options like `qos`.
-  The `callback` is called with the `params` passed to a remote `fetch()`.
-  The `callback` should set `info.resource` to a `Buffer` containing the resource data.
+
+  For **fetch requests**: The `callback` is called with the `params` passed to a remote `fetch()`.
+  The `callback` should set `info.resource` to a `Buffer` or `Readable` containing the resource data.
+
+  For **pushed data**: The `callback` is called with the `params` passed to a remote `push()`.
+  The `info.stream` provides a Node.js `Readable` stream for consuming the pushed data.
+  The `info.buffer` provides a lazy `Promise<Buffer>` that resolves to the complete data once the stream ends.
 
   Internally, on the MQTT broker, the topics by
-  `topicMake(resource, "resource-transfer-request")` (default: `${resource}/resource-transfer-request/any` and
-  `${resource}/resource-transfer-request/${peerId}`) are subscribed. Returns a
-  `Provisioning` object with an `unprovision()` method.
+  `topicMake(resource, "resource-transfer-request")` and `topicMake(resource, "resource-transfer-response")`
+  (default: `${resource}/resource-transfer-request/any`, `${resource}/resource-transfer-request/${peerId}`,
+  `${resource}/resource-transfer-response/any`, and `${resource}/resource-transfer-response/${peerId}`)
+  are subscribed. Returns a `Provisioning` object with an `unprovision()` method.
 
 - **Event Emission**:<br/>
 
@@ -303,33 +289,6 @@ The **MQTT+** API provides the following methods:
   Internally, publishes to the MQTT topic by `topicMake(event, "event-emission", peerId)`
   (default: `${event}/event-emission/any` or `${event}/event-emission/${peerId}`).
 
-- **Stream Transfer**:<br/>
-
-      /*  (simplified TypeScript API method signature)  */
-      transfer(
-          stream:    string,
-          readable:  stream.Readable,
-          receiver?: Receiver,
-          options?:  MQTT::IClientPublishOptions,
-          ...params: any[]
-      ): Promise<void>
-
-  Transfer a stream to all attachers or a specific attacher.
-  The `readable` is a Node.js `Readable` stream providing the data to transfer.
-  The optional `receiver` directs the transfer to a specific attacher only.
-  The optional `options` allows setting MQTT.js `publish()` options like `qos` or `retain`.
-
-  The data is read from `readable` in chunks (default: 16KB,
-  configurable via `chunkSize` option) and sent over MQTT until the
-  stream is closed. The returned `Promise` resolves when the entire
-  stream has been transferred.
-
-  The remote `attach()` `callback` is called with `params` and an `info` object
-  containing a `stream.Readable` for consuming the transferred data.
-
-  Internally, publishes to the MQTT topic by `topicMake(stream, "stream-transfer", peerId)`
-  (default: `${stream}/stream-transfer/any` or `${stream}/stream-transfer/${peerId}`).
-
 - **Service Call**:<br/>
 
       /*  (simplified TypeScript API method signature)  */
@@ -352,36 +311,67 @@ The **MQTT+** API provides the following methods:
   (default: `${service}/service-call-response/${peerId}`) is temporarily subscribed
   for receiving the response.
 
-- **Resource Transfer**:<br/>
+- **Resource Fetch**:<br/>
 
       /*  (simplified TypeScript API method signature)  */
       fetch(
-          blob:      string,
+          resource:  string,
           receiver?: Receiver,
           options?:  MQTT::IClientSubscribeOptions,
           ...params: any[]
-      ): Promise<Buffer>
+      ): Promise<{ stream: Readable, buffer: Promise<Buffer> }>
 
   Fetches a resource from any resource provisioner or from a specific provisioner.
   The optional `receiver` directs the call to a specific provisioner only.
   The optional `options` allows setting MQTT.js `publish()` options like `qos` or `retain`.
 
-  The remote `provision()` `callback` is called with `params` and its
-  return value resolves the returned `Promise`. If the remote `callback`
-  throws an exception, this rejects the returned `Promise`.
+  Returns an object with a `stream` (`Readable`) for consuming the transferred data
+  and a lazy `buffer` (`Promise<Buffer>`) that resolves to the complete data once the stream ends.
+
+  The remote `provision()` `callback` is called with `params` and
+  should set `info.resource` to a `Buffer` or `Readable` containing the resource data.
+  If the remote `callback` throws an exception, this destroys the stream with the error.
 
   Internally, on the MQTT broker, the topic by
   `topicMake(resource, "resource-transfer-response", peerId)` (default:
   `${resource}/resource-transfer-response/${peerId}`) is temporarily subscribed
   for receiving the response.
 
+- **Resource Push**:<br/>
+
+      /*  (simplified TypeScript API method signature)  */
+      push(
+          resource:       string,
+          streamOrBuffer: Readable | Buffer,
+          receiver?:      Receiver,
+          options?:       MQTT::IClientPublishOptions,
+          ...params:      any[]
+      ): Promise<void>
+
+  Pushes a resource to all provisioners or a specific provisioner.
+  The `streamOrBuffer` is either a Node.js `Readable` stream or a `Buffer` providing the data to push.
+  The optional `receiver` directs the push to a specific provisioner only.
+  The optional `options` allows setting MQTT.js `publish()` options like `qos` or `retain`.
+
+  The data is read from `streamOrBuffer` in chunks (default: 16KB,
+  configurable via `chunkSize` option) and sent over MQTT until the
+  stream is closed or the buffer is fully transferred.
+  The returned `Promise` resolves when the entire data has been pushed.
+
+  The remote `provision()` `callback` is called with `params` and an `info` object
+  containing `stream` (`Readable`) for consuming the pushed data and
+  `buffer` (lazy `Promise<Buffer>`) that resolves to the complete data once the stream ends.
+
+  Internally, publishes to the MQTT topic by `topicMake(resource, "resource-transfer-response", peerId)`
+  (default: `${resource}/resource-transfer-response/any` or `${resource}/resource-transfer-response/${peerId}`).
+
 - **Receiver Wrapping**:<br/>
 
       receiver(
           id: string
       ): Receiver
 
-  Wrap a receiver ID string for use with `emit()` or `call()` to direct the
+  Wrap a receiver ID string for use with `emit()`, `call()`, `fetch()` or `push()` to direct the
   message to a specific receiver. Returns a `Receiver` object.
 
 Internals
@@ -583,7 +573,7 @@ Notice
 > or CBOR (default), uses an own packet format (allowing sender and
 > receiver information), uses shorter NanoIDs instead of longer UUIDs
 > for identification of sender, receiver and requests, and additionally
-> provides stream transfer and resource transfer support.
+> provides resource transfer support (with fetch and push capabilities).
 
 License
 -------

package/doc/mqtt-plus-3-resource-transfer.d2

@@ -0,0 +1,32 @@
+
+shape: sequence_diagram
+
+client: "Client"
+broker: "Broker"
+server: "Server"
+
+broker.class: brown
+
+provision("foo/bar") {
+    server -> broker: "op: subscribe\ntopic: foo/bar/resource-transfer-request/any"
+    server -> broker: "op: subscribe\ntopic: foo/bar/resource-transfer-response/any"
+}
+
+push("foo/bar") {
+    client -> broker: "op: publish\ntopic: foo/bar/resource-transfer-response/any\ndata: Resource-Transfer-Response #1"
+    broker -> server: "op: publish\ntopic: foo/bar/resource-transfer-response/any\ndata: Resource-Transfer-Response #1"
+    client -> broker: "op: publish\ntopic: foo/bar/resource-transfer-response/any\ndata: Resource-Transfer-Response #N"
+    broker -> server: "op: publish\ntopic: foo/bar/resource-transfer-response/any\ndata: Resource-Transfer-Response #N"
+    client -> broker: "op: publish\ntopic: foo/bar/resource-transfer-response/any\ndata: Resource-Transfer-Response EoS"
+    broker -> server: "op: publish\ntopic: foo/bar/resource-transfer-response/any\ndata: Resource-Transfer-Response EoS"
+}
+
+fetch("foo/bar") {
+    client -> broker: "op: subscribe\ntopic: foo/bar/resource-transfer-response/XXX"
+    client -> broker: "op: publish\ntopic: foo/bar/resource-transfer-request/any\ndata: Resource-Transfer-Request"
+    broker -> server: "op: publish\ntopic: foo/bar/resource-transfer-request/any\ndata: Resource-Transfer-Request"
+    broker <- server: "op: publish\ntopic: foo/bar/resource-transfer-response/XXX\ndata: Resource-Transfer-Response #1"
+    client <- broker: "op: publish\ntopic: foo/bar/resource-transfer-response/XXX\ndata: Resource-Transfer-Response #1"
+    broker <- server: "op: publish\ntopic: foo/bar/resource-transfer-response/XXX\ndata: Resource-Transfer-Response #N"
+    client <- broker: "op: publish\ntopic: foo/bar/resource-transfer-response/XXX\ndata: Resource-Transfer-Response #N"
+}

package/doc/mqtt-plus-3-resource-transfer.svg

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" data-d2-version="v0.7.0-HEAD" preserveAspectRatio="xMinYMin meet" viewBox="0 0 826 1987"><svg class="d2-3815173987 d2-svg" width="826" height="1987" viewBox="11 51 826 1987"><rect x="11.000000" y="51.000000" width="826.000000" height="1987.000000" rx="0.000000" fill="#ffffff" class=" fill-N7" stroke-width="0" /><style type="text/css"><![CDATA[
+.d2-3815173987 .text {
+	font-family: "d2-3815173987-font-regular";
+}
+@font-face {
+	font-family: d2-3815173987-font-regular;
+	src: url("data:application/font-woff;base64,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");
+}
+.d2-3815173987 .text-italic {
+	font-family: "d2-3815173987-font-italic";
+}
+@font-face {
+	font-family: d2-3815173987-font-italic;
+	src: url("data:application/font-woff;base64,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");
+}]]></style><style type="text/css"><![CDATA[.shape {
+  shape-rendering: geometricPrecision;
+  stroke-linejoin: round;
+}
+.connection {
+  stroke-linecap: round;
+  stroke-linejoin: round;
+}
+.blend {
+  mix-blend-mode: multiply;
+  opacity: 0.5;
+}
+
+		.d2-3815173987 .fill-N1{fill:#303030;}
+		.d2-3815173987 .fill-N2{fill:#606060;}
+		.d2-3815173987 .fill-N3{fill:#909090;}
+		.d2-3815173987 .fill-N4{fill:#c0c0c0;}
+		.d2-3815173987 .fill-N5{fill:#e0e0e0;}
+		.d2-3815173987 .fill-N6{fill:#f0f0f0;}
+		.d2-3815173987 .fill-N7{fill:#ffffff;}
+		.d2-3815173987 .fill-B1{fill:#336699;}
+		.d2-3815173987 .fill-B2{fill:#6699cc;}
+		.d2-3815173987 .fill-B3{fill:#99ccff;}
+		.d2-3815173987 .fill-B4{fill:#c0d0ff;}
+		.d2-3815173987 .fill-B5{fill:#e0f0ff;}
+		.d2-3815173987 .fill-B6{fill:#f0f8ff;}
+		.d2-3815173987 .fill-AA2{fill:#cfb098;}
+		.d2-3815173987 .fill-AA4{fill:#efd0b8;}
+		.d2-3815173987 .fill-AA5{fill:#ffe0c8;}
+		.d2-3815173987 .fill-AB4{fill:#efd0b8;}
+		.d2-3815173987 .fill-AB5{fill:#ffe0c8;}
+		.d2-3815173987 .stroke-N1{stroke:#303030;}
+		.d2-3815173987 .stroke-N2{stroke:#606060;}
+		.d2-3815173987 .stroke-N3{stroke:#909090;}
+		.d2-3815173987 .stroke-N4{stroke:#c0c0c0;}
+		.d2-3815173987 .stroke-N5{stroke:#e0e0e0;}
+		.d2-3815173987 .stroke-N6{stroke:#f0f0f0;}
+		.d2-3815173987 .stroke-N7{stroke:#ffffff;}
+		.d2-3815173987 .stroke-B1{stroke:#336699;}
+		.d2-3815173987 .stroke-B2{stroke:#6699cc;}
+		.d2-3815173987 .stroke-B3{stroke:#99ccff;}
+		.d2-3815173987 .stroke-B4{stroke:#c0d0ff;}
+		.d2-3815173987 .stroke-B5{stroke:#e0f0ff;}
+		.d2-3815173987 .stroke-B6{stroke:#f0f8ff;}
+		.d2-3815173987 .stroke-AA2{stroke:#cfb098;}
+		.d2-3815173987 .stroke-AA4{stroke:#efd0b8;}
+		.d2-3815173987 .stroke-AA5{stroke:#ffe0c8;}
+		.d2-3815173987 .stroke-AB4{stroke:#efd0b8;}
+		.d2-3815173987 .stroke-AB5{stroke:#ffe0c8;}
+		.d2-3815173987 .background-color-N1{background-color:#303030;}
+		.d2-3815173987 .background-color-N2{background-color:#606060;}
+		.d2-3815173987 .background-color-N3{background-color:#909090;}
+		.d2-3815173987 .background-color-N4{background-color:#c0c0c0;}
+		.d2-3815173987 .background-color-N5{background-color:#e0e0e0;}
+		.d2-3815173987 .background-color-N6{background-color:#f0f0f0;}
+		.d2-3815173987 .background-color-N7{background-color:#ffffff;}
+		.d2-3815173987 .background-color-B1{background-color:#336699;}
+		.d2-3815173987 .background-color-B2{background-color:#6699cc;}
+		.d2-3815173987 .background-color-B3{background-color:#99ccff;}
+		.d2-3815173987 .background-color-B4{background-color:#c0d0ff;}
+		.d2-3815173987 .background-color-B5{background-color:#e0f0ff;}
+		.d2-3815173987 .background-color-B6{background-color:#f0f8ff;}
+		.d2-3815173987 .background-color-AA2{background-color:#cfb098;}
+		.d2-3815173987 .background-color-AA4{background-color:#efd0b8;}
+		.d2-3815173987 .background-color-AA5{background-color:#ffe0c8;}
+		.d2-3815173987 .background-color-AB4{background-color:#efd0b8;}
+		.d2-3815173987 .background-color-AB5{background-color:#ffe0c8;}
+		.d2-3815173987 .color-N1{color:#303030;}
+		.d2-3815173987 .color-N2{color:#606060;}
+		.d2-3815173987 .color-N3{color:#909090;}
+		.d2-3815173987 .color-N4{color:#c0c0c0;}
+		.d2-3815173987 .color-N5{color:#e0e0e0;}
+		.d2-3815173987 .color-N6{color:#f0f0f0;}
+		.d2-3815173987 .color-N7{color:#ffffff;}
+		.d2-3815173987 .color-B1{color:#336699;}
+		.d2-3815173987 .color-B2{color:#6699cc;}
+		.d2-3815173987 .color-B3{color:#99ccff;}
+		.d2-3815173987 .color-B4{color:#c0d0ff;}
+		.d2-3815173987 .color-B5{color:#e0f0ff;}
+		.d2-3815173987 .color-B6{color:#f0f8ff;}
+		.d2-3815173987 .color-AA2{color:#cfb098;}
+		.d2-3815173987 .color-AA4{color:#efd0b8;}
+		.d2-3815173987 .color-AA5{color:#ffe0c8;}
+		.d2-3815173987 .color-AB4{color:#efd0b8;}
+		.d2-3815173987 .color-AB5{color:#ffe0c8;}.appendix text.text{fill:#303030}.md{--color-fg-default:#303030;--color-fg-muted:#606060;--color-fg-subtle:#909090;--color-canvas-default:#ffffff;--color-canvas-subtle:#f0f0f0;--color-border-default:#336699;--color-border-muted:#6699cc;--color-neutral-muted:#f0f0f0;--color-accent-fg:#6699cc;--color-accent-emphasis:#6699cc;--color-attention-subtle:#606060;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark-d2-3815173987);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal-d2-3815173987);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal-d2-3815173987);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal-d2-3815173987);mix-blend-mode:color-burn}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3815173987);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3815173987);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-3815173987);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-normal-d2-3815173987);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3815173987);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-normal-d2-3815173987);mix-blend-mode:color-burn}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3815173987);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3815173987);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3815173987);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3815173987);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3815173987);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-normal-d2-3815173987);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3815173987);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3815173987);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g class="Y2xpZW50"><g class="shape" ><rect x="12.000000" y="52.000000" width="100.000000" height="66.000000" stroke="#336699" fill="#e0f0ff" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="62.000000" y="90.500000" fill="#303030" class="text fill-N1" style="text-anchor:middle;font-size:16px">Client</text></g><g class="YnJva2Vy brown"><g class="shape" ><rect x="374.000000" y="52.000000" width="100.000000" height="66.000000" stroke="#cfb098" fill="#ffe0c9" style="stroke-width:2;" /></g><text x="424.000000" y="90.500000" fill="#303030" class="text fill-N1" style="text-anchor:middle;font-size:16px">Broker</text></g><g class="c2VydmVy"><g class="shape" ><rect x="736.000000" y="52.000000" width="100.000000" height="66.000000" stroke="#336699" fill="#e0f0ff" class=" stroke-B1 fill-B5" style="stroke-width:2;" /></g><text x="786.000000" y="90.500000" fill="#303030" class="text fill-N1" style="text-anchor:middle;font-size:16px">Server</text></g><g class="KGNsaWVudCAtLSApWzBd"><path d="M 62.000000 120.000000 L 62.000000 2036.000000" stroke="#6699cc" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-3815173987)" /></g><g class="KGJyb2tlciAtLSApWzBd"><path d="M 424.000000 120.000000 L 424.000000 2036.000000" stroke="#cfb098" fill="none" class="connection" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-3815173987)" /></g><g class="KHNlcnZlciAtLSApWzBd"><path d="M 786.000000 120.000000 L 786.000000 2036.000000" stroke="#6699cc" fill="none" class="connection stroke-B2" style="stroke-width:2;stroke-dasharray:12.000000,11.838767;" mask="url(#d2-3815173987)" /></g><g class="JiMzOTtwcm92aXNpb24oJiMzNDtmb28vYmFyJiMzNDspJiMzOTs="><g class="shape blend" ><rect x="384.000000" y="175.000000" width="442.000000" height="198.000000" stroke="#336699" fill="#e0e0e0" class=" stroke-B1 fill-N5" style="stroke-width:0;" /></g><rect x="389.000000" y="180.000000" width="135.000000" height="21.000000" fill="#e0e0e0" class=" fill-N5" /><text x="456.500000" y="196.000000" fill="#303030" class="text fill-N1" style="text-anchor:middle;font-size:16px">provision(&#34;foo/bar&#34;)</text></g><g class="JiMzOTtwdXNoKCYjMzQ7Zm9vL2JhciYjMzQ7KSYjMzk7"><g class="shape blend" ><rect x="22.000000" y="418.000000" width="804.000000" height="718.000000" stroke="#336699" fill="#e0e0e0" class=" stroke-B1 fill-N5" style="stroke-width:0;" /></g><rect x="27.000000" y="423.000000" width="105.000000" height="21.000000" fill="#e0e0e0" class=" fill-N5" /><text x="79.500000" y="439.000000" fill="#303030" class="text fill-N1" style="text-anchor:middle;font-size:16px">push(&#34;foo/bar&#34;)</text></g><g class="JiMzOTtmZXRjaCgmIzM0O2Zvby9iYXImIzM0OykmIzM5Ow=="><g class="shape blend" ><rect x="22.000000" y="1181.000000" width="804.000000" height="824.000000" stroke="#336699" fill="#e0e0e0" class=" stroke-B1 fill-N5" style="stroke-width:0;" /></g><rect x="27.000000" y="1186.000000" width="107.000000" height="21.000000" fill="#e0e0e0" class=" fill-N5" /><text x="80.500000" y="1202.000000" fill="#303030" class="text fill-N1" style="text-anchor:middle;font-size:16px">fetch(&#34;foo/bar&#34;)</text></g><g class="KHNlcnZlciAtJmd0OyBicm9rZXIpWzBd"><marker id="mk-d2-3815173987-3488378134" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" fill="#336699" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 784.000000 237.000000 L 428.000000 237.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="605.500000" y="235.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="605.500000" dy="0.000000">op: subscribe</tspan><tspan x="605.500000" dy="18.500000">topic: foo/bar/resource-transfer-request/any</tspan></text></g><g class="KHNlcnZlciAtJmd0OyBicm9rZXIpWzFd"><path d="M 784.000000 343.000000 L 428.000000 343.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="605.000000" y="341.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="605.000000" dy="0.000000">op: subscribe</tspan><tspan x="605.000000" dy="18.500000">topic: foo/bar/resource-transfer-response/any</tspan></text></g><g class="KGNsaWVudCAtJmd0OyBicm9rZXIpWzBd"><path d="M 64.000000 488.000000 L 420.000000 488.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="243.000000" y="478.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="243.000000" dy="0.000000">op: publish</tspan><tspan x="243.000000" dy="17.666667">topic: foo/bar/resource-transfer-response/any</tspan><tspan x="243.000000" dy="17.666667">data: Resource-Transfer-Response #1</tspan></text></g><g class="KGJyb2tlciAtJmd0OyBzZXJ2ZXIpWzBd"><path d="M 426.000000 610.000000 L 782.000000 610.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="605.000000" y="600.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="605.000000" dy="0.000000">op: publish</tspan><tspan x="605.000000" dy="17.666667">topic: foo/bar/resource-transfer-response/any</tspan><tspan x="605.000000" dy="17.666667">data: Resource-Transfer-Response #1</tspan></text></g><g class="KGNsaWVudCAtJmd0OyBicm9rZXIpWzFd"><path d="M 64.000000 732.000000 L 420.000000 732.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="243.000000" y="722.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="243.000000" dy="0.000000">op: publish</tspan><tspan x="243.000000" dy="17.666667">topic: foo/bar/resource-transfer-response/any</tspan><tspan x="243.000000" dy="17.666667">data: Resource-Transfer-Response #N</tspan></text></g><g class="KGJyb2tlciAtJmd0OyBzZXJ2ZXIpWzFd"><path d="M 426.000000 854.000000 L 782.000000 854.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="605.000000" y="844.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="605.000000" dy="0.000000">op: publish</tspan><tspan x="605.000000" dy="17.666667">topic: foo/bar/resource-transfer-response/any</tspan><tspan x="605.000000" dy="17.666667">data: Resource-Transfer-Response #N</tspan></text></g><g class="KGNsaWVudCAtJmd0OyBicm9rZXIpWzJd"><path d="M 64.000000 976.000000 L 420.000000 976.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="243.000000" y="966.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="243.000000" dy="0.000000">op: publish</tspan><tspan x="243.000000" dy="17.666667">topic: foo/bar/resource-transfer-response/any</tspan><tspan x="243.000000" dy="17.666667">data: Resource-Transfer-Response EoS</tspan></text></g><g class="KGJyb2tlciAtJmd0OyBzZXJ2ZXIpWzJd"><path d="M 426.000000 1098.000000 L 782.000000 1098.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="605.000000" y="1088.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="605.000000" dy="0.000000">op: publish</tspan><tspan x="605.000000" dy="17.666667">topic: foo/bar/resource-transfer-response/any</tspan><tspan x="605.000000" dy="17.666667">data: Resource-Transfer-Response EoS</tspan></text></g><g class="KGNsaWVudCAtJmd0OyBicm9rZXIpWzNd"><path d="M 64.000000 1243.000000 L 420.000000 1243.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="243.000000" y="1241.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="243.000000" dy="0.000000">op: subscribe</tspan><tspan x="243.000000" dy="18.500000">topic: foo/bar/resource-transfer-response/XXX</tspan></text></g><g class="KGNsaWVudCAtJmd0OyBicm9rZXIpWzRd"><path d="M 64.000000 1357.000000 L 420.000000 1357.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="243.500000" y="1347.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="243.500000" dy="0.000000">op: publish</tspan><tspan x="243.500000" dy="17.666667">topic: foo/bar/resource-transfer-request/any</tspan><tspan x="243.500000" dy="17.666667">data: Resource-Transfer-Request</tspan></text></g><g class="KGJyb2tlciAtJmd0OyBzZXJ2ZXIpWzNd"><path d="M 426.000000 1479.000000 L 782.000000 1479.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-end="url(#mk-d2-3815173987-3488378134)" mask="url(#d2-3815173987)" /><text x="605.500000" y="1469.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="605.500000" dy="0.000000">op: publish</tspan><tspan x="605.500000" dy="17.666667">topic: foo/bar/resource-transfer-request/any</tspan><tspan x="605.500000" dy="17.666667">data: Resource-Transfer-Request</tspan></text></g><g class="KGJyb2tlciAmbHQ7LSBzZXJ2ZXIpWzBd"><marker id="mk-d2-3815173987-2451250203" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" fill="#336699" class="connection fill-B1" stroke-width="2" /> </marker><path d="M 428.000000 1601.000000 L 784.000000 1601.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-d2-3815173987-2451250203)" mask="url(#d2-3815173987)" /><text x="605.000000" y="1591.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="605.000000" dy="0.000000">op: publish</tspan><tspan x="605.000000" dy="17.666667">topic: foo/bar/resource-transfer-response/XXX</tspan><tspan x="605.000000" dy="17.666667">data: Resource-Transfer-Response #1</tspan></text></g><g class="KGNsaWVudCAmbHQ7LSBicm9rZXIpWzBd"><path d="M 66.000000 1723.000000 L 422.000000 1723.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-d2-3815173987-2451250203)" mask="url(#d2-3815173987)" /><text x="243.000000" y="1713.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="243.000000" dy="0.000000">op: publish</tspan><tspan x="243.000000" dy="17.666667">topic: foo/bar/resource-transfer-response/XXX</tspan><tspan x="243.000000" dy="17.666667">data: Resource-Transfer-Response #1</tspan></text></g><g class="KGJyb2tlciAmbHQ7LSBzZXJ2ZXIpWzFd"><path d="M 428.000000 1845.000000 L 784.000000 1845.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-d2-3815173987-2451250203)" mask="url(#d2-3815173987)" /><text x="605.000000" y="1835.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="605.000000" dy="0.000000">op: publish</tspan><tspan x="605.000000" dy="17.666667">topic: foo/bar/resource-transfer-response/XXX</tspan><tspan x="605.000000" dy="17.666667">data: Resource-Transfer-Response #N</tspan></text></g><g class="KGNsaWVudCAmbHQ7LSBicm9rZXIpWzFd"><path d="M 66.000000 1967.000000 L 422.000000 1967.000000" stroke="#336699" fill="none" class="connection stroke-B1" style="stroke-width:2;" marker-start="url(#mk-d2-3815173987-2451250203)" mask="url(#d2-3815173987)" /><text x="243.000000" y="1957.000000" fill="#606060" class="text-italic fill-N2" style="text-anchor:middle;font-size:16px"><tspan x="243.000000" dy="0.000000">op: publish</tspan><tspan x="243.000000" dy="17.666667">topic: foo/bar/resource-transfer-response/XXX</tspan><tspan x="243.000000" dy="17.666667">data: Resource-Transfer-Response #N</tspan></text></g><mask id="d2-3815173987" maskUnits="userSpaceOnUse" x="11" y="51" width="826" height="1987">
+<rect x="11" y="51" width="826" height="1987" fill="white"></rect>
+<rect x="457.000000" y="219.000000" width="297" height="37" fill="black"></rect>
+<rect x="452.000000" y="325.000000" width="306" height="37" fill="black"></rect>
+<rect x="90.000000" y="462.000000" width="306" height="53" fill="black"></rect>
+<rect x="452.000000" y="584.000000" width="306" height="53" fill="black"></rect>
+<rect x="90.000000" y="706.000000" width="306" height="53" fill="black"></rect>
+<rect x="452.000000" y="828.000000" width="306" height="53" fill="black"></rect>
+<rect x="90.000000" y="950.000000" width="306" height="53" fill="black"></rect>
+<rect x="452.000000" y="1072.000000" width="306" height="53" fill="black"></rect>
+<rect x="90.000000" y="1225.000000" width="306" height="37" fill="black"></rect>
+<rect x="95.000000" y="1331.000000" width="297" height="53" fill="black"></rect>
+<rect x="457.000000" y="1453.000000" width="297" height="53" fill="black"></rect>
+<rect x="452.000000" y="1575.000000" width="306" height="53" fill="black"></rect>
+<rect x="90.000000" y="1697.000000" width="306" height="53" fill="black"></rect>
+<rect x="452.000000" y="1819.000000" width="306" height="53" fill="black"></rect>
+<rect x="90.000000" y="1941.000000" width="306" height="53" fill="black"></rect>
+</mask></svg></svg>

package/dst-stage1/mqtt-plus-api.d.ts

@@ -1,22 +1,17 @@
 type Brand<T> = T & {
     readonly __brand: unique symbol;
 };
-export type APIEndpoint = APIEndpointEvent | APIEndpointStream | APIEndpointService | APIEndpointResource;
+export type APIEndpoint = APIEndpointEvent | APIEndpointService | APIEndpointResource;
 export type APIEndpointEvent = (...args: any[]) => void;
-export type APIEndpointStream = (...args: any[]) => void;
 export type APIEndpointService = (...args: any[]) => any;
 export type APIEndpointResource = (...args: any[]) => void;
 export type Event<T extends APIEndpointEvent> = Brand<T>;
-export type Stream<T extends APIEndpointStream> = Brand<T>;
 export type Service<T extends APIEndpointService> = Brand<T>;
 export type Resource<T extends APIEndpointResource> = Brand<T>;
 export type APISchema = Record<string, APIEndpoint>;
 export type EventKeys<T> = string extends keyof T ? string : {
     [K in keyof T]: T[K] extends Event<infer _F> ? K : never;
 }[keyof T];
-export type StreamKeys<T> = string extends keyof T ? string : {
-    [K in keyof T]: T[K] extends Stream<infer _F> ? K : never;
-}[keyof T];
 export type ServiceKeys<T> = string extends keyof T ? string : {
     [K in keyof T]: T[K] extends Service<infer _F> ? K : never;
 }[keyof T];

package/dst-stage1/mqtt-plus-base.js

@@ -109,6 +109,6 @@ export class BaseTrait extends ReceiverTrait {
         this._dispatchMessage(topic, parsed);
     }
     /*  dispatch parsed message to appropriate handler
-        (base implementation, to be overridden in super-traits)  */
+        (base implementation, to be overridden in sub-traits)  */
     _dispatchMessage(_topic, _parsed) { }
 }

package/dst-stage1/mqtt-plus-info.d.ts

@@ -1,16 +1,15 @@
-import stream from "stream";
+import { Readable } from "stream";
 export interface InfoBase {
     sender: string;
     receiver?: string;
 }
 export interface InfoEvent extends InfoBase {
 }
-export interface InfoStream extends InfoBase {
-    stream: stream.Readable;
-}
 export interface InfoService extends InfoBase {
 }
 export interface InfoResource extends InfoBase {
-    resource: Buffer | null;
+    resource: Buffer | Readable | null;
+    stream?: Readable;
+    buffer?: Promise<Buffer>;
 }
 export type WithInfo<F, I extends InfoBase> = F extends (...args: infer P) => infer R ? (...args: [...P, info: I]) => R : never;

package/dst-stage1/mqtt-plus-msg.d.ts

@@ -12,12 +12,6 @@ export declare class EventEmission extends Base {
     params?: any[] | undefined;
     constructor(id: string, event: string, params?: any[] | undefined, sender?: string, receiver?: string);
 }
-export declare class StreamTransfer extends Base {
-    stream: string;
-    chunk: Buffer | null;
-    params?: any[] | undefined;
-    constructor(id: string, stream: string, chunk: Buffer | null, params?: any[] | undefined, sender?: string, receiver?: string);
-}
 export declare class ServiceCallRequest extends Base {
     service: string;
     params?: any[] | undefined;
@@ -34,19 +28,20 @@ export declare class ResourceTransferRequest extends Base {
     constructor(id: string, resource: string, params?: any[] | undefined, sender?: string, receiver?: string);
 }
 export declare class ResourceTransferResponse extends Base {
-    chunk: Buffer | undefined;
-    error: string | undefined;
-    final: boolean | undefined;
-    constructor(id: string, chunk: Buffer | undefined, error: string | undefined, final: boolean | undefined, sender?: string, receiver?: string);
+    resource?: string | undefined;
+    params?: any[] | undefined;
+    chunk?: Buffer | undefined;
+    error?: string | undefined;
+    final?: boolean | undefined;
+    constructor(id: string, resource?: string | undefined, params?: any[] | undefined, chunk?: Buffer | undefined, error?: string | undefined, final?: boolean | undefined, sender?: string, receiver?: string);
 }
 export default class Msg {
     makeEventEmission(id: string, event: string, params?: any[], sender?: string, receiver?: string): EventEmission;
-    makeStreamTransfer(id: string, stream: string, chunk: Buffer | null, params?: any[], sender?: string, receiver?: string): StreamTransfer;
     makeServiceCallRequest(id: string, service: string, params?: any[], sender?: string, receiver?: string): ServiceCallRequest;
     makeServiceCallResponse(id: string, result?: any, error?: string, sender?: string, receiver?: string): ServiceCallResponse;
     makeResourceTransferRequest(id: string, resource: string, params?: any[], sender?: string, receiver?: string): ResourceTransferRequest;
-    makeResourceTransferResponse(id: string, chunk?: Buffer, error?: string, final?: boolean, sender?: string, receiver?: string): ResourceTransferResponse;
-    parse(obj: any): EventEmission | StreamTransfer | ServiceCallRequest | ServiceCallResponse | ResourceTransferRequest | ResourceTransferResponse;
+    makeResourceTransferResponse(id: string, resource?: string, params?: any[], chunk?: Buffer, error?: string, final?: boolean, sender?: string, receiver?: string): ResourceTransferResponse;
+    parse(obj: any): EventEmission | ServiceCallRequest | ServiceCallResponse | ResourceTransferRequest | ResourceTransferResponse;
 }
 export declare class MsgTrait<T extends APISchema = APISchema> extends CodecTrait<T> {
     protected msg: Msg;