@nmtjs/protocol 0.16.0-beta.3 → 0.16.0-beta.5

package/dist/client/format.d.ts

@@ -1,13 +1,13 @@
-import type { ProtocolBlob } from '../common/blob.ts';
+import type { ProtocolBlob, ProtocolBlobInterface } from '../common/blob.ts';
 import type { DecodeRPCContext } from '../common/types.ts';
-import type { ProtocolClientBlobStream, ProtocolServerBlobConsumer } from './stream.ts';
+import type { ProtocolClientBlobStream } from './stream.ts';
 export interface EncodeRPCContext<T = any> {
     addStream: (blob: ProtocolBlob) => T;
 }
 export type ProtocolRPCEncode = ArrayBufferView;
 export interface BaseClientDecoder {
     decode(buffer: ArrayBufferView): unknown;
-    decodeRPC(buffer: ArrayBufferView, context: DecodeRPCContext<ProtocolServerBlobConsumer>): unknown;
+    decodeRPC(buffer: ArrayBufferView, context: DecodeRPCContext<ProtocolBlobInterface>): unknown;
 }
 export interface BaseClientEncoder {
     encode(data: unknown): ArrayBufferView;
@@ -18,5 +18,5 @@ export declare abstract class BaseClientFormat implements BaseClientDecoder, Bas
     abstract encode(data: unknown): ArrayBufferView;
     abstract encodeRPC(data: unknown, context: EncodeRPCContext): ProtocolRPCEncode;
     abstract decode(buffer: ArrayBufferView): unknown;
-    abstract decodeRPC(buffer: ArrayBufferView, context: DecodeRPCContext<ProtocolServerBlobConsumer>): unknown;
+    abstract decodeRPC(buffer: ArrayBufferView, context: DecodeRPCContext<ProtocolBlobInterface>): unknown;
 }

package/dist/client/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/client/format.ts"],"names":[],"mappings":"AA6BA,MAAM,OAAgB,gBAAgB;CAerC"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/client/format.ts"],"names":[],"mappings":"AA0BA,MAAM,OAAgB,gBAAgB;CAerC"}

package/dist/client/protocol.d.ts

@@ -1,13 +1,13 @@
-import type { ProtocolBlob, ProtocolBlobMetadata } from '../common/blob.ts';
+import type { ProtocolBlob, ProtocolBlobInterface, ProtocolBlobMetadata } from '../common/blob.ts';
 import type { ClientMessageType, ProtocolVersion, ServerMessageType } from '../common/enums.ts';
 import type { BaseProtocolError, EncodeRPCStreams } from '../common/types.ts';
 import type { BaseClientDecoder, BaseClientEncoder } from './format.ts';
-import type { ProtocolClientBlobStream, ProtocolServerBlobConsumer } from './stream.ts';
+import type { ProtocolClientBlobStream } from './stream.ts';
 export type MessageContext = {
     decoder: BaseClientDecoder;
     encoder: BaseClientEncoder;
     addClientStream: (blob: ProtocolBlob) => ProtocolClientBlobStream;
-    addServerStream: (streamId: number, metadata: ProtocolBlobMetadata) => ProtocolServerBlobConsumer;
+    addServerStream: (streamId: number, metadata: ProtocolBlobMetadata) => ProtocolBlobInterface;
     transport: {
         send: (buffer: ArrayBufferView) => void;
     };

package/dist/client/protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../src/client/protocol.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAuD5C,MAAM,OAAgB,wBAAwB;IAgBlC,MAAM,CAAC,GAAG,MAAyC,EAAE;QAC7D,OAAO,MAAM,CAAC,GAAG,MAAM,CAAC,CAAA;IAAA,CACzB;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,KAAK;IACtC,IAAI,CAAQ;IACZ,IAAI,CAAM;IAEV,YAAY,IAAY,EAAE,OAAgB,EAAE,IAAU,EAAE;QACtD,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAAA,CACjB;IAED,IAAI,OAAO,GAAG;QACZ,OAAO,GAAG,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAA;IAAA,CACvC;IAED,QAAQ,GAAG;QACT,OAAO,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAA;IAAA,CACtC;IAED,MAAM,GAAG;QACP,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAA;IAAA,CACF;CACF"}
+{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../src/client/protocol.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAuD5C,MAAM,OAAgB,wBAAwB;IAgBlC,MAAM,CAAC,GAAG,MAAyC,EAAE;QAC7D,OAAO,MAAM,CAAC,GAAG,MAAM,CAAC,CAAA;IAAA,CACzB;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,KAAK;IACtC,IAAI,CAAQ;IACZ,IAAI,CAAM;IAEV,YAAY,IAAY,EAAE,OAAgB,EAAE,IAAU,EAAE;QACtD,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAAA,CACjB;IAED,IAAI,OAAO,GAAG;QACZ,OAAO,GAAG,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAA;IAAA,CACvC;IAED,QAAQ,GAAG;QACT,OAAO,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAA;IAAA,CACtC;IAED,MAAM,GAAG;QACP,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAA;IAAA,CACF;CACF"}

package/dist/client/stream.d.ts

@@ -47,6 +47,3 @@ export declare class ProtocolServerBlobStream extends ProtocolServerStreamInterf
      */
     slice(): Blob;
 }
-export type ProtocolServerBlobConsumer = ((options?: {
-    signal?: AbortSignal;
-}) => ProtocolServerBlobStream) & ProtocolBlobInterface;

package/dist/common/blob.d.ts

@@ -6,8 +6,11 @@ export type ProtocolBlobMetadata = {
 };
 export interface ProtocolBlobInterface {
     readonly metadata: ProtocolBlobMetadata;
+    readonly streamId?: number;
     readonly [kBlobKey]: any;
 }
+export declare const createProtocolBlobReference: (streamId: number, metadata: ProtocolBlobMetadata) => ProtocolBlobInterface;
+export declare const getProtocolBlobStreamId: (blob: ProtocolBlobInterface) => number;
 export declare class ProtocolBlob implements ProtocolBlobInterface {
     [kBlobKey]: true;
     readonly source: any;

package/dist/common/blob.js

@@ -1,4 +1,32 @@
 import { kBlobKey } from './constants.js';
+export const createProtocolBlobReference = (streamId, metadata) => {
+    return Object.defineProperties({}, {
+        metadata: {
+            configurable: false,
+            enumerable: true,
+            writable: false,
+            value: metadata,
+        },
+        streamId: {
+            configurable: false,
+            enumerable: false,
+            writable: false,
+            value: streamId,
+        },
+        [kBlobKey]: {
+            configurable: false,
+            enumerable: false,
+            writable: false,
+            value: true,
+        },
+    });
+};
+export const getProtocolBlobStreamId = (blob) => {
+    if (typeof blob.streamId !== 'number') {
+        throw new Error('Blob does not reference a protocol stream');
+    }
+    return blob.streamId;
+};
 export class ProtocolBlob {
     [kBlobKey] = true;
     source;

package/dist/common/blob.js.map

@@ -1 +1 @@
-{"version":3,"file":"blob.js","sourceRoot":"","sources":["../../src/common/blob.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAazC,MAAM,OAAO,YAAY;IACvB,CAAC,QAAQ,CAAC,GAAS,IAAI,CAAA;IAEP,MAAM,CAAK;IACX,QAAQ,CAAsB;IAC9B,MAAM,CAA8C;IACpD,MAAM,CAAgB;IAEtC,YAAY,EACV,MAAM,EACN,MAAM,EACN,IAAI,EACJ,IAAI,GAAG,0BAA0B,EACjC,QAAQ,GAOT,EAAE;QACD,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,IAAI,IAAI,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QAEzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,QAAQ,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;QACxC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE;gBACpC,YAAY,EAAE,KAAK;gBACnB,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,MAAM;aACd,CAAC,CAAA;QACJ,CAAC;IAAA,CACF;IAED,MAAM,CAAC,IAAI,CACT,OAAY,EACZ,SAAS,GAAwD,EAAE,EACnE,OAAqD,EACrD;QACA,IAAI,MAAW,CAAA;QACf,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,0BAA0B,EAAE,GAAG,SAAS,EAAE,CAAA;QAEnE,IAAI,OAAO,YAAY,UAAU,CAAC,cAAc,EAAE,CAAC;YACjD,MAAM,GAAG,OAAO,CAAA;QAClB,CAAC;aAAM,IAAI,MAAM,IAAI,UAAU,IAAI,OAAO,YAAY,UAAU,CAAC,IAAI,EAAE,CAAC;YACtE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;YACzB,QAAQ,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAA;YAC9B,QAAQ,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAA;QACpC,CAAC;aAAM,IAAI,OAAO,YAAY,UAAU,CAAC,IAAI,EAAE,CAAC;YAC9C,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;YACzB,QAAQ,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAA;YAC9B,QAAQ,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAA;QAChC,CAAC;aAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;YAChC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;YACtB,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAA;YAC3B,QAAQ,CAAC,IAAI,KAAK,YAAY,CAAA;QAChC,CAAC;aAAM,IAAI,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,OAAuC,CAAC,CAAC,CAAA;YAChE,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;YACtB,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAA;QAC7B,CAAC;aAAM,IAAI,OAAO,YAAY,UAAU,CAAC,WAAW,EAAE,CAAC;YACrD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;YAChC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;YACtB,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAA;QAC7B,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,OAAO,CAAA;QAClB,CAAC;QAED,OAAO,IAAI,YAAY,CAAC;YACtB,MAAM;YACN,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;YACrC,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;SAC5B,CAAC,CAAA;IAAA,CACH;CACF"}
+{"version":3,"file":"blob.js","sourceRoot":"","sources":["../../src/common/blob.ts"],"names":[],"mappings":"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"}

package/dist/common/types.d.ts

@@ -1,5 +1,4 @@
 import type { ProtocolBlobMetadata } from './blob.ts';
-type Stream = any;
 export interface BaseProtocolError {
     code: string;
     message: string;
@@ -8,7 +7,6 @@ export interface BaseProtocolError {
 export type ProtocolRPCPayload = unknown;
 export type ProtocolRPCResponse = unknown;
 export type EncodeRPCStreams = Record<number, ProtocolBlobMetadata>;
-export interface DecodeRPCContext<T = Stream> {
+export interface DecodeRPCContext<T = unknown> {
     addStream: (id: number, metadata: ProtocolBlobMetadata) => T;
 }
-export {};

package/dist/server/format.d.ts

@@ -1,11 +1,10 @@
 import type { Pattern } from '@nmtjs/common';
-import type { ProtocolBlobMetadata } from '../common/blob.ts';
+import type { ProtocolBlobInterface, ProtocolBlobMetadata } from '../common/blob.ts';
 import type { DecodeRPCContext, EncodeRPCStreams, ProtocolRPCPayload } from '../common/types.ts';
-import type { ProtocolClientStream } from './stream.ts';
 export interface BaseServerDecoder {
     accept: Pattern[];
     decode(buffer: ArrayBufferView): unknown;
-    decodeRPC(buffer: ArrayBufferView, context: DecodeRPCContext<() => ProtocolClientStream>): ProtocolRPCPayload;
+    decodeRPC(buffer: ArrayBufferView, context: DecodeRPCContext<ProtocolBlobInterface>): ProtocolRPCPayload;
 }
 export interface BaseServerEncoder {
     contentType: string;
@@ -20,7 +19,7 @@ export declare abstract class BaseServerFormat implements BaseServerDecoder, Bas
     abstract encodeRPC(data: unknown, streams: EncodeRPCStreams): ArrayBufferView;
     abstract encodeBlob(streamId: number, metadata: ProtocolBlobMetadata): unknown;
     abstract decode(buffer: ArrayBufferView): any;
-    abstract decodeRPC(buffer: ArrayBufferView, context: DecodeRPCContext<() => ProtocolClientStream>): ProtocolRPCPayload;
+    abstract decodeRPC(buffer: ArrayBufferView, context: DecodeRPCContext<ProtocolBlobInterface>): ProtocolRPCPayload;
 }
 export declare const parseContentTypes: (types: string) => string[];
 export declare class ProtocolFormats {

package/dist/server/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/server/format.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/server/format.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AA4BrC,MAAM,OAAgB,gBAAgB;CAcrC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC;IAClD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IAC/B,IAAI,UAAU,KAAK,KAAK;QAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACxC,OAAO,UAAU;SACd,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACV,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,MAAM,GAAG,IAAI,GAAG,CACpB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACb,CAAC;aACE,IAAI,EAAE;aACN,KAAK,CAAC,GAAG,CAAC;aACV,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CACR,CACxB,CAAA;QACD,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;YACpB,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7D,CAAA;IAAA,CACF,CAAC;SACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACd,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK;YAAE,OAAO,CAAC,CAAA;QAC9B,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK;YAAE,OAAO,CAAC,CAAC,CAAA;QAC/B,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IAAA,CACjB,CAAC;SACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;AAAA,CACtB,CAAA;AAED,MAAM,OAAO,eAAe;IAC1B,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAA;IAChD,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAA;IAEhD,OAAO,CAAkB;IAEzB,YAAY,OAAkD,EAAE;QAC9D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QACzB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;YAC7C,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACvC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;YACvC,CAAC;QACH,CAAC;IAAA,CACF;IAED,eAAe,CAAC,WAAmB,EAAE,kBAAkB,GAAG,KAAK,EAAE;QAC/D,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;IAAA,CACrE;IAED,eAAe,CAAC,WAAmB,EAAE,kBAAkB,GAAG,KAAK,EAAE;QAC/D,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;IAAA,CACrE;IAEO,QAAQ,CACd,OAAwB,EACxB,WAAmB,EACnB,kBAAkB,GAAG,KAAK,EAChB;QACV,0EAA0E;QAC1E,MAAM,KAAK,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAA;QAE5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACxC,IAAI,IAAI,KAAK,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC;oBAAE,OAAO,MAAM,CAAA;YAC3D,CAAC;QACH,CAAC;QAED,IAAI,kBAAkB;YACpB,MAAM,IAAI,KAAK,CAAC,8BAA8B,WAAW,EAAE,CAAC,CAAA;QAE9D,OAAO,IAAI,CAAA;IAAA,CACZ;CACF"}

package/dist/server/types.d.ts

@@ -1,13 +1,6 @@
-import type { PlainType } from '@nmtjs/type';
 import type { ProtocolBlobInterface, ProtocolBlobMetadata } from '../common/blob.ts';
-import type { kBlobKey } from '../common/constants.ts';
 import type { BaseServerDecoder, BaseServerEncoder } from './format.ts';
 import type { ProtocolVersionInterface } from './protocol.ts';
-import type { ProtocolClientStream } from './stream.ts';
-export type ClientStreamConsumer = (() => ProtocolClientStream) & {
-    readonly [kBlobKey]: any;
-    readonly metadata: ProtocolBlobMetadata;
-};
 export type MessageContext = {
     protocol: ProtocolVersionInterface;
     connectionId: string;
@@ -18,7 +11,7 @@ export type MessageContext = {
         streamId: number;
         metadata: ProtocolBlobMetadata;
         callId: number;
-    }) => ClientStreamConsumer;
+    }) => ProtocolBlobInterface;
     transport: {
         send?: (connectionId: string, buffer: ArrayBufferView) => boolean | null;
     };
@@ -27,8 +20,3 @@ export type ResolveFormatParams = {
     contentType?: string | null;
     accept?: string | null;
 };
-export type InputType<T> = T extends ProtocolBlobInterface ? ClientStreamConsumer : T extends {
-    [PlainType]?: true;
-} ? {
-    [K in keyof Omit<T, PlainType>]: InputType<T[K]>;
-} : T;

package/dist/server/versions/v1.d.ts

@@ -5,87 +5,87 @@ import { ProtocolVersionInterface } from '../protocol.ts';
 export declare class ProtocolVersion1 extends ProtocolVersionInterface {
     version: ProtocolVersion;
     decodeMessage(context: MessageContext, buffer: Buffer): {
-        callId?: undefined;
-        nonce?: undefined;
-        size?: undefined;
-        chunk?: undefined;
-        streamId?: undefined;
-        reason?: undefined;
         type: ClientMessageType.Rpc;
         rpc: {
             callId: number;
             procedure: string;
             payload: unknown;
         };
-    } | {
+        callId?: undefined;
         nonce?: undefined;
         size?: undefined;
-        chunk?: undefined;
+        reason?: undefined;
         streamId?: undefined;
+        chunk?: undefined;
+    } | {
         rpc?: undefined;
         type: ClientMessageType.RpcAbort;
         callId: number;
         reason: string | undefined;
-    } | {
-        callId?: undefined;
+        nonce?: undefined;
         size?: undefined;
-        chunk?: undefined;
         streamId?: undefined;
-        reason?: undefined;
+        chunk?: undefined;
+    } | {
         rpc?: undefined;
+        callId?: undefined;
         type: ClientMessageType.Ping;
         nonce: number;
-    } | {
-        callId?: undefined;
         size?: undefined;
-        chunk?: undefined;
-        streamId?: undefined;
         reason?: undefined;
+        streamId?: undefined;
+        chunk?: undefined;
+    } | {
         rpc?: undefined;
+        callId?: undefined;
         type: ClientMessageType.Pong;
         nonce: number;
-    } | {
-        callId?: undefined;
-        nonce?: undefined;
         size?: undefined;
+        reason?: undefined;
+        streamId?: undefined;
         chunk?: undefined;
+    } | {
         rpc?: undefined;
+        callId?: undefined;
+        nonce?: undefined;
         type: ClientMessageType.ServerStreamAbort;
         streamId: number;
         reason: string | undefined;
+        size?: undefined;
+        chunk?: undefined;
     } | {
+        rpc?: undefined;
         callId?: undefined;
         nonce?: undefined;
-        chunk?: undefined;
-        reason?: undefined;
-        rpc?: undefined;
         type: ClientMessageType.ServerStreamPull;
         streamId: number;
         size: number;
+        reason?: undefined;
+        chunk?: undefined;
     } | {
+        rpc?: undefined;
         callId?: undefined;
         nonce?: undefined;
         size?: undefined;
-        chunk?: undefined;
-        rpc?: undefined;
         type: ClientMessageType.ClientStreamAbort;
         streamId: number;
         reason: string | undefined;
+        chunk?: undefined;
     } | {
+        rpc?: undefined;
         callId?: undefined;
         nonce?: undefined;
         size?: undefined;
-        chunk?: undefined;
         reason?: undefined;
-        rpc?: undefined;
         type: ClientMessageType.ClientStreamEnd;
         streamId: number;
+        chunk?: undefined;
     } | {
+        rpc?: undefined;
         callId?: undefined;
         nonce?: undefined;
         size?: undefined;
         reason?: undefined;
-        rpc?: undefined;
         type: ClientMessageType.ClientStreamPush;
         streamId: number;
         chunk: Buffer<ArrayBufferLike>;

package/package.json

@@ -21,18 +21,18 @@
   },
   "dependencies": {
     "hookable": "6.1.0",
-    "@nmtjs/contract": "0.16.0-beta.3",
-    "@nmtjs/common": "0.16.0-beta.3",
-    "@nmtjs/type": "0.16.0-beta.3"
+    "@nmtjs/common": "0.16.0-beta.5",
+    "@nmtjs/contract": "0.16.0-beta.5",
+    "@nmtjs/type": "0.16.0-beta.5"
   },
   "devDependencies": {
-    "@nmtjs/core": "0.16.0-beta.3"
+    "@nmtjs/core": "0.16.0-beta.5"
   },
   "peerDependencies": {
-    "@nmtjs/common": "0.16.0-beta.3",
-    "@nmtjs/core": "0.16.0-beta.3",
-    "@nmtjs/contract": "0.16.0-beta.3",
-    "@nmtjs/type": "0.16.0-beta.3"
+    "@nmtjs/common": "0.16.0-beta.5",
+    "@nmtjs/contract": "0.16.0-beta.5",
+    "@nmtjs/core": "0.16.0-beta.5",
+    "@nmtjs/type": "0.16.0-beta.5"
   },
   "files": [
     "dist",
@@ -40,7 +40,7 @@
     "LICENSE.md",
     "README.md"
   ],
-  "version": "0.16.0-beta.3",
+  "version": "0.16.0-beta.5",
   "scripts": {
     "clean-build": "rm -rf ./dist"
   }

package/src/client/format.ts

@@ -1,9 +1,6 @@
-import type { ProtocolBlob } from '../common/blob.ts'
+import type { ProtocolBlob, ProtocolBlobInterface } from '../common/blob.ts'
 import type { DecodeRPCContext } from '../common/types.ts'
-import type {
-  ProtocolClientBlobStream,
-  ProtocolServerBlobConsumer,
-} from './stream.ts'
+import type { ProtocolClientBlobStream } from './stream.ts'
 
 export interface EncodeRPCContext<T = any> {
   addStream: (blob: ProtocolBlob) => T
@@ -15,7 +12,7 @@ export interface BaseClientDecoder {
   decode(buffer: ArrayBufferView): unknown
   decodeRPC(
     buffer: ArrayBufferView,
-    context: DecodeRPCContext<ProtocolServerBlobConsumer>,
+    context: DecodeRPCContext<ProtocolBlobInterface>,
   ): unknown
 }
 
@@ -40,6 +37,6 @@ export abstract class BaseClientFormat
   abstract decode(buffer: ArrayBufferView): unknown
   abstract decodeRPC(
     buffer: ArrayBufferView,
-    context: DecodeRPCContext<ProtocolServerBlobConsumer>,
+    context: DecodeRPCContext<ProtocolBlobInterface>,
   ): unknown
 }

package/src/client/protocol.ts

@@ -1,4 +1,8 @@
-import type { ProtocolBlob, ProtocolBlobMetadata } from '../common/blob.ts'
+import type {
+  ProtocolBlob,
+  ProtocolBlobInterface,
+  ProtocolBlobMetadata,
+} from '../common/blob.ts'
 import type {
   ClientMessageType,
   ProtocolVersion,
@@ -6,10 +10,7 @@ import type {
 } from '../common/enums.ts'
 import type { BaseProtocolError, EncodeRPCStreams } from '../common/types.ts'
 import type { BaseClientDecoder, BaseClientEncoder } from './format.ts'
-import type {
-  ProtocolClientBlobStream,
-  ProtocolServerBlobConsumer,
-} from './stream.ts'
+import type { ProtocolClientBlobStream } from './stream.ts'
 import { concat } from '../common/binary.ts'
 
 export type MessageContext = {
@@ -19,7 +20,7 @@ export type MessageContext = {
   addServerStream: (
     streamId: number,
     metadata: ProtocolBlobMetadata,
-  ) => ProtocolServerBlobConsumer
+  ) => ProtocolBlobInterface
   transport: { send: (buffer: ArrayBufferView) => void }
   streamId: () => number
 }

package/src/client/stream.ts

@@ -209,8 +209,3 @@ export class ProtocolServerBlobStream
     throw new Error('Unable to slice')
   }
 }
-
-export type ProtocolServerBlobConsumer = ((options?: {
-  signal?: AbortSignal
-}) => ProtocolServerBlobStream) &
-  ProtocolBlobInterface

package/src/common/blob.ts

@@ -8,9 +8,47 @@ export type ProtocolBlobMetadata = {
 
 export interface ProtocolBlobInterface {
   readonly metadata: ProtocolBlobMetadata
+  readonly streamId?: number
   readonly [kBlobKey]: any
 }
 
+export const createProtocolBlobReference = (
+  streamId: number,
+  metadata: ProtocolBlobMetadata,
+): ProtocolBlobInterface => {
+  return Object.defineProperties(
+    {},
+    {
+      metadata: {
+        configurable: false,
+        enumerable: true,
+        writable: false,
+        value: metadata,
+      },
+      streamId: {
+        configurable: false,
+        enumerable: false,
+        writable: false,
+        value: streamId,
+      },
+      [kBlobKey]: {
+        configurable: false,
+        enumerable: false,
+        writable: false,
+        value: true,
+      },
+    },
+  ) as ProtocolBlobInterface
+}
+
+export const getProtocolBlobStreamId = (blob: ProtocolBlobInterface) => {
+  if (typeof blob.streamId !== 'number') {
+    throw new Error('Blob does not reference a protocol stream')
+  }
+
+  return blob.streamId
+}
+
 export class ProtocolBlob implements ProtocolBlobInterface {
   [kBlobKey]: true = true
 

package/src/common/types.ts

@@ -1,7 +1,5 @@
 import type { ProtocolBlobMetadata } from './blob.ts'
 
-type Stream = any
-
 export interface BaseProtocolError {
   code: string
   message: string
@@ -13,6 +11,6 @@ export type ProtocolRPCResponse = unknown
 
 export type EncodeRPCStreams = Record<number, ProtocolBlobMetadata>
 
-export interface DecodeRPCContext<T = Stream> {
+export interface DecodeRPCContext<T = unknown> {
   addStream: (id: number, metadata: ProtocolBlobMetadata) => T
 }

package/src/server/format.ts

@@ -1,20 +1,22 @@
 import type { Pattern } from '@nmtjs/common'
 import { match } from '@nmtjs/common'
 
-import type { ProtocolBlobMetadata } from '../common/blob.ts'
+import type {
+  ProtocolBlobInterface,
+  ProtocolBlobMetadata,
+} from '../common/blob.ts'
 import type {
   DecodeRPCContext,
   EncodeRPCStreams,
   ProtocolRPCPayload,
 } from '../common/types.ts'
-import type { ProtocolClientStream } from './stream.ts'
 
 export interface BaseServerDecoder {
   accept: Pattern[]
   decode(buffer: ArrayBufferView): unknown
   decodeRPC(
     buffer: ArrayBufferView,
-    context: DecodeRPCContext<() => ProtocolClientStream>,
+    context: DecodeRPCContext<ProtocolBlobInterface>,
   ): ProtocolRPCPayload
 }
 
@@ -37,7 +39,7 @@ export abstract class BaseServerFormat
   abstract decode(buffer: ArrayBufferView): any
   abstract decodeRPC(
     buffer: ArrayBufferView,
-    context: DecodeRPCContext<() => ProtocolClientStream>,
+    context: DecodeRPCContext<ProtocolBlobInterface>,
   ): ProtocolRPCPayload
 }
 

package/src/server/types.ts

@@ -1,18 +1,9 @@
-import type { PlainType } from '@nmtjs/type'
-
 import type {
   ProtocolBlobInterface,
   ProtocolBlobMetadata,
 } from '../common/blob.ts'
-import type { kBlobKey } from '../common/constants.ts'
 import type { BaseServerDecoder, BaseServerEncoder } from './format.ts'
 import type { ProtocolVersionInterface } from './protocol.ts'
-import type { ProtocolClientStream } from './stream.ts'
-
-export type ClientStreamConsumer = (() => ProtocolClientStream) & {
-  readonly [kBlobKey]: any
-  readonly metadata: ProtocolBlobMetadata
-}
 
 export type MessageContext = {
   protocol: ProtocolVersionInterface
@@ -24,7 +15,7 @@ export type MessageContext = {
     streamId: number
     metadata: ProtocolBlobMetadata
     callId: number
-  }) => ClientStreamConsumer
+  }) => ProtocolBlobInterface
   transport: {
     send?: (connectionId: string, buffer: ArrayBufferView) => boolean | null
   }
@@ -34,9 +25,3 @@ export type ResolveFormatParams = {
   contentType?: string | null
   accept?: string | null
 }
-
-export type InputType<T> = T extends ProtocolBlobInterface
-  ? ClientStreamConsumer
-  : T extends { [PlainType]?: true }
-    ? { [K in keyof Omit<T, PlainType>]: InputType<T[K]> }
-    : T