-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
refactor: tighten up cloudflare detection #3170
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
2 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,81 @@ | ||
const { getStream, getSecureStream } = getStreamFuncs() | ||
|
||
module.exports = { | ||
/** | ||
* Get a socket stream compatible with the current runtime environment. | ||
* @returns {Duplex} | ||
*/ | ||
getStream, | ||
/** | ||
* Get a TLS secured socket, compatible with the current environment, | ||
* using the socket and other settings given in `options`. | ||
* @returns {Duplex} | ||
*/ | ||
getSecureStream, | ||
} | ||
|
||
/** | ||
* Get a socket stream compatible with the current runtime environment. | ||
* @returns {Duplex} | ||
* The stream functions that work in Node.js | ||
*/ | ||
module.exports.getStream = function getStream(ssl) { | ||
const net = require('net') | ||
if (typeof net.Socket === 'function') { | ||
function getNodejsStreamFuncs() { | ||
function getStream(ssl) { | ||
const net = require('net') | ||
return new net.Socket() | ||
} else { | ||
const { CloudflareSocket } = require('pg-cloudflare') | ||
return new CloudflareSocket(ssl) | ||
} | ||
|
||
function getSecureStream(options) { | ||
var tls = require('tls') | ||
return tls.connect(options) | ||
} | ||
return { | ||
getStream, | ||
getSecureStream, | ||
} | ||
} | ||
|
||
/** | ||
* Get a TLS secured socket, compatible with the current environment, | ||
* using the socket and other settings given in `options`. | ||
* @returns {Duplex} | ||
* The stream functions that work in Cloudflare Workers | ||
*/ | ||
module.exports.getSecureStream = function getSecureStream(options) { | ||
var tls = require('tls') | ||
if (tls.connect) { | ||
return tls.connect(options) | ||
} else { | ||
function getCloudflareStreamFuncs() { | ||
function getStream(ssl) { | ||
const { CloudflareSocket } = require('pg-cloudflare') | ||
return new CloudflareSocket(ssl) | ||
} | ||
|
||
function getSecureStream(options) { | ||
options.socket.startTls(options) | ||
return options.socket | ||
} | ||
return { | ||
getStream, | ||
getSecureStream, | ||
} | ||
} | ||
|
||
/** | ||
* Are we running in a Cloudflare Worker? | ||
* | ||
* @returns true if the code is currently running inside a Cloudflare Worker. | ||
*/ | ||
function isCloudflareRuntime() { | ||
petebacondarwin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// Since 2022-03-21 the `global_navigator` compatibility flag is on for Cloudflare Workers | ||
// which means that `navigator.userAgent` will be defined. | ||
if (typeof navigator === 'object' && navigator !== null && typeof navigator.userAgent === 'string') { | ||
return navigator.userAgent === 'Cloudflare-Workers' | ||
} | ||
// In case `navigator` or `navigator.userAgent` is not defined then try a more sneaky approach | ||
if (typeof Response === 'function') { | ||
const resp = new Response(null, { cf: { thing: true } }) | ||
if (typeof resp.cf === 'object' && resp.cf !== null && resp.cf.thing) { | ||
return true | ||
} | ||
} | ||
return false | ||
} | ||
|
||
function getStreamFuncs() { | ||
if (isCloudflareRuntime()) { | ||
return getCloudflareStreamFuncs() | ||
} | ||
return getNodejsStreamFuncs() | ||
} |
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.