@nmtjs/http-client 0.14.5 → 0.15.0-beta.2

package/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2024 Denis Ilchyshyn
+Copyright (c) 2025 Denys Ilchyshyn
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -6,4 +6,4 @@
 - binary data streaming and event subscriptions
 - contract-based API
 - end-to-end type safety
-- CPU-intensive task execution on separate workers
+- CPU-intensive task execution on separate workers

package/dist/index.js

@@ -1,84 +1,126 @@
-import { ClientError } from '@nmtjs/client';
-import { ErrorCode, ProtocolBlob } from '@nmtjs/protocol';
-import { ProtocolServerBlobStream, ProtocolTransport, ProtocolTransportStatus, } from '@nmtjs/protocol/client';
-export class HttpClientTransport extends ProtocolTransport {
+import { createFuture } from '@nmtjs/common';
+import { ConnectionType, ProtocolBlob } from '@nmtjs/protocol';
+const createDecodeBase64 = (customFn) => {
+    return (string) => {
+        if ('fromBase64' in Uint8Array &&
+            typeof Uint8Array.fromBase64 === 'function') {
+            return Uint8Array.fromBase64(string);
+        }
+        else if (typeof atob === 'function') {
+            return Uint8Array.from(atob(string), (c) => c.charCodeAt(0));
+        }
+        else if (customFn) {
+            return customFn(string);
+        }
+        else {
+            throw new Error('No base64 decoding function available');
+        }
+    };
+};
+const NEEMATA_BLOB_HEADER = 'X-Neemata-Blob';
+export class HttpTransportClient {
+    format;
     protocol;
     options;
-    #auth = null;
-    status = ProtocolTransportStatus.CONNECTED;
-    constructor(protocol, options) {
-        super();
+    type = ConnectionType.Unidirectional;
+    decodeBase64;
+    constructor(format, protocol, options) {
+        this.format = format;
         this.protocol = protocol;
         this.options = options;
+        this.options = { debug: false, ...options };
+        this.decodeBase64 = createDecodeBase64(options.decodeBase64);
     }
-    async call(procedure, payload, options, transformer) {
-        const call = this.protocol.createCall(procedure, options);
-        const headers = new Headers();
-        headers.set('Content-Type', this.protocol.contentType);
-        headers.set('Accept', this.protocol.contentType);
-        if (this.#auth)
-            headers.set('Authorization', this.#auth);
-        const isBlob = payload instanceof ProtocolBlob;
-        if (isBlob)
-            headers.set('x-neemata-blob', 'true');
-        const response = fetch(`${this.options.origin}/api/${procedure}`, {
-            method: 'POST',
-            headers,
-            credentials: 'include',
-            body: isBlob
-                ? payload.source
-                : this.protocol.format.encode(transformer.encodeRPC(procedure, payload)),
-            signal: call.signal,
-            // @ts-expect-error
-            duplex: 'half',
-        });
-        response
-            .catch((error) => Promise.reject(new Error('Network error', { cause: error })))
-            .then((response) => {
-            const isBlob = response.headers.get('x-neemata-blob') === 'true';
-            if (isBlob) {
-                const contentLength = response.headers.get('content-length');
-                const size = contentLength
-                    ? Number.parseInt(contentLength, 10) || undefined
-                    : undefined;
-                const type = response.headers.get('content-type') || 'application/octet-stream';
-                const stream = new ProtocolServerBlobStream(-1, { size, type });
-                response.body?.pipeThrough(stream);
-                return stream;
+    url({ procedure, application, payload, }) {
+        const base = application ? `/${application}/${procedure}` : `/${procedure}`;
+        const url = new URL(base, this.options.url);
+        if (payload)
+            url.searchParams.set('payload', JSON.stringify(payload));
+        return url;
+    }
+    async call(client, rpc, options) {
+        const { procedure, payload } = rpc;
+        const requestHeaders = new Headers();
+        const url = this.url({ application: client.application, procedure });
+        if (client.auth)
+            requestHeaders.set('Authorization', client.auth);
+        let body;
+        if (payload instanceof ProtocolBlob) {
+            requestHeaders.set('Content-Type', payload.metadata.type);
+            requestHeaders.set(NEEMATA_BLOB_HEADER, 'true');
+        }
+        else {
+            requestHeaders.set('Content-Type', client.format.contentType);
+            const buffer = client.format.encode(payload);
+            body = buffer;
+        }
+        if (options._stream_response) {
+            const _constructor = this.options.EventSource
+                ? this.options.EventSource
+                : EventSource;
+            const source = new _constructor(url.toString(), { withCredentials: true });
+            const future = createFuture();
+            const { readable, writable } = new TransformStream();
+            const writer = writable.getWriter();
+            source.addEventListener('open', () => future.resolve({ type: 'rpc_stream', stream: readable }));
+            source.addEventListener('close', () => writable.close());
+            source.addEventListener('error', (event) => {
+                const error = new Error('Stream error', { cause: event });
+                future.reject(error);
+                writable.abort(error);
+            });
+            source.addEventListener('message', (event) => {
+                try {
+                    const buffer = this.decodeBase64(event.data);
+                    writer.write(buffer);
+                }
+                catch (cause) {
+                    const error = new Error('Failed to decode stream message', { cause });
+                    writable.abort(error);
+                }
+            });
+            return future.promise;
+        }
+        else {
+            const response = await fetch(url.toString(), {
+                body,
+                method: 'POST',
+                headers: requestHeaders,
+                signal: options.signal,
+                credentials: 'include',
+                keepalive: true,
+            });
+            if (response.ok) {
+                const isBlob = !!response.headers.get(NEEMATA_BLOB_HEADER);
+                if (isBlob) {
+                    const contentLength = response.headers.get('content-length');
+                    const size = (contentLength && Number.parseInt(contentLength, 10)) || undefined;
+                    const type = response.headers.get('content-type') || 'application/octet-stream';
+                    const disposition = response.headers.get('content-disposition');
+                    let filename;
+                    if (disposition) {
+                        const match = disposition.match(/filename="?([^"]+)"?/);
+                        if (match)
+                            filename = match[1];
+                    }
+                    return {
+                        type: 'blob',
+                        metadata: { type, size, filename },
+                        source: body,
+                    };
+                }
+                else {
+                    return { type: 'rpc', result: await response.bytes() };
+                }
             }
             else {
-                const body = response.arrayBuffer();
-                return body.then((buffer) => {
-                    if (response.ok) {
-                        const decoded = this.protocol.format.decode(buffer);
-                        return transformer.decodeRPC(procedure, decoded);
-                    }
-                    else {
-                        if (buffer.byteLength === 0) {
-                            const error = new ClientError(ErrorCode.InternalServerError, `Empty response with ${response.status} status code`);
-                            return Promise.reject(error);
-                        }
-                        else {
-                            const payload = this.protocol.format.decode(buffer);
-                            const error = new ClientError(payload.code, payload.message, payload.data);
-                            return Promise.reject(error);
-                        }
-                    }
-                });
+                const decoded = await response.text();
+                // throw new ProtocolError()
+                throw new Error();
             }
-        })
-            .then(call.resolve)
-            .catch(call.reject);
-        return call;
-    }
-    async connect(auth) {
-        this.#auth = auth;
-        this.emit('connected');
-    }
-    async disconnect() {
-        this.emit('disconnected', 'client');
-    }
-    async send(_messageType, _buffer, _metadata) {
-        throw new Error('Not supported');
+        }
     }
 }
+export const HttpTransportFactory = (params, options) => {
+    return new HttpTransportClient(params.format, params.protocol, options);
+};

package/package.json

@@ -9,23 +9,25 @@
     }
   },
   "dependencies": {
-    "@nmtjs/client": "0.14.5",
-    "@nmtjs/common": "0.14.5",
-    "@nmtjs/protocol": "0.14.5"
+    "@nmtjs/client": "0.15.0-beta.2",
+    "@nmtjs/common": "0.15.0-beta.2",
+    "@nmtjs/protocol": "0.15.0-beta.2"
   },
   "peerDependencies": {
-    "@nmtjs/common": "0.14.5",
-    "@nmtjs/protocol": "0.14.5",
-    "@nmtjs/client": "0.14.5"
+    "@nmtjs/client": "0.15.0-beta.2",
+    "@nmtjs/common": "0.15.0-beta.2",
+    "@nmtjs/protocol": "0.15.0-beta.2"
   },
   "files": [
     "dist",
     "LICENSE.md",
     "README.md"
   ],
-  "version": "0.14.5",
+  "version": "0.15.0-beta.2",
   "scripts": {
+    "clean-build": "rm -rf ./dist",
     "build": "tsc",
+    "dev": "tsc --watch",
     "type-check": "tsc --noEmit"
   }
 }

package/dist/index.d.ts

@@ -1,22 +0,0 @@
-import type { ClientMessageType } from '@nmtjs/protocol';
-import type { BaseProtocol, ProtocolBaseClientCallOptions, ProtocolBaseTransformer, ProtocolClientCall, ProtocolSendMetadata } from '@nmtjs/protocol/client';
-import { ProtocolTransport, ProtocolTransportStatus } from '@nmtjs/protocol/client';
-export type HttpClientTransportOptions = {
-    /**
-     * The origin of the server
-     * @example 'http://localhost:3000'
-     */
-    origin: string;
-    debug?: boolean;
-};
-export declare class HttpClientTransport extends ProtocolTransport<HttpClientTransportOptions> {
-    #private;
-    protected readonly protocol: BaseProtocol;
-    protected readonly options: HttpClientTransportOptions;
-    status: ProtocolTransportStatus;
-    constructor(protocol: BaseProtocol, options: HttpClientTransportOptions);
-    call(procedure: string, payload: any, options: ProtocolBaseClientCallOptions, transformer: ProtocolBaseTransformer): Promise<ProtocolClientCall>;
-    connect(auth: any): Promise<void>;
-    disconnect(): Promise<void>;
-    send(_messageType: ClientMessageType, _buffer: ArrayBuffer, _metadata: ProtocolSendMetadata): Promise<void>;
-}