langpavel · langpavel · Jan 7, 2024 · Jan 8, 2024 · May 4, 2024 · May 4, 2024
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,15 +1,15 @@
 name: test
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   test:
     name: Node v${{ matrix.node }} on PostgreSQL v${{ matrix.postgres }}
     strategy:
       fail-fast: false
       matrix:
-        node: ['12', '14', '16', '18', '20', '21']
-        postgres: ['12', '13', '14', '15', '16']
+        node: ["22"]
+        postgres: ["16"]
     runs-on: ubuntu-latest
     services:
       postgres:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "deno.enablePaths": ["./deno"]
+}
diff --git a/cjs/tests/index.js b/cjs/tests/index.js
@@ -374,7 +374,7 @@ t('Options from uri with special characters in user and pass', async() => {
   return [[opt.user, opt.pass].toString(), 'öla,pass^word']
 })
 
-t('Fail with proper error on no host', async() =>
+nt('Fail with proper error on no host', async() =>
   ['ECONNREFUSED', (await new Promise((resolve, reject) => {
     const sql = postgres('postgres://localhost:33333/' + options.db, {
       idle_timeout
@@ -383,7 +383,7 @@ t('Fail with proper error on no host', async() =>
   })).code]
 )
 
-t('Connect using SSL', async() =>
+nt('Connect using SSL', async() =>
   [true, (await new Promise((resolve, reject) => {
     postgres({
       ssl: { rejectUnauthorized: false },
@@ -392,7 +392,7 @@ t('Connect using SSL', async() =>
   }))]
 )
 
-t('Connect using SSL require', async() =>
+nt('Connect using SSL require', async() =>
   [true, (await new Promise((resolve, reject) => {
     postgres({
       ssl: 'require',
@@ -417,7 +417,7 @@ t('Connect using SSL prefer', async() => {
   ]
 })
 
-t('Reconnect using SSL', { timeout: 2 }, async() => {
+nt('Reconnect using SSL', { timeout: 2 }, async() => {
   const sql = postgres({
     ssl: 'require',
     idle_timeout: 0.1
@@ -1004,7 +1004,7 @@ t('little bobby tables', async() => {
   ]
 })
 
-t('Connection errors are caught using begin()', {
+nt('Connection errors are caught using begin()', {
   timeout: 2
 }, async() => {
   let error
@@ -1220,7 +1220,7 @@ t('Multiple statements', async() =>
   `).then(([, [x]]) => x.a)]
 )
 
-t('throws correct error when authentication fails', async() => {
+nt('throws correct error when authentication fails', async() => {
   const sql = postgres({
     ...options,
     ...login_md5,
@@ -1656,7 +1656,7 @@ t('connect_timeout error message includes host:port', { timeout: 20 }, async() =
   return [['write CONNECT_TIMEOUT 127.0.0.1:', port].join(''), err]
 })
 
-t('requests works after single connect_timeout', async() => {
+nt('requests works after single connect_timeout', async() => {
   let first = true
 
   const sql = postgres({

diff --git a/cjs/tests/test.js b/cjs/tests/test.js
@@ -48,7 +48,7 @@ async function test(o, name, options, fn) {
       }
 
       tests[line].succeeded = true
-      process.stdout.write('✅')
+      process.stdout.write(`✅ ${name} at line ${line} succeeded\n`)
     })
     .catch(err => {
       tests[line].failed = failed = true

diff --git a/deno/polyfills.js b/deno/polyfills.js
diff --git a/deno/src/bytes.js b/deno/src/bytes.js
@@ -1,4 +1,4 @@
-import { Buffer } from 'https://deno.land/std@0.132.0/node/buffer.ts'
+import { Buffer } from 'node:buffer'
 const size = 256
 let buffer = Buffer.allocUnsafe(size)
 

diff --git a/deno/src/connection.js b/deno/src/connection.js
@@ -1,10 +1,9 @@
-import { HmacSha256 } from 'https://deno.land/std@0.132.0/hash/sha256.ts'
-import { Buffer } from 'https://deno.land/std@0.132.0/node/buffer.ts'
-import { setImmediate, clearImmediate } from '../polyfills.js'
-import { net } from '../polyfills.js'
-import { tls } from '../polyfills.js'
-import crypto from 'https://deno.land/std@0.132.0/node/crypto.ts'
-import Stream from 'https://deno.land/std@0.132.0/node/stream.ts'
+import { Buffer } from 'node:buffer'
+import { setImmediate, clearImmediate } from 'node:timers'
+import net from 'node:net'
+import tls from 'node:tls'
+import crypto from 'node:crypto'
+import Stream from 'node:stream'
 
 
 import { stringify, handleValue, arrayParser, arraySerializer } from './types.js'
@@ -1001,7 +1000,7 @@ function md5(x) {
 }
 
 function hmac(key, x) {
-  return Buffer.from(new HmacSha256(key).update(x).digest())
+  return crypto.createHmac('sha256', key).update(x).digest()
 }
 
 function sha256(x) {

diff --git a/deno/src/index.js b/deno/src/index.js
@@ -1,6 +1,6 @@
-import process from 'https://deno.land/std@0.132.0/node/process.ts'
-import os from 'https://deno.land/std@0.132.0/node/os.ts'
-import fs from 'https://deno.land/std@0.132.0/node/fs.ts'
+import process from 'node:process'
+import os from 'node:os'
+import fs from 'node:fs'
 
 import {
   mergeUserTypes,

diff --git a/deno/src/large.js b/deno/src/large.js
@@ -1,4 +1,4 @@
-import Stream from 'https://deno.land/std@0.132.0/node/stream.ts'
+import Stream from 'node:stream'
 
 export default function largeObject(sql, oid, mode = 0x00020000 | 0x00040000) {
   return new Promise(async(resolve, reject) => {

diff --git a/deno/src/subscribe.js b/deno/src/subscribe.js
@@ -1,4 +1,4 @@
-import { Buffer } from 'https://deno.land/std@0.132.0/node/buffer.ts'
+import { Buffer } from 'node:buffer'
 const noop = () => { /* noop */ }
 
 export default function Subscribe(postgres, options) {

diff --git a/deno/src/types.js b/deno/src/types.js
@@ -1,4 +1,4 @@
-import { Buffer } from 'https://deno.land/std@0.132.0/node/buffer.ts'
+import { Buffer } from 'node:buffer'
 import { Query } from './query.js'
 import { Errors } from './errors.js'
 

diff --git a/deno/tests/bootstrap.js b/deno/tests/bootstrap.js
@@ -1,4 +1,4 @@
-import { spawn } from 'https://deno.land/std@0.132.0/node/child_process.ts'
+import { spawn } from 'node:child_process'
 
 await exec('dropdb', ['postgres_js_test'])