mirror of
https://github.com/brianc/node-postgres.git
synced 2025-12-08 20:16:25 +00:00
Compare commits
19 Commits
pg-cloudfl
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d493f3b55 | ||
|
|
917478397b | ||
|
|
f5c90a5484 | ||
|
|
65bc3d4884 | ||
|
|
a6c1084db1 | ||
|
|
1b2bedc9c8 | ||
|
|
27a2754787 | ||
|
|
01fadd93d7 | ||
|
|
43b8692019 | ||
|
|
fab87b28af | ||
|
|
c8fb1e9261 | ||
|
|
54e0424991 | ||
|
|
235d7ad5e2 | ||
|
|
8f8e7315e8 | ||
|
|
f0d1c4868a | ||
|
|
0ad6c9b71e | ||
|
|
54964ecff7 | ||
|
|
1a25d12817 | ||
|
|
e00aac1398 |
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -42,8 +42,8 @@ jobs:
|
|||||||
- '18'
|
- '18'
|
||||||
- '20'
|
- '20'
|
||||||
- '22'
|
- '22'
|
||||||
- '23'
|
|
||||||
- '24'
|
- '24'
|
||||||
|
- '25'
|
||||||
os:
|
os:
|
||||||
- ubuntu-latest
|
- ubuntu-latest
|
||||||
name: Node.js ${{ matrix.node }}
|
name: Node.js ${{ matrix.node }}
|
||||||
|
|||||||
@ -91,7 +91,7 @@ const result = await pool.query('SELECT $1::text as name', ['brianc'])
|
|||||||
console.log(result.rows[0].name) // brianc
|
console.log(result.rows[0].name) // brianc
|
||||||
```
|
```
|
||||||
|
|
||||||
Notice in the example above there is no need to check out or release a client. The pool is doing the acquiring and releasing internally. I find `pool.query` to be a handy shortcut many situations and use it exclusively unless I need a transaction.
|
Notice in the example above there is no need to check out or release a client. The pool is doing the acquiring and releasing internally. I find `pool.query` to be a handy shortcut in many situations and I use it exclusively unless I need a transaction.
|
||||||
|
|
||||||
<Alert>
|
<Alert>
|
||||||
<div>
|
<div>
|
||||||
@ -112,7 +112,7 @@ Acquires a client from the pool.
|
|||||||
|
|
||||||
- If there are idle clients in the pool one will be returned to the callback on `process.nextTick`.
|
- If there are idle clients in the pool one will be returned to the callback on `process.nextTick`.
|
||||||
- If the pool is not full but all current clients are checked out a new client will be created & returned to this callback.
|
- If the pool is not full but all current clients are checked out a new client will be created & returned to this callback.
|
||||||
- If the pool is 'full' and all clients are currently checked out will wait in a FIFO queue until a client becomes available by it being released back to the pool.
|
- If the pool is 'full' and all clients are currently checked out, requests will wait in a FIFO queue until a client becomes available by being released back to the pool.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
import { Pool } from 'pg'
|
import { Pool } from 'pg'
|
||||||
|
|||||||
@ -4,5 +4,5 @@ await esbuild.build({
|
|||||||
entryPoints: ['./src/index.mjs'],
|
entryPoints: ['./src/index.mjs'],
|
||||||
bundle: true,
|
bundle: true,
|
||||||
outfile: './dist/esbuild-cloudflare.js',
|
outfile: './dist/esbuild-cloudflare.js',
|
||||||
conditions: ['import', 'cloudflare'],
|
conditions: ['import', 'workerd'],
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pg-bundler-test",
|
"name": "pg-bundler-test",
|
||||||
"version": "0.0.1",
|
"version": "0.0.2",
|
||||||
"description": "Test bundlers with pg-cloudflare, https://github.com/brianc/node-postgres/issues/3452",
|
"description": "Test bundlers with pg-cloudflare, https://github.com/brianc/node-postgres/issues/3452",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"private": true,
|
"private": true,
|
||||||
@ -9,7 +9,7 @@
|
|||||||
"@rollup/plugin-commonjs": "^28.0.3",
|
"@rollup/plugin-commonjs": "^28.0.3",
|
||||||
"@rollup/plugin-node-resolve": "^16.0.1",
|
"@rollup/plugin-node-resolve": "^16.0.1",
|
||||||
"esbuild": "^0.25.5",
|
"esbuild": "^0.25.5",
|
||||||
"pg-cloudflare": "^1.2.6",
|
"pg-cloudflare": "^1.2.7",
|
||||||
"rollup": "^4.41.1",
|
"rollup": "^4.41.1",
|
||||||
"vite": "^6.3.5",
|
"vite": "^6.3.5",
|
||||||
"webpack": "^5.99.9",
|
"webpack": "^5.99.9",
|
||||||
|
|||||||
@ -8,6 +8,6 @@ export default defineConfig({
|
|||||||
file: 'dist/rollup-cloudflare.js',
|
file: 'dist/rollup-cloudflare.js',
|
||||||
format: 'es',
|
format: 'es',
|
||||||
},
|
},
|
||||||
plugins: [nodeResolve({ exportConditions: ['import', 'cloudflare'], preferBuiltins: true }), commonjs()],
|
plugins: [nodeResolve({ exportConditions: ['import', 'workerd'], preferBuiltins: true }), commonjs()],
|
||||||
external: ['cloudflare:sockets'],
|
external: ['cloudflare:sockets'],
|
||||||
})
|
})
|
||||||
|
|||||||
@ -14,7 +14,7 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
conditions: ['import', 'cloudflare'],
|
conditions: ['import', 'workerd'],
|
||||||
},
|
},
|
||||||
plugins: [commonjs()],
|
plugins: [commonjs()],
|
||||||
})
|
})
|
||||||
|
|||||||
@ -6,7 +6,7 @@ export default {
|
|||||||
output: {
|
output: {
|
||||||
filename: 'webpack-cloudflare.js',
|
filename: 'webpack-cloudflare.js',
|
||||||
},
|
},
|
||||||
resolve: { conditionNames: ['import', 'cloudflare'] },
|
resolve: { conditionNames: ['import', 'workerd'] },
|
||||||
plugins: [
|
plugins: [
|
||||||
// ignore cloudflare:sockets imports
|
// ignore cloudflare:sockets imports
|
||||||
new webpack.IgnorePlugin({
|
new webpack.IgnorePlugin({
|
||||||
|
|||||||
@ -19,7 +19,7 @@ config. For example:
|
|||||||
```js
|
```js
|
||||||
export default {
|
export default {
|
||||||
...,
|
...,
|
||||||
resolve: { conditionNames: [..., "cloudflare"] },
|
resolve: { conditionNames: [..., "workerd"] },
|
||||||
plugins: [
|
plugins: [
|
||||||
// ignore cloudflare:sockets imports
|
// ignore cloudflare:sockets imports
|
||||||
new webpack.IgnorePlugin({
|
new webpack.IgnorePlugin({
|
||||||
@ -29,11 +29,15 @@ config. For example:
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
- `vite.config.js`
|
- `vite.config.js`
|
||||||
|
|
||||||
|
> [!NOTE]
|
||||||
|
> If you are using the [Cloudflare Vite plugin](https://www.npmjs.com/package/@cloudflare/vite-plugin) then the following configuration is not necessary.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
...,
|
...,
|
||||||
resolve: {
|
resolve: {
|
||||||
conditions: [..., "cloudflare"],
|
conditions: [..., "workerd"],
|
||||||
},
|
},
|
||||||
build: {
|
build: {
|
||||||
...,
|
...,
|
||||||
@ -44,11 +48,12 @@ config. For example:
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
```
|
```
|
||||||
|
|
||||||
- `rollup.config.js`
|
- `rollup.config.js`
|
||||||
```js
|
```js
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
...,
|
...,
|
||||||
plugins: [..., nodeResolve({ exportConditions: [..., 'cloudflare'] })],
|
plugins: [..., nodeResolve({ exportConditions: [..., 'workerd'] })],
|
||||||
// don't try to bundle cloudflare:sockets
|
// don't try to bundle cloudflare:sockets
|
||||||
external: [..., 'cloudflare:sockets'],
|
external: [..., 'cloudflare:sockets'],
|
||||||
})
|
})
|
||||||
@ -57,7 +62,7 @@ config. For example:
|
|||||||
```js
|
```js
|
||||||
await esbuild.build({
|
await esbuild.build({
|
||||||
...,
|
...,
|
||||||
conditions: [..., 'cloudflare'],
|
conditions: [..., 'workerd'],
|
||||||
})
|
})
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pg-cloudflare",
|
"name": "pg-cloudflare",
|
||||||
"version": "1.2.6",
|
"version": "1.2.7",
|
||||||
"description": "A socket implementation that can run on Cloudflare Workers using native TCP connections.",
|
"description": "A socket implementation that can run on Cloudflare Workers using native TCP connections.",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"types": "dist/index.d.ts",
|
"types": "dist/index.d.ts",
|
||||||
@ -11,12 +11,13 @@
|
|||||||
},
|
},
|
||||||
"exports": {
|
"exports": {
|
||||||
".": {
|
".": {
|
||||||
"cloudflare": {
|
"workerd": {
|
||||||
"import": "./esm/index.mjs",
|
"import": "./esm/index.mjs",
|
||||||
"require": "./dist/index.js"
|
"require": "./dist/index.js"
|
||||||
},
|
},
|
||||||
"default": "./dist/empty.js"
|
"default": "./dist/empty.js"
|
||||||
}
|
},
|
||||||
|
"./package.json": "./package.json"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "tsc",
|
"build": "tsc",
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
|
const { emitWarning } = require('node:process')
|
||||||
|
|
||||||
//Parse method copied from https://github.com/brianc/node-postgres
|
//Parse method copied from https://github.com/brianc/node-postgres
|
||||||
//Copyright (c) 2010-2014 Brian Carlson (brian.m.carlson@gmail.com)
|
//Copyright (c) 2010-2014 Brian Carlson (brian.m.carlson@gmail.com)
|
||||||
//MIT License
|
//MIT License
|
||||||
@ -33,6 +35,7 @@ function parse(str, options = {}) {
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
// Remove the input from the error message to avoid leaking sensitive information
|
// Remove the input from the error message to avoid leaking sensitive information
|
||||||
err.input && (err.input = '*****REDACTED*****')
|
err.input && (err.input = '*****REDACTED*****')
|
||||||
|
throw err
|
||||||
}
|
}
|
||||||
|
|
||||||
// We'd like to use Object.fromEntries() here but Node.js 10 does not support it
|
// We'd like to use Object.fromEntries() here but Node.js 10 does not support it
|
||||||
@ -138,6 +141,9 @@ function parse(str, options = {}) {
|
|||||||
case 'require':
|
case 'require':
|
||||||
case 'verify-ca':
|
case 'verify-ca':
|
||||||
case 'verify-full': {
|
case 'verify-full': {
|
||||||
|
if (config.sslmode !== 'verify-full') {
|
||||||
|
deprecatedSslModeWarning(config.sslmode)
|
||||||
|
}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
case 'no-verify': {
|
case 'no-verify': {
|
||||||
@ -206,6 +212,20 @@ function parseIntoClientConfig(str) {
|
|||||||
return toClientConfig(parse(str))
|
return toClientConfig(parse(str))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function deprecatedSslModeWarning(sslmode) {
|
||||||
|
if (!deprecatedSslModeWarning.warned) {
|
||||||
|
deprecatedSslModeWarning.warned = true
|
||||||
|
emitWarning(`SECURITY WARNING: The SSL modes 'prefer', 'require', and 'verify-ca' are treated as aliases for 'verify-full'.
|
||||||
|
In the next major version (pg-connection-string v3.0.0 and pg v9.0.0), these modes will adopt standard libpq semantics, which have weaker security guarantees.
|
||||||
|
|
||||||
|
To prepare for this change:
|
||||||
|
- If you want the current behavior, explicitly use 'sslmode=verify-full'
|
||||||
|
- If you want libpq compatibility now, use 'uselibpqcompat=true&sslmode=${sslmode}'
|
||||||
|
|
||||||
|
See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode definitions.`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
module.exports = parse
|
module.exports = parse
|
||||||
|
|
||||||
parse.parse = parse
|
parse.parse = parse
|
||||||
|
|||||||
@ -330,6 +330,7 @@ describe('parse', function () {
|
|||||||
parse(connectionString)
|
parse(connectionString)
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
expect(JSON.stringify(err)).to.not.include(password, 'Password should not be in the error message')
|
expect(JSON.stringify(err)).to.not.include(password, 'Password should not be in the error message')
|
||||||
|
expect(JSON.stringify(err)).to.include('REDACTED', 'The thrown error should contain the redacted URL')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
throw new Error('Expected an error to be thrown')
|
throw new Error('Expected an error to be thrown')
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pg-cursor",
|
"name": "pg-cursor",
|
||||||
"version": "2.15.1",
|
"version": "2.15.3",
|
||||||
"description": "Query cursor extension for node-postgres",
|
"description": "Query cursor extension for node-postgres",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"exports": {
|
"exports": {
|
||||||
@ -25,7 +25,7 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"mocha": "^10.5.2",
|
"mocha": "^10.5.2",
|
||||||
"pg": "^8.16.1"
|
"pg": "^8.16.3"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"pg": "^8"
|
"pg": "^8"
|
||||||
|
|||||||
@ -5,9 +5,14 @@ const { describe, it } = test
|
|||||||
const paths = [
|
const paths = [
|
||||||
'pg',
|
'pg',
|
||||||
'pg/lib/index.js',
|
'pg/lib/index.js',
|
||||||
|
'pg/lib/index',
|
||||||
|
'pg/lib/connection-parameters',
|
||||||
'pg/lib/connection-parameters.js',
|
'pg/lib/connection-parameters.js',
|
||||||
|
'pg/lib/type-overrides',
|
||||||
'pg-protocol/dist/messages.js',
|
'pg-protocol/dist/messages.js',
|
||||||
|
'pg-protocol/dist/messages',
|
||||||
'pg-native/lib/build-result.js',
|
'pg-native/lib/build-result.js',
|
||||||
|
'pg-cloudflare/package.json',
|
||||||
]
|
]
|
||||||
for (const path of paths) {
|
for (const path of paths) {
|
||||||
describe(`importing ${path}`, () => {
|
describe(`importing ${path}`, () => {
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "pg-esm-test",
|
"name": "pg-esm-test",
|
||||||
"version": "1.2.1",
|
"version": "1.2.3",
|
||||||
"description": "A test module for PostgreSQL with ESM support",
|
"description": "A test module for PostgreSQL with ESM support",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "node --test --conditions=cloudflare"
|
"test": "node --test --conditions=workerd"
|
||||||
},
|
},
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"postgres",
|
"postgres",
|
||||||
@ -14,13 +14,13 @@
|
|||||||
"test"
|
"test"
|
||||||
],
|
],
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"pg": "^8.16.1",
|
"pg": "^8.16.3",
|
||||||
"pg-cloudflare": "^1.2.6",
|
"pg-cloudflare": "^1.2.7",
|
||||||
"pg-cursor": "^2.15.1",
|
"pg-cursor": "^2.15.3",
|
||||||
"pg-native": "^3.5.1",
|
"pg-native": "^3.5.2",
|
||||||
"pg-pool": "^3.10.1",
|
"pg-pool": "^3.10.1",
|
||||||
"pg-protocol": "^1.10.1",
|
"pg-protocol": "^1.10.3",
|
||||||
"pg-query-stream": "^4.10.1"
|
"pg-query-stream": "^4.10.3"
|
||||||
},
|
},
|
||||||
"author": "Brian M. Carlson <brian.m.carlson@gmail.com>",
|
"author": "Brian M. Carlson <brian.m.carlson@gmail.com>",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
|
|||||||
@ -18,7 +18,7 @@ const Client = (module.exports = function (config) {
|
|||||||
this._reading = false
|
this._reading = false
|
||||||
this._read = this._read.bind(this)
|
this._read = this._read.bind(this)
|
||||||
|
|
||||||
// allow custom type converstion to be passed in
|
// allow custom type conversion to be passed in
|
||||||
this._types = config.types || types
|
this._types = config.types || types
|
||||||
|
|
||||||
// allow config to specify returning results
|
// allow config to specify returning results
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pg-native",
|
"name": "pg-native",
|
||||||
"version": "3.5.1",
|
"version": "3.5.2",
|
||||||
"description": "A slightly nicer interface to Postgres over node-libpq",
|
"description": "A slightly nicer interface to Postgres over node-libpq",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"exports": {
|
"exports": {
|
||||||
|
|||||||
@ -1,9 +1,11 @@
|
|||||||
# pg-pool
|
# pg-pool
|
||||||
|
|
||||||
[](https://travis-ci.org/brianc/node-pg-pool)
|
[](https://travis-ci.org/brianc/node-pg-pool)
|
||||||
|
|
||||||
A connection pool for node-postgres
|
A connection pool for node-postgres
|
||||||
|
|
||||||
## install
|
## install
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
npm i pg-pool pg
|
npm i pg-pool pg
|
||||||
```
|
```
|
||||||
@ -48,14 +50,15 @@ const pgNativePool = new Pool({ Client: PgNativeClient })
|
|||||||
```
|
```
|
||||||
|
|
||||||
##### Note:
|
##### Note:
|
||||||
|
|
||||||
The Pool constructor does not support passing a Database URL as the parameter. To use pg-pool on heroku, for example, you need to parse the URL into a config object. Here is an example of how to parse a Database URL.
|
The Pool constructor does not support passing a Database URL as the parameter. To use pg-pool on heroku, for example, you need to parse the URL into a config object. Here is an example of how to parse a Database URL.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
const Pool = require('pg-pool');
|
const Pool = require('pg-pool')
|
||||||
const url = require('url')
|
const url = require('url')
|
||||||
|
|
||||||
const params = url.parse(process.env.DATABASE_URL);
|
const params = url.parse(process.env.DATABASE_URL)
|
||||||
const auth = params.auth.split(':');
|
const auth = params.auth.split(':')
|
||||||
|
|
||||||
const config = {
|
const config = {
|
||||||
user: auth[0],
|
user: auth[0],
|
||||||
@ -63,10 +66,10 @@ const config = {
|
|||||||
host: params.hostname,
|
host: params.hostname,
|
||||||
port: params.port,
|
port: params.port,
|
||||||
database: params.pathname.split('/')[1],
|
database: params.pathname.split('/')[1],
|
||||||
ssl: true
|
ssl: true,
|
||||||
};
|
}
|
||||||
|
|
||||||
const pool = new Pool(config);
|
const pool = new Pool(config)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Transforms, 'postgres://DBuser:secret@DBHost:#####/myDB', into
|
Transforms, 'postgres://DBuser:secret@DBHost:#####/myDB', into
|
||||||
@ -87,12 +90,14 @@ pg-pool supports a fully promise-based api for acquiring clients
|
|||||||
|
|
||||||
```js
|
```js
|
||||||
const pool = new Pool()
|
const pool = new Pool()
|
||||||
pool.connect().then(client => {
|
pool.connect().then((client) => {
|
||||||
client.query('select $1::text as name', ['pg-pool']).then(res => {
|
client
|
||||||
|
.query('select $1::text as name', ['pg-pool'])
|
||||||
|
.then((res) => {
|
||||||
client.release()
|
client.release()
|
||||||
console.log('hello from', res.rows[0].name)
|
console.log('hello from', res.rows[0].name)
|
||||||
})
|
})
|
||||||
.catch(e => {
|
.catch((e) => {
|
||||||
client.release()
|
client.release()
|
||||||
console.error('query error', e.message, e.stack)
|
console.error('query error', e.message, e.stack)
|
||||||
})
|
})
|
||||||
@ -105,7 +110,7 @@ this ends up looking much nicer if you're using [co](https://github.com/tj/co) o
|
|||||||
|
|
||||||
```js
|
```js
|
||||||
// with async/await
|
// with async/await
|
||||||
(async () => {
|
;(async () => {
|
||||||
const pool = new Pool()
|
const pool = new Pool()
|
||||||
const client = await pool.connect()
|
const client = await pool.connect()
|
||||||
try {
|
try {
|
||||||
@ -114,7 +119,7 @@ this ends up looking much nicer if you're using [co](https://github.com/tj/co) o
|
|||||||
} finally {
|
} finally {
|
||||||
client.release()
|
client.release()
|
||||||
}
|
}
|
||||||
})().catch(e => console.error(e.message, e.stack))
|
})().catch((e) => console.error(e.message, e.stack))
|
||||||
|
|
||||||
// with co
|
// with co
|
||||||
co(function* () {
|
co(function* () {
|
||||||
@ -125,7 +130,7 @@ co(function * () {
|
|||||||
} finally {
|
} finally {
|
||||||
client.release()
|
client.release()
|
||||||
}
|
}
|
||||||
}).catch(e => console.error(e.message, e.stack))
|
}).catch((e) => console.error(e.message, e.stack))
|
||||||
```
|
```
|
||||||
|
|
||||||
### your new favorite helper method
|
### your new favorite helper method
|
||||||
@ -148,7 +153,7 @@ pool.query('SELECT $1::text as name', ['brianc'], function (err, res) {
|
|||||||
})
|
})
|
||||||
```
|
```
|
||||||
|
|
||||||
__pro tip:__ unless you need to run a transaction (which requires a single client for multiple queries) or you
|
**pro tip:** unless you need to run a transaction (which requires a single client for multiple queries) or you
|
||||||
have some other edge case like [streaming rows](https://github.com/brianc/node-pg-query-stream) or using a [cursor](https://github.com/brianc/node-pg-cursor)
|
have some other edge case like [streaming rows](https://github.com/brianc/node-pg-query-stream) or using a [cursor](https://github.com/brianc/node-pg-cursor)
|
||||||
you should almost always just use `pool.query`. Its easy, it does the right thing :tm:, and wont ever forget to return
|
you should almost always just use `pool.query`. Its easy, it does the right thing :tm:, and wont ever forget to return
|
||||||
clients back to the pool after the query is done.
|
clients back to the pool after the query is done.
|
||||||
@ -187,7 +192,7 @@ await pool.end()
|
|||||||
|
|
||||||
### a note on instances
|
### a note on instances
|
||||||
|
|
||||||
The pool should be a __long-lived object__ in your application. Generally you'll want to instantiate one pool when your app starts up and use the same instance of the pool throughout the lifetime of your application. If you are frequently creating a new pool within your code you likely don't have your pool initialization code in the correct place. Example:
|
The pool should be a **long-lived object** in your application. Generally you'll want to instantiate one pool when your app starts up and use the same instance of the pool throughout the lifetime of your application. If you are frequently creating a new pool within your code you likely don't have your pool initialization code in the correct place. Example:
|
||||||
|
|
||||||
```js
|
```js
|
||||||
// assume this is a file in your program at ./your-app/lib/db.js
|
// assume this is a file in your program at ./your-app/lib/db.js
|
||||||
@ -237,7 +242,7 @@ pool.on('error', function(error, client) {
|
|||||||
|
|
||||||
#### connect
|
#### connect
|
||||||
|
|
||||||
Fired whenever the pool creates a __new__ `pg.Client` instance and successfully connects it to the backend.
|
Fired whenever the pool creates a **new** `pg.Client` instance and successfully connects it to the backend.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
@ -247,20 +252,19 @@ const pool = new Pool()
|
|||||||
|
|
||||||
const count = 0
|
const count = 0
|
||||||
|
|
||||||
pool.on('connect', client => {
|
pool.on('connect', (client) => {
|
||||||
client.count = count++
|
client.count = count++
|
||||||
})
|
})
|
||||||
|
|
||||||
pool
|
pool
|
||||||
.connect()
|
.connect()
|
||||||
.then(client => {
|
.then((client) => {
|
||||||
return client
|
return client
|
||||||
.query('SELECT $1::int AS "clientCount"', [client.count])
|
.query('SELECT $1::int AS "clientCount"', [client.count])
|
||||||
.then(res => console.log(res.rows[0].clientCount)) // outputs 0
|
.then((res) => console.log(res.rows[0].clientCount)) // outputs 0
|
||||||
.then(() => client)
|
.then(() => client)
|
||||||
})
|
})
|
||||||
.then(client => client.release())
|
.then((client) => client.release())
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
#### acquire
|
#### acquire
|
||||||
@ -293,7 +297,6 @@ setTimeout(function () {
|
|||||||
console.log('connect count:', connectCount) // output: connect count: 10
|
console.log('connect count:', connectCount) // output: connect count: 10
|
||||||
console.log('acquire count:', acquireCount) // output: acquire count: 200
|
console.log('acquire count:', acquireCount) // output: acquire count: 200
|
||||||
}, 100)
|
}, 100)
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### environment variables
|
### environment variables
|
||||||
@ -310,27 +313,6 @@ PGSSLMODE=require
|
|||||||
|
|
||||||
Usually I will export these into my local environment via a `.env` file with environment settings or export them in `~/.bash_profile` or something similar. This way I get configurability which works with both the postgres suite of tools (`psql`, `pg_dump`, `pg_restore`) and node, I can vary the environment variables locally and in production, and it supports the concept of a [12-factor app](http://12factor.net/) out of the box.
|
Usually I will export these into my local environment via a `.env` file with environment settings or export them in `~/.bash_profile` or something similar. This way I get configurability which works with both the postgres suite of tools (`psql`, `pg_dump`, `pg_restore`) and node, I can vary the environment variables locally and in production, and it supports the concept of a [12-factor app](http://12factor.net/) out of the box.
|
||||||
|
|
||||||
## bring your own promise
|
|
||||||
|
|
||||||
In versions of node `<=0.12.x` there is no native promise implementation available globally. You can polyfill the promise globally like this:
|
|
||||||
|
|
||||||
```js
|
|
||||||
// first run `npm install promise-polyfill --save
|
|
||||||
if (typeof Promise == 'undefined') {
|
|
||||||
global.Promise = require('promise-polyfill')
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
You can use any other promise implementation you'd like. The pool also allows you to configure the promise implementation on a per-pool level:
|
|
||||||
|
|
||||||
```js
|
|
||||||
const bluebirdPool = new Pool({
|
|
||||||
Promise: require('bluebird')
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
__please note:__ in node `<=0.12.x` the pool will throw if you do not provide a promise constructor in one of the two ways mentioned above. In node `>=4.0.0` the pool will use the native promise implementation by default; however, the two methods above still allow you to "bring your own."
|
|
||||||
|
|
||||||
## maxUses and read-replica autoscaling (e.g. AWS Aurora)
|
## maxUses and read-replica autoscaling (e.g. AWS Aurora)
|
||||||
|
|
||||||
The maxUses config option can help an application instance rebalance load against a replica set that has been auto-scaled after the connection pool is already full of healthy connections.
|
The maxUses config option can help an application instance rebalance load against a replica set that has been auto-scaled after the connection pool is already full of healthy connections.
|
||||||
|
|||||||
@ -372,8 +372,10 @@ class Pool extends EventEmitter {
|
|||||||
let tid
|
let tid
|
||||||
if (this.options.idleTimeoutMillis && this._isAboveMin()) {
|
if (this.options.idleTimeoutMillis && this._isAboveMin()) {
|
||||||
tid = setTimeout(() => {
|
tid = setTimeout(() => {
|
||||||
|
if (this._isAboveMin()) {
|
||||||
this.log('remove idle client')
|
this.log('remove idle client')
|
||||||
this._remove(client, this._pulseQueue.bind(this))
|
this._remove(client, this._pulseQueue.bind(this))
|
||||||
|
}
|
||||||
}, this.options.idleTimeoutMillis)
|
}, this.options.idleTimeoutMillis)
|
||||||
|
|
||||||
if (this.options.allowExitOnIdle) {
|
if (this.options.allowExitOnIdle) {
|
||||||
|
|||||||
@ -30,9 +30,9 @@
|
|||||||
"author": "Brian M. Carlson",
|
"author": "Brian M. Carlson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/brianc/node-pg-pool/issues"
|
"url": "https://github.com/brianc/node-postgres/issues"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/brianc/node-pg-pool#readme",
|
"homepage": "https://github.com/brianc/node-postgres/tree/master/packages/pg-pool#readme",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"bluebird": "3.7.2",
|
"bluebird": "3.7.2",
|
||||||
"co": "4.6.0",
|
"co": "4.6.0",
|
||||||
|
|||||||
@ -1,42 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
const co = require('co')
|
|
||||||
const expect = require('expect.js')
|
|
||||||
|
|
||||||
const describe = require('mocha').describe
|
|
||||||
const it = require('mocha').it
|
|
||||||
const BluebirdPromise = require('bluebird')
|
|
||||||
|
|
||||||
const Pool = require('../')
|
|
||||||
|
|
||||||
const checkType = (promise) => {
|
|
||||||
expect(promise).to.be.a(BluebirdPromise)
|
|
||||||
return promise.catch((e) => undefined)
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('Bring your own promise', function () {
|
|
||||||
it(
|
|
||||||
'uses supplied promise for operations',
|
|
||||||
co.wrap(function* () {
|
|
||||||
const pool = new Pool({ Promise: BluebirdPromise })
|
|
||||||
const client1 = yield checkType(pool.connect())
|
|
||||||
client1.release()
|
|
||||||
yield checkType(pool.query('SELECT NOW()'))
|
|
||||||
const client2 = yield checkType(pool.connect())
|
|
||||||
// TODO - make sure pg supports BYOP as well
|
|
||||||
client2.release()
|
|
||||||
yield checkType(pool.end())
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
it(
|
|
||||||
'uses promises in errors',
|
|
||||||
co.wrap(function* () {
|
|
||||||
const pool = new Pool({ Promise: BluebirdPromise, port: 48484 })
|
|
||||||
yield checkType(pool.connect())
|
|
||||||
yield checkType(pool.end())
|
|
||||||
yield checkType(pool.connect())
|
|
||||||
yield checkType(pool.query())
|
|
||||||
yield checkType(pool.end())
|
|
||||||
})
|
|
||||||
)
|
|
||||||
})
|
|
||||||
@ -124,3 +124,19 @@ describe('pool size of 2', () => {
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe('pool min size', () => {
|
||||||
|
it(
|
||||||
|
'does not drop below min when clients released at same time',
|
||||||
|
co.wrap(function* () {
|
||||||
|
const pool = new Pool({ max: 2, min: 1, idleTimeoutMillis: 10 })
|
||||||
|
const client = yield pool.connect()
|
||||||
|
const client2 = yield pool.connect()
|
||||||
|
client.release()
|
||||||
|
client2.release()
|
||||||
|
yield new Promise((resolve) => setTimeout(resolve, 20))
|
||||||
|
expect(pool.idleCount).to.equal(1)
|
||||||
|
return yield pool.end()
|
||||||
|
})
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pg-protocol",
|
"name": "pg-protocol",
|
||||||
"version": "1.10.1",
|
"version": "1.10.3",
|
||||||
"description": "The postgres client/server binary protocol, implemented in TypeScript",
|
"description": "The postgres client/server binary protocol, implemented in TypeScript",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"types": "dist/index.d.ts",
|
"types": "dist/index.d.ts",
|
||||||
@ -10,11 +10,8 @@
|
|||||||
"require": "./dist/index.js",
|
"require": "./dist/index.js",
|
||||||
"default": "./dist/index.js"
|
"default": "./dist/index.js"
|
||||||
},
|
},
|
||||||
"./dist/*": {
|
"./dist/*": "./dist/*.js",
|
||||||
"import": "./dist/*",
|
"./dist/*.js": "./dist/*.js"
|
||||||
"require": "./dist/*",
|
|
||||||
"default": "./dist/*"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@ -96,6 +96,7 @@ describe('serializer', () => {
|
|||||||
.addCString('')
|
.addCString('')
|
||||||
.addInt16(0)
|
.addInt16(0)
|
||||||
.addInt16(0)
|
.addInt16(0)
|
||||||
|
.addInt16(1)
|
||||||
.addInt16(0)
|
.addInt16(0)
|
||||||
.join(true, 'B')
|
.join(true, 'B')
|
||||||
assert.deepEqual(actual, expectedBuffer)
|
assert.deepEqual(actual, expectedBuffer)
|
||||||
@ -123,6 +124,7 @@ describe('serializer', () => {
|
|||||||
.addInt32(-1)
|
.addInt32(-1)
|
||||||
.addInt32(4)
|
.addInt32(4)
|
||||||
.add(Buffer.from('zing'))
|
.add(Buffer.from('zing'))
|
||||||
|
.addInt16(1)
|
||||||
.addInt16(0)
|
.addInt16(0)
|
||||||
.join(true, 'B')
|
.join(true, 'B')
|
||||||
assert.deepEqual(actual, expectedBuffer)
|
assert.deepEqual(actual, expectedBuffer)
|
||||||
@ -149,6 +151,7 @@ describe('serializer', () => {
|
|||||||
.addInt32(-1)
|
.addInt32(-1)
|
||||||
.addInt32(-1)
|
.addInt32(-1)
|
||||||
.addInt32(-1)
|
.addInt32(-1)
|
||||||
|
.addInt16(1)
|
||||||
.addInt16(0)
|
.addInt16(0)
|
||||||
.join(true, 'B')
|
.join(true, 'B')
|
||||||
assert.deepEqual(actual, expectedBuffer)
|
assert.deepEqual(actual, expectedBuffer)
|
||||||
@ -176,6 +179,7 @@ describe('serializer', () => {
|
|||||||
.addInt32(-1)
|
.addInt32(-1)
|
||||||
.addInt32(4)
|
.addInt32(4)
|
||||||
.add(Buffer.from('zing', 'utf-8'))
|
.add(Buffer.from('zing', 'utf-8'))
|
||||||
|
.addInt16(1)
|
||||||
.addInt16(0)
|
.addInt16(0)
|
||||||
.join(true, 'B')
|
.join(true, 'B')
|
||||||
assert.deepEqual(actual, expectedBuffer)
|
assert.deepEqual(actual, expectedBuffer)
|
||||||
|
|||||||
@ -157,6 +157,8 @@ const bind = (config: BindOpts = {}): Buffer => {
|
|||||||
writer.addInt16(len)
|
writer.addInt16(len)
|
||||||
writer.add(paramWriter.flush())
|
writer.add(paramWriter.flush())
|
||||||
|
|
||||||
|
// all results use the same format code
|
||||||
|
writer.addInt16(1)
|
||||||
// format code
|
// format code
|
||||||
writer.addInt16(binary ? ParamType.BINARY : ParamType.STRING)
|
writer.addInt16(binary ? ParamType.BINARY : ParamType.STRING)
|
||||||
return writer.flush(code.bind)
|
return writer.flush(code.bind)
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pg-query-stream",
|
"name": "pg-query-stream",
|
||||||
"version": "4.10.1",
|
"version": "4.10.3",
|
||||||
"description": "Postgres query result returned as readable stream",
|
"description": "Postgres query result returned as readable stream",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@ -45,7 +45,7 @@
|
|||||||
"concat-stream": "~1.0.1",
|
"concat-stream": "~1.0.1",
|
||||||
"eslint-plugin-promise": "^7.2.1",
|
"eslint-plugin-promise": "^7.2.1",
|
||||||
"mocha": "^10.5.2",
|
"mocha": "^10.5.2",
|
||||||
"pg": "^8.16.1",
|
"pg": "^8.16.3",
|
||||||
"stream-spec": "~0.3.5",
|
"stream-spec": "~0.3.5",
|
||||||
"ts-node": "^8.5.4",
|
"ts-node": "^8.5.4",
|
||||||
"typescript": "^4.0.3"
|
"typescript": "^4.0.3"
|
||||||
@ -54,6 +54,6 @@
|
|||||||
"pg": "^8"
|
"pg": "^8"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"pg-cursor": "^2.15.1"
|
"pg-cursor": "^2.15.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
const EventEmitter = require('events').EventEmitter
|
const EventEmitter = require('events').EventEmitter
|
||||||
const utils = require('./utils')
|
const utils = require('./utils')
|
||||||
|
const nodeUtils = require('node:util')
|
||||||
const sasl = require('./crypto/sasl')
|
const sasl = require('./crypto/sasl')
|
||||||
const TypeOverrides = require('./type-overrides')
|
const TypeOverrides = require('./type-overrides')
|
||||||
|
|
||||||
@ -11,6 +12,27 @@ const defaults = require('./defaults')
|
|||||||
const Connection = require('./connection')
|
const Connection = require('./connection')
|
||||||
const crypto = require('./crypto/utils')
|
const crypto = require('./crypto/utils')
|
||||||
|
|
||||||
|
const activeQueryDeprecationNotice = nodeUtils.deprecate(
|
||||||
|
() => {},
|
||||||
|
'Client.activeQuery is deprecated and will be removed in a future version.'
|
||||||
|
)
|
||||||
|
|
||||||
|
const queryQueueDeprecationNotice = nodeUtils.deprecate(
|
||||||
|
() => {},
|
||||||
|
'Client.queryQueue is deprecated and will be removed in a future version.'
|
||||||
|
)
|
||||||
|
|
||||||
|
const pgPassDeprecationNotice = nodeUtils.deprecate(
|
||||||
|
() => {},
|
||||||
|
'pgpass support is deprecated and will be removed in a future version. ' +
|
||||||
|
'You can provide an async function as the password property to the Client/Pool constructor that returns a password instead. Within this funciton you can call the pgpass module in your own code.'
|
||||||
|
)
|
||||||
|
|
||||||
|
const byoPromiseDeprecationNotice = nodeUtils.deprecate(
|
||||||
|
() => {},
|
||||||
|
'Passing a custom Promise implementation to the Client/Pool constructor is deprecated and will be removed in a future version.'
|
||||||
|
)
|
||||||
|
|
||||||
class Client extends EventEmitter {
|
class Client extends EventEmitter {
|
||||||
constructor(config) {
|
constructor(config) {
|
||||||
super()
|
super()
|
||||||
@ -34,6 +56,9 @@ class Client extends EventEmitter {
|
|||||||
|
|
||||||
const c = config || {}
|
const c = config || {}
|
||||||
|
|
||||||
|
if (c.Promise) {
|
||||||
|
byoPromiseDeprecationNotice()
|
||||||
|
}
|
||||||
this._Promise = c.Promise || global.Promise
|
this._Promise = c.Promise || global.Promise
|
||||||
this._types = new TypeOverrides(c.types)
|
this._types = new TypeOverrides(c.types)
|
||||||
this._ending = false
|
this._ending = false
|
||||||
@ -42,6 +67,7 @@ class Client extends EventEmitter {
|
|||||||
this._connected = false
|
this._connected = false
|
||||||
this._connectionError = false
|
this._connectionError = false
|
||||||
this._queryable = true
|
this._queryable = true
|
||||||
|
this._activeQuery = null
|
||||||
|
|
||||||
this.enableChannelBinding = Boolean(c.enableChannelBinding) // set true to use SCRAM-SHA-256-PLUS when offered
|
this.enableChannelBinding = Boolean(c.enableChannelBinding) // set true to use SCRAM-SHA-256-PLUS when offered
|
||||||
this.connection =
|
this.connection =
|
||||||
@ -53,7 +79,7 @@ class Client extends EventEmitter {
|
|||||||
keepAliveInitialDelayMillis: c.keepAliveInitialDelayMillis || 0,
|
keepAliveInitialDelayMillis: c.keepAliveInitialDelayMillis || 0,
|
||||||
encoding: this.connectionParameters.client_encoding || 'utf8',
|
encoding: this.connectionParameters.client_encoding || 'utf8',
|
||||||
})
|
})
|
||||||
this.queryQueue = []
|
this._queryQueue = []
|
||||||
this.binary = c.binary || defaults.binary
|
this.binary = c.binary || defaults.binary
|
||||||
this.processID = null
|
this.processID = null
|
||||||
this.secretKey = null
|
this.secretKey = null
|
||||||
@ -70,6 +96,20 @@ class Client extends EventEmitter {
|
|||||||
this._connectionTimeoutMillis = c.connectionTimeoutMillis || 0
|
this._connectionTimeoutMillis = c.connectionTimeoutMillis || 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get activeQuery() {
|
||||||
|
activeQueryDeprecationNotice()
|
||||||
|
return this._activeQuery
|
||||||
|
}
|
||||||
|
|
||||||
|
set activeQuery(val) {
|
||||||
|
activeQueryDeprecationNotice()
|
||||||
|
this._activeQuery = val
|
||||||
|
}
|
||||||
|
|
||||||
|
_getActiveQuery() {
|
||||||
|
return this._activeQuery
|
||||||
|
}
|
||||||
|
|
||||||
_errorAllQueries(err) {
|
_errorAllQueries(err) {
|
||||||
const enqueueError = (query) => {
|
const enqueueError = (query) => {
|
||||||
process.nextTick(() => {
|
process.nextTick(() => {
|
||||||
@ -77,13 +117,14 @@ class Client extends EventEmitter {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.activeQuery) {
|
const activeQuery = this._getActiveQuery()
|
||||||
enqueueError(this.activeQuery)
|
if (activeQuery) {
|
||||||
this.activeQuery = null
|
enqueueError(activeQuery)
|
||||||
|
this._activeQuery = null
|
||||||
}
|
}
|
||||||
|
|
||||||
this.queryQueue.forEach(enqueueError)
|
this._queryQueue.forEach(enqueueError)
|
||||||
this.queryQueue.length = 0
|
this._queryQueue.length = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
_connect(callback) {
|
_connect(callback) {
|
||||||
@ -203,9 +244,7 @@ class Client extends EventEmitter {
|
|||||||
con.on('notification', this._handleNotification.bind(this))
|
con.on('notification', this._handleNotification.bind(this))
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(bmc): deprecate pgpass "built in" integration since this.password can be a function
|
_getPassword(cb) {
|
||||||
// it can be supplied by the user if required - this is a breaking change!
|
|
||||||
_checkPgPass(cb) {
|
|
||||||
const con = this.connection
|
const con = this.connection
|
||||||
if (typeof this.password === 'function') {
|
if (typeof this.password === 'function') {
|
||||||
this._Promise
|
this._Promise
|
||||||
@ -233,6 +272,7 @@ class Client extends EventEmitter {
|
|||||||
const pgPass = require('pgpass')
|
const pgPass = require('pgpass')
|
||||||
pgPass(this.connectionParameters, (pass) => {
|
pgPass(this.connectionParameters, (pass) => {
|
||||||
if (undefined !== pass) {
|
if (undefined !== pass) {
|
||||||
|
pgPassDeprecationNotice()
|
||||||
this.connectionParameters.password = this.password = pass
|
this.connectionParameters.password = this.password = pass
|
||||||
}
|
}
|
||||||
cb()
|
cb()
|
||||||
@ -244,13 +284,13 @@ class Client extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_handleAuthCleartextPassword(msg) {
|
_handleAuthCleartextPassword(msg) {
|
||||||
this._checkPgPass(() => {
|
this._getPassword(() => {
|
||||||
this.connection.password(this.password)
|
this.connection.password(this.password)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleAuthMD5Password(msg) {
|
_handleAuthMD5Password(msg) {
|
||||||
this._checkPgPass(async () => {
|
this._getPassword(async () => {
|
||||||
try {
|
try {
|
||||||
const hashedPassword = await crypto.postgresMd5PasswordHash(this.user, this.password, msg.salt)
|
const hashedPassword = await crypto.postgresMd5PasswordHash(this.user, this.password, msg.salt)
|
||||||
this.connection.password(hashedPassword)
|
this.connection.password(hashedPassword)
|
||||||
@ -261,7 +301,7 @@ class Client extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_handleAuthSASL(msg) {
|
_handleAuthSASL(msg) {
|
||||||
this._checkPgPass(() => {
|
this._getPassword(() => {
|
||||||
try {
|
try {
|
||||||
this.saslSession = sasl.startSession(msg.mechanisms, this.enableChannelBinding && this.connection.stream)
|
this.saslSession = sasl.startSession(msg.mechanisms, this.enableChannelBinding && this.connection.stream)
|
||||||
this.connection.sendSASLInitialResponseMessage(this.saslSession.mechanism, this.saslSession.response)
|
this.connection.sendSASLInitialResponseMessage(this.saslSession.mechanism, this.saslSession.response)
|
||||||
@ -314,8 +354,8 @@ class Client extends EventEmitter {
|
|||||||
}
|
}
|
||||||
this.emit('connect')
|
this.emit('connect')
|
||||||
}
|
}
|
||||||
const { activeQuery } = this
|
const activeQuery = this._getActiveQuery()
|
||||||
this.activeQuery = null
|
this._activeQuery = null
|
||||||
this.readyForQuery = true
|
this.readyForQuery = true
|
||||||
if (activeQuery) {
|
if (activeQuery) {
|
||||||
activeQuery.handleReadyForQuery(this.connection)
|
activeQuery.handleReadyForQuery(this.connection)
|
||||||
@ -323,7 +363,7 @@ class Client extends EventEmitter {
|
|||||||
this._pulseQueryQueue()
|
this._pulseQueryQueue()
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we receieve an error event or error message
|
// if we receive an error event or error message
|
||||||
// during the connection process we handle it here
|
// during the connection process we handle it here
|
||||||
_handleErrorWhileConnecting(err) {
|
_handleErrorWhileConnecting(err) {
|
||||||
if (this._connectionError) {
|
if (this._connectionError) {
|
||||||
@ -355,49 +395,51 @@ class Client extends EventEmitter {
|
|||||||
if (this._connecting) {
|
if (this._connecting) {
|
||||||
return this._handleErrorWhileConnecting(msg)
|
return this._handleErrorWhileConnecting(msg)
|
||||||
}
|
}
|
||||||
const activeQuery = this.activeQuery
|
const activeQuery = this._getActiveQuery()
|
||||||
|
|
||||||
if (!activeQuery) {
|
if (!activeQuery) {
|
||||||
this._handleErrorEvent(msg)
|
this._handleErrorEvent(msg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
this.activeQuery = null
|
this._activeQuery = null
|
||||||
activeQuery.handleError(msg, this.connection)
|
activeQuery.handleError(msg, this.connection)
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleRowDescription(msg) {
|
_handleRowDescription(msg) {
|
||||||
// delegate rowDescription to active query
|
// delegate rowDescription to active query
|
||||||
this.activeQuery.handleRowDescription(msg)
|
this._getActiveQuery().handleRowDescription(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleDataRow(msg) {
|
_handleDataRow(msg) {
|
||||||
// delegate dataRow to active query
|
// delegate dataRow to active query
|
||||||
this.activeQuery.handleDataRow(msg)
|
this._getActiveQuery().handleDataRow(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
_handlePortalSuspended(msg) {
|
_handlePortalSuspended(msg) {
|
||||||
// delegate portalSuspended to active query
|
// delegate portalSuspended to active query
|
||||||
this.activeQuery.handlePortalSuspended(this.connection)
|
this._getActiveQuery().handlePortalSuspended(this.connection)
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleEmptyQuery(msg) {
|
_handleEmptyQuery(msg) {
|
||||||
// delegate emptyQuery to active query
|
// delegate emptyQuery to active query
|
||||||
this.activeQuery.handleEmptyQuery(this.connection)
|
this._getActiveQuery().handleEmptyQuery(this.connection)
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleCommandComplete(msg) {
|
_handleCommandComplete(msg) {
|
||||||
if (this.activeQuery == null) {
|
const activeQuery = this._getActiveQuery()
|
||||||
|
if (activeQuery == null) {
|
||||||
const error = new Error('Received unexpected commandComplete message from backend.')
|
const error = new Error('Received unexpected commandComplete message from backend.')
|
||||||
this._handleErrorEvent(error)
|
this._handleErrorEvent(error)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// delegate commandComplete to active query
|
// delegate commandComplete to active query
|
||||||
this.activeQuery.handleCommandComplete(msg, this.connection)
|
activeQuery.handleCommandComplete(msg, this.connection)
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleParseComplete() {
|
_handleParseComplete() {
|
||||||
if (this.activeQuery == null) {
|
const activeQuery = this._getActiveQuery()
|
||||||
|
if (activeQuery == null) {
|
||||||
const error = new Error('Received unexpected parseComplete message from backend.')
|
const error = new Error('Received unexpected parseComplete message from backend.')
|
||||||
this._handleErrorEvent(error)
|
this._handleErrorEvent(error)
|
||||||
return
|
return
|
||||||
@ -405,17 +447,17 @@ class Client extends EventEmitter {
|
|||||||
// if a prepared statement has a name and properly parses
|
// if a prepared statement has a name and properly parses
|
||||||
// we track that its already been executed so we don't parse
|
// we track that its already been executed so we don't parse
|
||||||
// it again on the same client
|
// it again on the same client
|
||||||
if (this.activeQuery.name) {
|
if (activeQuery.name) {
|
||||||
this.connection.parsedStatements[this.activeQuery.name] = this.activeQuery.text
|
this.connection.parsedStatements[activeQuery.name] = activeQuery.text
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleCopyInResponse(msg) {
|
_handleCopyInResponse(msg) {
|
||||||
this.activeQuery.handleCopyInResponse(this.connection)
|
this._getActiveQuery().handleCopyInResponse(this.connection)
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleCopyData(msg) {
|
_handleCopyData(msg) {
|
||||||
this.activeQuery.handleCopyData(msg, this.connection)
|
this._getActiveQuery().handleCopyData(msg, this.connection)
|
||||||
}
|
}
|
||||||
|
|
||||||
_handleNotification(msg) {
|
_handleNotification(msg) {
|
||||||
@ -471,8 +513,8 @@ class Client extends EventEmitter {
|
|||||||
con.on('connect', function () {
|
con.on('connect', function () {
|
||||||
con.cancel(client.processID, client.secretKey)
|
con.cancel(client.processID, client.secretKey)
|
||||||
})
|
})
|
||||||
} else if (client.queryQueue.indexOf(query) !== -1) {
|
} else if (client._queryQueue.indexOf(query) !== -1) {
|
||||||
client.queryQueue.splice(client.queryQueue.indexOf(query), 1)
|
client._queryQueue.splice(client._queryQueue.indexOf(query), 1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -497,21 +539,22 @@ class Client extends EventEmitter {
|
|||||||
|
|
||||||
_pulseQueryQueue() {
|
_pulseQueryQueue() {
|
||||||
if (this.readyForQuery === true) {
|
if (this.readyForQuery === true) {
|
||||||
this.activeQuery = this.queryQueue.shift()
|
this._activeQuery = this._queryQueue.shift()
|
||||||
if (this.activeQuery) {
|
const activeQuery = this._getActiveQuery()
|
||||||
|
if (activeQuery) {
|
||||||
this.readyForQuery = false
|
this.readyForQuery = false
|
||||||
this.hasExecuted = true
|
this.hasExecuted = true
|
||||||
|
|
||||||
const queryError = this.activeQuery.submit(this.connection)
|
const queryError = activeQuery.submit(this.connection)
|
||||||
if (queryError) {
|
if (queryError) {
|
||||||
process.nextTick(() => {
|
process.nextTick(() => {
|
||||||
this.activeQuery.handleError(queryError, this.connection)
|
activeQuery.handleError(queryError, this.connection)
|
||||||
this.readyForQuery = true
|
this.readyForQuery = true
|
||||||
this._pulseQueryQueue()
|
this._pulseQueryQueue()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
} else if (this.hasExecuted) {
|
} else if (this.hasExecuted) {
|
||||||
this.activeQuery = null
|
this._activeQuery = null
|
||||||
this.emit('drain')
|
this.emit('drain')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -565,9 +608,9 @@ class Client extends EventEmitter {
|
|||||||
query.callback = () => {}
|
query.callback = () => {}
|
||||||
|
|
||||||
// Remove from queue
|
// Remove from queue
|
||||||
const index = this.queryQueue.indexOf(query)
|
const index = this._queryQueue.indexOf(query)
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
this.queryQueue.splice(index, 1)
|
this._queryQueue.splice(index, 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
this._pulseQueryQueue()
|
this._pulseQueryQueue()
|
||||||
@ -601,7 +644,7 @@ class Client extends EventEmitter {
|
|||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
this.queryQueue.push(query)
|
this._queryQueue.push(query)
|
||||||
this._pulseQueryQueue()
|
this._pulseQueryQueue()
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
@ -626,7 +669,7 @@ class Client extends EventEmitter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.activeQuery || !this._queryable) {
|
if (this._getActiveQuery() || !this._queryable) {
|
||||||
// if we have an active query we need to force a disconnect
|
// if we have an active query we need to force a disconnect
|
||||||
// on the socket - otherwise a hung query could block end forever
|
// on the socket - otherwise a hung query could block end forever
|
||||||
this.connection.stream.destroy()
|
this.connection.stream.destroy()
|
||||||
@ -642,6 +685,10 @@ class Client extends EventEmitter {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
get queryQueue() {
|
||||||
|
queryQueueDeprecationNotice()
|
||||||
|
return this._queryQueue
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// expose a Query constructor
|
// expose a Query constructor
|
||||||
|
|||||||
@ -19,7 +19,7 @@ const NativeQuery = (module.exports = function (config, values, callback) {
|
|||||||
// then emit them as they come in
|
// then emit them as they come in
|
||||||
// without setting singleRowMode to true
|
// without setting singleRowMode to true
|
||||||
// this has almost no meaning because libpq
|
// this has almost no meaning because libpq
|
||||||
// reads all rows into memory befor returning any
|
// reads all rows into memory before returning any
|
||||||
this._emitRowEvents = false
|
this._emitRowEvents = false
|
||||||
this.on(
|
this.on(
|
||||||
'newListener',
|
'newListener',
|
||||||
|
|||||||
@ -112,7 +112,7 @@ class Query extends EventEmitter {
|
|||||||
// if a named prepared statement is created with empty query text
|
// if a named prepared statement is created with empty query text
|
||||||
// the backend will send an emptyQuery message but *not* a command complete message
|
// the backend will send an emptyQuery message but *not* a command complete message
|
||||||
// since we pipeline sync immediately after execute we don't need to do anything here
|
// since we pipeline sync immediately after execute we don't need to do anything here
|
||||||
// unless we have rows specified, in which case we did not pipeline the intial sync call
|
// unless we have rows specified, in which case we did not pipeline the initial sync call
|
||||||
handleEmptyQuery(connection) {
|
handleEmptyQuery(connection) {
|
||||||
if (this.rows) {
|
if (this.rows) {
|
||||||
connection.sync()
|
connection.sync()
|
||||||
|
|||||||
@ -66,7 +66,8 @@ class Result {
|
|||||||
const rawValue = rowData[i]
|
const rawValue = rowData[i]
|
||||||
const field = this.fields[i].name
|
const field = this.fields[i].name
|
||||||
if (rawValue !== null) {
|
if (rawValue !== null) {
|
||||||
row[field] = this._parsers[i](rawValue)
|
const v = this.fields[i].format === 'binary' ? Buffer.from(rawValue) : rawValue
|
||||||
|
row[field] = this._parsers[i](v)
|
||||||
} else {
|
} else {
|
||||||
row[field] = null
|
row[field] = null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pg",
|
"name": "pg",
|
||||||
"version": "8.16.1",
|
"version": "8.16.3",
|
||||||
"description": "PostgreSQL client - pure javascript & libpq with the same API",
|
"description": "PostgreSQL client - pure javascript & libpq with the same API",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"database",
|
"database",
|
||||||
@ -28,16 +28,13 @@
|
|||||||
"./package.json": {
|
"./package.json": {
|
||||||
"default": "./package.json"
|
"default": "./package.json"
|
||||||
},
|
},
|
||||||
"./lib/*": {
|
"./lib/*": "./lib/*.js",
|
||||||
"import": "./lib/*",
|
"./lib/*.js": "./lib/*.js"
|
||||||
"require": "./lib/*",
|
|
||||||
"default": "./lib/*"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"pg-connection-string": "^2.9.1",
|
"pg-connection-string": "^2.9.1",
|
||||||
"pg-pool": "^3.10.1",
|
"pg-pool": "^3.10.1",
|
||||||
"pg-protocol": "^1.10.1",
|
"pg-protocol": "^1.10.3",
|
||||||
"pg-types": "2.2.0",
|
"pg-types": "2.2.0",
|
||||||
"pgpass": "1.0.5"
|
"pgpass": "1.0.5"
|
||||||
},
|
},
|
||||||
@ -53,7 +50,7 @@
|
|||||||
"wrangler": "^3.x"
|
"wrangler": "^3.x"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"pg-cloudflare": "^1.2.6"
|
"pg-cloudflare": "^1.2.7"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"pg-native": ">=3.0.1"
|
"pg-native": ">=3.0.1"
|
||||||
|
|||||||
@ -19,15 +19,8 @@ test('simple query interface', function () {
|
|||||||
rows.push(row['name'])
|
rows.push(row['name'])
|
||||||
})
|
})
|
||||||
query.once('row', function (row) {
|
query.once('row', function (row) {
|
||||||
test('Can iterate through columns', function () {
|
test('returned right columns', function () {
|
||||||
const columnCount = Object.keys(row).length
|
assert.deepStrictEqual(row, { name: row.name })
|
||||||
if ('length' in row) {
|
|
||||||
assert.lengthIs(
|
|
||||||
row,
|
|
||||||
columnCount,
|
|
||||||
'Iterating through the columns gives a different length from calling .length.'
|
|
||||||
)
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
25
packages/pg/test/integration/gh-issues/3487-tests.js
Normal file
25
packages/pg/test/integration/gh-issues/3487-tests.js
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
const helper = require('../test-helper')
|
||||||
|
const assert = require('assert')
|
||||||
|
|
||||||
|
const suite = new helper.Suite()
|
||||||
|
|
||||||
|
suite.testAsync('allows you to switch between format modes for arrays', async () => {
|
||||||
|
const client = new helper.pg.Client()
|
||||||
|
await client.connect()
|
||||||
|
|
||||||
|
const r1 = await client.query({
|
||||||
|
text: 'SELECT CAST($1 AS INT[]) as a',
|
||||||
|
values: [[1, 2, 8]],
|
||||||
|
binary: false,
|
||||||
|
})
|
||||||
|
assert.deepEqual([1, 2, 8], r1.rows[0].a)
|
||||||
|
|
||||||
|
const r2 = await client.query({
|
||||||
|
text: 'SELECT CAST($1 AS INT[]) as a',
|
||||||
|
values: [[4, 5, 6]],
|
||||||
|
binary: true,
|
||||||
|
})
|
||||||
|
assert.deepEqual([4, 5, 6], r2.rows[0].a)
|
||||||
|
|
||||||
|
await client.end()
|
||||||
|
})
|
||||||
@ -31,8 +31,6 @@ suite.test('emits end when not in query', function () {
|
|||||||
client.connection.emit('connect')
|
client.connection.emit('connect')
|
||||||
process.nextTick(function () {
|
process.nextTick(function () {
|
||||||
client.connection.emit('readyForQuery')
|
client.connection.emit('readyForQuery')
|
||||||
assert.equal(client.queryQueue.length, 0)
|
|
||||||
assert(client.activeQuery, 'client should have issued query')
|
|
||||||
process.nextTick(function () {
|
process.nextTick(function () {
|
||||||
stream.emit('close')
|
stream.emit('close')
|
||||||
})
|
})
|
||||||
|
|||||||
294
yarn.lock
294
yarn.lock
@ -1034,6 +1034,13 @@
|
|||||||
wrap-ansi "^8.1.0"
|
wrap-ansi "^8.1.0"
|
||||||
wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
|
wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
|
||||||
|
|
||||||
|
"@isaacs/fs-minipass@^4.0.0":
|
||||||
|
version "4.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32"
|
||||||
|
integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==
|
||||||
|
dependencies:
|
||||||
|
minipass "^7.0.4"
|
||||||
|
|
||||||
"@istanbuljs/load-nyc-config@^1.0.0":
|
"@istanbuljs/load-nyc-config@^1.0.0":
|
||||||
version "1.1.0"
|
version "1.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
|
resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
|
||||||
@ -1827,10 +1834,10 @@
|
|||||||
"@nodelib/fs.scandir" "2.1.5"
|
"@nodelib/fs.scandir" "2.1.5"
|
||||||
fastq "^1.6.0"
|
fastq "^1.6.0"
|
||||||
|
|
||||||
"@npmcli/agent@^2.0.0":
|
"@npmcli/agent@^3.0.0":
|
||||||
version "2.2.2"
|
version "3.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5"
|
resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-3.0.0.tgz#1685b1fbd4a1b7bb4f930cbb68ce801edfe7aa44"
|
||||||
integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==
|
integrity sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==
|
||||||
dependencies:
|
dependencies:
|
||||||
agent-base "^7.1.0"
|
agent-base "^7.1.0"
|
||||||
http-proxy-agent "^7.0.0"
|
http-proxy-agent "^7.0.0"
|
||||||
@ -1838,10 +1845,10 @@
|
|||||||
lru-cache "^10.0.1"
|
lru-cache "^10.0.1"
|
||||||
socks-proxy-agent "^8.0.3"
|
socks-proxy-agent "^8.0.3"
|
||||||
|
|
||||||
"@npmcli/fs@^3.1.0":
|
"@npmcli/fs@^4.0.0":
|
||||||
version "3.1.1"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726"
|
resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-4.0.0.tgz#a1eb1aeddefd2a4a347eca0fab30bc62c0e1c0f2"
|
||||||
integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==
|
integrity sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==
|
||||||
dependencies:
|
dependencies:
|
||||||
semver "^7.3.5"
|
semver "^7.3.5"
|
||||||
|
|
||||||
@ -1959,10 +1966,10 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
|
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
|
||||||
integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
|
integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
|
||||||
|
|
||||||
"@pkgr/core@^0.2.3":
|
"@pkgr/core@^0.2.4":
|
||||||
version "0.2.4"
|
version "0.2.7"
|
||||||
resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.4.tgz#d897170a2b0ba51f78a099edccd968f7b103387c"
|
resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.7.tgz#eb5014dfd0b03e7f3ba2eeeff506eed89b028058"
|
||||||
integrity sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==
|
integrity sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg==
|
||||||
|
|
||||||
"@rollup/plugin-commonjs@^28.0.3":
|
"@rollup/plugin-commonjs@^28.0.3":
|
||||||
version "28.0.3"
|
version "28.0.3"
|
||||||
@ -2668,10 +2675,10 @@ abbrev@1.0.x:
|
|||||||
resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"
|
resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"
|
||||||
integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
|
integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
|
||||||
|
|
||||||
abbrev@^2.0.0:
|
abbrev@^3.0.0:
|
||||||
version "2.0.0"
|
version "3.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
|
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-3.0.1.tgz#8ac8b3b5024d31464fe2a5feeea9f4536bf44025"
|
||||||
integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
|
integrity sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==
|
||||||
|
|
||||||
acorn-jsx@^5.3.2:
|
acorn-jsx@^5.3.2:
|
||||||
version "5.3.2"
|
version "5.3.2"
|
||||||
@ -3199,12 +3206,12 @@ cacache@^12.0.0, cacache@^12.0.3:
|
|||||||
unique-filename "^1.1.1"
|
unique-filename "^1.1.1"
|
||||||
y18n "^4.0.0"
|
y18n "^4.0.0"
|
||||||
|
|
||||||
cacache@^18.0.0:
|
cacache@^19.0.1:
|
||||||
version "18.0.3"
|
version "19.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.3.tgz#864e2c18414e1e141ae8763f31e46c2cb96d1b21"
|
resolved "https://registry.yarnpkg.com/cacache/-/cacache-19.0.1.tgz#3370cc28a758434c85c2585008bd5bdcff17d6cd"
|
||||||
integrity sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==
|
integrity sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@npmcli/fs" "^3.1.0"
|
"@npmcli/fs" "^4.0.0"
|
||||||
fs-minipass "^3.0.0"
|
fs-minipass "^3.0.0"
|
||||||
glob "^10.2.2"
|
glob "^10.2.2"
|
||||||
lru-cache "^10.0.1"
|
lru-cache "^10.0.1"
|
||||||
@ -3212,10 +3219,10 @@ cacache@^18.0.0:
|
|||||||
minipass-collect "^2.0.1"
|
minipass-collect "^2.0.1"
|
||||||
minipass-flush "^1.0.5"
|
minipass-flush "^1.0.5"
|
||||||
minipass-pipeline "^1.2.4"
|
minipass-pipeline "^1.2.4"
|
||||||
p-map "^4.0.0"
|
p-map "^7.0.2"
|
||||||
ssri "^10.0.0"
|
ssri "^12.0.0"
|
||||||
tar "^6.1.11"
|
tar "^7.4.3"
|
||||||
unique-filename "^3.0.0"
|
unique-filename "^4.0.0"
|
||||||
|
|
||||||
cache-base@^1.0.1:
|
cache-base@^1.0.1:
|
||||||
version "1.0.1"
|
version "1.0.1"
|
||||||
@ -3411,10 +3418,10 @@ chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.4:
|
|||||||
resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
|
resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
|
||||||
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
|
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
|
||||||
|
|
||||||
chownr@^2.0.0:
|
chownr@^3.0.0:
|
||||||
version "2.0.0"
|
version "3.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
|
resolved "https://registry.yarnpkg.com/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4"
|
||||||
integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
|
integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==
|
||||||
|
|
||||||
chrome-trace-event@^1.0.2:
|
chrome-trace-event@^1.0.2:
|
||||||
version "1.0.4"
|
version "1.0.4"
|
||||||
@ -4434,12 +4441,12 @@ eslint-plugin-node@^11.1.0:
|
|||||||
semver "^6.1.0"
|
semver "^6.1.0"
|
||||||
|
|
||||||
eslint-plugin-prettier@^5.1.2:
|
eslint-plugin-prettier@^5.1.2:
|
||||||
version "5.2.6"
|
version "5.5.1"
|
||||||
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.6.tgz#be39e3bb23bb3eeb7e7df0927cdb46e4d7945096"
|
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.1.tgz#470820964de9aedb37e9ce62c3266d2d26d08d15"
|
||||||
integrity sha512-mUcf7QG2Tjk7H055Jk0lGBjbgDnfrvqjhXh9t2xLMSCjZVcw9Rb1V6sVNXO0th3jgeO7zllWPTNRil3JW94TnQ==
|
integrity sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw==
|
||||||
dependencies:
|
dependencies:
|
||||||
prettier-linter-helpers "^1.0.0"
|
prettier-linter-helpers "^1.0.0"
|
||||||
synckit "^0.11.0"
|
synckit "^0.11.7"
|
||||||
|
|
||||||
eslint-plugin-promise@^7.2.1:
|
eslint-plugin-promise@^7.2.1:
|
||||||
version "7.2.1"
|
version "7.2.1"
|
||||||
@ -4965,13 +4972,6 @@ fs-minipass@^1.2.7:
|
|||||||
dependencies:
|
dependencies:
|
||||||
minipass "^2.6.0"
|
minipass "^2.6.0"
|
||||||
|
|
||||||
fs-minipass@^2.0.0:
|
|
||||||
version "2.1.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
|
|
||||||
integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
|
|
||||||
dependencies:
|
|
||||||
minipass "^3.0.0"
|
|
||||||
|
|
||||||
fs-minipass@^3.0.0:
|
fs-minipass@^3.0.0:
|
||||||
version "3.0.3"
|
version "3.0.3"
|
||||||
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
|
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
|
||||||
@ -5205,7 +5205,7 @@ glob@8.1.0:
|
|||||||
minimatch "^5.0.1"
|
minimatch "^5.0.1"
|
||||||
once "^1.3.0"
|
once "^1.3.0"
|
||||||
|
|
||||||
glob@^10.2.2, glob@^10.3.10:
|
glob@^10.2.2:
|
||||||
version "10.4.1"
|
version "10.4.1"
|
||||||
resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
|
resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
|
||||||
integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
|
integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
|
||||||
@ -5227,19 +5227,7 @@ glob@^5.0.15:
|
|||||||
once "^1.3.0"
|
once "^1.3.0"
|
||||||
path-is-absolute "^1.0.0"
|
path-is-absolute "^1.0.0"
|
||||||
|
|
||||||
glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
|
glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
|
||||||
version "7.1.6"
|
|
||||||
resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
|
|
||||||
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
|
|
||||||
dependencies:
|
|
||||||
fs.realpath "^1.0.0"
|
|
||||||
inflight "^1.0.4"
|
|
||||||
inherits "2"
|
|
||||||
minimatch "^3.0.4"
|
|
||||||
once "^1.3.0"
|
|
||||||
path-is-absolute "^1.0.0"
|
|
||||||
|
|
||||||
glob@^7.1.6:
|
|
||||||
version "7.2.3"
|
version "7.2.3"
|
||||||
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
|
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
|
||||||
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
|
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
|
||||||
@ -5794,11 +5782,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
is-extglob "^2.1.1"
|
is-extglob "^2.1.1"
|
||||||
|
|
||||||
is-lambda@^1.0.1:
|
|
||||||
version "1.0.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
|
|
||||||
integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
|
|
||||||
|
|
||||||
is-module@^1.0.0:
|
is-module@^1.0.0:
|
||||||
version "1.0.0"
|
version "1.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
|
resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
|
||||||
@ -6479,23 +6462,22 @@ make-error@^1.1.1:
|
|||||||
resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
|
resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
|
||||||
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
|
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
|
||||||
|
|
||||||
make-fetch-happen@^13.0.0:
|
make-fetch-happen@^14.0.3:
|
||||||
version "13.0.1"
|
version "14.0.3"
|
||||||
resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36"
|
resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz#d74c3ecb0028f08ab604011e0bc6baed483fcdcd"
|
||||||
integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==
|
integrity sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@npmcli/agent" "^2.0.0"
|
"@npmcli/agent" "^3.0.0"
|
||||||
cacache "^18.0.0"
|
cacache "^19.0.1"
|
||||||
http-cache-semantics "^4.1.1"
|
http-cache-semantics "^4.1.1"
|
||||||
is-lambda "^1.0.1"
|
|
||||||
minipass "^7.0.2"
|
minipass "^7.0.2"
|
||||||
minipass-fetch "^3.0.0"
|
minipass-fetch "^4.0.0"
|
||||||
minipass-flush "^1.0.5"
|
minipass-flush "^1.0.5"
|
||||||
minipass-pipeline "^1.2.4"
|
minipass-pipeline "^1.2.4"
|
||||||
negotiator "^0.6.3"
|
negotiator "^1.0.0"
|
||||||
proc-log "^4.2.0"
|
proc-log "^5.0.0"
|
||||||
promise-retry "^2.0.1"
|
promise-retry "^2.0.1"
|
||||||
ssri "^10.0.0"
|
ssri "^12.0.0"
|
||||||
|
|
||||||
make-fetch-happen@^5.0.0:
|
make-fetch-happen@^5.0.0:
|
||||||
version "5.0.2"
|
version "5.0.2"
|
||||||
@ -6763,14 +6745,14 @@ minipass-collect@^2.0.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
minipass "^7.0.3"
|
minipass "^7.0.3"
|
||||||
|
|
||||||
minipass-fetch@^3.0.0:
|
minipass-fetch@^4.0.0:
|
||||||
version "3.0.5"
|
version "4.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c"
|
resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-4.0.1.tgz#f2d717d5a418ad0b1a7274f9b913515d3e78f9e5"
|
||||||
integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==
|
integrity sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
minipass "^7.0.3"
|
minipass "^7.0.3"
|
||||||
minipass-sized "^1.0.3"
|
minipass-sized "^1.0.3"
|
||||||
minizlib "^2.1.2"
|
minizlib "^3.0.1"
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
encoding "^0.1.13"
|
encoding "^0.1.13"
|
||||||
|
|
||||||
@ -6810,12 +6792,7 @@ minipass@^3.0.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
yallist "^4.0.0"
|
yallist "^4.0.0"
|
||||||
|
|
||||||
minipass@^5.0.0:
|
"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4, minipass@^7.1.2:
|
||||||
version "5.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
|
|
||||||
integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
|
|
||||||
|
|
||||||
"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.1.2:
|
|
||||||
version "7.1.2"
|
version "7.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
|
resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
|
||||||
integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
|
integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
|
||||||
@ -6827,13 +6804,12 @@ minizlib@^1.3.3:
|
|||||||
dependencies:
|
dependencies:
|
||||||
minipass "^2.9.0"
|
minipass "^2.9.0"
|
||||||
|
|
||||||
minizlib@^2.1.1, minizlib@^2.1.2:
|
minizlib@^3.0.1:
|
||||||
version "2.1.2"
|
version "3.0.2"
|
||||||
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
|
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-3.0.2.tgz#f33d638eb279f664439aa38dc5f91607468cb574"
|
||||||
integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
|
integrity sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==
|
||||||
dependencies:
|
dependencies:
|
||||||
minipass "^3.0.0"
|
minipass "^7.1.2"
|
||||||
yallist "^4.0.0"
|
|
||||||
|
|
||||||
mississippi@^3.0.0:
|
mississippi@^3.0.0:
|
||||||
version "3.0.0"
|
version "3.0.0"
|
||||||
@ -6866,10 +6842,10 @@ mkdirp-promise@^5.0.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
mkdirp "*"
|
mkdirp "*"
|
||||||
|
|
||||||
mkdirp@*, mkdirp@^1.0.3:
|
mkdirp@*, mkdirp@^3.0.1:
|
||||||
version "1.0.4"
|
version "3.0.1"
|
||||||
resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
|
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
|
||||||
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
|
integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
|
||||||
|
|
||||||
mkdirp@0.5.x, mkdirp@^0.5.1, mkdirp@^0.5.5:
|
mkdirp@0.5.x, mkdirp@^0.5.1, mkdirp@^0.5.5:
|
||||||
version "0.5.5"
|
version "0.5.5"
|
||||||
@ -7002,10 +6978,10 @@ natural-compare@^1.4.0:
|
|||||||
resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
|
resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
|
||||||
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
|
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
|
||||||
|
|
||||||
negotiator@^0.6.3:
|
negotiator@^1.0.0:
|
||||||
version "0.6.3"
|
version "1.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
|
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a"
|
||||||
integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
|
integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==
|
||||||
|
|
||||||
neo-async@^2.6.0, neo-async@^2.6.2:
|
neo-async@^2.6.0, neo-async@^2.6.2:
|
||||||
version "2.6.2"
|
version "2.6.2"
|
||||||
@ -7034,20 +7010,20 @@ node-fetch@^2.5.0, node-fetch@^2.6.1:
|
|||||||
whatwg-url "^5.0.0"
|
whatwg-url "^5.0.0"
|
||||||
|
|
||||||
node-gyp@>=10.x:
|
node-gyp@>=10.x:
|
||||||
version "10.2.0"
|
version "11.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.2.0.tgz#80101c4aa4f7ab225f13fcc8daaaac4eb1a8dd86"
|
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-11.3.0.tgz#e543e3dcd69877e4a9a682ce355150c5d6a6947b"
|
||||||
integrity sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==
|
integrity sha512-9J0+C+2nt3WFuui/mC46z2XCZ21/cKlFDuywULmseD/LlmnOrSeEAE4c/1jw6aybXLmpZnQY3/LmOJfgyHIcng==
|
||||||
dependencies:
|
dependencies:
|
||||||
env-paths "^2.2.0"
|
env-paths "^2.2.0"
|
||||||
exponential-backoff "^3.1.1"
|
exponential-backoff "^3.1.1"
|
||||||
glob "^10.3.10"
|
|
||||||
graceful-fs "^4.2.6"
|
graceful-fs "^4.2.6"
|
||||||
make-fetch-happen "^13.0.0"
|
make-fetch-happen "^14.0.3"
|
||||||
nopt "^7.0.0"
|
nopt "^8.0.0"
|
||||||
proc-log "^4.1.0"
|
proc-log "^5.0.0"
|
||||||
semver "^7.3.5"
|
semver "^7.3.5"
|
||||||
tar "^6.2.1"
|
tar "^7.4.3"
|
||||||
which "^4.0.0"
|
tinyglobby "^0.2.12"
|
||||||
|
which "^5.0.0"
|
||||||
|
|
||||||
node-gyp@^5.0.2:
|
node-gyp@^5.0.2:
|
||||||
version "5.1.1"
|
version "5.1.1"
|
||||||
@ -7093,12 +7069,12 @@ nopt@^4.0.1:
|
|||||||
abbrev "1"
|
abbrev "1"
|
||||||
osenv "^0.1.4"
|
osenv "^0.1.4"
|
||||||
|
|
||||||
nopt@^7.0.0:
|
nopt@^8.0.0:
|
||||||
version "7.2.1"
|
version "8.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7"
|
resolved "https://registry.yarnpkg.com/nopt/-/nopt-8.1.0.tgz#b11d38caf0f8643ce885818518064127f602eae3"
|
||||||
integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==
|
integrity sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==
|
||||||
dependencies:
|
dependencies:
|
||||||
abbrev "^2.0.0"
|
abbrev "^3.0.0"
|
||||||
|
|
||||||
normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
|
normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
|
||||||
version "2.5.0"
|
version "2.5.0"
|
||||||
@ -7449,12 +7425,10 @@ p-map@^3.0.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
aggregate-error "^3.0.0"
|
aggregate-error "^3.0.0"
|
||||||
|
|
||||||
p-map@^4.0.0:
|
p-map@^7.0.2:
|
||||||
version "4.0.0"
|
version "7.0.3"
|
||||||
resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
|
resolved "https://registry.yarnpkg.com/p-map/-/p-map-7.0.3.tgz#7ac210a2d36f81ec28b736134810f7ba4418cdb6"
|
||||||
integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
|
integrity sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==
|
||||||
dependencies:
|
|
||||||
aggregate-error "^3.0.0"
|
|
||||||
|
|
||||||
p-pipe@^1.2.0:
|
p-pipe@^1.2.0:
|
||||||
version "1.2.0"
|
version "1.2.0"
|
||||||
@ -7862,10 +7836,10 @@ printable-characters@^1.0.42:
|
|||||||
resolved "https://registry.yarnpkg.com/printable-characters/-/printable-characters-1.0.42.tgz#3f18e977a9bd8eb37fcc4ff5659d7be90868b3d8"
|
resolved "https://registry.yarnpkg.com/printable-characters/-/printable-characters-1.0.42.tgz#3f18e977a9bd8eb37fcc4ff5659d7be90868b3d8"
|
||||||
integrity sha512-dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ==
|
integrity sha512-dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ==
|
||||||
|
|
||||||
proc-log@^4.1.0, proc-log@^4.2.0:
|
proc-log@^5.0.0:
|
||||||
version "4.2.0"
|
version "5.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034"
|
resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-5.0.0.tgz#e6c93cf37aef33f835c53485f314f50ea906a9d8"
|
||||||
integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==
|
integrity sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==
|
||||||
|
|
||||||
process-nextick-args@~2.0.0:
|
process-nextick-args@~2.0.0:
|
||||||
version "2.0.1"
|
version "2.0.1"
|
||||||
@ -8833,10 +8807,10 @@ sshpk@^1.7.0:
|
|||||||
safer-buffer "^2.0.2"
|
safer-buffer "^2.0.2"
|
||||||
tweetnacl "~0.14.0"
|
tweetnacl "~0.14.0"
|
||||||
|
|
||||||
ssri@^10.0.0:
|
ssri@^12.0.0:
|
||||||
version "10.0.6"
|
version "12.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5"
|
resolved "https://registry.yarnpkg.com/ssri/-/ssri-12.0.0.tgz#bcb4258417c702472f8191981d3c8a771fee6832"
|
||||||
integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==
|
integrity sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
minipass "^7.0.3"
|
minipass "^7.0.3"
|
||||||
|
|
||||||
@ -9111,13 +9085,12 @@ supports-preserve-symlinks-flag@^1.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
|
resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
|
||||||
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
|
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
|
||||||
|
|
||||||
synckit@^0.11.0:
|
synckit@^0.11.7:
|
||||||
version "0.11.4"
|
version "0.11.8"
|
||||||
resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.4.tgz#48972326b59723fc15b8d159803cf8302b545d59"
|
resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.8.tgz#b2aaae998a4ef47ded60773ad06e7cb821f55457"
|
||||||
integrity sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ==
|
integrity sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@pkgr/core" "^0.2.3"
|
"@pkgr/core" "^0.2.4"
|
||||||
tslib "^2.8.1"
|
|
||||||
|
|
||||||
tapable@^2.1.1, tapable@^2.2.0:
|
tapable@^2.1.1, tapable@^2.2.0:
|
||||||
version "2.2.2"
|
version "2.2.2"
|
||||||
@ -9137,17 +9110,17 @@ tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
|
|||||||
safe-buffer "^5.2.1"
|
safe-buffer "^5.2.1"
|
||||||
yallist "^3.1.1"
|
yallist "^3.1.1"
|
||||||
|
|
||||||
tar@^6.1.11, tar@^6.2.1:
|
tar@^7.4.3:
|
||||||
version "6.2.1"
|
version "7.4.3"
|
||||||
resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
|
resolved "https://registry.yarnpkg.com/tar/-/tar-7.4.3.tgz#88bbe9286a3fcd900e94592cda7a22b192e80571"
|
||||||
integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
|
integrity sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==
|
||||||
dependencies:
|
dependencies:
|
||||||
chownr "^2.0.0"
|
"@isaacs/fs-minipass" "^4.0.0"
|
||||||
fs-minipass "^2.0.0"
|
chownr "^3.0.0"
|
||||||
minipass "^5.0.0"
|
minipass "^7.1.2"
|
||||||
minizlib "^2.1.1"
|
minizlib "^3.0.1"
|
||||||
mkdirp "^1.0.3"
|
mkdirp "^3.0.1"
|
||||||
yallist "^4.0.0"
|
yallist "^5.0.0"
|
||||||
|
|
||||||
temp-dir@^1.0.0:
|
temp-dir@^1.0.0:
|
||||||
version "1.0.0"
|
version "1.0.0"
|
||||||
@ -9251,15 +9224,7 @@ tinyexec@^0.3.2:
|
|||||||
resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2"
|
resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2"
|
||||||
integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==
|
integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==
|
||||||
|
|
||||||
tinyglobby@^0.2.12:
|
tinyglobby@^0.2.12, tinyglobby@^0.2.13:
|
||||||
version "0.2.13"
|
|
||||||
resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.13.tgz#a0e46515ce6cbcd65331537e57484af5a7b2ff7e"
|
|
||||||
integrity sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==
|
|
||||||
dependencies:
|
|
||||||
fdir "^6.4.4"
|
|
||||||
picomatch "^4.0.2"
|
|
||||||
|
|
||||||
tinyglobby@^0.2.13:
|
|
||||||
version "0.2.14"
|
version "0.2.14"
|
||||||
resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.14.tgz#5280b0cf3f972b050e74ae88406c0a6a58f4079d"
|
resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.14.tgz#5280b0cf3f972b050e74ae88406c0a6a58f4079d"
|
||||||
integrity sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==
|
integrity sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==
|
||||||
@ -9387,7 +9352,7 @@ tslib@^1.9.0:
|
|||||||
resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
|
resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
|
||||||
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
|
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
|
||||||
|
|
||||||
tslib@^2.4.0, tslib@^2.8.1:
|
tslib@^2.4.0:
|
||||||
version "2.8.1"
|
version "2.8.1"
|
||||||
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
|
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
|
||||||
integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
|
integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
|
||||||
@ -9541,12 +9506,12 @@ unique-filename@^1.1.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
unique-slug "^2.0.0"
|
unique-slug "^2.0.0"
|
||||||
|
|
||||||
unique-filename@^3.0.0:
|
unique-filename@^4.0.0:
|
||||||
version "3.0.0"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
|
resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-4.0.0.tgz#a06534d370e7c977a939cd1d11f7f0ab8f1fed13"
|
||||||
integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
|
integrity sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
unique-slug "^4.0.0"
|
unique-slug "^5.0.0"
|
||||||
|
|
||||||
unique-slug@^2.0.0:
|
unique-slug@^2.0.0:
|
||||||
version "2.0.2"
|
version "2.0.2"
|
||||||
@ -9555,10 +9520,10 @@ unique-slug@^2.0.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
imurmurhash "^0.1.4"
|
imurmurhash "^0.1.4"
|
||||||
|
|
||||||
unique-slug@^4.0.0:
|
unique-slug@^5.0.0:
|
||||||
version "4.0.0"
|
version "5.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
|
resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-5.0.0.tgz#ca72af03ad0dbab4dad8aa683f633878b1accda8"
|
||||||
integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
|
integrity sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==
|
||||||
dependencies:
|
dependencies:
|
||||||
imurmurhash "^0.1.4"
|
imurmurhash "^0.1.4"
|
||||||
|
|
||||||
@ -9852,10 +9817,10 @@ which@^2.0.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
isexe "^2.0.0"
|
isexe "^2.0.0"
|
||||||
|
|
||||||
which@^4.0.0:
|
which@^5.0.0:
|
||||||
version "4.0.0"
|
version "5.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
|
resolved "https://registry.yarnpkg.com/which/-/which-5.0.0.tgz#d93f2d93f79834d4363c7d0c23e00d07c466c8d6"
|
||||||
integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
|
integrity sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
isexe "^3.1.1"
|
isexe "^3.1.1"
|
||||||
|
|
||||||
@ -10090,6 +10055,11 @@ yallist@^4.0.0:
|
|||||||
resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
|
resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
|
||||||
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
|
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
|
||||||
|
|
||||||
|
yallist@^5.0.0:
|
||||||
|
version "5.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533"
|
||||||
|
integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==
|
||||||
|
|
||||||
yargs-parser@20.2.4:
|
yargs-parser@20.2.4:
|
||||||
version "20.2.4"
|
version "20.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
|
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user