@m2k-5f/pgtx 2.6.11 → 2.7.1

package/dist/protocol/connection-response-reader.d.ts

@@ -64,5 +64,6 @@ export declare class ConnectionResponseReader {
     readBindComplete(): void;
     readParameterDescription(): void;
     readNoData(): void;
+    skip(count: number): void;
 }
 //# sourceMappingURL=connection-response-reader.d.ts.map

package/dist/protocol/connection-response-reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection-response-reader.d.ts","sourceRoot":"","sources":["../../src/protocol/connection-response-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA6B,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC5G,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAOxC,qBAAa,wBAAwB;IAI7B,OAAO,CAAC,MAAM;IAHlB,OAAO,CAAC,KAAK,CAAI;IAEjB,OAAO;IAKP,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;IAK1B,QAAQ,IAAI,MAAM;IAOlB,SAAS,IAAI,MAAM;IAOnB,SAAS,IAAI,MAAM;IAOnB,WAAW,IAAI,MAAM;IAQrB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAOrC,OAAO,IAAI,OAAO;IAKlB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAO3C,cAAc,IAAI,IAAI;IAOtB,mBAAmB,IAAI,IAAI;IAO3B,cAAc,IAAI,MAAM;IAaxB,SAAS,CAAC,SAAS,EAAE,MAAM;IAK3B,aAAa,IAAI,OAAO;IAaxB,iBAAiB;IAIjB,QAAQ;IAMR,YAAY,IAAI,MAAM;IAOtB,SAAS;IAST,WAAW;IAOX,WAAW,IAAI,MAAM;IAMrB,QAAQ;IAWR,SAAS,CAAC,MAAM,EAAE,MAAM;IAQxB,aAAa,CAAC,MAAM,EAAE,MAAM;CAW/B;AAGD,qBAAa,wBAAwB;IAG7B,OAAO,CAAC,MAAM;IADlB,OAAO;IAKP,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;IAK1B,QAAQ;cACoC,YAAY;;;IAIxD,kBAAkB,IACoB,kBAAkB;IAIxD,WAAW;IAKX,mBAAmB;;;;IAQnB,kBAAkB;;;;IAQlB,iBAAiB,IAAI,aAAa;IA4ClC,iBAAiB,IACoB,iBAAiB;IAItD,kBAAkB,IAAI,MAAM,EAAE;IAa9B,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAKvC,kBAAkB;IAsBlB,WAAW,CAAC,YAAY,EAAE,iBAAiB,EAAE,EAAE,YAAY,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IA0G1F,wBAAwB;;;;IASxB,mBAAmB,IAAI,MAAM;IAK7B,OAAO;IAKP,aAAa;IAKb,iBAAiB;IAKjB,iBAAiB;IAGjB,gBAAgB;IAGhB,wBAAwB;IAOxB,UAAU;CACb"}
+{"version":3,"file":"connection-response-reader.d.ts","sourceRoot":"","sources":["../../src/protocol/connection-response-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA6B,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC5G,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAOxC,qBAAa,wBAAwB;IAI7B,OAAO,CAAC,MAAM;IAHlB,OAAO,CAAC,KAAK,CAAI;IAEjB,OAAO;IAKP,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;IAK1B,QAAQ,IAAI,MAAM;IAOlB,SAAS,IAAI,MAAM;IAOnB,SAAS,IAAI,MAAM;IAOnB,WAAW,IAAI,MAAM;IAQrB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAOrC,OAAO,IAAI,OAAO;IAKlB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAO3C,cAAc,IAAI,IAAI;IAOtB,mBAAmB,IAAI,IAAI;IAO3B,cAAc,IAAI,MAAM;IAaxB,SAAS,CAAC,SAAS,EAAE,MAAM;IAK3B,aAAa,IAAI,OAAO;IAaxB,iBAAiB;IAIjB,QAAQ;IAMR,YAAY,IAAI,MAAM;IAOtB,SAAS;IAST,WAAW;IAOX,WAAW,IAAI,MAAM;IAMrB,QAAQ;IAWR,SAAS,CAAC,MAAM,EAAE,MAAM;IAQxB,aAAa,CAAC,MAAM,EAAE,MAAM;CAW/B;AAGD,qBAAa,wBAAwB;IAG7B,OAAO,CAAC,MAAM;IADlB,OAAO;IAKP,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;IAK1B,QAAQ;cACoC,YAAY;;;IAIxD,kBAAkB,IACoB,kBAAkB;IAIxD,WAAW;IAKX,mBAAmB;;;;IAQnB,kBAAkB;;;;IAQlB,iBAAiB,IAAI,aAAa;IA4ClC,iBAAiB,IACoB,iBAAiB;IAItD,kBAAkB,IAAI,MAAM,EAAE;IAa9B,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAKvC,kBAAkB;IAsBlB,WAAW,CAAC,YAAY,EAAE,iBAAiB,EAAE,EAAE,YAAY,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IA0G1F,wBAAwB;;;;IASxB,mBAAmB,IAAI,MAAM;IAK7B,OAAO;IAKP,aAAa;IAKb,iBAAiB;IAKjB,iBAAiB;IAGjB,gBAAgB;IAGhB,wBAAwB;IAOxB,UAAU;IAEV,IAAI,CAAC,KAAK,EAAE,MAAM;CAGrB"}

package/dist/protocol/connection-response-reader.js

@@ -376,4 +376,7 @@ export class ConnectionResponseReader {
         }
     }
     readNoData() { }
+    skip(count) {
+        this.buffer.skipBytes(count);
+    }
 }

package/dist/protocol/constants.d.ts

@@ -27,6 +27,8 @@ export declare const ResponseTypes: {
     readonly NoData: "n";
     readonly Notice: "N";
     readonly NotificationResponse: "A";
+    readonly SSLOk: "S";
+    readonly SSLDenied: "N";
 };
 export declare const DataTypeOids: {
     readonly Bool: 16;

package/dist/protocol/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/protocol/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAElC,eAAO,MAAM,YAAY;;;;;;;;;CASf,CAAA;AAEV,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,YAAY,CAAC,CAAA;AAGtD,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;CAiBhB,CAAA;AAGV,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDf,CAAA;AAEV,MAAM,MAAM,WAAW,GAAG,OAAO,YAAY,CAAC,MAAM,OAAO,YAAY,CAAC,CAAC;AAIzE,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,aAAa,CAAC,CAAA;AAGxD,eAAO,MAAM,mBAAmB;;;;;;;CAOtB,CAAA;AAEV,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,mBAAmB,CAAC,CAAA;AAGpE,eAAO,MAAM,mBAAmB;;;;CAItB,CAAA;AAEV,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,mBAAmB,CAAC,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/protocol/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAElC,eAAO,MAAM,YAAY;;;;;;;;;CASf,CAAA;AAEV,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,YAAY,CAAC,CAAA;AAGtD,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;CAmBhB,CAAA;AAGV,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDf,CAAA;AAEV,MAAM,MAAM,WAAW,GAAG,OAAO,YAAY,CAAC,MAAM,OAAO,YAAY,CAAC,CAAC;AAIzE,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,aAAa,CAAC,CAAA;AAGxD,eAAO,MAAM,mBAAmB;;;;;;;CAOtB,CAAA;AAEV,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,mBAAmB,CAAC,CAAA;AAGpE,eAAO,MAAM,mBAAmB;;;;CAItB,CAAA;AAEV,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,mBAAmB,CAAC,CAAA"}

package/dist/protocol/constants.js

@@ -24,7 +24,9 @@ export const ResponseTypes = {
     ParameterDescription: "t",
     NoData: "n",
     Notice: "N",
-    NotificationResponse: "A"
+    NotificationResponse: "A",
+    SSLOk: "S",
+    SSLDenied: "N"
 };
 export const DataTypeOids = {
     Bool: 16,

package/dist/protocol/socket-authorization.d.ts

@@ -1,7 +1,8 @@
-import { Socket } from "node:net";
-import { ConnectionRequestWriter } from "./connection-request-writer";
 import { PostgresError } from "../error";
 import { Future } from "fluent-future";
-import { AuthorizationParams } from "../types";
-export declare const createAuthorizedSocket: (writer: ConnectionRequestWriter, params: AuthorizationParams) => Future<Socket, PostgresError>;
+import { Socket } from "node:net";
+import { ConnectionConfig } from "../types";
+export declare const createSocket: (config: ConnectionConfig) => Future<Socket, PostgresError>;
+export declare const upgradeSocket: (socket: Socket, config: ConnectionConfig) => Future<Socket, PostgresError>;
+export declare const authorizeSocket: (socket: Socket, config: ConnectionConfig) => Future<Socket, PostgresError>;
 //# sourceMappingURL=socket-authorization.d.ts.map

package/dist/protocol/socket-authorization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket-authorization.d.ts","sourceRoot":"","sources":["../../src/protocol/socket-authorization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,MAAM,EAAE,MAAM,UAAU,CAAA;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAKrE,OAAO,EAAoE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC1G,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAG9C,eAAO,MAAM,sBAAsB,GAAI,QAAQ,uBAAuB,EAAE,QAAQ,mBAAmB,kCAoHlG,CAAA"}
+{"version":3,"file":"socket-authorization.d.ts","sourceRoot":"","sources":["../../src/protocol/socket-authorization.ts"],"names":[],"mappings":"AAKA,OAAO,EAA4J,aAAa,EAAE,MAAM,UAAU,CAAA;AAClM,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAEtC,OAAO,EAAoB,MAAM,EAAE,MAAM,UAAU,CAAA;AAEnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAI3C,eAAO,MAAM,YAAY,GAAI,QAAQ,gBAAgB,kCASpD,CAAA;AAGD,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,EAAE,QAAQ,gBAAgB,kCA+ErE,CAAA;AAGD,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,EAAE,QAAQ,gBAAgB,kCAyHvE,CAAA"}

package/dist/protocol/socket-authorization.js

@@ -1,93 +1,186 @@
-import { createConnection } from "node:net";
+import { ConnectionRequestWriter } from "./connection-request-writer";
 import { calculateScramAuth, generateNonce } from "../security/sasl";
 import { SocketConnector } from "./socket-connector";
 import { AuthenticationCodes, ResponseTypes } from "./constants";
 import { encryptMd5 } from "../security/md5";
-import { ErrNonceMismatch, ErrPasswordRequired, ErrSocketFailedDuringAuth } from "../error";
+import { ErrCertificateFileNotFound, ErrDatabaseNotFound, ErrNonceMismatch, ErrPasswordRequired, ErrSocketFailedDuringAuth, ErrSSLDenied, ErrUntrustedCertificate } from "../error";
 import { Future } from "fluent-future";
-export const createAuthorizedSocket = (writer, params) => {
+import { connect } from "node:tls";
+import { createConnection } from "node:net";
+import { readFileSync } from "node:fs";
+export const createSocket = (config) => {
+    const { future, resolve, reject } = Future.withResolvers();
+    const socket = createConnection({ host: config.host, port: config.port });
+    socket.once('connect', () => resolve(socket));
+    socket.once('error', () => reject(ErrDatabaseNotFound));
+    return future;
+};
+export const upgradeSocket = (socket, config) => {
+    if (config.ssl === 'disable')
+        return Future.resolve(socket);
+    const { future, reject, resolve } = Future.withResolvers();
+    const writer = ConnectionRequestWriter.new();
+    const onError = () => {
+        cleanup();
+        reject(ErrSocketFailedDuringAuth);
+    };
+    socket.once('error', onError);
+    const cleanup = () => {
+        socket.off('error', onError);
+    };
+    socket.once('data', (data) => {
+        cleanup();
+        const responseCode = data.toString('utf8', 0, 1);
+        if (responseCode === 'S') {
+            if (data.length > 1) {
+                socket.unshift(data.subarray(1));
+            }
+            let cert = undefined;
+            try {
+                cert = config.caPath ? readFileSync(config.caPath) : undefined;
+            }
+            catch {
+                socket.destroy();
+                return reject(ErrCertificateFileNotFound);
+            }
+            const tls = connect({
+                socket: socket,
+                host: config.host,
+                rejectUnauthorized: config.ssl === 'require',
+                ca: cert
+            });
+            const tlsCleanup = () => {
+                tls.off('secureConnect', onSecureConnect);
+                tls.off('error', onTlsError);
+            };
+            const onSecureConnect = () => {
+                tlsCleanup();
+                resolve(tls);
+            };
+            const onTlsError = () => {
+                tlsCleanup();
+                tls.destroy();
+                reject(ErrUntrustedCertificate);
+            };
+            tls.once('secureConnect', onSecureConnect);
+            tls.once('error', onTlsError);
+        }
+        else if (responseCode === 'N') {
+            if (config.ssl === 'require') {
+                socket.destroy();
+                reject(ErrSSLDenied);
+                return;
+            }
+            resolve(socket);
+        }
+        else {
+            socket.destroy();
+            reject(ErrSocketFailedDuringAuth);
+        }
+    });
+    socket.write(writer.writeSSLRequest().asBuffer());
+    writer.clear();
+    return future;
+};
+export const authorizeSocket = (socket, config) => {
     const { future, reject, resolve } = Future.withResolvers();
+    const writer = ConnectionRequestWriter.new();
     const nonce = generateNonce();
     let clientMessage = '';
     let serverMessage = '';
-    const socket = createConnection({ host: params.host, port: params.port });
-    const connector = new SocketConnector(socket, (type, length, reader) => {
-        writer.clear();
+    const connector = new SocketConnector(socket, handle, () => reject(ErrSocketFailedDuringAuth));
+    function handle(type, length, reader) {
         switch (type) {
-            case ResponseTypes.Authentication: {
-                switch (reader.readAuthentication()) {
-                    case AuthenticationCodes.Ok: break;
-                    case AuthenticationCodes.CleartextPassword: {
-                        if (!params.password)
-                            throw ErrPasswordRequired;
-                        connector.write(writer.writePassword(params.password));
-                        break;
-                    }
-                    case AuthenticationCodes.MD5Password: {
-                        const salt = reader.readMD5Salt();
-                        if (!params.password)
-                            throw ErrPasswordRequired;
-                        const password = encryptMd5(params.password, params.user, salt);
-                        connector.write(writer.writePassword(password));
-                        break;
-                    }
-                    case AuthenticationCodes.SASL: {
-                        reader.readSaslMechanisms();
-                        if (!params.password)
-                            throw ErrPasswordRequired;
-                        clientMessage = `n=${params.user},r=${nonce}`;
-                        connector.write(writer.writeSaslInitial('SCRAM-SHA-256', `n,,${clientMessage}`));
-                        break;
-                    }
-                    case AuthenticationCodes.SASLContinue: {
-                        serverMessage = reader.readSaslMessage(length);
-                        if (!params.password)
-                            throw ErrPasswordRequired;
-                        const parts = Object.fromEntries(serverMessage.split(',').map(x => x.split('=')));
-                        const serverNonce = parts.r;
-                        const saltBase64 = parts.s;
-                        const iterations = parseInt(parts.i, 10);
-                        if (!serverNonce.startsWith(nonce)) {
-                            connector.destroy();
-                            return reject(ErrNonceMismatch);
-                        }
-                        const clientFinalMessageWithoutProof = `c=biws,r=${serverNonce}`;
-                        const authMessage = `${clientMessage},${serverMessage},${clientFinalMessageWithoutProof}`;
-                        const { clientProof } = calculateScramAuth(params.password, saltBase64, iterations, authMessage);
-                        const clientFinalMessage = `${clientFinalMessageWithoutProof},p=${clientProof}`;
-                        connector.write(writer.writeSaslResponse(clientFinalMessage));
-                        break;
-                    }
-                    case AuthenticationCodes.SASLFinal: {
-                        reader.readSaslMessage(length);
-                        break;
-                    }
+            case ResponseTypes.Authentication:
+                {
+                    Authentication(length, reader);
                 }
                 break;
-            }
-            case ResponseTypes.ParamaterStatus: {
-                reader.readParameterStatus();
+            case ResponseTypes.ParamaterStatus:
+                {
+                    reader.readParameterStatus();
+                }
                 break;
-            }
-            case ResponseTypes.ErrorResponse: {
-                const error = reader.readErrorResponse();
-                connector.destroy();
-                reject(error);
+            case ResponseTypes.ErrorResponse:
+                {
+                    const error = reader.readErrorResponse();
+                    connector.destroy();
+                    reject(error);
+                }
                 return;
-            }
-            case ResponseTypes.BackendKeyData: {
-                reader.readBackendKeyData();
-            }
-            case ResponseTypes.ReadyForQuery: {
-                reader.readReadyForQuery();
-                resolve(connector.unwrapSocket());
+            case ResponseTypes.BackendKeyData:
+                {
+                    reader.readBackendKeyData();
+                }
+                break;
+            case ResponseTypes.ReadyForQuery:
+                {
+                    reader.readReadyForQuery();
+                    resolve(connector.unwrapSocket());
+                }
                 return;
-            }
         }
-    }, error => {
-        reject(ErrSocketFailedDuringAuth);
-    });
-    connector.write(writer.writeStartup(params.user, params.database));
+    }
+    function Authentication(length, reader) {
+        switch (reader.readAuthentication()) {
+            case AuthenticationCodes.Ok: break;
+            case AuthenticationCodes.CleartextPassword:
+                {
+                    if (!config.password)
+                        throw ErrPasswordRequired;
+                    connector.write(writer.writePassword(config.password));
+                    writer.clear();
+                }
+                break;
+            case AuthenticationCodes.MD5Password:
+                {
+                    const salt = reader.readMD5Salt();
+                    if (!config.password)
+                        throw ErrPasswordRequired;
+                    const password = encryptMd5(config.password, config.user, salt);
+                    connector.write(writer.writePassword(password));
+                    writer.clear();
+                }
+                break;
+            case AuthenticationCodes.SASL:
+                {
+                    reader.readSaslMechanisms();
+                    if (!config.password)
+                        throw ErrPasswordRequired;
+                    clientMessage = `n=${config.user},r=${nonce}`;
+                    connector.write(writer.writeSaslInitial('SCRAM-SHA-256', `n,,${clientMessage}`));
+                    writer.clear();
+                }
+                break;
+            case AuthenticationCodes.SASLContinue:
+                {
+                    serverMessage = reader.readSaslMessage(length);
+                    if (!config.password)
+                        throw ErrPasswordRequired;
+                    const parts = Object.fromEntries(serverMessage.split(',').map(x => x.split('=')));
+                    const serverNonce = parts.r;
+                    const saltBase64 = parts.s;
+                    const iterations = parseInt(parts.i, 10);
+                    if (!serverNonce.startsWith(nonce)) {
+                        connector.destroy();
+                        return reject(ErrNonceMismatch);
+                    }
+                    const clientFinalMessageWithoutProof = `c=biws,r=${serverNonce}`;
+                    const authMessage = `${clientMessage},${serverMessage},${clientFinalMessageWithoutProof}`;
+                    const { clientProof } = calculateScramAuth(config.password, saltBase64, iterations, authMessage);
+                    const clientFinalMessage = `${clientFinalMessageWithoutProof},p=${clientProof}`;
+                    connector.write(writer.writeSaslResponse(clientFinalMessage));
+                    writer.clear();
+                }
+                break;
+            case AuthenticationCodes.SASLFinal:
+                {
+                    reader.readSaslMessage(length);
+                }
+                break;
+        }
+    }
+    connector.write(writer.writeStartup(config.user, config.database));
     writer.clear();
     return future;
 };

package/dist/protocol/socket-connector.d.ts

@@ -4,14 +4,14 @@ import { ConnectionResponseReader } from '../protocol/connection-response-reader
 import { ConnectionRequestWriter } from '../protocol/connection-request-writer';
 export declare class SocketConnector {
     private _socket;
-    private _onData;
-    private _onError;
     private residualBuffer;
-    private _isDestroyed;
-    constructor(_socket: Socket, _onData: (type: ResponseType, length: number, reader: ConnectionResponseReader) => void, _onError: (error: Error) => void);
+    private _onError;
+    private _onClose;
+    private _onData;
+    private _destroyed;
+    constructor(_socket: Socket, onData: (type: ResponseType, length: number, reader: ConnectionResponseReader) => void, onError: (error: unknown) => void);
     write(writer: ConnectionRequestWriter): void;
     unwrapSocket(): Socket;
     destroy(): void;
-    get isDestroyed(): boolean;
 }
 //# sourceMappingURL=socket-connector.d.ts.map

package/dist/protocol/socket-connector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket-connector.d.ts","sourceRoot":"","sources":["../../src/protocol/socket-connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAA;AAE/E,qBAAa,eAAe;IAKpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;IANpB,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,YAAY,CAAQ;gBAGhB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,wBAAwB,KAAK,IAAI,EACvF,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI;IA8B5C,KAAK,CAAC,MAAM,EAAE,uBAAuB;IAMrC,YAAY;IAQZ,OAAO;IAMP,IAAI,WAAW,YAA6B;CAC/C"}
+{"version":3,"file":"socket-connector.d.ts","sourceRoot":"","sources":["../../src/protocol/socket-connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAA;AAE/E,qBAAa,eAAe;IAQpB,OAAO,CAAC,OAAO;IAPnB,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAQ;gBAGd,OAAO,EAAE,MAAM,EACvB,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,wBAAwB,KAAK,IAAI,EACtF,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI;IA4CrC,KAAK,CAAC,MAAM,EAAE,uBAAuB;IAKrC,YAAY;IASZ,OAAO;CAGV"}

package/dist/protocol/socket-connector.js

@@ -1,13 +1,24 @@
 import { ConnectionResponseReader } from '../protocol/connection-response-reader';
 export class SocketConnector {
-    constructor(_socket, _onData, _onError) {
+    constructor(_socket, onData, onError) {
         this._socket = _socket;
-        this._onData = _onData;
-        this._onError = _onError;
         this.residualBuffer = null;
-        this._isDestroyed = false;
-        _socket.setKeepAlive(true, 10000);
-        _socket.on('data', buffer => {
+        this._destroyed = false;
+        this._onError = (err) => {
+            if (this._destroyed)
+                return;
+            this._destroyed = true;
+            onError(err);
+            this.destroy();
+        };
+        this._onClose = () => {
+            if (this._destroyed)
+                return;
+            this._destroyed = true;
+            onError(new Error("Socket closed"));
+            this.destroy();
+        };
+        this._onData = buffer => {
             const currentBuffer = this.residualBuffer
                 ? Buffer.concat([this.residualBuffer, buffer])
                 : buffer;
@@ -19,14 +30,13 @@ export class SocketConnector {
                     return;
                 }
                 const { type, length } = reader.readType();
-                this._onData(type, length, reader);
+                onData(type, length, reader);
             }
-        });
-        _socket.on('error', error => {
-            this._onError(error);
-            this._socket.destroy();
-            this._isDestroyed = true;
-        });
+        };
+        _socket.setKeepAlive(true, 10000);
+        _socket.on('data', this._onData);
+        _socket.on('error', this._onError);
+        _socket.on('close', this._onClose);
     }
     write(writer) {
         this._socket.write(writer.asBuffer());
@@ -34,11 +44,10 @@ export class SocketConnector {
     unwrapSocket() {
         this._socket.off('error', this._onError);
         this._socket.off("data", this._onData);
+        this._socket.off('close', this._onClose);
         return this._socket;
     }
     destroy() {
-        this._isDestroyed = true;
         this._socket.destroy();
     }
-    get isDestroyed() { return this._isDestroyed; }
 }

package/dist/query.d.ts

@@ -1,44 +1,41 @@
 import { Future } from "fluent-future";
-import { ColumnDescription, QueryMeta, QueryText, StatementName } from "./types";
+import { ColumnDescription, QueryText, Row, StatementName } from "./types";
 import { PostgresError } from "./error";
 export declare abstract class Query {
     statement: StatementName;
+    text: QueryText;
+    args: (string | null)[];
     protected _timer?: NodeJS.Timeout;
-    constructor(statement: StatementName, timeout: number);
+    constructor(statement: StatementName, text: QueryText, args: (string | null)[], timeout: number);
     abstract reject(cause: PostgresError): void;
     abstract resolve(...args: any[]): void;
 }
-export declare class SimpleQuery<T> extends Query {
-    text: QueryText;
-    args: (string | null)[];
-    columns: ColumnDescription[];
+export declare class CollectQuery<T extends Row> extends Query {
+    columns: ColumnDescription[] | null;
     future: Future<T[], PostgresError>;
     private _resolve;
     private _reject;
     private _rows;
-    constructor(statement: StatementName, text: QueryText, args: (string | null)[], columns: ColumnDescription[], timeout: number);
+    constructor(statement: StatementName, text: QueryText, args: (string | null)[], columns: ColumnDescription[] | null, timeout: number);
     push(value: T): void;
     reject(cause: PostgresError): void;
     resolve(): void;
 }
-export declare class ParseQuery extends Query {
-    text: QueryText;
-    future: Future<QueryMeta, PostgresError>;
+export declare class ExecuteQuery extends Query {
+    future: Future<void, PostgresError>;
     private _resolve;
     private _reject;
-    constructor(statement: StatementName, text: QueryText, timeout: number);
+    constructor(statement: StatementName, text: QueryText, args: (string | null)[], timeout: number);
     reject(cause: PostgresError): void;
-    resolve(meta: QueryMeta): void;
+    resolve(): void;
 }
 export declare class StreamQuery<T> extends Query {
-    text: QueryText;
-    args: (string | null)[];
     controller: ReadableStreamDefaultController<T>;
-    columns: ColumnDescription[];
-    constructor(statement: StatementName, text: QueryText, args: (string | null)[], controller: ReadableStreamDefaultController<T>, columns: ColumnDescription[], timeout: number);
+    columns: ColumnDescription[] | null;
+    constructor(statement: StatementName, text: QueryText, args: (string | null)[], controller: ReadableStreamDefaultController<T>, columns: ColumnDescription[] | null, timeout: number);
     push(value: T): void;
     reject(cause: PostgresError): void;
     resolve(): void;
 }
-export type PostgresQuery = SimpleQuery<any> | ParseQuery | StreamQuery<any>;
+export type PostgresQuery = CollectQuery<any> | StreamQuery<any> | ExecuteQuery;
 //# sourceMappingURL=query.d.ts.map

package/dist/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACjF,OAAO,EAAmB,aAAa,EAAE,MAAM,SAAS,CAAC;AAGzD,8BAAsB,KAAK;IAIZ,SAAS,EAAE,aAAa;IAHnC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;gBAGtB,SAAS,EAAE,aAAa,EAC/B,OAAO,EAAE,MAAM;IAQnB,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAE3C,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;CACzC;AAGD,qBAAa,WAAW,CAAC,CAAC,CAAE,SAAQ,KAAK;IAQ1B,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE;IACvB,OAAO,EAAE,iBAAiB,EAAE;IAThC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IACzC,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,KAAK,CAAU;gBAGnB,SAAS,EAAE,aAAa,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EACvB,OAAO,EAAE,iBAAiB,EAAE,EACnC,OAAO,EAAE,MAAM;IAWnB,IAAI,CAAC,KAAK,EAAE,CAAC;IAKb,MAAM,CAAC,KAAK,EAAE,aAAa;IAM3B,OAAO;CAIV;AAGD,qBAAa,UAAW,SAAQ,KAAK;IAOtB,IAAI,EAAE,SAAS;IANnB,MAAM,EAAE,MAAM,CAAC,SAAS,EAAG,aAAa,CAAC,CAAA;IAChD,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,OAAO,CAAiC;gBAG5C,SAAS,EAAE,aAAa,EACjB,IAAI,EAAE,SAAS,EACtB,OAAO,EAAE,MAAM;IAWnB,MAAM,CAAC,KAAK,EAAE,aAAa;IAM3B,OAAO,CAAC,IAAI,EAAE,SAAS;CAI1B;AAGD,qBAAa,WAAW,CAAC,CAAC,CAAE,SAAQ,KAAK;IAG1B,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE;IACvB,UAAU,EAAE,+BAA+B,CAAC,CAAC,CAAC;IAC9C,OAAO,EAAE,iBAAiB,EAAE;gBAJnC,SAAS,EAAE,aAAa,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EACvB,UAAU,EAAE,+BAA+B,CAAC,CAAC,CAAC,EAC9C,OAAO,EAAE,iBAAiB,EAAE,EACnC,OAAO,EAAE,MAAM;IAMnB,IAAI,CAAC,KAAK,EAAE,CAAC;IAKb,MAAM,CAAC,KAAK,EAAE,aAAa;IAM3B,OAAO;CAIV;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAa,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtF,OAAO,EAAmB,aAAa,EAAE,MAAM,SAAS,CAAC;AAGzD,8BAAsB,KAAK;IAIZ,SAAS,EAAE,aAAa;IACxB,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE;IALlC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;gBAGtB,SAAS,EAAE,aAAa,EACxB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EAC9B,OAAO,EAAE,MAAM;IAQnB,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAE3C,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;CACzC;AAGD,qBAAa,YAAY,CAAC,CAAC,SAAS,GAAG,CAAE,SAAQ,KAAK;IAUvC,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAI;IATvC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IACzC,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,KAAK,CAAU;gBAGnB,SAAS,EAAE,aAAa,EACxB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EAChB,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAC1C,OAAO,EAAE,MAAM;IAWnB,IAAI,CAAC,KAAK,EAAE,CAAC;IAKb,MAAM,CAAC,KAAK,EAAE,aAAa;IAM3B,OAAO;CAIV;AAGD,qBAAa,YAAa,SAAQ,KAAK;IAC5B,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAA;IAC1C,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,OAAO,CAAiC;gBAE5C,SAAS,EAAE,aAAa,EACxB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EACvB,OAAO,EAAE,MAAM;IASnB,MAAM,CAAC,KAAK,EAAE,aAAa;IAM3B,OAAO;CAIV;AAGD,qBAAa,WAAW,CAAC,CAAC,CAAE,SAAQ,KAAK;IAK1B,UAAU,EAAE,+BAA+B,CAAC,CAAC,CAAC;IAC9C,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAI;gBAJ1C,SAAS,EAAE,aAAa,EACxB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EAChB,UAAU,EAAE,+BAA+B,CAAC,CAAC,CAAC,EAC9C,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAC1C,OAAO,EAAE,MAAM;IAMnB,IAAI,CAAC,KAAK,EAAE,CAAC;IAOb,MAAM,CAAC,KAAK,EAAE,aAAa;IAM3B,OAAO;CAMV;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,YAAY,CAAA"}

package/dist/query.js

@@ -1,18 +1,18 @@
 import { Future } from "fluent-future";
 import { ErrQueryTimeout } from "./error";
 export class Query {
-    constructor(statement, timeout) {
+    constructor(statement, text, args, timeout) {
         this.statement = statement;
+        this.text = text;
+        this.args = args;
         this._timer = setTimeout(() => {
             this.reject(ErrQueryTimeout);
         }, timeout);
     }
 }
-export class SimpleQuery extends Query {
+export class CollectQuery extends Query {
     constructor(statement, text, args, columns, timeout) {
-        super(statement, timeout);
-        this.text = text;
-        this.args = args;
+        super(statement, text, args, timeout);
         this.columns = columns;
         this._rows = [];
         const { future, reject, resolve } = Future.withResolvers();
@@ -32,34 +32,34 @@ export class SimpleQuery extends Query {
         this._resolve(this._rows);
     }
 }
-export class ParseQuery extends Query {
-    constructor(statement, text, timeout) {
-        super(statement, timeout);
-        this.text = text;
+export class ExecuteQuery extends Query {
+    constructor(statement, text, args, timeout) {
+        super(statement, text, args, timeout);
         const { future, reject, resolve } = Future.withResolvers();
         this.future = future;
-        this._resolve = resolve;
         this._reject = reject;
+        this._resolve = resolve;
     }
     reject(cause) {
         clearTimeout(this._timer);
         this._reject(cause);
     }
-    resolve(meta) {
+    resolve() {
         clearTimeout(this._timer);
-        this._resolve(meta);
+        this._resolve();
     }
 }
 export class StreamQuery extends Query {
     constructor(statement, text, args, controller, columns, timeout) {
-        super(statement, timeout);
-        this.text = text;
-        this.args = args;
+        super(statement, text, args, timeout);
         this.controller = controller;
         this.columns = columns;
     }
     push(value) {
-        this.controller.enqueue(value);
+        try {
+            this.controller.enqueue(value);
+        }
+        catch { }
     }
     reject(cause) {
         clearTimeout(this._timer);
@@ -67,6 +67,9 @@ export class StreamQuery extends Query {
     }
     resolve() {
         clearTimeout(this._timer);
-        this.controller.close();
+        try {
+            this.controller.close();
+        }
+        catch { }
     }
 }

package/dist/transaction.d.ts

@@ -1,6 +1,7 @@
 import { Future } from "fluent-future";
 import { Connection } from "./connection";
 import { PostgresError } from "./error";
+import { Row } from "./types";
 /**
  * Represents an active SQL transaction.
  * All queries are executed on a single dedicated connection.
@@ -24,7 +25,14 @@ export declare class Transaction {
     /**
      * Executes a query within the current transaction.
      */
-    query<T extends Record<string, any>>(strings: TemplateStringsArray, ...values: any[]): Future<T[], PostgresError>;
+    query<T extends Row>(strings: TemplateStringsArray, ...values: any[]): Future<T[], PostgresError>;
+    /**
+     * Like {@link query}, but for statements that don't return rows (INSERT/UPDATE/DDL/etc).
+     *
+     * @example
+     * await tx.execute`UPDATE users SET name = ${name} WHERE id = ${id}`
+     */
+    execute(strings: TemplateStringsArray, ...params: any[]): Future<void, PostgresError>;
     /**
      * Creates a sub-transaction using PostgreSQL SAVEPOINT.
      * If the callback throws, only the actions within this savepoint are rolled back.

package/dist/transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAwB,aAAa,EAAE,MAAM,SAAS,CAAA;AAE7D;;;GAGG;AACH,qBAAa,WAAW;IAIhB,QAAQ,CAAC,IAAI,EAAE,UAAU;IAH7B,OAAO,CAAC,UAAU,CAAiB;gBAGtB,IAAI,EAAE,UAAU;IAG7B;;OAEG;IACH,IAAW,QAAQ,IAAI,OAAO,CAE7B;IAED;;OAEG;IACI,MAAM;IAQb;;OAEG;IACI,QAAQ;IAQf;;OAEG;IACI,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAM3F;;;;;;;;;OASG;IACI,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;CAW9E"}
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAwB,aAAa,EAAE,MAAM,SAAS,CAAA;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAE7B;;;GAGG;AACH,qBAAa,WAAW;IAIhB,QAAQ,CAAC,IAAI,EAAE,UAAU;IAH7B,OAAO,CAAC,UAAU,CAAiB;gBAGtB,IAAI,EAAE,UAAU;IAG7B;;OAEG;IACH,IAAW,QAAQ,IAAI,OAAO,CAE7B;IAED;;OAEG;IACI,MAAM;IAQb;;OAEG;IACI,QAAQ;IAQf;;OAEG;IACI,KAAK,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAM3E;;;;;OAKG;IACI,OAAO,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAM9D;;;;;;;;;OASG;IACI,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;CAW9E"}

package/dist/transaction.js

@@ -44,6 +44,17 @@ export class Transaction {
             return Future.reject(ErrTransactionClosed);
         return this.conn.query(strings, ...values);
     }
+    /**
+     * Like {@link query}, but for statements that don't return rows (INSERT/UPDATE/DDL/etc).
+     *
+     * @example
+     * await tx.execute`UPDATE users SET name = ${name} WHERE id = ${id}`
+     */
+    execute(strings, ...params) {
+        if (this.isFinished)
+            return Future.reject(ErrTransactionClosed);
+        return this.conn.execute(strings, ...params);
+    }
     /**
      * Creates a sub-transaction using PostgreSQL SAVEPOINT.
      * If the callback throws, only the actions within this savepoint are rolled back.