diff --git a/packages/crt-loader/CHANGELOG.md b/packages/crt-loader/CHANGELOG.md new file mode 100644 index 000000000000..e9fb6ecf5930 --- /dev/null +++ b/packages/crt-loader/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/crt-loader/LICENSE b/packages/crt-loader/LICENSE new file mode 100644 index 000000000000..7b6491ba7876 --- /dev/null +++ b/packages/crt-loader/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/crt-loader/README.md b/packages/crt-loader/README.md new file mode 100644 index 000000000000..e97807e0d515 --- /dev/null +++ b/packages/crt-loader/README.md @@ -0,0 +1,7 @@ +# @aws-sdk/crt-loader + +[![NPM version](https://img.shields.io/npm/v/@aws-sdk/crt-loader/latest.svg)](https://www.npmjs.com/package/@aws-sdk/crt-loader) +[![NPM downloads](https://img.shields.io/npm/dm/@aws-sdk/crt-loader.svg)](https://www.npmjs.com/package/@aws-sdk/crt-loader) + +This internal package is a loader for AWS Common Runtime (CRT) native modules that only executable in Node.js runtime. +See also https://github.com/aws/aws-sdk-js-v3/tree/main#functionality-requiring-aws-common-runtime-crt. diff --git a/packages/crt-loader/api-extractor.json b/packages/crt-loader/api-extractor.json new file mode 100644 index 000000000000..b03e22a16a06 --- /dev/null +++ b/packages/crt-loader/api-extractor.json @@ -0,0 +1,4 @@ +{ + "extends": "../../api-extractor.packages.json", + "mainEntryPointFilePath": "./dist-types/index.d.ts" +} diff --git a/packages/crt-loader/package.json b/packages/crt-loader/package.json new file mode 100644 index 000000000000..c840d4af36ff --- /dev/null +++ b/packages/crt-loader/package.json @@ -0,0 +1,47 @@ +{ + "name": "@aws-sdk/crt-loader", + "version": "3.0.0", + "description": "Loader for AWS Common Runtime https://github.com/awslabs/aws-crt-nodejs", + "main": "./dist-cjs/index.js", + "module": "./dist-es/index.js", + "types": "./dist-types/index.d.ts", + "scripts": { + "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'", + "build:cjs": "node ../../scripts/compilation/inline crt-loader", + "build:es": "tsc -p tsconfig.es.json", + "build:include:deps": "lerna run --scope $npm_package_name --include-dependencies build", + "build:types": "tsc -p tsconfig.types.json", + "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4", + "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo", + "extract:docs": "api-extractor run --local" + }, + "author": { + "name": "AWS SDK for JavaScript Team", + "url": "https://aws.amazon.com/javascript/" + }, + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/util-user-agent-node": "*", + "aws-crt": "^1.18.3", + "tslib": "^2.6.2" + }, + "devDependencies": { + "@tsconfig/recommended": "1.0.1", + "concurrently": "7.0.0", + "downlevel-dts": "0.10.1", + "rimraf": "3.0.2", + "typescript": "~4.9.5" + }, + "engines": { + "node": ">=16.0.0" + }, + "files": [ + "dist-*/**" + ], + "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/crt-loader", + "repository": { + "type": "git", + "url": "https://github.com/aws/aws-sdk-js-v3.git", + "directory": "packages/crt-loader" + } +} diff --git a/packages/crt-loader/src/index.ts b/packages/crt-loader/src/index.ts new file mode 100644 index 000000000000..e78e55efb793 --- /dev/null +++ b/packages/crt-loader/src/index.ts @@ -0,0 +1,4 @@ +import { crtAvailability } from "@aws-sdk/util-user-agent-node"; +crtAvailability.isCrtAvailable = true; + +export * from "aws-crt"; diff --git a/packages/crt-loader/tsconfig.cjs.json b/packages/crt-loader/tsconfig.cjs.json new file mode 100644 index 000000000000..fd33d99033c0 --- /dev/null +++ b/packages/crt-loader/tsconfig.cjs.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "lib": ["es2016"], + "noUnusedLocals": true, + "outDir": "dist-cjs", + "rootDir": "src", + "stripInternal": true + }, + "extends": "../../tsconfig.cjs.json", + "include": ["src/"] +} diff --git a/packages/crt-loader/tsconfig.es.json b/packages/crt-loader/tsconfig.es.json new file mode 100644 index 000000000000..37d7418d4733 --- /dev/null +++ b/packages/crt-loader/tsconfig.es.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "lib": [], + "noUnusedLocals": true, + "outDir": "dist-es", + "rootDir": "src", + "stripInternal": true + }, + "extends": "../../tsconfig.es.json", + "include": ["src/"] +} diff --git a/packages/crt-loader/tsconfig.types.json b/packages/crt-loader/tsconfig.types.json new file mode 100644 index 000000000000..6cdf9f52ea06 --- /dev/null +++ b/packages/crt-loader/tsconfig.types.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "declarationDir": "dist-types", + "rootDir": "src" + }, + "extends": "../../tsconfig.types.json", + "include": ["src/"] +} diff --git a/packages/signature-v4-crt/package.json b/packages/signature-v4-crt/package.json index 06d306ab283e..39f948da74fb 100644 --- a/packages/signature-v4-crt/package.json +++ b/packages/signature-v4-crt/package.json @@ -22,14 +22,13 @@ }, "license": "Apache-2.0", "dependencies": { + "@aws-sdk/crt-loader": "*", "@aws-sdk/signature-v4-multi-region": "*", "@aws-sdk/types": "*", - "@aws-sdk/util-user-agent-node": "*", "@smithy/querystring-parser": "^3.0.11", "@smithy/signature-v4": "^4.2.4", "@smithy/types": "^3.7.2", "@smithy/util-middleware": "^3.0.11", - "aws-crt": "^1.18.3", "tslib": "^2.6.2" }, "devDependencies": { diff --git a/packages/signature-v4-crt/src/CrtSignerV4.spec.ts b/packages/signature-v4-crt/src/CrtSignerV4.spec.ts index 31ba57fbf136..2b646dd8dc73 100644 --- a/packages/signature-v4-crt/src/CrtSignerV4.spec.ts +++ b/packages/signature-v4-crt/src/CrtSignerV4.spec.ts @@ -1,5 +1,5 @@ import { Sha256 } from "@aws-crypto/sha256-js"; -import { auth as crtAuth } from "aws-crt"; +import { auth as crtAuth } from "@aws-sdk/crt-loader"; import { ALGORITHM_IDENTIFIER_V4A, diff --git a/packages/signature-v4-crt/src/CrtSignerV4.ts b/packages/signature-v4-crt/src/CrtSignerV4.ts index 29dda4e4bece..4f1f680d679f 100644 --- a/packages/signature-v4-crt/src/CrtSignerV4.ts +++ b/packages/signature-v4-crt/src/CrtSignerV4.ts @@ -1,3 +1,4 @@ +import { auth as crtAuth, http as crtHttp, io as crtIO } from "@aws-sdk/crt-loader"; import { AwsCredentialIdentity } from "@aws-sdk/types"; import { parseQueryString } from "@smithy/querystring-parser"; import { @@ -18,7 +19,6 @@ import { RequestSigningArguments, } from "@smithy/types"; import { normalizeProvider } from "@smithy/util-middleware"; -import { auth as crtAuth, http as crtHttp, io as crtIO } from "aws-crt"; import { MAX_PRESIGNED_TTL, SHA256_HEADER } from "./constants"; import { deleteHeader } from "./headerUtil"; diff --git a/packages/signature-v4-crt/src/index.ts b/packages/signature-v4-crt/src/index.ts index eddd5a2c85a0..ea2acf4d28c7 100644 --- a/packages/signature-v4-crt/src/index.ts +++ b/packages/signature-v4-crt/src/index.ts @@ -1,9 +1,7 @@ import { signatureV4CrtContainer } from "@aws-sdk/signature-v4-multi-region"; -import { crtAvailability } from "@aws-sdk/util-user-agent-node"; import { CrtSignerV4 } from "./CrtSignerV4"; signatureV4CrtContainer.CrtSignerV4 = CrtSignerV4; -crtAvailability.isCrtAvailable = true; export * from "./CrtSignerV4"; diff --git a/yarn.lock b/yarn.lock index b589a3762bbc..4881daabe4b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23446,6 +23446,21 @@ __metadata: languageName: unknown linkType: soft +"@aws-sdk/crt-loader@npm:*, @aws-sdk/crt-loader@workspace:packages/crt-loader": + version: 0.0.0-use.local + resolution: "@aws-sdk/crt-loader@workspace:packages/crt-loader" + dependencies: + "@aws-sdk/util-user-agent-node": "npm:*" + "@tsconfig/recommended": "npm:1.0.1" + aws-crt: "npm:^1.18.3" + concurrently: "npm:7.0.0" + downlevel-dts: "npm:0.10.1" + rimraf: "npm:3.0.2" + tslib: "npm:^2.6.2" + typescript: "npm:~4.9.5" + languageName: unknown + linkType: soft + "@aws-sdk/dsql-signer@workspace:packages/dsql-signer": version: 0.0.0-use.local resolution: "@aws-sdk/dsql-signer@workspace:packages/dsql-signer" @@ -24206,16 +24221,15 @@ __metadata: resolution: "@aws-sdk/signature-v4-crt@workspace:packages/signature-v4-crt" dependencies: "@aws-crypto/sha256-js": "npm:5.2.0" + "@aws-sdk/crt-loader": "npm:*" "@aws-sdk/signature-v4-multi-region": "npm:*" "@aws-sdk/types": "npm:*" - "@aws-sdk/util-user-agent-node": "npm:*" "@smithy/protocol-http": "npm:^4.1.8" "@smithy/querystring-parser": "npm:^3.0.11" "@smithy/signature-v4": "npm:^4.2.4" "@smithy/types": "npm:^3.7.2" "@smithy/util-middleware": "npm:^3.0.11" "@tsconfig/recommended": "npm:1.0.1" - aws-crt: "npm:^1.18.3" concurrently: "npm:7.0.0" downlevel-dts: "npm:0.10.1" rimraf: "npm:3.0.2"