postgrejs 2.12.0 → 2.15.0

package/esm/data-types/timestamptz-type.js

@@ -16,8 +16,9 @@ export const TimestamptzType = {
             return fetchAsString ? '-infinity' : -Infinity;
         // Shift from 2000 to 1970
         let d = new Date((lo + hi * timeMul) / 1000 + timeShift);
-        if (fetchAsString || !options.utcDates)
+        if (fetchAsString || !options.utcDates) {
             d = new Date(d.getFullYear(), d.getMonth(), d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds(), d.getMilliseconds());
+        }
         return fetchAsString ? dateToTimestamptzString(d) : d;
     },
     encodeBinary(buf, v, options) {

package/esm/index.js

@@ -1,11 +1,10 @@
-export * from './constants.js';
-export * from './data-type-map.js';
-export * from './types.js';
 export * from './connection/bind-param.js';
 export * from './connection/connection.js';
 export * from './connection/cursor.js';
 export * from './connection/pool.js';
 export * from './connection/prepared-statement.js';
+export * from './constants.js';
+export * from './data-type-map.js';
 export * from './interfaces/command-result.js';
 export * from './interfaces/data-mapping-options.js';
 export * from './interfaces/data-type.js';
@@ -16,10 +15,11 @@ export * from './interfaces/query-result.js';
 export * from './interfaces/script-execute-options.js';
 export * from './interfaces/script-result.js';
 export * from './interfaces/statement-prepare-options.js';
+export * from './protocol/database-error.js';
+export * from './protocol/smart-buffer.js';
+export * from './types.js';
 export * from './util/connection-config.js';
 export * from './util/escape-literal.js';
 export * from './util/parse-datetime.js';
 export * from './util/stringify-arrayliteral.js';
 export * from './util/stringify-for-sql.js';
-export * from './protocol/smart-buffer.js';
-export * from './protocol/database-error.js';

package/esm/protocol/frontend.js

@@ -158,8 +158,9 @@ export class Frontend {
         return setLengthAndFlush(io, 1);
     }
     getDescribeMessage(args) {
-        if (args.name && args.name.length > 63)
-            throw new Error(args.type === 'P' ? 'Portal' : 'Statement' + 'name length must be lower than 63');
+        if (args.name && args.name.length > 63) {
+            throw new Error(args.type === 'P' ? 'Portal' : 'Statement name length must be lower than 63');
+        }
         const io = this._io
             .start()
             .writeInt8(Protocol.FrontendMessageCode.Describe)
@@ -169,8 +170,9 @@ export class Frontend {
         return setLengthAndFlush(io, 1);
     }
     getExecuteMessage(args) {
-        if (args.fetchCount && (args.fetchCount < 0 || args.fetchCount > 4294967295))
+        if (args.fetchCount && (args.fetchCount < 0 || args.fetchCount > 4294967295)) {
             throw new Error('fetchCount can be between 0 and 4294967295');
+        }
         const io = this._io
             .start()
             .writeInt8(Protocol.FrontendMessageCode.Execute)
@@ -180,8 +182,9 @@ export class Frontend {
         return setLengthAndFlush(io, 1);
     }
     getCloseMessage(args) {
-        if (args.name && args.name.length > 63)
-            throw new Error(args.type === 'P' ? 'Portal' : 'Statement' + 'name length must be lower than 63');
+        if (args.name && args.name.length > 63) {
+            throw new Error(args.type === 'P' ? 'Portal' : 'Statement name length must be lower than 63');
+        }
         const io = this._io
             .start()
             .writeInt8(Protocol.FrontendMessageCode.Close)

package/esm/protocol/pg-socket.js

@@ -53,30 +53,31 @@ export class PgSocket extends SafeEventEmitter {
             socket.setTimeout(0);
             if (this.options.keepAlive || this.options.keepAlive == null)
                 socket.setKeepAlive(true);
-            if (options.ssl) {
-                socket.write(this._frontend.getSSLRequestMessage());
-                socket.once('data', x => {
-                    this._removeListeners();
-                    if (x.toString() === 'S') {
-                        const tslOptions = { ...options.ssl, socket };
-                        if (options.host && net.isIP(options.host) === 0)
-                            tslOptions.servername = options.host;
-                        const tlsSocket = (this._socket = tls.connect(tslOptions));
-                        tlsSocket.once('error', errorHandler);
-                        tlsSocket.once('secureConnect', () => {
-                            this._removeListeners();
-                            this._handleConnect();
-                        });
-                        return;
-                    }
-                    if (x.toString() === 'N')
+            socket.write(this._frontend.getSSLRequestMessage());
+            socket.once('data', x => {
+                this._removeListeners();
+                if (x.toString() === 'S') {
+                    const tslOptions = { ...options.ssl, socket };
+                    if (options.host && net.isIP(options.host) === 0)
+                        tslOptions.servername = options.host;
+                    const tlsSocket = (this._socket = tls.connect(tslOptions));
+                    tlsSocket.once('error', errorHandler);
+                    tlsSocket.once('secureConnect', () => {
+                        this._removeListeners();
+                        this._handleConnect();
+                    });
+                    return;
+                }
+                if (x.toString() === 'N') {
+                    if (options.requireSSL) {
                         return errorHandler(new Error('Server does not support SSL connections'));
-                    return errorHandler(new Error('There was an error establishing an SSL connection'));
-                });
-            }
-            else {
-                this._handleConnect();
-            }
+                    }
+                    this._removeListeners();
+                    this._handleConnect();
+                    return;
+                }
+                return errorHandler(new Error('There was an error establishing an SSL connection'));
+            });
         };
         socket.setNoDelay(true);
         socket.setTimeout(options.connectTimeoutMs || 30000, () => errorHandler(new Error('Connection timed out')));
@@ -283,8 +284,9 @@ export class PgSocket extends SafeEventEmitter {
                 });
                 break;
             case Protocol.AuthenticationMessageKind.SASL: {
-                if (!msg.mechanisms.includes('SCRAM-SHA-256'))
+                if (!msg.mechanisms.includes('SCRAM-SHA-256')) {
                     throw new Error('SASL: Only mechanism SCRAM-SHA-256 is currently supported');
+                }
                 const saslSession = (this._saslSession = SASL.createSession(this.options.user || '', 'SCRAM-SHA-256'));
                 this._send(this._frontend.getSASLMessage(saslSession));
                 break;
@@ -308,6 +310,8 @@ export class PgSocket extends SafeEventEmitter {
                 this._saslSession = undefined;
                 break;
             }
+            default:
+                break;
         }
     }
     _handleParameterStatus(msg) {

package/esm/protocol/sasl.js

@@ -33,6 +33,8 @@ export var SASL;
                 case 'i':
                     iteration = parseInt(i.substring(2), 10);
                     break;
+                default:
+                    break;
             }
         }
         if (!nonce)
@@ -69,25 +71,25 @@ export var SASL;
             throw new Error('SASL: Server signature does not match');
     }
     SASL.finalizeSession = finalizeSession;
-    function firstMessageBare(username, nonce) {
+    const firstMessageBare = function (username, nonce) {
         return `n=${username},r=${nonce}`;
-    }
+    };
     /**
      * Hi() is, essentially, PBKDF2 [RFC2898] with HMAC() as the
      * pseudorandom function (PRF) and with dkLen == output length of
      * HMAC() == output length of H()
      */
-    function hi(text, salt, iterations) {
+    const hi = function (text, salt, iterations) {
         return crypto.pbkdf2Sync(text, Buffer.from(salt, 'base64'), iterations, 32, 'sha256');
-    }
+    };
     const encode64 = str => Buffer.from(str).toString('base64');
-    function hmac(key, msg) {
+    const hmac = function (key, msg) {
         return crypto.createHmac('sha256', key).update(msg).digest();
-    }
-    function hash(data) {
+    };
+    const hash = function (data) {
         return crypto.createHash('sha256').update(data).digest();
-    }
-    function xor(a, b) {
+    };
+    const xor = function (a, b) {
         a = Buffer.isBuffer(a) ? a : Buffer.from(a);
         b = Buffer.isBuffer(b) ? b : Buffer.from(b);
         if (a.length !== b.length)
@@ -98,5 +100,5 @@ export var SASL;
             out[i] = a[i] ^ b[i];
         }
         return out;
-    }
+    };
 })(SASL || (SASL = {}));

package/esm/util/connection-config.js

@@ -23,9 +23,7 @@ export function parseConnectionString(str) {
     if (!str.includes('://'))
         str = 'postgres://' + str;
     const parsed = new URL(str);
-    const getFirst = (v) => {
-        return typeof v === 'string' ? v : Array.isArray(v) ? v[0] : '';
-    };
+    const getFirst = (v) => (typeof v === 'string' ? v : Array.isArray(v) ? v[0] : '');
     const cfg = {};
     cfg.host = decodeURI(parsed.hostname || '');
     if (parsed.port)
@@ -47,11 +45,13 @@ export function parseConnectionString(str) {
         cfg.database = decodeURI(getFirst(parsed.searchParams.get('db')));
     if (parsed.searchParams.get('schema'))
         cfg.schema = decodeURI(getFirst(parsed.searchParams.get('schema')));
-    if (parsed.searchParams.get('application_name'))
+    if (parsed.searchParams.get('application_name')) {
         cfg.applicationName = decodeURI(getFirst(parsed.searchParams.get('application_name')));
+    }
     if (parsed.username)
         cfg.user = parsed.username;
     if (parsed.password)
         cfg.password = parsed.password;
+    cfg.requireSSL = parsed.searchParams.get('sslmode') === 'require';
     return cfg;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "postgrejs",
-  "description": "Enterprise level PostgreSQL client for JavaScript",
-  "version": "2.12.0",
+  "description": "Professional PostgreSQL client NodeJS",
+  "version": "2.15.0",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
@@ -9,7 +9,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/panates/postgresql-client.git"
+    "url": "https://github.com/panates/postgrejs.git"
   },
   "type": "module",
   "main": "./cjs/index.js",
@@ -19,7 +19,7 @@
     "doublylinked": "^2.5.4",
     "lightning-pool": "^4.2.2",
     "postgres-bytea": "^3.0.0",
-    "power-tasks": "^1.7.3",
+    "power-tasks": "^1.7.4",
     "putil-merge": "^3.12.1",
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5"
@@ -51,4 +51,4 @@
     "ts",
     "esm"
   ]
-}
+}

package/typings/connection/connection.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ConnectionState } from '../constants.js';
 import { ConnectionConfiguration } from '../interfaces/database-connection-params.js';
 import { QueryOptions } from '../interfaces/query-options.js';

package/typings/connection/cursor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { FieldInfo } from '../interfaces/field-info.js';
 import { QueryOptions } from '../interfaces/query-options.js';
 import { SafeEventEmitter } from '../safe-event-emitter.js';

package/typings/connection/prepared-statement.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { QueryOptions } from '../interfaces/query-options.js';
 import { QueryResult } from '../interfaces/query-result.js';
 import { StatementPrepareOptions } from '../interfaces/statement-prepare-options.js';

package/typings/index.d.ts

@@ -1,11 +1,10 @@
-export * from './constants.js';
-export * from './data-type-map.js';
-export * from './types.js';
 export * from './connection/bind-param.js';
 export * from './connection/connection.js';
 export * from './connection/cursor.js';
 export * from './connection/pool.js';
 export * from './connection/prepared-statement.js';
+export * from './constants.js';
+export * from './data-type-map.js';
 export * from './interfaces/command-result.js';
 export * from './interfaces/data-mapping-options.js';
 export * from './interfaces/data-type.js';
@@ -16,10 +15,11 @@ export * from './interfaces/query-result.js';
 export * from './interfaces/script-execute-options.js';
 export * from './interfaces/script-result.js';
 export * from './interfaces/statement-prepare-options.js';
+export * from './protocol/database-error.js';
+export * from './protocol/smart-buffer.js';
+export * from './types.js';
 export * from './util/connection-config.js';
 export * from './util/escape-literal.js';
 export * from './util/parse-datetime.js';
 export * from './util/stringify-arrayliteral.js';
 export * from './util/stringify-for-sql.js';
-export * from './protocol/smart-buffer.js';
-export * from './protocol/database-error.js';

package/typings/interfaces/database-connection-params.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { PoolConfiguration as LPoolConfiguration } from 'lightning-pool';
 import type { ConnectionOptions as TlsConnectionOptions } from 'tls';
 import type { SmartBufferConfig } from '../protocol/smart-buffer.js';
@@ -10,6 +9,7 @@ export interface DatabaseConnectionParams {
     password?: string | (() => string | Promise<string>);
     database?: string;
     applicationName?: string;
+    requireSSL?: boolean;
     ssl?: TlsConnectionOptions;
     timezone?: string;
     schema?: string;

package/typings/protocol/backend.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Protocol } from './protocol.js';
 declare type ParseCallback = (code: Protocol.BackendMessageCode, data?: any) => void;
 export declare class Backend {

package/typings/protocol/buffer-reader.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare class BufferReader {
     buffer: Buffer;
     offset: number;

package/typings/protocol/frontend.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { DataTypeMap } from '../data-type-map.js';
 import { QueryOptions } from '../interfaces/query-options.js';
 import { Maybe, OID } from '../types.js';

package/typings/protocol/pg-socket.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ConnectionState } from '../constants.js';
 import { ConnectionConfiguration } from '../interfaces/database-connection-params.js';
 import { SafeEventEmitter } from '../safe-event-emitter.js';

package/typings/protocol/protocol.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Nullable } from '../types.js';
 export declare namespace Protocol {
     const VERSION_MAJOR = 3;

package/typings/protocol/smart-buffer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { BufferReader } from './buffer-reader.js';
 export interface SmartBufferConfig {
     pageSize?: number;

package/typings/safe-event-emitter.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'events';
 export declare class SafeEventEmitter extends EventEmitter {
     emit(event: string | symbol, ...args: any[]): boolean;

package/typings/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { DataMappingOptions } from './interfaces/data-mapping-options.js';
 import type { SmartBuffer } from './protocol/smart-buffer';
 export type OID = number;

package/typings/util/bigint-methods.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" />
 export declare function readBigInt64BE(buf: Buffer, offset?: number): bigint;
 export declare function writeBigUInt64BE(buf: Buffer, value: BigInt, offset?: number): number;

package/typings/util/decode-binaryarray.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { DataMappingOptions } from '../interfaces/data-mapping-options.js';
 import type { DecodeBinaryFunction, Nullable } from '../types.js';
 export declare function decodeBinaryArray<T = any>(buf: Buffer, decoder: DecodeBinaryFunction, options?: DataMappingOptions): Nullable<T[]>;