This repository has been archived by the owner on Jun 28, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 23
Update Node types and TypeScript #114
Open
oporkka
wants to merge
3
commits into
master
Choose a base branch
from
node-types
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 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 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 | ||||
---|---|---|---|---|---|---|
|
@@ -525,21 +525,18 @@ export class ServiceClient { | |||||
constructor(optionsOrUrl: ServiceClientOptions | string) { | ||||||
let options: ServiceClientOptions; | ||||||
if (typeof optionsOrUrl === "string") { | ||||||
const { | ||||||
port, | ||||||
protocol, | ||||||
query, | ||||||
hostname = "", | ||||||
pathname = "/" | ||||||
} = url.parse(optionsOrUrl, true); | ||||||
const { port, protocol, query, hostname, pathname } = url.parse( | ||||||
optionsOrUrl, | ||||||
true | ||||||
); | ||||||
options = { | ||||||
hostname, | ||||||
hostname: hostname || "", | ||||||
defaultRequestOptions: { | ||||||
port, | ||||||
protocol, | ||||||
query, | ||||||
// pathname will be overwritten in actual usage, we just guarantee a sane default | ||||||
pathname | ||||||
Comment on lines
-528
to
-542
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there any issue with the defaults not working with deconstruction? |
||||||
pathname: pathname || "/" | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
} | ||||||
}; | ||||||
} else { | ||||||
|
This file contains 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 | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -9,6 +9,7 @@ import * as zlib from "zlib"; | |||||||||
import { ServiceClientError } from "./client"; | ||||||||||
import { Socket } from "net"; | ||||||||||
import { Readable } from "stream"; | ||||||||||
import { ParsedUrlQueryInput } from "querystring"; | ||||||||||
|
||||||||||
const DEFAULT_READ_TIMEOUT = 2000; | ||||||||||
const DEFAULT_CONNECTION_TIMEOUT = 1000; | ||||||||||
|
@@ -53,7 +54,7 @@ interface Span { | |||||||||
|
||||||||||
export interface ServiceClientRequestOptions extends RequestOptions { | ||||||||||
pathname: string; | ||||||||||
query?: object; | ||||||||||
query?: ParsedUrlQueryInput; | ||||||||||
timing?: boolean; | ||||||||||
autoDecodeUtf8?: boolean; | ||||||||||
dropRequestAfter?: number; | ||||||||||
|
@@ -234,7 +235,9 @@ export const request = ( | |||||||||
const requestObject = httpRequestFn(options); | ||||||||||
requestObject.setTimeout(readTimeout, () => { | ||||||||||
logEvent(EventSource.HTTP_REQUEST, EventName.TIMEOUT); | ||||||||||
requestObject.socket.destroy(); | ||||||||||
if (requestObject.socket != null) { | ||||||||||
requestObject.socket.destroy(); | ||||||||||
} | ||||||||||
Comment on lines
+238
to
+240
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||
reject(new ReadTimeoutError(options)); | ||||||||||
}); | ||||||||||
|
||||||||||
|
Oops, something went wrong.
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.