From db7d8303ddf8e1288fa3b4d84e0684772d956c2a Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Wed, 13 Mar 2024 18:15:21 +0000 Subject: [PATCH] fixup! refactor: tighten up cloudflare detection --- packages/pg/lib/stream.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/pg/lib/stream.js b/packages/pg/lib/stream.js index 0cba52e30..296b26737 100644 --- a/packages/pg/lib/stream.js +++ b/packages/pg/lib/stream.js @@ -3,12 +3,12 @@ * @returns {Duplex} */ module.exports.getStream = function getStream(ssl) { - try { - const { CloudflareSocket } = require('pg-cloudflare') - return new CloudflareSocket(ssl) - } catch { + if (process?.release?.name === 'node') { const net = require('net') return new net.Socket() + } else { + const { CloudflareSocket } = require('pg-cloudflare') + return new CloudflareSocket(ssl) } } @@ -18,11 +18,11 @@ module.exports.getStream = function getStream(ssl) { * @returns {Duplex} */ module.exports.getSecureStream = function getSecureStream(options) { - try { - options.socket.startTls(options) - return options.socket - } catch { + if (process?.release?.name === 'node') { var tls = require('tls') return tls.connect(options) + } else { + options.socket.startTls(options) + return options.socket } }