Cleanup

Author: porsager

README.md

@@ -860,12 +860,12 @@ import ssh2 from 'ssh2'
 
 const sql = postgres({
   ...options,
-  socket: ({ hostname, port }) => new Promise((resolve, reject) => {
+  socket: ({ host: [host], port: [port] }) => new Promise((resolve, reject) => {
     const ssh = new ssh2.Client()
     ssh
     .on('error', reject)
     .on('ready', () => 
-      ssh.forwardOut('127.0.0.1', 12345, hostname, port, 
+      ssh.forwardOut('127.0.0.1', 12345, host, port, 
         (err, socket) => err ? reject(err) : resolve(socket)
       )
     )

cjs/src/connection.js

@@ -350,7 +350,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       statementCount = 1
       lifeTimer.start()
       socket.on('data', data)
-      socket.setKeepAlive && socket.setKeepAlive(true, 1000 * keep_alive)
+      keep_alive != null && socket.setKeepAlive(true, 1000 * keep_alive)
       const s = StartupMessage()
       write(s)
     } catch (err) {
@@ -529,7 +529,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       return
     }
 
-    while (sent.length && (query = sent.shift()) && (query.active = true) && query.cancelled)
+    while (sent.length && (query = sent.shift()) && (query.active = true, query.cancelled))
       Connection(options).cancel(query.state, query.cancelled.resolve, query.cancelled.reject)
 
     if (query)

cjs/src/index.js

@@ -375,7 +375,7 @@ function parseOptions(a, b) {
 
   const env = process.env // eslint-disable-line
       , o = (typeof a === 'string' ? b : a) || {}
-      , { url, multihost } = parseUrl(a, env)
+      , { url, multihost } = parseUrl(a)
       , query = url.searchParams
       , host = o.hostname || o.host || multihost || url.hostname || env.PGHOST || 'localhost'
       , port = o.port || url.port || env.PGPORT || 5432

cjs/src/subscribe.js

@@ -24,7 +24,7 @@ module.exports = Subscribe;function Subscribe(postgres, options) {
         return
       stream = null
       state.pid = state.secret = undefined
-      !ended && connected(await init(sql, slot, options.publications))
+      connected(await init(sql, slot, options.publications))
       subscribers.forEach(event => event.forEach(({ onsubscribe }) => onsubscribe()))
     },
     no_subscribe: true
@@ -212,7 +212,7 @@ function parse(x, state, parsers, handle) {
       old && (i = tuples(x, old, key ? relation.keys : relation.columns, i += 3))
 
       const row = {}
-      i = tuples(x, row, relation.columns, i += 3)
+      i = tuples(x, row, relation.columns, i + 3)
 
       handle(row, {
         command: 'update',

deno/README.md

@@ -605,11 +605,11 @@ const sql = postgres({ publications: 'alltables' })
 
 const { unsubscribe } = await sql.subscribe(
   'insert:events', 
-  function(row, { command, relation, key, old }) => {
+  (row, { command, relation, key, old }) => {
     // Callback function for each row change
     // tell about new event row over eg. websockets or do something else
   },
-  function onsubscribe() => {
+  () => {
     // Callback on initial connect and potential reconnects
   }
 )
@@ -856,12 +856,12 @@ import ssh2 from 'ssh2'
 
 const sql = postgres({
   ...options,
-  socket: ({ hostname, port }) => new Promise((resolve, reject) => {
+  socket: ({ host: [host], port: [port] }) => new Promise((resolve, reject) => {
     const ssh = new ssh2.Client()
     ssh
     .on('error', reject)
     .on('ready', () => 
-      ssh.forwardOut('127.0.0.1', 12345, hostname, port, 
+      ssh.forwardOut('127.0.0.1', 12345, host, port, 
         (err, socket) => err ? reject(err) : resolve(socket)
       )
     )
@@ -996,6 +996,7 @@ Postgres.js doesn't come with any migration solution since it's way out of scope
 
 - https://github.com/porsager/postgres-shift
 - https://github.com/lukeed/ley
+- https://github.com/JAForbes/pgmg
 
 ## Thank you
 

deno/polyfills.js

@@ -24,11 +24,16 @@ export const net = {
   Socket() {
     let paused
       , resume
+      , keepAlive
 
     const socket = {
       error,
       success,
       readyState: 'open',
+      setKeepAlive: x => {
+        keepAlive = x
+        socket.raw && socket.raw.setKeepAlive && socket.raw.setKeepAlive(x)
+      },
       connect: (port, hostname) => {
         socket.raw = null
         socket.readyState = 'connecting'
@@ -72,7 +77,7 @@ export const net = {
           })
         return false
       },
-      destroy: () => close(true),
+      destroy: () => close(),
       end: (x) => {
         x && socket.write(x)
         close()
@@ -87,6 +92,7 @@ export const net = {
 
       const encrypted = socket.encrypted
       socket.raw = raw
+      keepAlive != null && raw.setKeepAlive(keepAlive)
       socket.readyState = 'open'
       socket.encrypted
         ? call(socket.events.secureConnect)

deno/src/connection.js

@@ -354,7 +354,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       statementCount = 1
       lifeTimer.start()
       socket.on('data', data)
-      socket.setKeepAlive && socket
+      keep_alive != null && socket.setKeepAlive(true)
       const s = StartupMessage()
       write(s)
     } catch (err) {
@@ -533,7 +533,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       return
     }
 
-    while (sent.length && (query = sent.shift()) && (query.active = true) && query.cancelled)
+    while (sent.length && (query = sent.shift()) && (query.active = true, query.cancelled))
       Connection(options).cancel(query.state, query.cancelled.resolve, query.cancelled.reject)
 
     if (query)

deno/src/index.js

@@ -376,7 +376,7 @@ function parseOptions(a, b) {
 
   const env = process.env // eslint-disable-line
       , o = (typeof a === 'string' ? b : a) || {}
-      , { url, multihost } = parseUrl(a, env)
+      , { url, multihost } = parseUrl(a)
       , query = url.searchParams
       , host = o.hostname || o.host || multihost || url.hostname || env.PGHOST || 'localhost'
       , port = o.port || url.port || env.PGPORT || 5432

deno/src/subscribe.js

@@ -25,7 +25,7 @@ export default function Subscribe(postgres, options) {
         return
       stream = null
       state.pid = state.secret = undefined
-      !ended && connected(await init(sql, slot, options.publications))
+      connected(await init(sql, slot, options.publications))
       subscribers.forEach(event => event.forEach(({ onsubscribe }) => onsubscribe()))
     },
     no_subscribe: true
@@ -213,7 +213,7 @@ function parse(x, state, parsers, handle) {
       old && (i = tuples(x, old, key ? relation.keys : relation.columns, i += 3))
 
       const row = {}
-      i = tuples(x, row, relation.columns, i += 3)
+      i = tuples(x, row, relation.columns, i + 3)
 
       handle(row, {
         command: 'update',

src/connection.js

@@ -350,7 +350,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       statementCount = 1
       lifeTimer.start()
       socket.on('data', data)
-      socket.setKeepAlive && socket.setKeepAlive(true, 1000 * keep_alive)
+      keep_alive != null && socket.setKeepAlive(true, 1000 * keep_alive)
       const s = StartupMessage()
       write(s)
     } catch (err) {
@@ -529,7 +529,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       return
     }
 
-    while (sent.length && (query = sent.shift()) && (query.active = true) && query.cancelled)
+    while (sent.length && (query = sent.shift()) && (query.active = true, query.cancelled))
       Connection(options).cancel(query.state, query.cancelled.resolve, query.cancelled.reject)
 
     if (query)