From d1e8ecb049a972d16f10d457159e5f2b7932b3bd Mon Sep 17 00:00:00 2001 From: Alex Forsyth Date: Mon, 1 Jun 2020 15:19:39 -0700 Subject: [PATCH 1/3] inital --- packages/fetch-http-handler/karma.conf.js | 7 ++++++- .../src/fetch-http-handler.browser.spec.ts | 17 +++++++++++++++++ .../src/fetch-http-handler.ts | 3 +-- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 packages/fetch-http-handler/src/fetch-http-handler.browser.spec.ts diff --git a/packages/fetch-http-handler/karma.conf.js b/packages/fetch-http-handler/karma.conf.js index 90d29b2f602e..02614806dfa2 100644 --- a/packages/fetch-http-handler/karma.conf.js +++ b/packages/fetch-http-handler/karma.conf.js @@ -2,7 +2,12 @@ process.env.CHROME_BIN = require("puppeteer").executablePath(); module.exports = function (config) { config.set({ frameworks: ["jasmine", "karma-typescript"], - files: ["src/stream-collector.ts", "src/stream-collector.browser.spec.ts"], + files: [ + "src/stream-collector.ts", + "src/stream-collector.browser.spec.ts", + "src/fetch-http-handler.ts", + "src/fetch-http-handler.browser.spec.ts" + ], exclude: ["**/*.d.ts"], preprocessors: { "**/*.ts": "karma-typescript" diff --git a/packages/fetch-http-handler/src/fetch-http-handler.browser.spec.ts b/packages/fetch-http-handler/src/fetch-http-handler.browser.spec.ts new file mode 100644 index 000000000000..673168f905e6 --- /dev/null +++ b/packages/fetch-http-handler/src/fetch-http-handler.browser.spec.ts @@ -0,0 +1,17 @@ +import { FetchHttpHandler } from "./fetch-http-handler"; + +describe("fetchHttpHandler", () => { + it("returns does something when something", done => { + expect(1).toBe(1); + // const expected = new Uint8Array(0); + + // const dataPromise = new Response(expected.buffer) + // .blob() + // .then(blob => FetchHttpHandler(blob)); + + // dataPromise.then((data: any) => { + // expect(data).toEqual(expected); + // done(); + // }); + }); +}); diff --git a/packages/fetch-http-handler/src/fetch-http-handler.ts b/packages/fetch-http-handler/src/fetch-http-handler.ts index 3d9aa867d64d..7b5b1d6521b5 100644 --- a/packages/fetch-http-handler/src/fetch-http-handler.ts +++ b/packages/fetch-http-handler/src/fetch-http-handler.ts @@ -53,8 +53,7 @@ export class FetchHttpHandler implements HttpHandler { const requestOptions: RequestInit = { body: request.body, headers: new Headers(request.headers), - method: request.method, - mode: "cors" + method: request.method }; // some browsers support abort signal From 41f96033d3e859bf578c127841e130ef015d7dd6 Mon Sep 17 00:00:00 2001 From: Alex Forsyth Date: Mon, 1 Jun 2020 15:24:40 -0700 Subject: [PATCH 2/3] fix(fetch-http-handler): add missing dependency --- packages/fetch-http-handler/package.json | 1 + yarn.lock | 49 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/packages/fetch-http-handler/package.json b/packages/fetch-http-handler/package.json index 70fa074cfc07..7c527ebd17a5 100644 --- a/packages/fetch-http-handler/package.json +++ b/packages/fetch-http-handler/package.json @@ -18,6 +18,7 @@ "@aws-sdk/protocol-http": "1.0.0-gamma.1", "@aws-sdk/querystring-builder": "1.0.0-gamma.1", "@aws-sdk/types": "1.0.0-gamma.1", + "@aws-sdk/util-base64-browser": "1.0.0-gamma.1", "tslib": "^1.8.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index aa9f1f061603..e1a412acec18 100644 --- a/yarn.lock +++ b/yarn.lock @@ -45,6 +45,13 @@ dependencies: tslib "^1.9.3" +"@aws-sdk/util-base64-browser@^0.1.0-preview.1": + version "0.1.0-preview.1" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-base64-browser/-/util-base64-browser-0.1.0-preview.1.tgz#95455d5ab0b58479c67540c110626392f139c34f" + integrity sha512-AJfuHnIaqUR16Gx1j1kmr04jGuUvRBoUtyzIAbR81i5O66vmPnMTFq+5ReBSg1ebhsaEaW3tM9er6l+gmmMqDg== + dependencies: + tslib "^1.8.0" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" @@ -4295,6 +4302,11 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= +fast-base64-decode@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fast-base64-decode/-/fast-base64-decode-1.0.0.tgz#b434a0dd7d92b12b43f26819300d2dafb83ee418" + integrity sha512-qwaScUgUGBYeDNRnbc/KyllVU88Jk1pRHPStuF/lO7B0/RTRLj7U0lkdTAutlBblY08rwZDff6tNU9cjv6j//Q== + fast-deep-equal@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" @@ -6363,6 +6375,11 @@ jest-watcher@^25.5.0: jest-util "^25.5.0" string-length "^3.1.0" +jest-websocket-mock@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/jest-websocket-mock/-/jest-websocket-mock-2.0.2.tgz#8dfa268fd56bba6e0b759756cd1d3bafd40cdb42" + integrity sha512-SFTUI8O/LDGqROOMnfAzbrrX5gQ8GDhRqkzVrt8Y67evnFKccRPFI3ymS05tKcMONvVfxumat4pX/LRjM/CjVg== + jest-worker@^24.6.0, jest-worker@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5" @@ -7280,6 +7297,13 @@ mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1: dependencies: minimist "^1.2.5" +mock-socket@^9.0.3: + version "9.0.3" + resolved "https://registry.yarnpkg.com/mock-socket/-/mock-socket-9.0.3.tgz#4bc6d2aea33191e4fed5ec71f039e2bbeb95e414" + integrity sha512-SxIiD2yE/By79p3cNAAXyLQWTvEFNEzcAO7PH+DzRqKSFaplAPFjiQLmw8ofmpCsZf+Rhfn2/xCJagpdGmYdTw== + dependencies: + url-parse "^1.4.4" + modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" @@ -8354,6 +8378,11 @@ querystring@0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= +querystringify@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" + integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== + quick-lru@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" @@ -8394,6 +8423,13 @@ react-is@^16.12.0, react-is@^16.8.4: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +react-native-get-random-values@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/react-native-get-random-values/-/react-native-get-random-values-1.4.0.tgz#1234d4dde6b56b2fab0eaa7dc1719e2f8c32c336" + integrity sha512-NnmEZcC5zfz+QEytFPM/fw818Hodw/BNbv7jGxU4pla4K2K9DCzG83IReMJqQ2wo552AYKguqrBG2SSn/U6rbA== + dependencies: + fast-base64-decode "^1.0.0" + read-cmd-shim@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16" @@ -10122,6 +10158,14 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= +url-parse@^1.4.4: + version "1.4.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" + integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -10202,6 +10246,11 @@ uuid@^7.0.0, uuid@^7.0.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== +uuid@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d" + integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg== + v8-to-istanbul@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz#22fe35709a64955f49a08a7c7c959f6520ad6f20" From 6b81aface468065b4c14acb02f8483f9cc0152d2 Mon Sep 17 00:00:00 2001 From: Alex Forsyth Date: Mon, 1 Jun 2020 15:28:52 -0700 Subject: [PATCH 3/3] Revert "inital" This reverts commit d1e8ecb049a972d16f10d457159e5f2b7932b3bd. --- packages/fetch-http-handler/karma.conf.js | 7 +------ .../src/fetch-http-handler.browser.spec.ts | 17 ----------------- .../src/fetch-http-handler.ts | 3 ++- 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 packages/fetch-http-handler/src/fetch-http-handler.browser.spec.ts diff --git a/packages/fetch-http-handler/karma.conf.js b/packages/fetch-http-handler/karma.conf.js index 02614806dfa2..90d29b2f602e 100644 --- a/packages/fetch-http-handler/karma.conf.js +++ b/packages/fetch-http-handler/karma.conf.js @@ -2,12 +2,7 @@ process.env.CHROME_BIN = require("puppeteer").executablePath(); module.exports = function (config) { config.set({ frameworks: ["jasmine", "karma-typescript"], - files: [ - "src/stream-collector.ts", - "src/stream-collector.browser.spec.ts", - "src/fetch-http-handler.ts", - "src/fetch-http-handler.browser.spec.ts" - ], + files: ["src/stream-collector.ts", "src/stream-collector.browser.spec.ts"], exclude: ["**/*.d.ts"], preprocessors: { "**/*.ts": "karma-typescript" diff --git a/packages/fetch-http-handler/src/fetch-http-handler.browser.spec.ts b/packages/fetch-http-handler/src/fetch-http-handler.browser.spec.ts deleted file mode 100644 index 673168f905e6..000000000000 --- a/packages/fetch-http-handler/src/fetch-http-handler.browser.spec.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { FetchHttpHandler } from "./fetch-http-handler"; - -describe("fetchHttpHandler", () => { - it("returns does something when something", done => { - expect(1).toBe(1); - // const expected = new Uint8Array(0); - - // const dataPromise = new Response(expected.buffer) - // .blob() - // .then(blob => FetchHttpHandler(blob)); - - // dataPromise.then((data: any) => { - // expect(data).toEqual(expected); - // done(); - // }); - }); -}); diff --git a/packages/fetch-http-handler/src/fetch-http-handler.ts b/packages/fetch-http-handler/src/fetch-http-handler.ts index 7b5b1d6521b5..3d9aa867d64d 100644 --- a/packages/fetch-http-handler/src/fetch-http-handler.ts +++ b/packages/fetch-http-handler/src/fetch-http-handler.ts @@ -53,7 +53,8 @@ export class FetchHttpHandler implements HttpHandler { const requestOptions: RequestInit = { body: request.body, headers: new Headers(request.headers), - method: request.method + method: request.method, + mode: "cors" }; // some browsers support abort signal