denodrivers · Oct 9, 2023
Showing with 14 additions and 7 deletions.

+8 −3 connection/connection.ts

+3 −1 connection/connection_params.ts

+1 −1 deps.ts

+2 −2 query/decoders.ts
diff --git a/connection/connection.ts b/connection/connection.ts
@@ -142,6 +142,11 @@ export class Connection {
     return this.#transport;
   }
 
+  static connFactory?: { // dfp: allow alternate Deno.connect/startTls
+    connect: typeof Deno.connect,
+    startTls: typeof Deno.startTls,
+  }
+
   constructor(
     connection_params: ClientConfiguration,
     disconnection_callback: () => Promise<void>,
@@ -250,7 +255,7 @@ export class Connection {
   async #openConnection(options: ConnectOptions) {
     // @ts-ignore This will throw in runtime if the options passed to it are socket related and deno is running
     // on stable
-    this.#conn = await Deno.connect(options);
+    this.#conn = await (Connection.connFactory?.connect ?? Deno.connect)(options); // dfp: allow alternate Deno.connect
     this.#bufWriter = new BufWriter(this.#conn);
     this.#bufReader = new BufReader(this.#conn);
   }
@@ -287,7 +292,7 @@ export class Connection {
     connection: Deno.Conn,
     options: { hostname: string; caCerts: string[] },
   ) {
-    this.#conn = await Deno.startTls(connection, options);
+    this.#conn = await (Connection.connFactory?.startTls ?? Deno.startTls)(connection, options); // dfp: allow alternate Deno.startTls
     this.#bufWriter = new BufWriter(this.#conn);
     this.#bufReader = new BufReader(this.#conn);
   }
@@ -387,7 +392,7 @@ export class Connection {
       } catch (e) {
         // Make sure to close the connection before erroring or reseting
         this.#closeConnection();
-        if (e instanceof Deno.errors.InvalidData && tls_enabled) {
+        if (globalThis.Deno?.errors?.InvalidData && e instanceof Deno.errors.InvalidData && tls_enabled) { // dfp: Deno.errors.InvalidData may not exist
           if (tls_enforced) {
             throw new Error(
               "The certificate used to secure the TLS connection is invalid.",

diff --git a/connection/connection_params.ts b/connection/connection_params.ts
@@ -27,6 +27,7 @@ export type ConnectionString = string;
  * It will throw if no env permission was provided on startup
  */
 function getPgEnv(): ClientOptions {
+  if (!globalThis.Deno?.env) throw new Error(`No Deno.env`); // dfp: Deno.env may not exist
   return {
     applicationName: Deno.env.get("PGAPPNAME"),
     database: Deno.env.get("PGDATABASE"),
@@ -333,7 +334,7 @@ export function createParams(
   try {
     pgEnv = getPgEnv();
   } catch (e) {
-    if (e instanceof Deno.errors.PermissionDenied) {
+    if (e.message === 'No Deno.env' || globalThis.Deno?.errors?.PermissionDenied && e instanceof Deno.errors.PermissionDenied) { // dfp: Deno.errors.PermissionDenied may not exist
       has_env_access = false;
     } else {
       throw e;
@@ -354,6 +355,7 @@ export function createParams(
     const socket = provided_host ?? DEFAULT_OPTIONS.socket;
     try {
       if (!isAbsolute(socket)) {
+        if (!Deno?.mainModule) throw new Error(`Relative socket needs Deno.mainModule`); // dfp: Deno.mainModule may not exist
         const parsed_host = new URL(socket, Deno.mainModule);
 
         // Resolve relative path

diff --git a/deps.ts b/deps.ts
@@ -6,7 +6,7 @@ export {
   BufWriter,
 } from "https://deno.land/std@0.160.0/io/buffer.ts";
 export { copy } from "https://deno.land/std@0.160.0/bytes/mod.ts";
-export { crypto } from "https://deno.land/std@0.160.0/crypto/mod.ts";
+const crypto = globalThis.crypto; export { crypto }; // dfp: assume crypto in globalThis
 export {
   type Deferred,
   deferred,

diff --git a/query/decoders.ts b/query/decoders.ts
@@ -40,7 +40,7 @@ export function decodeBooleanArray(value: string) {
 }
 
 export function decodeBox(value: string): Box {
-  const [a, b] = value.match(/\(.*?\)/g) || [];
+  const [a, b] = value.match(/\(.*?\)/g) || [] as any; // dfp: doesn't compile, wait for an upstream fix
 
   return {
     a: decodePoint(a),
@@ -221,7 +221,7 @@ export function decodeLineArray(value: string) {
 export function decodeLineSegment(value: string): LineSegment {
   const [a, b] = value
     .substring(1, value.length - 1)
-    .match(/\(.*?\)/g) || [];
+    .match(/\(.*?\)/g) || [] as any; // dfp: doesn't compile, wait for an upstream fix
 
   return {
     a: decodePoint(a),