Dliu/pg browser

package.json

@@ -26,7 +26,8 @@
     "eslint-plugin-prettier": "^3.1.4",
     "lerna": "^4.0.0",
     "prettier": "2.1.2",
-    "typescript": "^4.0.3"
+    "typescript": "^4.0.3",
+    "webpack-cli": "^4.9.2"
   },
   "prettier": {
     "semi": false,

packages/pg/lib/connection.js

@@ -52,7 +52,7 @@ class Connection extends EventEmitter {
       if(port && host) {
         var url = 'ws://'+host+':'+port;
       } else {
-        var url = 'ws://localhost:5901'
+        var url = 'ws://localhost:5432'
       }
       this.stream = new WebSocketStream(url)
       this.placeholderStream = false
@@ -131,7 +131,6 @@ class Connection extends EventEmitter {
         this.emit('message', msg)
       }
       this.emit(eventName, msg)
-      // console.log(msg)
     })
   }
 

packages/pg/lib/defaults.js

@@ -6,23 +6,20 @@ module.exports = {
 
   // database user's name
   user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-  // user: 'postgres',
 
   // name of database to connect
-  // database: undefined,
-  database: 'postgres',
+  database: undefined,
 
   // database user's password
-  // password: null,
-  password: 'password',
+  password: null,
 
   // a Postgres connection string to be used instead of setting individual connection items
   // NOTE:  Setting this value will cause it to override any other value (such as database or user) defined
   // in the defaults object.
   connectionString: undefined,
 
   // database port
-  port: 5901,
+  port: 5432,
 
   // number of rows to return at a time from a prepared statement's
   // portal. 0 will return all rows at once

packages/pg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-browser",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "PostgreSQL with websockets",
   "keywords": [
     "database",

packages/pg/test/integration/client/configuration-tests.js

@@ -14,9 +14,9 @@ for (var key in process.env) {
 suite.test('default values are used in new clients', function () {
   assert.same(pg.defaults, {
     user: process.env.USER,
-    database: 'postgres',
-    password: 'password',
-    port: 5901,
+    database: undefined,
+    password: null,
+    port: 5432,
     rows: 0,
     max: 10,
     binary: false,
@@ -31,9 +31,9 @@ suite.test('default values are used in new clients', function () {
   var client = new pg.Client()
   assert.same(client, {
     user: process.env.USER,
-    database: 'postgres',
-    password: 'password',
-    port: 5901,
+    database: process.env.USER,
+    password: null,
+    port: 5432,
   })
 })
 

packages/pg/test/integration/connection/test-helper.js

@@ -8,7 +8,7 @@ var connect = function (callback) {
   var username = helper.args.user
   var database = helper.args.database
   // var con = new Connection({ stream: new net.Stream() })
-  var con = new Connection({stream: new WebSocketStream('ws://localhost:5901')})
+  var con = new Connection({stream: new WebSocketStream('ws://localhost:5432')})
   con.on('error', function (error) {
     console.log(error)
     throw new Error('Connection error')

packages/pg/test/suite.js

@@ -6,6 +6,7 @@ class Test {
   constructor(name, cb) {
     this.name = name
     this.action = cb
+    // timeout set higher since 1105-tests.js takes around 9000 ms to pass with websockets
     this.timeout = 10000
   }
 

packages/pg/test/unit/client/configuration-tests.js

@@ -3,8 +3,8 @@ require('./test-helper')
 var assert = require('assert')
 
 var pguser = process.env['PGUSER'] || process.env.USER
-var pgdatabase = process.env['PGDATABASE'] || 'postgres'
-var pgport = process.env['PGPORT'] || 5901
+var pgdatabase = process.env['PGDATABASE'] || process.env.USER
+var pgport = process.env['PGPORT'] || 5432
 
 test('client settings', function () {
   test('defaults', function () {
@@ -90,10 +90,10 @@ test('initializing from a config string', function () {
   test('when not including all values the defaults are used', function () {
     var client = new Client('postgres://host1')
     assert.equal(client.user, process.env['PGUSER'] || process.env.USER)
-    assert.equal(client.password, process.env['PGPASSWORD'] || 'password')
+    assert.equal(client.password, process.env['PGPASSWORD'] || null)
     assert.equal(client.host, 'host1')
-    assert.equal(client.port, process.env['PGPORT'] || 5901)
-    assert.equal(client.database, process.env['PGDATABASE'] || 'postgres')
+    assert.equal(client.port, process.env['PGPORT'] || 5432)
+    assert.equal(client.database, process.env['PGDATABASE'] || process.env.USER)
   })
 
   test('when not including all values the environment variables are used', function () {

packages/pg/test/unit/connection/startup-tests.js

@@ -7,7 +7,7 @@ test('connection can take existing stream', function () {
   assert.equal(con.stream, stream)
 })
 
-// test('using any stream', function () {
+test('using any stream', function () {
 //   var makeStream = function () {
     // var stream = new MemoryStream()
 
@@ -20,10 +20,10 @@ test('connection can take existing stream', function () {
   // }
 
   // var stream = makeStream()
-
-  // var con = new Connection({ stream: stream })
-  // con = new Client({connection: con})
-  // con.connect()
+  var stream = new MemoryStream()
+  var con = new Connection({ stream: stream })
+  con = new Client({connection: con})
+  con.connect()
   // con.websocket.close()
   // con.end()
   // test('makes stream connect', function () {
@@ -38,16 +38,16 @@ test('connection can take existing stream', function () {
   //   assert.equal(stream.host, 'bang')
   // })
 
-  // test('after stream connects client emits connected event', function () {
-  //   var hit = false
+  test('after stream connects client emits connected event', function () {
+    var hit = false
 
-  //   con.once('connect', function () {
-  //     hit = true
-  //   })
+    con.once('connect', function () {
+      hit = true
+    })
 
-  //   assert.ok(stream.emit('connect'))
-  //   assert.ok(hit)
-  // })
+    assert.ok(con.emit('connect'))
+    assert.ok(hit)
+  })
 
   // TCP-keepalive not relevant for websockets
 
@@ -67,4 +67,4 @@ test('connection can take existing stream', function () {
   //     assert.equal(res, true)
   //   })
   // })
-// })
+})