From 0bab182a02a086c64a961ee78658614e531c58bf Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 24 Dec 2021 00:00:02 +0000 Subject: [PATCH 1/8] chore(types): add types for GetAwsChunkedEncodingStream --- packages/types/src/stream.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/types/src/stream.ts diff --git a/packages/types/src/stream.ts b/packages/types/src/stream.ts new file mode 100644 index 000000000000..6b817c965e60 --- /dev/null +++ b/packages/types/src/stream.ts @@ -0,0 +1,18 @@ +import { HashConstructor, StreamHasher } from "./crypto"; +import { Encoder } from "./util"; + +export interface GetAwsChunkedEncodingStreamOptions { + base64Encoder?: Encoder; + bodyLengthChecker: (body: any) => number | undefined; + checksumAlgorithmFn?: HashConstructor; + checksumLocationName?: string; + streamHasher?: StreamHasher; +} + +/** + * A function that returns Readable Stream which follows aws-chunked encoding stream. + * It optionally adds checksum if options are provided. + */ +export interface GetAwsChunkedEncodingStream { + (readableStream: StreamType, options: GetAwsChunkedEncodingStreamOptions): StreamType; +} From acc78ba1015d6001c67319ea5b2b89e49304858e Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 24 Dec 2021 00:00:54 +0000 Subject: [PATCH 2/8] feat(util-stream-browser): add getAwsChunkedEncodingStream for browser --- packages/util-stream-browser/.gitignore | 8 + packages/util-stream-browser/CHANGELOG.md | 4 + packages/util-stream-browser/LICENSE | 201 ++++++++++++++++++ packages/util-stream-browser/README.md | 12 ++ packages/util-stream-browser/jest.config.js | 5 + packages/util-stream-browser/package.json | 42 ++++ .../src/getAwsChunkedEncodingStream.ts | 35 +++ packages/util-stream-browser/src/index.ts | 1 + packages/util-stream-browser/tsconfig.es.json | 9 + .../util-stream-browser/tsconfig.types.json | 9 + 10 files changed, 326 insertions(+) create mode 100644 packages/util-stream-browser/.gitignore create mode 100644 packages/util-stream-browser/CHANGELOG.md create mode 100644 packages/util-stream-browser/LICENSE create mode 100644 packages/util-stream-browser/README.md create mode 100644 packages/util-stream-browser/jest.config.js create mode 100644 packages/util-stream-browser/package.json create mode 100644 packages/util-stream-browser/src/getAwsChunkedEncodingStream.ts create mode 100644 packages/util-stream-browser/src/index.ts create mode 100644 packages/util-stream-browser/tsconfig.es.json create mode 100644 packages/util-stream-browser/tsconfig.types.json diff --git a/packages/util-stream-browser/.gitignore b/packages/util-stream-browser/.gitignore new file mode 100644 index 000000000000..3d1714c9806e --- /dev/null +++ b/packages/util-stream-browser/.gitignore @@ -0,0 +1,8 @@ +/node_modules/ +/build/ +/coverage/ +/docs/ +*.tsbuildinfo +*.tgz +*.log +package-lock.json diff --git a/packages/util-stream-browser/CHANGELOG.md b/packages/util-stream-browser/CHANGELOG.md new file mode 100644 index 000000000000..e9fb6ecf5930 --- /dev/null +++ b/packages/util-stream-browser/CHANGELOG.md @@ -0,0 +1,4 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. \ No newline at end of file diff --git a/packages/util-stream-browser/LICENSE b/packages/util-stream-browser/LICENSE new file mode 100644 index 000000000000..7b6491ba7876 --- /dev/null +++ b/packages/util-stream-browser/LICENSE @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/packages/util-stream-browser/README.md b/packages/util-stream-browser/README.md new file mode 100644 index 000000000000..411efbb05419 --- /dev/null +++ b/packages/util-stream-browser/README.md @@ -0,0 +1,12 @@ +# @aws-sdk/util-stream-browser + +[![NPM version](https://img.shields.io/npm/v/@aws-sdk/util-stream-browser/latest.svg)](https://www.npmjs.com/package/@aws-sdk/util-stream-browser) +[![NPM downloads](https://img.shields.io/npm/dm/@aws-sdk/util-stream-browser.svg)](https://www.npmjs.com/package/@aws-sdk/util-stream-browser) + +Package with utilities to operate on Node.JS streams. + +> An internal package + +## Usage + +You probably shouldn't, at least directly. diff --git a/packages/util-stream-browser/jest.config.js b/packages/util-stream-browser/jest.config.js new file mode 100644 index 000000000000..a8d1c2e49912 --- /dev/null +++ b/packages/util-stream-browser/jest.config.js @@ -0,0 +1,5 @@ +const base = require("../../jest.config.base.js"); + +module.exports = { + ...base, +}; diff --git a/packages/util-stream-browser/package.json b/packages/util-stream-browser/package.json new file mode 100644 index 000000000000..627dd3cdaea9 --- /dev/null +++ b/packages/util-stream-browser/package.json @@ -0,0 +1,42 @@ +{ + "name": "@aws-sdk/util-stream-browser", + "version": "3.0.0", + "scripts": { + "build": "yarn build:es && yarn build:types", + "build:es": "tsc -p tsconfig.es.json", + "build:types": "tsc -p tsconfig.types.json", + "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", + "test": "exit 0" + }, + "main": "./dist-es/index.js", + "module": "./dist-es/index.js", + "types": "./dist-types/index.d.ts", + "author": { + "name": "AWS SDK for JavaScript Team", + "url": "https://aws.amazon.com/javascript/" + }, + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.40.0", + "tslib": "^2.3.0" + }, + "devDependencies": { + "typescript": "~4.3.5" + }, + "typesVersions": { + "<4.0": { + "dist-types/*": [ + "dist-types/ts3.4/*" + ] + } + }, + "files": [ + "dist-*" + ], + "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/util-stream-browser", + "repository": { + "type": "git", + "url": "https://github.com/aws/aws-sdk-js-v3.git", + "directory": "packages/util-stream-browser" + } +} diff --git a/packages/util-stream-browser/src/getAwsChunkedEncodingStream.ts b/packages/util-stream-browser/src/getAwsChunkedEncodingStream.ts new file mode 100644 index 000000000000..ce0376e8e0a6 --- /dev/null +++ b/packages/util-stream-browser/src/getAwsChunkedEncodingStream.ts @@ -0,0 +1,35 @@ +import { GetAwsChunkedEncodingStream, GetAwsChunkedEncodingStreamOptions } from "@aws-sdk/types"; + +export const getAwsChunkedEncodingStream: GetAwsChunkedEncodingStream = ( + readableStream: ReadableStream, + options: GetAwsChunkedEncodingStreamOptions +) => { + const { base64Encoder, bodyLengthChecker, checksumAlgorithmFn, checksumLocationName, streamHasher } = options; + + const checksumRequired = + base64Encoder !== undefined && + bodyLengthChecker !== undefined && + checksumAlgorithmFn !== undefined && + checksumLocationName !== undefined && + streamHasher !== undefined; + const digest = checksumRequired ? streamHasher!(checksumAlgorithmFn!, readableStream) : undefined; + + const reader = readableStream.getReader(); + return new ReadableStream({ + async pull(controller) { + const { value, done } = await reader.read(); + + if (done) { + controller.enqueue(`0\r\n`); + if (checksumRequired) { + const checksum = base64Encoder!(await digest!); + controller.enqueue(`${checksumLocationName}:${checksum}\r\n`); + controller.enqueue(`\r\n`); + } + controller.close(); + } else { + controller.enqueue(`${(bodyLengthChecker(value) || 0).toString(16)}\r\n${value}\r\n`); + } + }, + }); +}; diff --git a/packages/util-stream-browser/src/index.ts b/packages/util-stream-browser/src/index.ts new file mode 100644 index 000000000000..b8a0d0906334 --- /dev/null +++ b/packages/util-stream-browser/src/index.ts @@ -0,0 +1 @@ +export * from "./getAwsChunkedEncodingStream"; diff --git a/packages/util-stream-browser/tsconfig.es.json b/packages/util-stream-browser/tsconfig.es.json new file mode 100644 index 000000000000..db3e1f18c259 --- /dev/null +++ b/packages/util-stream-browser/tsconfig.es.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "outDir": "dist-es", + "rootDir": "src" + }, + "extends": "../../tsconfig.es.json", + "include": ["src/"] +} diff --git a/packages/util-stream-browser/tsconfig.types.json b/packages/util-stream-browser/tsconfig.types.json new file mode 100644 index 000000000000..6cdf9f52ea06 --- /dev/null +++ b/packages/util-stream-browser/tsconfig.types.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "declarationDir": "dist-types", + "rootDir": "src" + }, + "extends": "../../tsconfig.types.json", + "include": ["src/"] +} From deb1f98c71cd6a06e6b247bf5ef832cbc47198e7 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 24 Dec 2021 00:01:17 +0000 Subject: [PATCH 3/8] feat(util-stream-node): add getAwsChunkedEncodingStream for node --- packages/util-stream-node/.gitignore | 8 + packages/util-stream-node/CHANGELOG.md | 4 + packages/util-stream-node/LICENSE | 201 ++++++++++++++++++ packages/util-stream-node/README.md | 12 ++ packages/util-stream-node/jest.config.js | 5 + packages/util-stream-node/package.json | 49 +++++ .../src/getAwsChunkedEncodingStream.ts | 31 +++ packages/util-stream-node/src/index.ts | 1 + packages/util-stream-node/tsconfig.cjs.json | 9 + packages/util-stream-node/tsconfig.es.json | 9 + packages/util-stream-node/tsconfig.types.json | 9 + 11 files changed, 338 insertions(+) create mode 100644 packages/util-stream-node/.gitignore create mode 100644 packages/util-stream-node/CHANGELOG.md create mode 100644 packages/util-stream-node/LICENSE create mode 100644 packages/util-stream-node/README.md create mode 100644 packages/util-stream-node/jest.config.js create mode 100644 packages/util-stream-node/package.json create mode 100644 packages/util-stream-node/src/getAwsChunkedEncodingStream.ts create mode 100644 packages/util-stream-node/src/index.ts create mode 100644 packages/util-stream-node/tsconfig.cjs.json create mode 100644 packages/util-stream-node/tsconfig.es.json create mode 100644 packages/util-stream-node/tsconfig.types.json diff --git a/packages/util-stream-node/.gitignore b/packages/util-stream-node/.gitignore new file mode 100644 index 000000000000..3d1714c9806e --- /dev/null +++ b/packages/util-stream-node/.gitignore @@ -0,0 +1,8 @@ +/node_modules/ +/build/ +/coverage/ +/docs/ +*.tsbuildinfo +*.tgz +*.log +package-lock.json diff --git a/packages/util-stream-node/CHANGELOG.md b/packages/util-stream-node/CHANGELOG.md new file mode 100644 index 000000000000..e9fb6ecf5930 --- /dev/null +++ b/packages/util-stream-node/CHANGELOG.md @@ -0,0 +1,4 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. \ No newline at end of file diff --git a/packages/util-stream-node/LICENSE b/packages/util-stream-node/LICENSE new file mode 100644 index 000000000000..7b6491ba7876 --- /dev/null +++ b/packages/util-stream-node/LICENSE @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/packages/util-stream-node/README.md b/packages/util-stream-node/README.md new file mode 100644 index 000000000000..e6e03ea9400f --- /dev/null +++ b/packages/util-stream-node/README.md @@ -0,0 +1,12 @@ +# @aws-sdk/util-stream-node + +[![NPM version](https://img.shields.io/npm/v/@aws-sdk/util-stream-node/latest.svg)](https://www.npmjs.com/package/@aws-sdk/util-stream-node) +[![NPM downloads](https://img.shields.io/npm/dm/@aws-sdk/util-stream-node.svg)](https://www.npmjs.com/package/@aws-sdk/util-stream-node) + +Package with utilities to operate on Node.JS streams. + +> An internal package + +## Usage + +You probably shouldn't, at least directly. diff --git a/packages/util-stream-node/jest.config.js b/packages/util-stream-node/jest.config.js new file mode 100644 index 000000000000..a8d1c2e49912 --- /dev/null +++ b/packages/util-stream-node/jest.config.js @@ -0,0 +1,5 @@ +const base = require("../../jest.config.base.js"); + +module.exports = { + ...base, +}; diff --git a/packages/util-stream-node/package.json b/packages/util-stream-node/package.json new file mode 100644 index 000000000000..6d2bcb4cf644 --- /dev/null +++ b/packages/util-stream-node/package.json @@ -0,0 +1,49 @@ +{ + "name": "@aws-sdk/util-stream-node", + "version": "3.0.0", + "scripts": { + "build": "yarn build:cjs && yarn build:es && yarn build:types", + "build:cjs": "tsc -p tsconfig.cjs.json", + "build:es": "tsc -p tsconfig.es.json", + "build:types": "tsc -p tsconfig.types.json", + "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", + "test": "jest" + }, + "main": "./dist-cjs/index.js", + "module": "./dist-es/index.js", + "types": "./dist-types/index.d.ts", + "author": { + "name": "AWS SDK for JavaScript Team", + "url": "https://aws.amazon.com/javascript/" + }, + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.40.0", + "tslib": "^2.3.0" + }, + "devDependencies": { + "@types/jest": "^26.0.4", + "@types/node": "^10.0.0", + "jest": "^26.1.0", + "typescript": "~4.3.5" + }, + "engines": { + "node": ">= 10.0.0" + }, + "typesVersions": { + "<4.0": { + "dist-types/*": [ + "dist-types/ts3.4/*" + ] + } + }, + "files": [ + "dist-*" + ], + "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/util-stream-node", + "repository": { + "type": "git", + "url": "https://github.com/aws/aws-sdk-js-v3.git", + "directory": "packages/util-stream-node" + } +} diff --git a/packages/util-stream-node/src/getAwsChunkedEncodingStream.ts b/packages/util-stream-node/src/getAwsChunkedEncodingStream.ts new file mode 100644 index 000000000000..52daf791ec79 --- /dev/null +++ b/packages/util-stream-node/src/getAwsChunkedEncodingStream.ts @@ -0,0 +1,31 @@ +import { GetAwsChunkedEncodingStream, GetAwsChunkedEncodingStreamOptions } from "@aws-sdk/types"; +import { Readable } from "stream"; + +export const getAwsChunkedEncodingStream: GetAwsChunkedEncodingStream = ( + readableStream: Readable, + options: GetAwsChunkedEncodingStreamOptions +) => { + const { base64Encoder, bodyLengthChecker, checksumAlgorithmFn, checksumLocationName, streamHasher } = options; + + const checksumRequired = + base64Encoder !== undefined && + checksumAlgorithmFn !== undefined && + checksumLocationName !== undefined && + streamHasher !== undefined; + const digest = checksumRequired ? streamHasher!(checksumAlgorithmFn!, readableStream) : undefined; + + const awsChunkedEncodingStream = new Readable({ read: () => {} }); + readableStream.on("data", (data) => { + awsChunkedEncodingStream.push(`${(bodyLengthChecker(data) || 0).toString(16)}\r\n${data.toString()}\r\n`); + }); + readableStream.on("end", async () => { + awsChunkedEncodingStream.push(`0\r\n`); + if (checksumRequired) { + const checksum = base64Encoder!(await digest!); + awsChunkedEncodingStream.push(`${checksumLocationName}:${checksum}\r\n`); + awsChunkedEncodingStream.push(`\r\n`); + } + awsChunkedEncodingStream.push(null); + }); + return awsChunkedEncodingStream; +}; diff --git a/packages/util-stream-node/src/index.ts b/packages/util-stream-node/src/index.ts new file mode 100644 index 000000000000..b8a0d0906334 --- /dev/null +++ b/packages/util-stream-node/src/index.ts @@ -0,0 +1 @@ +export * from "./getAwsChunkedEncodingStream"; diff --git a/packages/util-stream-node/tsconfig.cjs.json b/packages/util-stream-node/tsconfig.cjs.json new file mode 100644 index 000000000000..96198be81644 --- /dev/null +++ b/packages/util-stream-node/tsconfig.cjs.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "outDir": "dist-cjs", + "rootDir": "src" + }, + "extends": "../../tsconfig.cjs.json", + "include": ["src/"] +} diff --git a/packages/util-stream-node/tsconfig.es.json b/packages/util-stream-node/tsconfig.es.json new file mode 100644 index 000000000000..db3e1f18c259 --- /dev/null +++ b/packages/util-stream-node/tsconfig.es.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "outDir": "dist-es", + "rootDir": "src" + }, + "extends": "../../tsconfig.es.json", + "include": ["src/"] +} diff --git a/packages/util-stream-node/tsconfig.types.json b/packages/util-stream-node/tsconfig.types.json new file mode 100644 index 000000000000..6cdf9f52ea06 --- /dev/null +++ b/packages/util-stream-node/tsconfig.types.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "declarationDir": "dist-types", + "rootDir": "src" + }, + "extends": "../../tsconfig.types.json", + "include": ["src/"] +} From a1457cbd3d3eac6db3b9c485950148e3c1ae5ddd Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Sun, 20 Feb 2022 18:33:25 +0000 Subject: [PATCH 4/8] chore(util-stream-*): use asterisk for internal deps --- packages/util-stream-browser/package.json | 2 +- packages/util-stream-node/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/util-stream-browser/package.json b/packages/util-stream-browser/package.json index 627dd3cdaea9..e8543a7c53bd 100644 --- a/packages/util-stream-browser/package.json +++ b/packages/util-stream-browser/package.json @@ -17,7 +17,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.40.0", + "@aws-sdk/types": "*", "tslib": "^2.3.0" }, "devDependencies": { diff --git a/packages/util-stream-node/package.json b/packages/util-stream-node/package.json index 6d2bcb4cf644..805f899117ae 100644 --- a/packages/util-stream-node/package.json +++ b/packages/util-stream-node/package.json @@ -18,7 +18,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.40.0", + "@aws-sdk/types": "*", "tslib": "^2.3.0" }, "devDependencies": { From 7564c8936fb6b8827e5fe90fb415e2cc39b8b49b Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Sun, 20 Feb 2022 18:36:30 +0000 Subject: [PATCH 5/8] chore: updates from recent commits to main --- packages/util-stream-browser/package.json | 11 +++++++++-- packages/util-stream-node/package.json | 10 +++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/packages/util-stream-browser/package.json b/packages/util-stream-browser/package.json index e8543a7c53bd..69e0b8f6b8d8 100644 --- a/packages/util-stream-browser/package.json +++ b/packages/util-stream-browser/package.json @@ -2,10 +2,11 @@ "name": "@aws-sdk/util-stream-browser", "version": "3.0.0", "scripts": { - "build": "yarn build:es && yarn build:types", + "build": "concurrently 'yarn:build:es' 'yarn:build:types'", "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", + "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo", "test": "exit 0" }, "main": "./dist-es/index.js", @@ -21,7 +22,13 @@ "tslib": "^2.3.0" }, "devDependencies": { - "typescript": "~4.3.5" + "@types/jest": "^26.0.4", + "@types/node": "^10.0.0", + "concurrently": "7.0.0", + "downlevel-dts": "0.7.0", + "jest": "^26.1.0", + "typescript": "~4.3.5", + "rimraf": "3.0.2" }, "typesVersions": { "<4.0": { diff --git a/packages/util-stream-node/package.json b/packages/util-stream-node/package.json index 805f899117ae..fc7db533646a 100644 --- a/packages/util-stream-node/package.json +++ b/packages/util-stream-node/package.json @@ -2,11 +2,12 @@ "name": "@aws-sdk/util-stream-node", "version": "3.0.0", "scripts": { - "build": "yarn build:cjs && yarn build:es && yarn build:types", + "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'", "build:cjs": "tsc -p tsconfig.cjs.json", "build:es": "tsc -p tsconfig.es.json", "build:types": "tsc -p tsconfig.types.json", "downlevel-dts": "downlevel-dts dist-types dist-types/ts3.4", + "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo", "test": "jest" }, "main": "./dist-cjs/index.js", @@ -24,11 +25,14 @@ "devDependencies": { "@types/jest": "^26.0.4", "@types/node": "^10.0.0", + "concurrently": "7.0.0", + "downlevel-dts": "0.7.0", "jest": "^26.1.0", - "typescript": "~4.3.5" + "typescript": "~4.3.5", + "rimraf": "3.0.2" }, "engines": { - "node": ">= 10.0.0" + "node": ">= 12.0.0" }, "typesVersions": { "<4.0": { From 31de2106f463b2d87296eeb7513840ab445fca83 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Sun, 20 Feb 2022 18:40:57 +0000 Subject: [PATCH 6/8] fix(types): export stream.ts --- packages/types/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 012fdc38bfbf..4b5a64cab49e 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -12,6 +12,7 @@ export * from "./response"; export * from "./serde"; export * from "./shapes"; export * from "./signature"; +export * from "./stream"; export * from "./transfer"; export * from "./util"; export * from "./waiter"; From e0f802eb4735c9b1e33de2710c7a3f143a97e189 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Mon, 21 Feb 2022 19:33:04 +0000 Subject: [PATCH 7/8] chore: added a ToDo for ReadableStream and getReader validation --- packages/util-stream-browser/src/getAwsChunkedEncodingStream.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/util-stream-browser/src/getAwsChunkedEncodingStream.ts b/packages/util-stream-browser/src/getAwsChunkedEncodingStream.ts index ce0376e8e0a6..a786abab56a3 100644 --- a/packages/util-stream-browser/src/getAwsChunkedEncodingStream.ts +++ b/packages/util-stream-browser/src/getAwsChunkedEncodingStream.ts @@ -14,6 +14,8 @@ export const getAwsChunkedEncodingStream: GetAwsChunkedEncodingStream Date: Mon, 21 Feb 2022 18:53:59 -0800 Subject: [PATCH 8/8] docs: typo Node.js -> browser Co-authored-by: AllanZhengYP --- packages/util-stream-browser/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/util-stream-browser/README.md b/packages/util-stream-browser/README.md index 411efbb05419..9844f4dfcd16 100644 --- a/packages/util-stream-browser/README.md +++ b/packages/util-stream-browser/README.md @@ -3,7 +3,7 @@ [![NPM version](https://img.shields.io/npm/v/@aws-sdk/util-stream-browser/latest.svg)](https://www.npmjs.com/package/@aws-sdk/util-stream-browser) [![NPM downloads](https://img.shields.io/npm/dm/@aws-sdk/util-stream-browser.svg)](https://www.npmjs.com/package/@aws-sdk/util-stream-browser) -Package with utilities to operate on Node.JS streams. +Package with utilities to operate on browser streams. > An internal package