-
Notifications
You must be signed in to change notification settings - Fork 1
fix: improve node-fetch compatibility in error cases MONGOSH-2443 #224
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
+162
−19
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ac775df
fix: improve node-fetch compatibility in error cases MONGOSH-2443
addaleax ea2590e
fixup: do not do HTTP error handling if `status` is not present
addaleax bebe356
Merge remote-tracking branch 'origin/main' into 2443-dev
addaleax 6a84138
fixup: implement web stream methods
addaleax 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
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 |
---|---|---|
|
@@ -6,6 +6,7 @@ import type { | |
} from 'openid-client'; | ||
import { MongoDBOIDCError, type OIDCAbortSignal } from './types'; | ||
import { createHash, randomBytes } from 'crypto'; | ||
import type { Readable } from 'stream'; | ||
|
||
class AbortError extends Error { | ||
constructor() { | ||
|
@@ -236,44 +237,67 @@ export class TokenSet { | |
} | ||
} | ||
|
||
function getCause(err: unknown): Record<string, unknown> | undefined { | ||
if ( | ||
err && | ||
typeof err === 'object' && | ||
'cause' in err && | ||
err.cause && | ||
typeof err.cause === 'object' | ||
) { | ||
return err.cause as Record<string, unknown>; | ||
} | ||
} | ||
|
||
// [email protected] has reduced error messages for HTTP errors significantly, reducing e.g. | ||
// an HTTP error to just a simple 'unexpect HTTP response status code' message, without | ||
// further diagnostic information. So if the `cause` of an `err` object is a fetch `Response` | ||
// object, we try to throw a more helpful error. | ||
export async function improveHTTPResponseBasedError<T>( | ||
err: T | ||
): Promise<T | MongoDBOIDCError> { | ||
if ( | ||
err && | ||
typeof err === 'object' && | ||
'cause' in err && | ||
err.cause && | ||
typeof err.cause === 'object' && | ||
'status' in err.cause && | ||
'statusText' in err.cause && | ||
'text' in err.cause && | ||
typeof err.cause.text === 'function' | ||
) { | ||
// Note: `err.cause` can either be an `Error` object itself, or a `Response`, or a JSON HTTP response body | ||
const cause = getCause(err); | ||
if (cause) { | ||
try { | ||
const statusObject = | ||
'status' in cause ? cause : (err as Record<string, unknown>); | ||
if (!statusObject.status) return err; | ||
|
||
let body = ''; | ||
try { | ||
body = await err.cause.text(); | ||
if ('text' in cause && typeof cause.text === 'function') | ||
body = await cause.text(); // Handle the `Response` case | ||
} catch { | ||
// ignore | ||
} | ||
let errorMessageFromBody = ''; | ||
try { | ||
const parsed = JSON.parse(body); | ||
let parsed: Record<string, unknown> = cause; | ||
try { | ||
parsed = JSON.parse(body); | ||
} catch { | ||
// ignore, and maybe `parsed` already contains the parsed JSON body anyway | ||
} | ||
errorMessageFromBody = | ||
': ' + String(parsed.error_description || parsed.error || ''); | ||
': ' + | ||
[parsed.error, parsed.error_description] | ||
.filter(Boolean) | ||
.map(String) | ||
.join(', '); | ||
} catch { | ||
// ignore | ||
} | ||
if (!errorMessageFromBody) errorMessageFromBody = `: ${body}`; | ||
|
||
const statusTextInsert = | ||
'statusText' in statusObject | ||
? `(${String(statusObject.statusText)})` | ||
: ''; | ||
return new MongoDBOIDCError( | ||
`${errorString(err)}: caused by HTTP response ${String( | ||
err.cause.status | ||
)} (${String(err.cause.statusText)})${errorMessageFromBody}`, | ||
statusObject.status | ||
)} ${statusTextInsert}${errorMessageFromBody}`, | ||
{ codeName: 'HTTPResponseError', cause: err } | ||
); | ||
} catch { | ||
|
@@ -282,3 +306,76 @@ export async function improveHTTPResponseBasedError<T>( | |
} | ||
return err; | ||
} | ||
|
||
// Check whether converting a Node.js `Readable` stream to a web `ReadableStream` | ||
// is possible. We use this for compatibility with fetch() implementations that | ||
// return Node.js `Readable` streams like node-fetch. | ||
export function streamIsNodeReadable(stream: unknown): stream is Readable { | ||
return !!( | ||
stream && | ||
typeof stream === 'object' && | ||
'pipe' in stream && | ||
typeof stream.pipe === 'function' && | ||
(!('cancel' in stream) || !stream.cancel) | ||
); | ||
} | ||
|
||
export function nodeFetchCompat( | ||
response: Response & { body: Readable | ReadableStream | null } | ||
): Response { | ||
const notImplemented = (method: string) => | ||
new MongoDBOIDCError(`Not implemented: body.${method}`, { | ||
codeName: 'HTTPBodyShimNotImplemented', | ||
}); | ||
const { body, clone } = response; | ||
if (streamIsNodeReadable(body)) { | ||
let webStream: ReadableStream | undefined; | ||
const toWeb = () => | ||
webStream ?? (body.constructor as typeof Readable).toWeb?.(body); | ||
// Provide ReadableStream methods that may be used by openid-client | ||
Object.assign( | ||
body, | ||
{ | ||
locked: false, | ||
cancel() { | ||
if (webStream) return webStream.cancel(); | ||
body.resume(); | ||
}, | ||
getReader(...args: Parameters<ReadableStream['getReader']>) { | ||
if ((webStream = toWeb())) return webStream.getReader(...args); | ||
|
||
throw notImplemented('getReader'); | ||
}, | ||
pipeThrough(...args: Parameters<ReadableStream['pipeThrough']>) { | ||
if ((webStream = toWeb())) return webStream.pipeThrough(...args); | ||
throw notImplemented('pipeThrough'); | ||
}, | ||
pipeTo(...args: Parameters<ReadableStream['pipeTo']>) { | ||
if ((webStream = toWeb())) return webStream.pipeTo(...args); | ||
|
||
throw notImplemented('pipeTo'); | ||
}, | ||
tee(...args: Parameters<ReadableStream['tee']>) { | ||
if ((webStream = toWeb())) return webStream.tee(...args); | ||
throw notImplemented('tee'); | ||
}, | ||
values(...args: Parameters<ReadableStream['values']>) { | ||
if ((webStream = toWeb())) return webStream.values(...args); | ||
throw notImplemented('values'); | ||
}, | ||
}, | ||
body | ||
); | ||
Object.assign(response, { | ||
clone: function (this: Response): Response { | ||
// node-fetch replaces `.body` on `.clone()` on *both* | ||
// the original and the cloned Response objects | ||
const cloned = clone.call(this); | ||
nodeFetchCompat(this); | ||
return nodeFetchCompat(cloned); | ||
}, | ||
}); | ||
} | ||
|
||
return response; | ||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.