@juit/pgproxy-client 1.4.40 → 1.5.1

package/dist/websocket.cjs

@@ -25,12 +25,6 @@ __export(websocket_exports, {
 module.exports = __toCommonJS(websocket_exports);
 var import_assert = require("./assert.cjs");
 var import_provider = require("./provider.cjs");
-var pgWebSocketReadyState = {
-  CONNECTING: 0,
-  OPEN: 1,
-  CLOSING: 2,
-  CLOSED: 3
-};
 function msg(message, defaultMessage) {
   return message || defaultMessage;
 }
@@ -101,8 +95,8 @@ var WebSocketConnectionImpl = class {
   /** Our error, set also when the websocket is closed */
   _error;
   close() {
-    if (this._socket.readyState === pgWebSocketReadyState.CLOSED) return;
-    if (this._socket.readyState === pgWebSocketReadyState.CLOSING) return;
+    if (this._socket.readyState === WebSocket.CLOSED) return;
+    if (this._socket.readyState === WebSocket.CLOSING) return;
     this._socket.close(1e3, "Normal termination");
   }
   query(query, params = []) {
@@ -130,8 +124,8 @@ var WebSocketProvider = class extends import_provider.AbstractPGProvider {
    */
   _connectWebSocket(socket) {
     return new Promise((resolve, reject) => {
-      if (socket.readyState === pgWebSocketReadyState.OPEN) return resolve(socket);
-      if (socket.readyState !== pgWebSocketReadyState.CONNECTING) {
+      if (socket.readyState === WebSocket.OPEN) return resolve(socket);
+      if (socket.readyState !== WebSocket.CONNECTING) {
         return reject(new Error(`Invalid WebSocket ready state ${socket.readyState}`));
       }
       const onopen = () => {
@@ -140,7 +134,7 @@ var WebSocketProvider = class extends import_provider.AbstractPGProvider {
       };
       const onerror = (event) => {
         removeEventListeners();
-        if ("error" in event) return reject(event.error);
+        if (event.error) return reject(event.error);
         reject(new Error("Uknown error opening WebSocket"));
       };
       const onclose = (event) => {

package/dist/websocket.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/websocket.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/websocket.d.ts

@@ -1,28 +1,5 @@
 import { AbstractPGProvider } from './provider';
 import type { PGProvider, PGProviderConnection, PGProviderResult } from './provider';
-interface PGWebSocketCloseEvent {
-    readonly code: number;
-    readonly reason: string;
-}
-interface PGWebSocketMessageEvent {
-    readonly data?: any;
-}
-interface PGWebSocketErrorEvent {
-    readonly error?: any;
-}
-export interface PGWebSocket {
-    addEventListener(event: 'close', handler: (event: PGWebSocketCloseEvent) => void): void;
-    addEventListener(event: 'error', handler: (event: PGWebSocketErrorEvent) => void): void;
-    addEventListener(event: 'message', handler: (event: PGWebSocketMessageEvent) => void): void;
-    addEventListener(event: 'open', handler: () => void): void;
-    removeEventListener(event: 'close', handler: (event: PGWebSocketCloseEvent) => void): void;
-    removeEventListener(event: 'error', handler: (event: PGWebSocketErrorEvent) => void): void;
-    removeEventListener(event: 'message', handler: (event: PGWebSocketMessageEvent) => void): void;
-    removeEventListener(event: 'open', handler: () => void): void;
-    readonly readyState: number;
-    send(message: string): void;
-    close(code?: number, reason?: string): void;
-}
 /** A connection to the database backed by a `WebSocket` */
 export interface WebSocketConnection extends PGProviderConnection {
     /** Close this connection and the underlying `WebSocket` */
@@ -46,16 +23,15 @@ export declare abstract class WebSocketProvider extends AbstractPGProvider imple
      * `close`, or `error` events before the event loop has a chance to resolve
      * the `Promise` asynchronously.
      */
-    protected abstract _getWebSocket(): Promise<PGWebSocket>;
+    protected abstract _getWebSocket(): Promise<WebSocket>;
     /**
      * Handle the initial connection of a WebSocket.
      *
      * This method should be called _synchronously_ by {@link WebSocketProvider._getWebSocket} as
      * soon as the WebSocket instance is created.
      */
-    protected _connectWebSocket<S extends PGWebSocket>(socket: S): Promise<S>;
+    protected _connectWebSocket<S extends WebSocket>(socket: S): Promise<S>;
     acquire(): Promise<WebSocketConnection>;
     release(connection: WebSocketConnection): Promise<void>;
     destroy(): Promise<void>;
 }
-export {};

package/dist/websocket.mjs

@@ -1,12 +1,6 @@
 // websocket.ts
 import { assert } from "./assert.mjs";
 import { AbstractPGProvider } from "./provider.mjs";
-var pgWebSocketReadyState = {
-  CONNECTING: 0,
-  OPEN: 1,
-  CLOSING: 2,
-  CLOSED: 3
-};
 function msg(message, defaultMessage) {
   return message || defaultMessage;
 }
@@ -77,8 +71,8 @@ var WebSocketConnectionImpl = class {
   /** Our error, set also when the websocket is closed */
   _error;
   close() {
-    if (this._socket.readyState === pgWebSocketReadyState.CLOSED) return;
-    if (this._socket.readyState === pgWebSocketReadyState.CLOSING) return;
+    if (this._socket.readyState === WebSocket.CLOSED) return;
+    if (this._socket.readyState === WebSocket.CLOSING) return;
     this._socket.close(1e3, "Normal termination");
   }
   query(query, params = []) {
@@ -106,8 +100,8 @@ var WebSocketProvider = class extends AbstractPGProvider {
    */
   _connectWebSocket(socket) {
     return new Promise((resolve, reject) => {
-      if (socket.readyState === pgWebSocketReadyState.OPEN) return resolve(socket);
-      if (socket.readyState !== pgWebSocketReadyState.CONNECTING) {
+      if (socket.readyState === WebSocket.OPEN) return resolve(socket);
+      if (socket.readyState !== WebSocket.CONNECTING) {
         return reject(new Error(`Invalid WebSocket ready state ${socket.readyState}`));
       }
       const onopen = () => {
@@ -116,7 +110,7 @@ var WebSocketProvider = class extends AbstractPGProvider {
       };
       const onerror = (event) => {
         removeEventListeners();
-        if ("error" in event) return reject(event.error);
+        if (event.error) return reject(event.error);
         reject(new Error("Uknown error opening WebSocket"));
       };
       const onclose = (event) => {

package/dist/websocket.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/websocket.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juit/pgproxy-client",
-  "version": "1.4.40",
+  "version": "1.5.1",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/juitnow/juit-pgproxy#readme",
   "dependencies": {
-    "@juit/pgproxy-types": "1.4.40"
+    "@juit/pgproxy-types": "1.5.1"
   },
   "directories": {
     "test": "test"

package/src/websocket.ts

@@ -4,48 +4,6 @@ import { AbstractPGProvider } from './provider'
 import type { Request, Response } from '@juit/pgproxy-server'
 import type { PGProvider, PGProviderConnection, PGProviderResult } from './provider'
 
-/* ========================================================================== *
- * WEBSOCKET TYPES: in order to work with both WHATWG WebSockets and NodeJS's *
- * "ws" package, let's abstract our _minimal_ requirement for implementation  *
- * ensuring type compatibility between the two variants.                      *
- * ========================================================================== */
-
-const pgWebSocketReadyState = {
-  CONNECTING: 0,
-  OPEN: 1,
-  CLOSING: 2,
-  CLOSED: 3,
-} as const
-
-interface PGWebSocketCloseEvent {
-  readonly code: number;
-  readonly reason: string;
-}
-
-interface PGWebSocketMessageEvent {
-  readonly data?: any
-}
-
-interface PGWebSocketErrorEvent {
-  readonly error?: any
-}
-
-export interface PGWebSocket {
-  addEventListener(event: 'close', handler: (event: PGWebSocketCloseEvent) => void): void
-  addEventListener(event: 'error', handler: (event: PGWebSocketErrorEvent) => void): void
-  addEventListener(event: 'message', handler: (event: PGWebSocketMessageEvent) => void): void
-  addEventListener(event: 'open', handler: () => void): void
-  removeEventListener(event: 'close', handler: (event: PGWebSocketCloseEvent) => void): void
-  removeEventListener(event: 'error', handler: (event: PGWebSocketErrorEvent) => void): void
-  removeEventListener(event: 'message', handler: (event: PGWebSocketMessageEvent) => void): void
-  removeEventListener(event: 'open', handler: () => void): void
-
-  readonly readyState: number;
-
-  send(message: string): void
-  close(code?: number, reason?: string): void;
-}
-
 /* ========================================================================== *
  * INTERNALS                                                                  *
  * ========================================================================== */
@@ -76,7 +34,7 @@ class WebSocketConnectionImpl implements WebSocketConnection {
   /** Our error, set also when the websocket is closed */
   private _error?: any
 
-  constructor(private _socket: PGWebSocket, private _getRequestId: () => string) {
+  constructor(private _socket: WebSocket, private _getRequestId: () => string) {
     /* On close, set the error to "WebSocket Closed" if none was set before */
     _socket.addEventListener('close', (event) => {
       /* Keep the first error we received... */
@@ -92,7 +50,7 @@ class WebSocketConnectionImpl implements WebSocketConnection {
     })
 
     /* On errors, make sure that the websocket is closed */
-    _socket.addEventListener('error', (event) => {
+    _socket.addEventListener('error', (event: Event & { error?: any }) => {
       if (event.error) this._error = event.error
       else this._error = new Error('Unknown WebSocket Error')
 
@@ -143,9 +101,9 @@ class WebSocketConnectionImpl implements WebSocketConnection {
   }
 
   close(): void {
-    if (this._socket.readyState === pgWebSocketReadyState.CLOSED) return
+    if (this._socket.readyState === WebSocket.CLOSED) return
     /* coverage ignore if */
-    if (this._socket.readyState === pgWebSocketReadyState.CLOSING) return
+    if (this._socket.readyState === WebSocket.CLOSING) return
     this._socket.close(1000, 'Normal termination')
   }
 
@@ -204,7 +162,7 @@ export abstract class WebSocketProvider extends AbstractPGProvider implements PG
    * `close`, or `error` events before the event loop has a chance to resolve
    * the `Promise` asynchronously.
    */
-  protected abstract _getWebSocket(): Promise<PGWebSocket>
+  protected abstract _getWebSocket(): Promise<WebSocket>
 
   /**
    * Handle the initial connection of a WebSocket.
@@ -212,12 +170,12 @@ export abstract class WebSocketProvider extends AbstractPGProvider implements PG
    * This method should be called _synchronously_ by {@link WebSocketProvider._getWebSocket} as
    * soon as the WebSocket instance is created.
    */
-  protected _connectWebSocket<S extends PGWebSocket>(socket: S): Promise<S> {
+  protected _connectWebSocket<S extends WebSocket>(socket: S): Promise<S> {
     return new Promise<S>((resolve, reject) => {
     /* The socket might have already connected (or failed connecting) in the
          * time it takes for the event loop to resolve our promise... */
-      if (socket.readyState === pgWebSocketReadyState.OPEN) return resolve(socket)
-      if (socket.readyState !== pgWebSocketReadyState.CONNECTING) {
+      if (socket.readyState === WebSocket.OPEN) return resolve(socket)
+      if (socket.readyState !== WebSocket.CONNECTING) {
         return reject(new Error(`Invalid WebSocket ready state ${socket.readyState}`))
       }
 
@@ -226,13 +184,13 @@ export abstract class WebSocketProvider extends AbstractPGProvider implements PG
         resolve(socket)
       }
 
-      const onerror = (event: PGWebSocketErrorEvent): void => {
+      const onerror = (event: Event & { error?: any }): void => {
         removeEventListeners()
-        if ('error' in event) return reject(event.error)
+        if (event.error) return reject(event.error)
         reject(new Error('Uknown error opening WebSocket'))
       }
 
-      const onclose = (event: PGWebSocketCloseEvent): void => {
+      const onclose = (event: Event & { code?: number; reason?: string }): void => {
         removeEventListeners()
         reject(new Error(`Connection closed with code ${event.code}: ${event.reason}`))
       }