Dliu/pg browser

package.json

@@ -24,15 +24,21 @@
     "eslint-config-prettier": "^6.12.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
-    "lerna": "^3.19.0",
+    "lerna": "^4.0.0",
     "prettier": "2.1.2",
-    "typescript": "^4.0.3"
+    "typescript": "^4.0.3",
+    "webpack-cli": "^4.9.2"
   },
   "prettier": {
     "semi": false,
     "printWidth": 120,
     "arrowParens": "always",
     "trailingComma": "es5",
     "singleQuote": true
+  },
+  "dependencies": {
+    "is-ip": "^4.0.0",
+    "pg": "^8.7.3",
+    "websocket-stream": "^5.5.2"
   }
 }

packages/pg-connection-string/package.json

@@ -30,7 +30,7 @@
     "chai": "^4.1.1",
     "coveralls": "^3.0.4",
     "istanbul": "^0.4.5",
-    "mocha": "^7.1.2"
+    "mocha": "^9.2.0"
   },
   "files": [
     "index.js",

packages/pg-cursor/index.js

@@ -23,6 +23,7 @@ class Cursor extends EventEmitter {
     this._portal = null
     this._ifNoData = this._ifNoData.bind(this)
     this._rowDescription = this._rowDescription.bind(this)
+    this.moveAllAndClosing = false
   }
 
   _ifNoData() {
@@ -42,7 +43,8 @@ class Cursor extends EventEmitter {
   submit(connection) {
     this.state = 'submitted'
     this.connection = connection
-    this._portal = 'C_' + nextUniqueID++
+    // the portal name must start with a lowercase c, for some reason
+    this._portal = 'c_' + nextUniqueID++
 
     const con = connection
 
@@ -133,7 +135,9 @@ class Cursor extends EventEmitter {
 
   handleCommandComplete(msg) {
     this._result.addCommandComplete(msg)
-    this._closePortal()
+    if (!this.moveAllAndClosing) {
+      this._closePortal()
+    }
   }
 
   handlePortalSuspended() {
@@ -202,6 +206,49 @@ class Cursor extends EventEmitter {
     this.connection.end()
   }
 
+  _promisifiedQuery(text) {
+    return new Promise((resolve, reject) => {
+      try {
+        var res = this.connection.query(text)
+        resolve(res)
+      } catch (e) {
+        reject(e)
+      }
+    })
+  }
+
+  moveAllAndClose(cb) {
+    this.moveAllAndClosing = true
+    if (this.state === 'done' || this.state == 'error') {
+      return this.close(cb)
+    }
+    return this._promisifiedQuery("MOVE ALL FROM " + this._portal).then(() => {
+      this._close_checkFinished(cb)
+    })
+  }
+
+  _close_checkFinished(cb) {
+    this._closePortal()
+    // delay the callback until portal is finished closing
+    // (this means a closeComplete followed by a readyForQuery)
+    // (when moveAllAndClose calls closePortal, client will receive a readyForQuery generated by "MOVE ALL" simple query before receiving a closeComplete and a subsequent readyForQuery)
+    var finishedClosing = false
+    this.connection.once('closeComplete', function () {
+      finishedClosing = true
+    })
+
+    const _handleReadyForQueryInClose = () => {
+      if (finishedClosing) {
+        cb()
+        this.moveAllAndClosing = false
+        this.connection.removeListener('readyForQuery', _handleReadyForQueryInClose)
+      } 
+    }
+
+    this.connection.on('readyForQuery', _handleReadyForQueryInClose)
+    return
+  }
+
   close(cb) {
     let promise
 

packages/pg-cursor/package.json

@@ -17,7 +17,7 @@
   "author": "Brian M. Carlson",
   "license": "MIT",
   "devDependencies": {
-    "mocha": "^7.1.2",
+    "mocha": "^9.2.1",
     "pg": "^8.7.3"
   },
   "peerDependencies": {

packages/pg-pool/index.js

@@ -86,7 +86,7 @@ class Pool extends EventEmitter {
     this.options.allowExitOnIdle = this.options.allowExitOnIdle || false
     this.options.maxLifetimeSeconds = this.options.maxLifetimeSeconds || 0
     this.log = this.options.log || function () {}
-    this.Client = this.options.Client || Client || require('pg').Client
+    this.Client = this.options.Client || Client || require('../pg/lib/index.js').Client
     this.Promise = this.options.Promise || global.Promise
 
     if (typeof this.options.idleTimeoutMillis === 'undefined') {

packages/pg-pool/package.json

@@ -31,7 +31,7 @@
     "co": "4.6.0",
     "expect.js": "0.3.1",
     "lodash": "^4.17.11",
-    "mocha": "^7.1.2",
+    "mocha": "^9.2.0",
     "pg-cursor": "^1.3.0"
   },
   "peerDependencies": {

packages/pg-protocol/dist/messages.d.ts

@@ -0,0 +1,162 @@
+/// <reference types="node" />
+export declare type Mode = 'text' | 'binary';
+export declare type MessageName = 'parseComplete' | 'bindComplete' | 'closeComplete' | 'noData' | 'portalSuspended' | 'replicationStart' | 'emptyQuery' | 'copyDone' | 'copyData' | 'rowDescription' | 'parameterDescription' | 'parameterStatus' | 'backendKeyData' | 'notification' | 'readyForQuery' | 'commandComplete' | 'dataRow' | 'copyInResponse' | 'copyOutResponse' | 'authenticationOk' | 'authenticationMD5Password' | 'authenticationCleartextPassword' | 'authenticationSASL' | 'authenticationSASLContinue' | 'authenticationSASLFinal' | 'error' | 'notice';
+export interface BackendMessage {
+    name: MessageName;
+    length: number;
+}
+export declare const parseComplete: BackendMessage;
+export declare const bindComplete: BackendMessage;
+export declare const closeComplete: BackendMessage;
+export declare const noData: BackendMessage;
+export declare const portalSuspended: BackendMessage;
+export declare const replicationStart: BackendMessage;
+export declare const emptyQuery: BackendMessage;
+export declare const copyDone: BackendMessage;
+interface NoticeOrError {
+    message: string | undefined;
+    severity: string | undefined;
+    code: string | undefined;
+    detail: string | undefined;
+    hint: string | undefined;
+    position: string | undefined;
+    internalPosition: string | undefined;
+    internalQuery: string | undefined;
+    where: string | undefined;
+    schema: string | undefined;
+    table: string | undefined;
+    column: string | undefined;
+    dataType: string | undefined;
+    constraint: string | undefined;
+    file: string | undefined;
+    line: string | undefined;
+    routine: string | undefined;
+}
+export declare class DatabaseError extends Error implements NoticeOrError {
+    readonly length: number;
+    readonly name: MessageName;
+    severity: string | undefined;
+    code: string | undefined;
+    detail: string | undefined;
+    hint: string | undefined;
+    position: string | undefined;
+    internalPosition: string | undefined;
+    internalQuery: string | undefined;
+    where: string | undefined;
+    schema: string | undefined;
+    table: string | undefined;
+    column: string | undefined;
+    dataType: string | undefined;
+    constraint: string | undefined;
+    file: string | undefined;
+    line: string | undefined;
+    routine: string | undefined;
+    constructor(message: string, length: number, name: MessageName);
+}
+export declare class CopyDataMessage {
+    readonly length: number;
+    readonly chunk: Buffer;
+    readonly name = "copyData";
+    constructor(length: number, chunk: Buffer);
+}
+export declare class CopyResponse {
+    readonly length: number;
+    readonly name: MessageName;
+    readonly binary: boolean;
+    readonly columnTypes: number[];
+    constructor(length: number, name: MessageName, binary: boolean, columnCount: number);
+}
+export declare class Field {
+    readonly name: string;
+    readonly tableID: number;
+    readonly columnID: number;
+    readonly dataTypeID: number;
+    readonly dataTypeSize: number;
+    readonly dataTypeModifier: number;
+    readonly format: Mode;
+    constructor(name: string, tableID: number, columnID: number, dataTypeID: number, dataTypeSize: number, dataTypeModifier: number, format: Mode);
+}
+export declare class RowDescriptionMessage {
+    readonly length: number;
+    readonly fieldCount: number;
+    readonly name: MessageName;
+    readonly fields: Field[];
+    constructor(length: number, fieldCount: number);
+}
+export declare class ParameterDescriptionMessage {
+    readonly length: number;
+    readonly parameterCount: number;
+    readonly name: MessageName;
+    readonly dataTypeIDs: number[];
+    constructor(length: number, parameterCount: number);
+}
+export declare class ParameterStatusMessage {
+    readonly length: number;
+    readonly parameterName: string;
+    readonly parameterValue: string;
+    readonly name: MessageName;
+    constructor(length: number, parameterName: string, parameterValue: string);
+}
+export declare class AuthenticationMD5Password implements BackendMessage {
+    readonly length: number;
+    readonly salt: Buffer;
+    readonly name: MessageName;
+    constructor(length: number, salt: Buffer);
+}
+export declare class BackendKeyDataMessage {
+    readonly length: number;
+    readonly processID: number;
+    readonly secretKey: number;
+    readonly name: MessageName;
+    constructor(length: number, processID: number, secretKey: number);
+}
+export declare class NotificationResponseMessage {
+    readonly length: number;
+    readonly processId: number;
+    readonly channel: string;
+    readonly payload: string;
+    readonly name: MessageName;
+    constructor(length: number, processId: number, channel: string, payload: string);
+}
+export declare class ReadyForQueryMessage {
+    readonly length: number;
+    readonly status: string;
+    readonly name: MessageName;
+    constructor(length: number, status: string);
+}
+export declare class CommandCompleteMessage {
+    readonly length: number;
+    readonly text: string;
+    readonly name: MessageName;
+    constructor(length: number, text: string);
+}
+export declare class DataRowMessage {
+    length: number;
+    fields: any[];
+    readonly fieldCount: number;
+    readonly name: MessageName;
+    constructor(length: number, fields: any[]);
+}
+export declare class NoticeMessage implements BackendMessage, NoticeOrError {
+    readonly length: number;
+    readonly message: string | undefined;
+    constructor(length: number, message: string | undefined);
+    readonly name = "notice";
+    severity: string | undefined;
+    code: string | undefined;
+    detail: string | undefined;
+    hint: string | undefined;
+    position: string | undefined;
+    internalPosition: string | undefined;
+    internalQuery: string | undefined;
+    where: string | undefined;
+    schema: string | undefined;
+    table: string | undefined;
+    column: string | undefined;
+    dataType: string | undefined;
+    constraint: string | undefined;
+    file: string | undefined;
+    line: string | undefined;
+    routine: string | undefined;
+}
+export {};

packages/pg-protocol/package.json

@@ -11,7 +11,7 @@
     "@types/node": "^12.12.21",
     "chai": "^4.2.0",
     "chunky": "^0.0.0",
-    "mocha": "^7.1.2",
+    "mocha": "^9.2.0",
     "ts-node": "^8.5.4",
     "typescript": "^4.0.3"
   },

packages/pg-protocol/tsconfig.json

@@ -21,5 +21,8 @@
   },
   "include": [
     "src/**/*"
+  ],
+  "exclude": [
+    "dist"
   ]
 }

packages/pg-query-stream/package.json

@@ -33,10 +33,10 @@
     "@types/mocha": "^8.0.3",
     "@types/node": "^14.0.0",
     "@types/pg": "^7.14.5",
-    "JSONStream": "~0.7.1",
     "concat-stream": "~1.0.1",
     "eslint-plugin-promise": "^3.5.0",
-    "mocha": "^7.1.2",
+    "JSONStream": "~0.7.1",
+    "mocha": "^9.2.0",
     "pg": "^8.7.3",
     "stream-spec": "~0.3.5",
     "stream-tester": "0.0.5",

packages/pg/Makefile

@@ -33,6 +33,9 @@ test-connection:
 	@echo "***Testing connection***"
 	@node script/create-test-tables.js $(params)
 
+test-unit-connection: test-connection
+	@find test/unit/connection -name "*-tests.js" | $(node-command)
+
 test-missing-native:
 	@echo "***Testing optional native install***"
 	@rm -rf node_modules/pg-native
@@ -53,6 +56,26 @@ test-integration: test-connection
 	@echo "***Testing Pure Javascript***"
 	@find test/integration -name "*-tests.js" | $(node-command)
 
+test-integration-client: test-connection
+	@echo "***Testing integration for client***"
+	@find test/integration/client -name "*-tests.js" | $(node-command)
+
+test-integration-connection: test-connection
+	@echo "***Testing integration for connection***"
+	@find test/integration/connection -name "*-tests.js" | $(node-command)
+
+test-integration-connection-pool: test-connection
+	@echo "***Testing integration for connection***"
+	@find test/integration/connection-pool -name "*-tests.js" | $(node-command)
+
+test-gh-issues: test-connection
+	@echo "***Testing gh-issues***"
+	@find test/integration/gh-issues -name "*-tests.js" | $(node-command)
+
+test-unit-client: test-connection
+	@echo "***Testing integration for client***"
+	@find test/unit/client -name "*-tests.js" | $(node-command)
+
 test-binary: test-connection
 	@echo "***Testing Pure Javascript (binary)***"
 	@find test/integration -name "*-tests.js" | $(node-command) binary