@smithy/eventstream-serde-universal 4.2.14 → 4.3.0

package/dist-cjs/index.js

@@ -1,132 +1,6 @@
-'use strict';
-
-var eventstreamCodec = require('@smithy/eventstream-codec');
-
-function getChunkedStream(source) {
-    let currentMessageTotalLength = 0;
-    let currentMessagePendingLength = 0;
-    let currentMessage = null;
-    let messageLengthBuffer = null;
-    const allocateMessage = (size) => {
-        if (typeof size !== "number") {
-            throw new Error("Attempted to allocate an event message where size was not a number: " + size);
-        }
-        currentMessageTotalLength = size;
-        currentMessagePendingLength = 4;
-        currentMessage = new Uint8Array(size);
-        const currentMessageView = new DataView(currentMessage.buffer);
-        currentMessageView.setUint32(0, size, false);
-    };
-    const iterator = async function* () {
-        const sourceIterator = source[Symbol.asyncIterator]();
-        while (true) {
-            const { value, done } = await sourceIterator.next();
-            if (done) {
-                if (!currentMessageTotalLength) {
-                    return;
-                }
-                else if (currentMessageTotalLength === currentMessagePendingLength) {
-                    yield currentMessage;
-                }
-                else {
-                    throw new Error("Truncated event message received.");
-                }
-                return;
-            }
-            const chunkLength = value.length;
-            let currentOffset = 0;
-            while (currentOffset < chunkLength) {
-                if (!currentMessage) {
-                    const bytesRemaining = chunkLength - currentOffset;
-                    if (!messageLengthBuffer) {
-                        messageLengthBuffer = new Uint8Array(4);
-                    }
-                    const numBytesForTotal = Math.min(4 - currentMessagePendingLength, bytesRemaining);
-                    messageLengthBuffer.set(value.slice(currentOffset, currentOffset + numBytesForTotal), currentMessagePendingLength);
-                    currentMessagePendingLength += numBytesForTotal;
-                    currentOffset += numBytesForTotal;
-                    if (currentMessagePendingLength < 4) {
-                        break;
-                    }
-                    allocateMessage(new DataView(messageLengthBuffer.buffer).getUint32(0, false));
-                    messageLengthBuffer = null;
-                }
-                const numBytesToWrite = Math.min(currentMessageTotalLength - currentMessagePendingLength, chunkLength - currentOffset);
-                currentMessage.set(value.slice(currentOffset, currentOffset + numBytesToWrite), currentMessagePendingLength);
-                currentMessagePendingLength += numBytesToWrite;
-                currentOffset += numBytesToWrite;
-                if (currentMessageTotalLength && currentMessageTotalLength === currentMessagePendingLength) {
-                    yield currentMessage;
-                    currentMessage = null;
-                    currentMessageTotalLength = 0;
-                    currentMessagePendingLength = 0;
-                }
-            }
-        }
-    };
-    return {
-        [Symbol.asyncIterator]: iterator,
-    };
-}
-
-function getMessageUnmarshaller(deserializer, toUtf8) {
-    return async function (message) {
-        const { value: messageType } = message.headers[":message-type"];
-        if (messageType === "error") {
-            const unmodeledError = new Error(message.headers[":error-message"].value || "UnknownError");
-            unmodeledError.name = message.headers[":error-code"].value;
-            throw unmodeledError;
-        }
-        else if (messageType === "exception") {
-            const code = message.headers[":exception-type"].value;
-            const exception = { [code]: message };
-            const deserializedException = await deserializer(exception);
-            if (deserializedException.$unknown) {
-                const error = new Error(toUtf8(message.body));
-                error.name = code;
-                throw error;
-            }
-            throw deserializedException[code];
-        }
-        else if (messageType === "event") {
-            const event = {
-                [message.headers[":event-type"].value]: message,
-            };
-            const deserialized = await deserializer(event);
-            if (deserialized.$unknown)
-                return;
-            return deserialized;
-        }
-        else {
-            throw Error(`Unrecognizable event type: ${message.headers[":event-type"].value}`);
-        }
-    };
-}
-
-class EventStreamMarshaller {
-    eventStreamCodec;
-    utfEncoder;
-    constructor({ utf8Encoder, utf8Decoder }) {
-        this.eventStreamCodec = new eventstreamCodec.EventStreamCodec(utf8Encoder, utf8Decoder);
-        this.utfEncoder = utf8Encoder;
-    }
-    deserialize(body, deserializer) {
-        const inputStream = getChunkedStream(body);
-        return new eventstreamCodec.SmithyMessageDecoderStream({
-            messageStream: new eventstreamCodec.MessageDecoderStream({ inputStream, decoder: this.eventStreamCodec }),
-            deserializer: getMessageUnmarshaller(deserializer, this.utfEncoder),
-        });
-    }
-    serialize(inputStream, serializer) {
-        return new eventstreamCodec.MessageEncoderStream({
-            messageStream: new eventstreamCodec.SmithyMessageEncoderStream({ inputStream, serializer }),
-            encoder: this.eventStreamCodec,
-            includeEndFrame: true,
-        });
-    }
-}
-
-const eventStreamSerdeProvider = (options) => new EventStreamMarshaller(options);
-
-exports.EventStreamMarshaller = EventStreamMarshaller;
-exports.eventStreamSerdeProvider = eventStreamSerdeProvider;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.eventStreamSerdeProvider = exports.EventStreamMarshaller = void 0;
+var event_streams_1 = require("@smithy/core/event-streams");
+Object.defineProperty(exports, "EventStreamMarshaller", { enumerable: true, get: function () { return event_streams_1.UniversalEventStreamMarshaller; } });
+Object.defineProperty(exports, "eventStreamSerdeProvider", { enumerable: true, get: function () { return event_streams_1.universalEventStreamSerdeProvider; } });

package/dist-es/index.js

@@ -1,2 +1 @@
-export * from "./EventStreamMarshaller";
-export * from "./provider";
+export { UniversalEventStreamMarshaller as EventStreamMarshaller, universalEventStreamSerdeProvider as eventStreamSerdeProvider, } from "@smithy/core/event-streams";

package/dist-types/index.d.ts

@@ -1,8 +1,3 @@
-/**
- * @internal
- */
-export * from "./EventStreamMarshaller";
-/**
- * @internal
- */
-export * from "./provider";
+/** @deprecated Use @smithy/core/event-streams instead. */
+export { UniversalEventStreamMarshaller as EventStreamMarshaller, universalEventStreamSerdeProvider as eventStreamSerdeProvider, } from "@smithy/core/event-streams";
+export type { UniversalEventStreamMarshallerOptions as EventStreamMarshallerOptions } from "@smithy/core/event-streams";

package/package.json

@@ -1,19 +1,10 @@
 {
   "name": "@smithy/eventstream-serde-universal",
-  "version": "4.2.14",
+  "version": "4.3.0",
   "scripts": {
-    "build": "concurrently 'yarn:build:types' 'yarn:build:es:cjs'",
-    "build:es:cjs": "yarn g:tsc -p tsconfig.es.json && node ../../scripts/inline eventstream-serde-universal",
-    "build:types": "yarn g:tsc -p tsconfig.types.json",
-    "build:types:downlevel": "premove dist-types/ts3.4 && downlevel-dts dist-types dist-types/ts3.4",
+    "build": "yarn g:tsc -p tsconfig.cjs.json && yarn g:tsc -p tsconfig.es.json && yarn g:tsc -p tsconfig.types.json",
     "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
-    "format": "prettier --config ../../prettier.config.js --ignore-path ../../.prettierignore --write \"**/*.{ts,md,json}\"",
-    "lint": "eslint -c ../../.eslintrc.js \"src/**/*.ts\"",
-    "stage-release": "premove .release && yarn pack && mkdir ./.release && tar zxvf ./package.tgz --directory ./.release && rm ./package.tgz",
-    "test": "yarn g:vitest run",
-    "test:integration": "yarn g:vitest run -c vitest.config.integ.mts",
-    "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts",
-    "test:watch": "yarn g:vitest watch"
+    "stage-release": "premove .release && yarn pack && mkdir ./.release && tar zxvf ./package.tgz --directory ./.release && rm ./package.tgz"
   },
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -25,28 +16,15 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@smithy/eventstream-codec": "^4.2.14",
-    "@smithy/types": "^4.14.1",
+    "@smithy/core": "^3.24.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@smithy/util-utf8": "^4.2.2",
-    "@types/node": "^18.11.9",
-    "concurrently": "7.0.0",
-    "downlevel-dts": "0.10.1",
-    "premove": "4.0.0",
-    "typedoc": "0.23.23"
+    "premove": "4.0.0"
   },
   "engines": {
     "node": ">=18.0.0"
   },
-  "typesVersions": {
-    "<4.5": {
-      "dist-types/*": [
-        "dist-types/ts3.4/*"
-      ]
-    }
-  },
   "files": [
     "dist-*/**"
   ],

package/README.md

@@ -1,17 +0,0 @@
-# @smithy/eventstream-serde-universal
-
-[![NPM version](https://img.shields.io/npm/v/@smithy/eventstream-serde-universal/latest.svg)](https://www.npmjs.com/package/@smithy/eventstream-serde-universal)
-[![NPM downloads](https://img.shields.io/npm/dm/@smithy/eventstream-serde-universal.svg)](https://www.npmjs.com/package/@smithy/eventstream-serde-universal)
-
-### :warning: Internal API :warning:
-
-> This is an internal package.
-> That means this is used as a dependency for other, public packages, but
-> should not be taken directly as a dependency in your application's `package.json`.
-
-> If you are updating the version of this package, for example to bring in a
-> bug-fix, you should do so by updating your application lockfile with
-> e.g. `npm up @scope/package` or equivalent command in another
-> package manager, rather than taking a direct dependency.
-
----

package/dist-es/EventStreamMarshaller.js

@@ -1,25 +0,0 @@
-import { EventStreamCodec, MessageDecoderStream, MessageEncoderStream, SmithyMessageDecoderStream, SmithyMessageEncoderStream, } from "@smithy/eventstream-codec";
-import { getChunkedStream } from "./getChunkedStream";
-import { getMessageUnmarshaller } from "./getUnmarshalledStream";
-export class EventStreamMarshaller {
-    eventStreamCodec;
-    utfEncoder;
-    constructor({ utf8Encoder, utf8Decoder }) {
-        this.eventStreamCodec = new EventStreamCodec(utf8Encoder, utf8Decoder);
-        this.utfEncoder = utf8Encoder;
-    }
-    deserialize(body, deserializer) {
-        const inputStream = getChunkedStream(body);
-        return new SmithyMessageDecoderStream({
-            messageStream: new MessageDecoderStream({ inputStream, decoder: this.eventStreamCodec }),
-            deserializer: getMessageUnmarshaller(deserializer, this.utfEncoder),
-        });
-    }
-    serialize(inputStream, serializer) {
-        return new MessageEncoderStream({
-            messageStream: new SmithyMessageEncoderStream({ inputStream, serializer }),
-            encoder: this.eventStreamCodec,
-            includeEndFrame: true,
-        });
-    }
-}

package/dist-es/getChunkedStream.js

@@ -1,66 +0,0 @@
-export function getChunkedStream(source) {
-    let currentMessageTotalLength = 0;
-    let currentMessagePendingLength = 0;
-    let currentMessage = null;
-    let messageLengthBuffer = null;
-    const allocateMessage = (size) => {
-        if (typeof size !== "number") {
-            throw new Error("Attempted to allocate an event message where size was not a number: " + size);
-        }
-        currentMessageTotalLength = size;
-        currentMessagePendingLength = 4;
-        currentMessage = new Uint8Array(size);
-        const currentMessageView = new DataView(currentMessage.buffer);
-        currentMessageView.setUint32(0, size, false);
-    };
-    const iterator = async function* () {
-        const sourceIterator = source[Symbol.asyncIterator]();
-        while (true) {
-            const { value, done } = await sourceIterator.next();
-            if (done) {
-                if (!currentMessageTotalLength) {
-                    return;
-                }
-                else if (currentMessageTotalLength === currentMessagePendingLength) {
-                    yield currentMessage;
-                }
-                else {
-                    throw new Error("Truncated event message received.");
-                }
-                return;
-            }
-            const chunkLength = value.length;
-            let currentOffset = 0;
-            while (currentOffset < chunkLength) {
-                if (!currentMessage) {
-                    const bytesRemaining = chunkLength - currentOffset;
-                    if (!messageLengthBuffer) {
-                        messageLengthBuffer = new Uint8Array(4);
-                    }
-                    const numBytesForTotal = Math.min(4 - currentMessagePendingLength, bytesRemaining);
-                    messageLengthBuffer.set(value.slice(currentOffset, currentOffset + numBytesForTotal), currentMessagePendingLength);
-                    currentMessagePendingLength += numBytesForTotal;
-                    currentOffset += numBytesForTotal;
-                    if (currentMessagePendingLength < 4) {
-                        break;
-                    }
-                    allocateMessage(new DataView(messageLengthBuffer.buffer).getUint32(0, false));
-                    messageLengthBuffer = null;
-                }
-                const numBytesToWrite = Math.min(currentMessageTotalLength - currentMessagePendingLength, chunkLength - currentOffset);
-                currentMessage.set(value.slice(currentOffset, currentOffset + numBytesToWrite), currentMessagePendingLength);
-                currentMessagePendingLength += numBytesToWrite;
-                currentOffset += numBytesToWrite;
-                if (currentMessageTotalLength && currentMessageTotalLength === currentMessagePendingLength) {
-                    yield currentMessage;
-                    currentMessage = null;
-                    currentMessageTotalLength = 0;
-                    currentMessagePendingLength = 0;
-                }
-            }
-        }
-    };
-    return {
-        [Symbol.asyncIterator]: iterator,
-    };
-}

package/dist-es/getUnmarshalledStream.js

@@ -1,47 +0,0 @@
-export function getUnmarshalledStream(source, options) {
-    const messageUnmarshaller = getMessageUnmarshaller(options.deserializer, options.toUtf8);
-    return {
-        [Symbol.asyncIterator]: async function* () {
-            for await (const chunk of source) {
-                const message = options.eventStreamCodec.decode(chunk);
-                const type = await messageUnmarshaller(message);
-                if (type === undefined)
-                    continue;
-                yield type;
-            }
-        },
-    };
-}
-export function getMessageUnmarshaller(deserializer, toUtf8) {
-    return async function (message) {
-        const { value: messageType } = message.headers[":message-type"];
-        if (messageType === "error") {
-            const unmodeledError = new Error(message.headers[":error-message"].value || "UnknownError");
-            unmodeledError.name = message.headers[":error-code"].value;
-            throw unmodeledError;
-        }
-        else if (messageType === "exception") {
-            const code = message.headers[":exception-type"].value;
-            const exception = { [code]: message };
-            const deserializedException = await deserializer(exception);
-            if (deserializedException.$unknown) {
-                const error = new Error(toUtf8(message.body));
-                error.name = code;
-                throw error;
-            }
-            throw deserializedException[code];
-        }
-        else if (messageType === "event") {
-            const event = {
-                [message.headers[":event-type"].value]: message,
-            };
-            const deserialized = await deserializer(event);
-            if (deserialized.$unknown)
-                return;
-            return deserialized;
-        }
-        else {
-            throw Error(`Unrecognizable event type: ${message.headers[":event-type"].value}`);
-        }
-    };
-}

package/dist-es/provider.js

@@ -1,2 +0,0 @@
-import { EventStreamMarshaller } from "./EventStreamMarshaller";
-export const eventStreamSerdeProvider = (options) => new EventStreamMarshaller(options);

package/dist-types/EventStreamMarshaller.d.ts

@@ -1,23 +0,0 @@
-import type { Decoder, Encoder, EventStreamMarshaller as IEventStreamMarshaller, Message } from "@smithy/types";
-/**
- * @internal
- */
-export interface EventStreamMarshaller extends IEventStreamMarshaller {
-}
-/**
- * @internal
- */
-export interface EventStreamMarshallerOptions {
-    utf8Encoder: Encoder;
-    utf8Decoder: Decoder;
-}
-/**
- * @internal
- */
-export declare class EventStreamMarshaller {
-    private readonly eventStreamCodec;
-    private readonly utfEncoder;
-    constructor({ utf8Encoder, utf8Decoder }: EventStreamMarshallerOptions);
-    deserialize<T>(body: AsyncIterable<Uint8Array>, deserializer: (input: Record<string, Message>) => Promise<T>): AsyncIterable<T>;
-    serialize<T>(inputStream: AsyncIterable<T>, serializer: (event: T) => Message): AsyncIterable<Uint8Array>;
-}

package/dist-types/getChunkedStream.d.ts

@@ -1,4 +0,0 @@
-/**
- * @internal
- */
-export declare function getChunkedStream(source: AsyncIterable<Uint8Array>): AsyncIterable<Uint8Array>;

package/dist-types/getUnmarshalledStream.d.ts

@@ -1,18 +0,0 @@
-import type { EventStreamCodec } from "@smithy/eventstream-codec";
-import type { Encoder, Message } from "@smithy/types";
-/**
- * @internal
- */
-export type UnmarshalledStreamOptions<T> = {
-    eventStreamCodec: EventStreamCodec;
-    deserializer: (input: Record<string, Message>) => Promise<T>;
-    toUtf8: Encoder;
-};
-/**
- * @internal
- */
-export declare function getUnmarshalledStream<T extends Record<string, any>>(source: AsyncIterable<Uint8Array>, options: UnmarshalledStreamOptions<T>): AsyncIterable<T>;
-/**
- * @internal
- */
-export declare function getMessageUnmarshaller<T extends Record<string, any>>(deserializer: (input: Record<string, Message>) => Promise<T>, toUtf8: Encoder): (input: Message) => Promise<T | undefined>;

package/dist-types/provider.d.ts

@@ -1,3 +0,0 @@
-import type { EventStreamSerdeProvider } from "@smithy/types";
-/** NodeJS event stream utils provider */
-export declare const eventStreamSerdeProvider: EventStreamSerdeProvider;