@nmtjs/client 0.15.2 → 0.16.0-beta.1

package/dist/layers/streams.js

@@ -0,0 +1,194 @@
+import { MAX_UINT32, noopFn } from '@nmtjs/common';
+import { ClientMessageType, kBlobKey, ServerMessageType } from '@nmtjs/protocol';
+import { ProtocolServerBlobStream } from '@nmtjs/protocol/client';
+import { ClientStreams, ServerStreams } from '../streams.js';
+const DEFAULT_PULL_SIZE = 65535;
+const toReasonString = (reason) => {
+    if (typeof reason === 'string')
+        return reason;
+    if (reason === undefined || reason === null)
+        return undefined;
+    return String(reason);
+};
+export const createServerBlobConsumer = (metadata, subscribe) => {
+    const consumer = ((options) => subscribe(options));
+    Object.defineProperties(consumer, {
+        metadata: {
+            configurable: false,
+            enumerable: true,
+            writable: false,
+            value: metadata,
+        },
+        [kBlobKey]: {
+            configurable: false,
+            enumerable: false,
+            writable: false,
+            value: true,
+        },
+    });
+    return consumer;
+};
+export const createStreamLayer = (core) => {
+    const clientStreams = new ClientStreams();
+    const serverStreams = new ServerStreams();
+    let streamId = 0;
+    const getStreamId = () => {
+        if (streamId >= MAX_UINT32) {
+            streamId = 0;
+        }
+        return streamId++;
+    };
+    const addClientStream = (blob) => {
+        const id = getStreamId();
+        return clientStreams.add(blob.source, id, blob.metadata);
+    };
+    const createServerBlobStream = (id, metadata) => {
+        const stream = new ProtocolServerBlobStream(metadata, {
+            pull: () => {
+                if (!core.messageContext)
+                    return;
+                core.emitStreamEvent({
+                    direction: 'outgoing',
+                    streamType: 'server_blob',
+                    action: 'pull',
+                    streamId: id,
+                    byteLength: DEFAULT_PULL_SIZE,
+                });
+                const buffer = core.protocol.encodeMessage(core.messageContext, ClientMessageType.ServerStreamPull, { streamId: id, size: DEFAULT_PULL_SIZE });
+                core.send(buffer).catch(noopFn);
+            },
+            close: () => {
+                serverStreams.remove(id);
+            },
+            readableStrategy: { highWaterMark: 0 },
+        });
+        serverStreams.add(id, stream);
+        return createServerBlobConsumer(metadata, ({ signal } = {}) => {
+            if (signal) {
+                signal.addEventListener('abort', () => {
+                    if (!core.messageContext)
+                        return;
+                    core.emitStreamEvent({
+                        direction: 'outgoing',
+                        streamType: 'server_blob',
+                        action: 'abort',
+                        streamId: id,
+                        reason: toReasonString(signal.reason),
+                    });
+                    const buffer = core.protocol.encodeMessage(core.messageContext, ClientMessageType.ServerStreamAbort, { streamId: id, reason: toReasonString(signal.reason) });
+                    core.send(buffer).catch(noopFn);
+                    void serverStreams.abort(id).catch(noopFn);
+                }, { once: true });
+            }
+            return stream;
+        });
+    };
+    const addServerBlobStream = (metadata) => {
+        const id = getStreamId();
+        const stream = new ProtocolServerBlobStream(metadata);
+        serverStreams.add(id, stream);
+        return { streamId: id, stream };
+    };
+    core.on('message', (message) => {
+        switch (message.type) {
+            case ServerMessageType.ServerStreamPush:
+                core.emitStreamEvent({
+                    direction: 'incoming',
+                    streamType: 'server_blob',
+                    action: 'push',
+                    streamId: message.streamId,
+                    byteLength: message.chunk.byteLength,
+                });
+                void serverStreams.push(message.streamId, message.chunk);
+                break;
+            case ServerMessageType.ServerStreamEnd:
+                core.emitStreamEvent({
+                    direction: 'incoming',
+                    streamType: 'server_blob',
+                    action: 'end',
+                    streamId: message.streamId,
+                });
+                void serverStreams.end(message.streamId);
+                break;
+            case ServerMessageType.ServerStreamAbort:
+                core.emitStreamEvent({
+                    direction: 'incoming',
+                    streamType: 'server_blob',
+                    action: 'abort',
+                    streamId: message.streamId,
+                    reason: message.reason,
+                });
+                void serverStreams.abort(message.streamId);
+                break;
+            case ServerMessageType.ClientStreamPull:
+                core.emitStreamEvent({
+                    direction: 'incoming',
+                    streamType: 'client_blob',
+                    action: 'pull',
+                    streamId: message.streamId,
+                    byteLength: message.size,
+                });
+                void clientStreams.pull(message.streamId, message.size).then((chunk) => {
+                    if (!core.messageContext)
+                        return;
+                    if (chunk) {
+                        core.emitStreamEvent({
+                            direction: 'outgoing',
+                            streamType: 'client_blob',
+                            action: 'push',
+                            streamId: message.streamId,
+                            byteLength: chunk.byteLength,
+                        });
+                        const buffer = core.protocol.encodeMessage(core.messageContext, ClientMessageType.ClientStreamPush, { streamId: message.streamId, chunk });
+                        core.send(buffer).catch(noopFn);
+                        return;
+                    }
+                    core.emitStreamEvent({
+                        direction: 'outgoing',
+                        streamType: 'client_blob',
+                        action: 'end',
+                        streamId: message.streamId,
+                    });
+                    const buffer = core.protocol.encodeMessage(core.messageContext, ClientMessageType.ClientStreamEnd, { streamId: message.streamId });
+                    core.send(buffer).catch(noopFn);
+                    void clientStreams.end(message.streamId).catch(noopFn);
+                }, () => {
+                    if (!core.messageContext)
+                        return;
+                    core.emitStreamEvent({
+                        direction: 'outgoing',
+                        streamType: 'client_blob',
+                        action: 'abort',
+                        streamId: message.streamId,
+                    });
+                    const buffer = core.protocol.encodeMessage(core.messageContext, ClientMessageType.ClientStreamAbort, { streamId: message.streamId });
+                    core.send(buffer).catch(noopFn);
+                    clientStreams.remove(message.streamId);
+                });
+                break;
+            case ServerMessageType.ClientStreamAbort:
+                core.emitStreamEvent({
+                    direction: 'incoming',
+                    streamType: 'client_blob',
+                    action: 'abort',
+                    streamId: message.streamId,
+                    reason: message.reason,
+                });
+                void clientStreams.abort(message.streamId, message.reason).catch(noopFn);
+                break;
+        }
+    });
+    core.on('disconnected', (reason) => {
+        void clientStreams.clear(reason).catch(noopFn);
+        void serverStreams.clear(reason).catch(noopFn);
+    });
+    return {
+        clientStreams,
+        serverStreams,
+        getStreamId,
+        addClientStream,
+        createServerBlobStream,
+        addServerBlobStream,
+    };
+};
+//# sourceMappingURL=streams.js.map

package/dist/layers/streams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../src/layers/streams.ts"],"names":[],"mappings":"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"}

package/dist/plugins/browser.js

@@ -1,29 +1,48 @@
+const syncPauseReasons = (setPauseReason) => {
+    if (globalThis.window && 'navigator' in globalThis.window) {
+        setPauseReason('offline', globalThis.window.navigator?.onLine === false);
+    }
+    if (globalThis.document) {
+        setPauseReason('tab_hidden', globalThis.document.visibilityState === 'hidden');
+    }
+};
 export const browserConnectivityPlugin = () => {
-    return (client) => {
+    return ({ core }) => {
         const cleanup = [];
-        const maybeConnect = () => {
-            if (client.state === 'disconnected' && !client.isDisposed()) {
-                client.connect().catch(() => void 0);
+        const triggerReconnect = () => {
+            if (!core.isDisposed()) {
+                core.triggerReconnect();
             }
         };
         return {
             name: 'browser-connectivity',
             onInit: () => {
+                syncPauseReasons(core.setReconnectPauseReason.bind(core));
                 if (globalThis.window) {
-                    const onPageShow = () => maybeConnect();
+                    const onPageShow = () => triggerReconnect();
                     globalThis.window.addEventListener('pageshow', onPageShow);
                     cleanup.push(() => globalThis.window?.removeEventListener('pageshow', onPageShow));
-                    const onOnline = () => maybeConnect();
+                    const onOnline = () => {
+                        core.setReconnectPauseReason('offline', false);
+                        triggerReconnect();
+                    };
                     globalThis.window.addEventListener('online', onOnline);
                     cleanup.push(() => globalThis.window?.removeEventListener('online', onOnline));
-                    const onFocus = () => maybeConnect();
+                    const onOffline = () => {
+                        core.setReconnectPauseReason('offline', true);
+                    };
+                    globalThis.window.addEventListener('offline', onOffline);
+                    cleanup.push(() => globalThis.window?.removeEventListener('offline', onOffline));
+                    const onFocus = () => triggerReconnect();
                     globalThis.window.addEventListener('focus', onFocus);
                     cleanup.push(() => globalThis.window?.removeEventListener('focus', onFocus));
                 }
                 if (globalThis.document) {
                     const onVisibilityChange = () => {
-                        if (globalThis.document?.visibilityState === 'visible') {
-                            maybeConnect();
+                        const hidden = globalThis.document?.visibilityState === 'hidden';
+                        core.setReconnectPauseReason('tab_hidden', hidden);
+                        if (!hidden) {
+                            triggerReconnect();
                         }
                     };
                     globalThis.document.addEventListener('visibilitychange', onVisibilityChange);

package/dist/plugins/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/plugins/browser.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAiB,EAAE,CAAC;IAC3D,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACjB,MAAM,OAAO,GAAsB,EAAE,CAAA;QAErC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC;YACzB,IAAI,MAAM,CAAC,KAAK,KAAK,cAAc,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;gBAC5D,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;YACtC,CAAC;QAAA,CACF,CAAA;QAED,OAAO;YACL,IAAI,EAAE,sBAAsB;YAC5B,MAAM,EAAE,GAAG,EAAE,CAAC;gBACZ,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;oBACtB,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,YAAY,EAAE,CAAA;oBACvC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;oBAC1D,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAChB,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,UAAU,EAAE,UAAU,CAAC,CAC/D,CAAA;oBAED,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,YAAY,EAAE,CAAA;oBACrC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;oBACtD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAChB,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAC3D,CAAA;oBAED,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,YAAY,EAAE,CAAA;oBACpC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;oBACpD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAChB,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CACzD,CAAA;gBACH,CAAC;gBAED,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;oBACxB,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC;wBAC/B,IAAI,UAAU,CAAC,QAAQ,EAAE,eAAe,KAAK,SAAS,EAAE,CAAC;4BACvD,YAAY,EAAE,CAAA;wBAChB,CAAC;oBAAA,CACF,CAAA;oBAED,UAAU,CAAC,QAAQ,CAAC,gBAAgB,CAClC,kBAAkB,EAClB,kBAAkB,CACnB,CAAA;oBACD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAChB,UAAU,CAAC,QAAQ,EAAE,mBAAmB,CACtC,kBAAkB,EAClB,kBAAkB,CACnB,CACF,CAAA;gBACH,CAAC;YAAA,CACF;YACD,OAAO,EAAE,GAAG,EAAE,CAAC;gBACb,KAAK,MAAM,IAAI,IAAI,OAAO;oBAAE,IAAI,EAAE,CAAA;gBAClC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;YAAA,CACnB;SACF,CAAA;IAAA,CACF,CAAA;AAAA,CACF,CAAA"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/plugins/browser.ts"],"names":[],"mappings":"AAEA,MAAM,gBAAgB,GAAG,CACvB,cAAyD,EACzD,EAAE,CAAC;IACH,IAAI,UAAU,CAAC,MAAM,IAAI,WAAW,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QAC1D,cAAc,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,KAAK,KAAK,CAAC,CAAA;IAC1E,CAAC;IAED,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;QACxB,cAAc,CACZ,YAAY,EACZ,UAAU,CAAC,QAAQ,CAAC,eAAe,KAAK,QAAQ,CACjD,CAAA;IACH,CAAC;AAAA,CACF,CAAA;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAiB,EAAE,CAAC;IAC3D,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACnB,MAAM,OAAO,GAAsB,EAAE,CAAA;QAErC,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;gBACvB,IAAI,CAAC,gBAAgB,EAAE,CAAA;YACzB,CAAC;QAAA,CACF,CAAA;QAED,OAAO;YACL,IAAI,EAAE,sBAAsB;YAC5B,MAAM,EAAE,GAAG,EAAE,CAAC;gBACZ,gBAAgB,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;gBAEzD,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;oBACtB,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAA;oBAC3C,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;oBAC1D,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAChB,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,UAAU,EAAE,UAAU,CAAC,CAC/D,CAAA;oBAED,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC;wBACrB,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;wBAC9C,gBAAgB,EAAE,CAAA;oBAAA,CACnB,CAAA;oBACD,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;oBACtD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAChB,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAC3D,CAAA;oBAED,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC;wBACtB,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;oBAAA,CAC9C,CAAA;oBACD,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;oBACxD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAChB,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC,CAC7D,CAAA;oBAED,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAA;oBACxC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;oBACpD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAChB,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CACzD,CAAA;gBACH,CAAC;gBAED,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;oBACxB,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC;wBAC/B,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,EAAE,eAAe,KAAK,QAAQ,CAAA;wBAChE,IAAI,CAAC,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;wBAClD,IAAI,CAAC,MAAM,EAAE,CAAC;4BACZ,gBAAgB,EAAE,CAAA;wBACpB,CAAC;oBAAA,CACF,CAAA;oBAED,UAAU,CAAC,QAAQ,CAAC,gBAAgB,CAClC,kBAAkB,EAClB,kBAAkB,CACnB,CAAA;oBACD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAChB,UAAU,CAAC,QAAQ,EAAE,mBAAmB,CACtC,kBAAkB,EAClB,kBAAkB,CACnB,CACF,CAAA;gBACH,CAAC;YAAA,CACF;YACD,OAAO,EAAE,GAAG,EAAE,CAAC;gBACb,KAAK,MAAM,IAAI,IAAI,OAAO;oBAAE,IAAI,EAAE,CAAA;gBAClC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;YAAA,CACnB;SACF,CAAA;IAAA,CACF,CAAA;AAAA,CACF,CAAA"}

package/dist/plugins/heartbeat.js

@@ -26,7 +26,7 @@ const isPaused = () => {
     return false;
 };
 export const heartbeatPlugin = (options = {}) => {
-    return (client) => {
+    return ({ core, ping }) => {
         const interval = options.interval ?? DEFAULT_HEARTBEAT_INTERVAL;
         const timeout = options.timeout ?? DEFAULT_HEARTBEAT_TIMEOUT;
         let heartbeatAbortController = null;
@@ -39,32 +39,32 @@ export const heartbeatPlugin = (options = {}) => {
         const startHeartbeat = () => {
             if (heartbeatTask)
                 return;
-            if (client.transportType !== ConnectionType.Bidirectional)
+            if (core.transportType !== ConnectionType.Bidirectional)
                 return;
             heartbeatAbortController = new AbortController();
             const signal = heartbeatAbortController.signal;
             heartbeatTask = (async () => {
                 while (!signal.aborted &&
-                    !client.isDisposed() &&
-                    client.state === 'connected') {
+                    !core.isDisposed() &&
+                    core.state === 'connected') {
                     if (isPaused()) {
                         await sleep(1000, signal);
                         continue;
                     }
                     await sleep(interval, signal);
                     if (signal.aborted ||
-                        client.isDisposed() ||
-                        client.state !== 'connected') {
+                        core.isDisposed() ||
+                        core.state !== 'connected') {
                         continue;
                     }
                     try {
-                        await client.ping(timeout, signal);
+                        await ping.ping(timeout, signal);
                     }
                     catch {
                         if (!signal.aborted &&
-                            !client.isDisposed() &&
-                            client.state === 'connected') {
-                            await client
+                            !core.isDisposed() &&
+                            core.state === 'connected') {
+                            await core
                                 .requestReconnect('heartbeat_timeout')
                                 .catch(() => void 0);
                         }

package/dist/plugins/heartbeat.js.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../src/plugins/heartbeat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../src/plugins/heartbeat.ts"],"names":[],"mappings":"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"}

package/dist/plugins/index.d.ts

@@ -1,5 +1,5 @@
+export type { ClientPlugin, ClientPluginContext, ClientPluginEvent, ClientPluginInstance, ReconnectConfig, StreamEvent, } from './types.ts';
 export * from './browser.ts';
 export * from './heartbeat.ts';
 export * from './logging.ts';
 export * from './reconnect.ts';
-export * from './types.ts';

package/dist/plugins/index.js

@@ -2,5 +2,4 @@ export * from './browser.js';
 export * from './heartbeat.js';
 export * from './logging.js';
 export * from './reconnect.js';
-export * from './types.js';
 //# sourceMappingURL=index.js.map

package/dist/plugins/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":"AAQA,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA"}

package/dist/plugins/reconnect.js

@@ -1,98 +1,15 @@
-import { ConnectionType } from '@nmtjs/protocol';
-const DEFAULT_RECONNECT_TIMEOUT = 1000;
-const DEFAULT_MAX_RECONNECT_TIMEOUT = 60000;
-const sleep = (ms, signal) => {
-    return new Promise((resolve) => {
-        if (signal?.aborted)
-            return resolve();
-        const timer = setTimeout(resolve, ms);
-        if (signal) {
-            signal.addEventListener('abort', () => {
-                clearTimeout(timer);
-                resolve();
-            }, { once: true });
-        }
-    });
-};
-const computeReconnectDelay = (ms) => {
-    if (globalThis.window) {
-        const jitter = Math.floor(ms * 0.2 * Math.random());
-        return ms + jitter;
-    }
-    return ms;
-};
-const isReconnectPaused = () => {
-    if (globalThis.window && 'navigator' in globalThis.window) {
-        if (globalThis.window.navigator?.onLine === false)
-            return true;
-    }
-    if (globalThis.document) {
-        if (globalThis.document.visibilityState === 'hidden')
-            return true;
-    }
-    return false;
-};
 export const reconnectPlugin = (options = {}) => {
-    return (client) => {
-        let reconnecting = null;
-        let reconnectAbortController = null;
-        let reconnectTimeout = options.initialTimeout ?? DEFAULT_RECONNECT_TIMEOUT;
-        const cancelReconnect = () => {
-            reconnectAbortController?.abort();
-            reconnectAbortController = null;
-            reconnecting = null;
-        };
-        const ensureReconnectLoop = () => {
-            if (reconnecting)
-                return;
-            reconnectAbortController = new AbortController();
-            const signal = reconnectAbortController.signal;
-            reconnecting = (async () => {
-                while (!signal.aborted &&
-                    !client.isDisposed() &&
-                    client.state === 'disconnected' &&
-                    client.lastDisconnectReason !== 'client') {
-                    if (isReconnectPaused()) {
-                        await sleep(1000, signal);
-                        continue;
-                    }
-                    const delay = computeReconnectDelay(reconnectTimeout);
-                    await sleep(delay, signal);
-                    if (signal.aborted ||
-                        client.isDisposed() ||
-                        client.state !== 'disconnected' ||
-                        client.lastDisconnectReason === 'client') {
-                        break;
-                    }
-                    const previousTimeout = reconnectTimeout;
-                    await client.connect().catch(() => void 0);
-                    if (client.state === 'disconnected') {
-                        reconnectTimeout = Math.min(previousTimeout * 2, options.maxTimeout ?? DEFAULT_MAX_RECONNECT_TIMEOUT);
-                    }
-                }
-            })().finally(() => {
-                reconnecting = null;
-                reconnectAbortController = null;
+    return ({ core }) => ({
+        name: 'reconnect',
+        onInit: () => {
+            core.configureReconnect({
+                initialTimeout: options.initialTimeout,
+                maxTimeout: options.maxTimeout,
             });
-        };
-        const onDisconnect = (reason) => {
-            if (client.transportType !== ConnectionType.Bidirectional ||
-                reason === 'client' ||
-                client.isDisposed()) {
-                cancelReconnect();
-                return;
-            }
-            ensureReconnectLoop();
-        };
-        return {
-            name: 'reconnect',
-            onConnect: () => {
-                reconnectTimeout = options.initialTimeout ?? DEFAULT_RECONNECT_TIMEOUT;
-                cancelReconnect();
-            },
-            onDisconnect,
-            dispose: cancelReconnect,
-        };
-    };
+        },
+        dispose: () => {
+            core.configureReconnect(null);
+        },
+    });
 };
 //# sourceMappingURL=reconnect.js.map

package/dist/plugins/reconnect.js.map

@@ -1 +1 @@
-{"version":3,"file":"reconnect.js","sourceRoot":"","sources":["../../src/plugins/reconnect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reconnect.js","sourceRoot":"","sources":["../../src/plugins/reconnect.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,OAAO,GAA2B,EAAE,EACtB,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACpB,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE,GAAG,EAAE,CAAC;YACZ,IAAI,CAAC,kBAAkB,CAAC;gBACtB,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,UAAU,EAAE,OAAO,CAAC,UAAU;aAC/B,CAAC,CAAA;QAAA,CACH;QACD,OAAO,EAAE,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QAAA,CAC9B;KACF,CAAC,CAAA;AAAA,CACH,CAAA"}

package/dist/plugins/types.d.ts

@@ -1,6 +1,25 @@
-import type { BaseClient } from '../core.ts';
+import type { ClientCore, ConnectionState } from '../core.ts';
+import type { PingLayerApi } from '../layers/ping.ts';
 export type ClientDisconnectReason = 'client' | 'server' | (string & {});
+export interface ReconnectConfig {
+    initialTimeout?: number;
+    maxTimeout?: number;
+}
+export type StreamEvent = {
+    direction: 'incoming' | 'outgoing';
+    streamType: 'rpc' | 'client_blob' | 'server_blob';
+    action: 'response' | 'pull' | 'push' | 'end' | 'abort';
+    callId?: number;
+    streamId?: number;
+    byteLength?: number;
+    reason?: string;
+};
 export type ClientPluginEvent = {
+    kind: 'state_changed';
+    timestamp: number;
+    state: ConnectionState;
+    previous: ConnectionState;
+} | {
     kind: 'connected';
     timestamp: number;
     transportType: 'bidirectional' | 'unidirectional';
@@ -33,17 +52,10 @@ export type ClientPluginEvent = {
     callId: number;
     procedure: string;
     error: unknown;
-} | {
+} | ({
     kind: 'stream_event';
     timestamp: number;
-    direction: 'incoming' | 'outgoing';
-    streamType: 'rpc' | 'client_blob' | 'server_blob';
-    action: 'response' | 'pull' | 'push' | 'end' | 'abort';
-    callId?: number;
-    streamId?: number;
-    byteLength?: number;
-    reason?: string;
-};
+} & StreamEvent);
 /**
  * Client plugin lifecycle contract.
  *
@@ -60,4 +72,8 @@ export interface ClientPluginInstance {
     onClientEvent?(event: ClientPluginEvent): void | Promise<void>;
     dispose?(): void;
 }
-export type ClientPlugin = (client: BaseClient<any, any, any, any, any>) => ClientPluginInstance;
+export interface ClientPluginContext {
+    core: ClientCore;
+    ping: PingLayerApi;
+}
+export type ClientPlugin = (context: ClientPluginContext) => ClientPluginInstance;

package/dist/transport.d.ts

@@ -1,53 +1,71 @@
 import type { ConnectionType, ProtocolBlobMetadata, ProtocolVersion } from '@nmtjs/protocol';
 import type { BaseClientFormat } from '@nmtjs/protocol/client';
-export type ClientTransportMessageOptions = {
-    signal?: AbortSignal;
-    _stream_response?: boolean;
-};
-export interface ClientTransportStartParams {
+export type ClientDisconnectReason = 'client' | 'server' | (string & {});
+export interface TransportConnectParams {
     auth?: string;
     application?: string;
-    onMessage: (message: ArrayBufferView) => any;
-    onConnect: () => any;
-    onDisconnect: (reason: 'client' | 'server' | (string & {})) => any;
+    onMessage: (message: ArrayBufferView) => void;
+    onConnect: () => void;
+    onDisconnect: (reason: ClientDisconnectReason) => void;
 }
-export interface ClientTransportRpcParams {
-    format: BaseClientFormat;
+export interface TransportSendOptions {
+    signal?: AbortSignal;
+}
+export interface TransportCallContext {
+    contentType: string;
     auth?: string;
     application?: string;
 }
-export type ClientCallResponse = {
+export interface TransportRpcParams {
+    callId: number;
+    procedure: string;
+    payload: ArrayBufferView;
+    blob?: {
+        source: ReadableStream;
+        metadata: ProtocolBlobMetadata;
+    };
+}
+export interface TransportCallOptions {
+    signal?: AbortSignal;
+    streamResponse?: boolean;
+}
+export interface TransportRpcResponse {
     type: 'rpc';
     result: ArrayBufferView;
-} | {
+}
+export interface TransportRpcStreamResponse {
     type: 'rpc_stream';
     stream: ReadableStream<ArrayBufferView>;
-} | {
+}
+export interface TransportBlobResponse {
     type: 'blob';
     metadata: ProtocolBlobMetadata;
     source: ReadableStream<ArrayBufferView>;
-};
-export type ClientTransport<T extends ConnectionType = ConnectionType> = T extends ConnectionType.Bidirectional ? {
+}
+export interface TransportErrorResponse {
+    type: 'error';
+    error: ArrayBufferView;
+    status?: number;
+    statusText?: string;
+}
+export type TransportCallResponse = TransportRpcResponse | TransportRpcStreamResponse | TransportBlobResponse | TransportErrorResponse;
+export interface BidirectionalTransport {
     type: ConnectionType.Bidirectional;
-    connect(params: ClientTransportStartParams): Promise<void>;
+    connect(params: TransportConnectParams): Promise<void>;
     disconnect(): Promise<void>;
-    send(message: ArrayBufferView, options: ClientTransportMessageOptions): Promise<void>;
-} : {
+    send(message: ArrayBufferView, options: TransportSendOptions): Promise<void>;
+}
+export interface UnidirectionalTransport {
     type: ConnectionType.Unidirectional;
-    connect?(params: ClientTransportStartParams): Promise<void>;
-    disconnect?(): Promise<void>;
-    call(client: {
-        format: BaseClientFormat;
-        auth?: string;
-        application?: string;
-    }, rpc: {
-        callId: number;
-        procedure: string;
-        payload: any;
-    }, options: ClientTransportMessageOptions): Promise<ClientCallResponse>;
-};
+    call(context: TransportCallContext, rpc: TransportRpcParams, options: TransportCallOptions): Promise<TransportCallResponse>;
+}
+export type ClientTransport = BidirectionalTransport | UnidirectionalTransport;
 export interface ClientTransportParams {
     protocol: ProtocolVersion;
     format: BaseClientFormat;
 }
-export type ClientTransportFactory<Type extends ConnectionType, Options = unknown, Transport extends ClientTransport<Type> = ClientTransport<Type>> = (params: ClientTransportParams, options: Options) => Transport;
+export type ClientTransportFactory<Transport extends ClientTransport = ClientTransport, Options = unknown> = (params: ClientTransportParams, options: Options) => Transport;
+export type ClientTransportMessageOptions = TransportSendOptions;
+export type ClientTransportStartParams = TransportConnectParams;
+export type ClientTransportRpcParams = TransportCallContext;
+export type ClientCallResponse = TransportCallResponse;