-
Notifications
You must be signed in to change notification settings - Fork 34
Bug 1728810 - Implement an uploader for the Node.js platform #730
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| import https from "https"; | ||
| import http from "http"; | ||
|
|
||
| import log, { LoggingLevel } from "../../core/log.js"; | ||
| import Uploader, { | ||
| UploadResult, | ||
| UploadResultStatus, | ||
| DEFAULT_UPLOAD_TIMEOUT_MS | ||
| } from "../../core/upload/uploader.js"; | ||
|
|
||
| const LOG_TAG = "platform.node.Uploader"; | ||
|
|
||
| class NodeUploader extends Uploader { | ||
| post(url: string, body: string | Uint8Array, headers?: Record<string, string>): Promise<UploadResult> { | ||
| return new Promise(resolve => { | ||
| // We can trust that the URL is valid, | ||
| // since it is validated upon Glean initialzation | ||
| // TODO: Bug 1730496 | ||
| const parsedURL = new URL(url); | ||
| const mod = parsedURL.protocol === "http:" ? http : https; | ||
| const request = mod.request( | ||
| { | ||
| hostname: parsedURL.hostname, | ||
| path: parsedURL.pathname, | ||
| port: parsedURL.port, | ||
| headers, | ||
| method: "POST", | ||
| timeout: DEFAULT_UPLOAD_TIMEOUT_MS | ||
| }, | ||
| response => { | ||
| response.resume(); | ||
| response.once("end", () => { | ||
| resolve(new UploadResult(UploadResultStatus.Success, response.statusCode)); | ||
| }); | ||
| } | ||
| ); | ||
|
|
||
| request.on("timeout", () => { | ||
brizental marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| log(LOG_TAG, "Timeout while attempting to upload ping.", LoggingLevel.Error); | ||
| request.destroy(); | ||
| resolve(new UploadResult(UploadResultStatus.RecoverableFailure)); | ||
| }); | ||
|
|
||
| request.on("error", error => { | ||
| log( | ||
| LOG_TAG, | ||
| [ "Network error while attempting to upload ping.\n", error.message ], | ||
| LoggingLevel.Error | ||
| ); | ||
| resolve(new UploadResult(UploadResultStatus.RecoverableFailure)); | ||
| }); | ||
|
|
||
| // Finish sending the request. | ||
| request.end(body); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| export default new NodeUploader(); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| import assert from "assert"; | ||
| import nock from "nock"; | ||
|
|
||
| import NodeUploader from "../../../../src/platform/node/uploader"; | ||
| import { DEFAULT_UPLOAD_TIMEOUT_MS, UploadResult, UploadResultStatus } from "../../../../src/core/upload/uploader"; | ||
|
|
||
| const MOCK_ENDPOINT = "http://www.example.com"; | ||
|
|
||
| describe("Uploader/Node", function () { | ||
| afterEach(function () { | ||
| nock.cleanAll(); | ||
| }); | ||
|
|
||
| it("returns the correct status for successful requests", async function () { | ||
| for (const status of [200, 400, 500]) { | ||
| nock(MOCK_ENDPOINT).post(/./i).reply(status); | ||
|
|
||
| const response = NodeUploader.post(MOCK_ENDPOINT, ""); | ||
| const expectedResponse = new UploadResult(UploadResultStatus.Success, status); | ||
| assert.deepStrictEqual( | ||
| await response, | ||
| expectedResponse | ||
| ); | ||
| } | ||
| }); | ||
|
|
||
| it("returns the correct status for timeout requests", async function () { | ||
| nock(MOCK_ENDPOINT).post(/./i).delay(DEFAULT_UPLOAD_TIMEOUT_MS + 1).reply(500); | ||
chutten marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| const response = NodeUploader.post(MOCK_ENDPOINT, ""); | ||
| const expectedResponse = new UploadResult(UploadResultStatus.RecoverableFailure); | ||
| assert.deepStrictEqual( | ||
| await response, | ||
chutten marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| expectedResponse | ||
| ); | ||
| }); | ||
|
|
||
| it("returns the correct status for request errors", async function () { | ||
| nock(MOCK_ENDPOINT).post(/./i).replyWithError({ | ||
| message: "something awful happened", | ||
| code: "AWFUL_ERROR", | ||
| }); | ||
|
|
||
| const response = NodeUploader.post(MOCK_ENDPOINT, ""); | ||
| const expectedResponse = new UploadResult(UploadResultStatus.RecoverableFailure); | ||
| assert.deepStrictEqual( | ||
| await response, | ||
| expectedResponse | ||
| ); | ||
| }); | ||
| }); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess there's an interesting discussion to be had about allowing un-TLS'd connections in Glean to non-local hosts, but this isn't the time or place.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There will be some validation soon https://bugzilla.mozilla.org/show_bug.cgi?id=1730496#c1