diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md index b4b846564..0f62b1c53 100644 --- a/ACKNOWLEDGMENTS.md +++ b/ACKNOWLEDGMENTS.md @@ -2652,10 +2652,6 @@ Signal Desktop makes use of the following open source projects. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -## pino-multi-stream - - License: MIT - ## protobufjs This license applies to all parts of protobuf.js except those files @@ -3186,30 +3182,6 @@ Signal Desktop makes use of the following open source projects. ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -## rotating-file-stream - - The MIT License (MIT) - - Copyright (c) 2015-2020 Daniele Ricci - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - ## sanitize.css License: CC0-1.0 diff --git a/package.json b/package.json index ceeaad3e2..4f4c670b7 100644 --- a/package.json +++ b/package.json @@ -144,8 +144,7 @@ "p-timeout": "4.1.0", "parchment": "1.1.4", "pify": "3.0.0", - "pino": "6.11.1", - "pino-multi-stream": "5.3.0", + "pino": "8.6.1", "protobufjs": "6.11.3", "proxy-agent": "5.0.0", "qrcode-generator": "1.4.4", @@ -175,7 +174,6 @@ "reselect": "4.1.2", "rimraf": "2.6.2", "ringrtc": "https://github.com/signalapp/signal-ringrtc-node.git#6c3a7f12dfdca4d8cc16ba76051231271d30a4c7", - "rotating-file-stream": "2.1.5", "sanitize.css": "11.0.0", "semver": "5.4.1", "sharp": "0.30.5", @@ -244,8 +242,6 @@ "@types/node-forge": "0.9.5", "@types/normalize-path": "3.0.0", "@types/pify": "3.0.2", - "@types/pino": "6.3.6", - "@types/pino-multi-stream": "5.1.0", "@types/quill": "1.3.10", "@types/react": "17.0.45", "@types/react-dom": "17.0.17", diff --git a/ts/logging/main_process_logging.ts b/ts/logging/main_process_logging.ts index 4d78bf7a0..07e5befc2 100644 --- a/ts/logging/main_process_logging.ts +++ b/ts/logging/main_process_logging.ts @@ -10,17 +10,17 @@ import split2 from 'split2'; import { readdirSync, createReadStream, unlinkSync, writeFileSync } from 'fs'; import type { BrowserWindow } from 'electron'; import { app, ipcMain as ipc } from 'electron'; -import pinoms from 'pino-multi-stream'; import pino from 'pino'; +import type { StreamEntry } from 'pino'; import * as mkdirp from 'mkdirp'; import { filter, flatten, map, pick, sortBy } from 'lodash'; import readFirstLine from 'firstline'; import { read as readLastLines } from 'read-last-lines'; import rimraf from 'rimraf'; -import { createStream } from 'rotating-file-stream'; import type { LoggerType } from '../types/Logging'; import * as durations from '../util/durations'; +import { createRotatingPinoDest } from '../util/rotatingPinoDest'; import * as log from './log'; import { Environment, getEnvironment } from '../environment'; @@ -80,9 +80,8 @@ export async function initialize( } const logFile = join(logPath, 'main.log'); - const stream = createStream(logFile, { - interval: '1d', - rotate: 3, + const rotatingStream = createRotatingPinoDest({ + logFile, }); const onClose = () => { @@ -93,11 +92,11 @@ export async function initialize( } }; - stream.on('close', onClose); - stream.on('error', onClose); + rotatingStream.on('close', onClose); + rotatingStream.on('error', onClose); - const streams: pinoms.Streams = []; - streams.push({ stream }); + const streams = new Array(); + streams.push({ stream: rotatingStream }); if (isRunningFromConsole) { streams.push({ @@ -106,10 +105,16 @@ export async function initialize( }); } - const logger = pinoms({ - streams, - timestamp: pino.stdTimeFunctions.isoTime, - }); + const logger = pino( + { + formatters: { + // No point in saving pid or hostname + bindings: () => ({}), + }, + timestamp: pino.stdTimeFunctions.isoTime, + }, + pino.multistream(streams) + ); ipc.removeHandler('fetch-log'); ipc.handle('fetch-log', async () => { diff --git a/ts/logging/set_up_renderer_logging.ts b/ts/logging/set_up_renderer_logging.ts index fc43a0bc9..fd955e4e7 100644 --- a/ts/logging/set_up_renderer_logging.ts +++ b/ts/logging/set_up_renderer_logging.ts @@ -8,7 +8,6 @@ import { ipcRenderer as ipc } from 'electron'; import * as path from 'path'; import pino from 'pino'; -import { createStream } from 'rotating-file-stream'; import { initLogger, @@ -23,6 +22,7 @@ import { } from './shared'; import * as log from './log'; import { Environment, getEnvironment } from '../environment'; +import { createRotatingPinoDest } from '../util/rotatingPinoDest'; // Backwards-compatible logging, simple strings and no level (defaulted to INFO) function now() { @@ -53,10 +53,6 @@ export function initialize(): void { const basePath = ipc.sendSync('get-user-data-path'); const logFile = path.join(basePath, 'logs', 'app.log'); - const stream = createStream(logFile, { - interval: '1d', - rotate: 3, - }); const onClose = () => { globalLogger = undefined; @@ -66,11 +62,19 @@ export function initialize(): void { } }; + const stream = createRotatingPinoDest({ + logFile, + }); + stream.on('close', onClose); stream.on('error', onClose); globalLogger = pino( { + formatters: { + // No point in saving pid or hostname + bindings: () => ({}), + }, timestamp: pino.stdTimeFunctions.isoTime, }, stream diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json index 0c26b6c9c..a11fb166d 100644 --- a/ts/util/lint/exceptions.json +++ b/ts/util/lint/exceptions.json @@ -69,20 +69,6 @@ "updated": "2018-09-15T00:16:19.197Z", "line": " Module['load'] = function load(f) {" }, - { - "rule": "jQuery-load(", - "path": "ts/services/globalMessageAudio.ts", - "reasonCategory": "falseMatch", - "updated": "2022-09-09T15:04:29.812Z", - "line": " load({" - }, - { - "rule": "jQuery-load(", - "path": "ts/state/ducks/audioPlayer.ts", - "line": " globalMessageAudio.load({", - "reasonCategory": "falseMatch", - "updated": "2022-09-09T15:04:29.812Z" - }, { "rule": "jQuery-load(", "path": "components/mp3lameencoder/lib/Mp3LameEncoder.js", @@ -5966,6 +5952,34 @@ "reasonCategory": "falseMatch", "updated": "2018-09-19T18:06:35.446Z" }, + { + "rule": "jQuery-wrap(", + "path": "node_modules/pino-abstract-transport/node_modules/readable-stream/lib/internal/streams/duplexify.js", + "line": " const r = pair.readable && typeof pair.readable.read !== 'function' ? Readable.wrap(pair.readable) : pair.readable", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-wrap(", + "path": "node_modules/pino-abstract-transport/node_modules/readable-stream/lib/internal/streams/readable.js", + "line": " // a static factory method, e.g. Readable.wrap(stream).", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-wrap(", + "path": "node_modules/pino-abstract-transport/node_modules/readable-stream/lib/internal/streams/readable.js", + "line": " stream = Readable.wrap(stream, {", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-wrap(", + "path": "node_modules/pino-abstract-transport/node_modules/readable-stream/lib/internal/streams/readable.js", + "line": " }).wrap(src)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, { "rule": "jQuery-wrap(", "path": "node_modules/pino/browser.js", @@ -8291,6 +8305,132 @@ "reasonCategory": "falseMatch", "updated": "2022-03-22T19:29:46.099Z" }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " const writeIndex = Atomics.load(stream[kImpl].state, WRITE_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " this[kImpl].needDrain = this[kImpl].data.length - this[kImpl].buf.length - Atomics.load(this[kImpl].state, WRITE_INDEX) <= 0", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " const writeIndex = Atomics.load(this[kImpl].state, WRITE_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " // process._rawDebug(`(flush) readIndex (${Atomics.load(this.state, READ_INDEX)}) writeIndex (${Atomics.load(this.state, WRITE_INDEX)})`)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " const current = Atomics.load(stream[kImpl].state, WRITE_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " let readIndex = Atomics.load(stream[kImpl].state, READ_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " // process._rawDebug(`(end) readIndex (${Atomics.load(stream.state, READ_INDEX)}) writeIndex (${Atomics.load(stream.state, WRITE_INDEX)})`)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " readIndex = Atomics.load(stream[kImpl].state, READ_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " const writeIndex = Atomics.load(stream[kImpl].state, WRITE_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " const writeIndex = Atomics.load(stream[kImpl].state, WRITE_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/index.js", + "line": " const readIndex = Atomics.load(stream[kImpl].state, READ_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/lib/wait.js", + "line": " let current = Atomics.load(state, index)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/lib/wait.js", + "line": " current = Atomics.load(state, index)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/lib/wait.js", + "line": " let current = Atomics.load(state, index)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/lib/wait.js", + "line": " current = Atomics.load(state, index)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/lib/worker.js", + "line": " const end = Atomics.load(state, WRITE_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/lib/worker.js", + "line": " const current = Atomics.load(state, READ_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, + { + "rule": "jQuery-load(", + "path": "node_modules/thread-stream/lib/worker.js", + "line": " const end = Atomics.load(state, WRITE_INDEX)", + "reasonCategory": "falseMatch", + "updated": "2022-09-30T01:25:09.543Z" + }, { "rule": "jQuery-$(", "path": "node_modules/type-check/lib/parse-type.js", @@ -8632,13 +8772,6 @@ "reasonCategory": "falseMatch", "updated": "2018-09-19T21:59:32.770Z" }, - { - "rule": "React-useRef", - "path": "ts/components/StoryViewsNRepliesModal.tsx", - "line": " const shouldScrollToBottomRef = useRef(false);", - "reasonCategory": "usageTrusted", - "updated": "2022-09-22T03:07:22.153Z" - }, { "rule": "React-useRef", "path": "sticker-creator/components/StickerFrame.js", @@ -9176,6 +9309,13 @@ "reasonCategory": "usageTrusted", "updated": "2022-08-04T00:52:01.080Z" }, + { + "rule": "React-useRef", + "path": "ts/components/StoryViewsNRepliesModal.tsx", + "line": " const shouldScrollToBottomRef = useRef(false);", + "reasonCategory": "usageTrusted", + "updated": "2022-09-22T03:07:22.153Z" + }, { "rule": "React-useRef", "path": "ts/components/TextAttachment.tsx", @@ -9440,6 +9580,13 @@ "updated": "2020-11-06T17:43:07.381Z", "reasonDetail": "used for figuring out clipboard contents" }, + { + "rule": "jQuery-load(", + "path": "ts/services/globalMessageAudio.ts", + "reasonCategory": "falseMatch", + "updated": "2022-09-09T15:04:29.812Z", + "line": " load({" + }, { "rule": "jQuery-load(", "path": "ts/state/ducks/app.ts", @@ -9447,6 +9594,13 @@ "reasonCategory": "falseMatch", "updated": "2021-11-04T16:14:03.477Z" }, + { + "rule": "jQuery-load(", + "path": "ts/state/ducks/audioPlayer.ts", + "line": " globalMessageAudio.load({", + "reasonCategory": "falseMatch", + "updated": "2022-09-09T15:04:29.812Z" + }, { "rule": "React-useRef", "path": "ts/state/smart/InstallScreen.tsx", diff --git a/ts/util/rotatingPinoDest.ts b/ts/util/rotatingPinoDest.ts new file mode 100644 index 000000000..19b57a306 --- /dev/null +++ b/ts/util/rotatingPinoDest.ts @@ -0,0 +1,61 @@ +// Copyright 2022 Signal Messenger, LLC +// SPDX-License-Identifier: AGPL-3.0-only + +import fs from 'fs'; +import pino from 'pino'; + +import { DAY } from './durations'; +import { isMoreRecentThan } from './timestamp'; + +export const DEFAULT_MAX_ROTATIONS = 3; + +export type RotatingPinoDestOptionsType = Readonly<{ + logFile: string; + maxSavedLogFiles?: number; + interval?: number; +}>; + +export function createRotatingPinoDest({ + logFile, + maxSavedLogFiles = DEFAULT_MAX_ROTATIONS, + interval = DAY, +}: RotatingPinoDestOptionsType): ReturnType { + const boom = pino.destination({ + dest: logFile, + sync: true, + mkdir: true, + }); + + function maybeRotate() { + try { + const { birthtimeMs } = fs.statSync(logFile); + + if (isMoreRecentThan(birthtimeMs, interval)) { + return; + } + + for (let i = maxSavedLogFiles - 1; i >= 0; i -= 1) { + const currentPath = i === 0 ? logFile : `${logFile}.${i}`; + const nextPath = `${logFile}.${i + 1}`; + + if (fs.existsSync(nextPath)) { + fs.unlinkSync(nextPath); + } + if (!fs.existsSync(currentPath)) { + continue; + } + fs.renameSync(currentPath, nextPath); + } + } catch (error) { + boom.destroy(); + boom.emit('error', error); + } + + boom.reopen(); + } + + maybeRotate(); + setInterval(maybeRotate, interval); + + return boom; +} diff --git a/yarn.lock b/yarn.lock index 8f7c10762..796a0815e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3542,29 +3542,6 @@ resolved "https://registry.yarnpkg.com/@types/pify/-/pify-3.0.2.tgz#1bc75dac43e31dba981c37e0a08edddc1b49cd39" integrity sha512-a5AKF1/9pCU3HGMkesgY6LsBdXHUY3WU+I2qgpU0J+I8XuJA1aFr59eS84/HP0+dxsyBSNbt+4yGI2adUpHwSg== -"@types/pino-multi-stream@5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@types/pino-multi-stream/-/pino-multi-stream-5.1.0.tgz#9820fa5ec86e71ff10f2404465495bbaae34223d" - integrity sha512-d0W3gEsPZZ0p7hR/ROjcATAZs+LVnByX6UK1bYaSktkMV06RqEB/2K91VYasy6Ih0GvU7wli9FaBZoNaqpEPHA== - dependencies: - "@types/pino" "*" - -"@types/pino-std-serializers@*": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@types/pino-std-serializers/-/pino-std-serializers-2.4.1.tgz#f8bd52a209c8b3c97d1533b1ba27f57c816382bf" - integrity sha512-17XcksO47M24IVTVKPeAByWUd3Oez7EbIjXpSbzMPhXVzgjGtrOa49gKBwxH9hb8dKv58OelsWQ+A1G1l9S3wQ== - dependencies: - "@types/node" "*" - -"@types/pino@*", "@types/pino@6.3.6": - version "6.3.6" - resolved "https://registry.yarnpkg.com/@types/pino/-/pino-6.3.6.tgz#3aa928bcbd30dc0c6a0ec2e9302cabd5dee6e832" - integrity sha512-yVgSyMGzNDYe/XNMJyuIkklDeZbFdGAxRztYLoN1QQrrgiLJ1oJPmnS8Ge5xpzI9ODKEddKH97VFQ7cWO6Pumw== - dependencies: - "@types/node" "*" - "@types/pino-std-serializers" "*" - "@types/sonic-boom" "*" - "@types/pretty-hrtime@^1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz#72a26101dc567b0d68fd956cf42314556e42d601" @@ -3742,13 +3719,6 @@ dependencies: "@types/node" "*" -"@types/sonic-boom@*": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@types/sonic-boom/-/sonic-boom-0.7.0.tgz#38337036293992a1df65dd3161abddf8fb9b7176" - integrity sha512-AfqR0fZMoUXUNwusgXKxcE9DPlHNDHQp6nKYUd4PSRpLobF5CCevSpyTEBcVZreqaWKCnGBr9KI1fHMTttoB7A== - dependencies: - "@types/node" "*" - "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" @@ -5714,6 +5684,14 @@ buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + builder-util-runtime@9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.2.tgz#dc54f8581bbcf1e0428da4483fa46d09524be857" @@ -8399,7 +8377,7 @@ eventemitter3@^4.0.0, eventemitter3@^4.0.4: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -events@^3.0.0, events@^3.2.0: +events@^3.0.0, events@^3.2.0, events@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== @@ -8675,15 +8653,10 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" -fast-redact@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.0.0.tgz#ac2f9e36c9f4976f5db9fb18c6ffbaf308cf316d" - integrity sha512-a/S/Hp6aoIjx7EmugtzLqXmcNsyFszqbt6qQ99BdG61QjBZF6shNis0BYR6TsZOQ1twYc0FN2Xdhwwbv6+KD0w== - -fast-safe-stringify@^2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" - integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== +fast-redact@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.1.2.tgz#d58e69e9084ce9fa4c1a6fa98a3e1ecf5d7839aa" + integrity sha512-+0em+Iya9fKGfEQGcd62Yv6onjBmmhV1uh86XVfOU8VwAe6kaFdQCWI9s0/Nnugx5Vd9tdbZ7e6gE2tR9dzXdw== fastest-levenshtein@^1.0.12: version "1.0.12" @@ -8942,11 +8915,6 @@ flat@^5.0.2: resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== -flatstr@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/flatstr/-/flatstr-1.0.12.tgz#c2ba6a08173edbb6c9640e3055b95e287ceb5931" - integrity sha512-4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw== - flatted@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" @@ -10280,7 +10248,7 @@ icss-utils@^4.0.0, icss-utils@^4.1.1: dependencies: postcss "^7.0.14" -ieee754@^1.1.13, ieee754@^1.1.4: +ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -13131,6 +13099,11 @@ obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" +on-exit-leak-free@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.0.tgz#5c703c968f7e7f851885f6459bf8a8a57edc9cc4" + integrity sha512-VuCaZZAjReZ3vUwgOB8LxAosIurDiAW0s13rI1YwmaP++jvcxP77AWoQvenZebpCA2m8WC1/EosPYPMjnRAp/w== + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -13748,29 +13721,35 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" -pino-multi-stream@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/pino-multi-stream/-/pino-multi-stream-5.3.0.tgz#2816ec4422c7e37e676a210a1705c7155506afd4" - integrity sha512-4fAGCRll18I+JmoAbxDvU9zc5sera/3c+VgTtUdoNMOZ/VSHB+HMAYtixKpeRmZTDHDDdE2rtwjVkuwWB8mYQA== +pino-abstract-transport@v1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.0.0.tgz#cc0d6955fffcadb91b7b49ef220a6cc111d48bb3" + integrity sha512-c7vo5OpW4wIS42hUVcT5REsL8ZljsUfBjqV/e2sFxmFEFZiq1XLUp5EYLtuDH6PEHq9W1egWqRbnLUP5FuZmOA== dependencies: - pino "^6.0.0" + readable-stream "^4.0.0" + split2 "^4.0.0" -pino-std-serializers@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-3.2.0.tgz#b56487c402d882eb96cd67c257868016b61ad671" - integrity sha512-EqX4pwDPrt3MuOAAUBMU0Tk5kR/YcCM5fNPEzgCO2zJ5HfX0vbiH9HbJglnyeQsN96Kznae6MWD47pZB5avTrg== +pino-std-serializers@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.0.0.tgz#4c20928a1bafca122fdc2a7a4a171ca1c5f9c526" + integrity sha512-mMMOwSKrmyl+Y12Ri2xhH1lbzQxwwpuru9VjyJpgFIH4asSj88F2csdMwN6+M5g1Ll4rmsYghHLQJw81tgZ7LQ== -pino@6.11.1, pino@^6.0.0: - version "6.11.1" - resolved "https://registry.yarnpkg.com/pino/-/pino-6.11.1.tgz#5af2d5395cfe625ead9fe64a3b51a4802cd2598e" - integrity sha512-PoDR/4jCyaP1k2zhuQ4N0NuhaMtei+C9mUHBRRJQujexl/bq3JkeL2OC23ada6Np3zeUMHbO4TGzY2D/rwZX3w== +pino@8.6.1: + version "8.6.1" + resolved "https://registry.yarnpkg.com/pino/-/pino-8.6.1.tgz#3fc43acc79bcd3e871670347854f7359e2612f10" + integrity sha512-fi+V2K98eMZjQ/uEHHSiMALNrz7HaFdKNYuyA3ZUrbH0f1e8sPFDmeRGzg7ZH2q4QDxGnJPOswmqlEaTAZeDPA== dependencies: - fast-redact "^3.0.0" - fast-safe-stringify "^2.0.7" - flatstr "^1.0.12" - pino-std-serializers "^3.1.0" - quick-format-unescaped "^4.0.1" - sonic-boom "^1.0.2" + atomic-sleep "^1.0.0" + fast-redact "^3.1.1" + on-exit-leak-free "^2.1.0" + pino-abstract-transport v1.0.0 + pino-std-serializers "^6.0.0" + process-warning "^2.0.0" + quick-format-unescaped "^4.0.3" + real-require "^0.2.0" + safe-stable-stringify "^2.3.1" + sonic-boom "^3.1.0" + thread-stream "^2.0.0" pinpoint@^1.1.0: version "1.1.0" @@ -14151,6 +14130,11 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +process-warning@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-2.0.0.tgz#341dbeaac985b90a04ebcd844d50097c7737b2ee" + integrity sha512-+MmoAXoUX+VTHAlwns0h+kFUWFs/3FZy+ZuchkgjyOu3oioLAo2LB5aCfKPh2+P9O18i3m43tUEv3YqttSy0Ww== + process@^0.11.1, process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -14390,10 +14374,10 @@ querystring@0.2.0, querystring@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" -quick-format-unescaped@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.1.tgz#437a5ea1a0b61deb7605f8ab6a8fd3858dbeb701" - integrity sha512-RyYpQ6Q5/drsJyOhrWHYMWTedvjTIat+FTwv0K4yoUxzvekw2aRHMQJLlnvt8UantkZg2++bEzD9EdxXqkWf4A== +quick-format-unescaped@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7" + integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg== quick-lru@^5.1.1: version "5.1.1" @@ -14903,6 +14887,16 @@ readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable string_decoder "^1.1.1" util-deprecate "^1.0.1" +readable-stream@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.2.0.tgz#a7ef523d3b39e4962b0db1a1af22777b10eeca46" + integrity sha512-gJrBHsaI3lgBoGMW/jHZsQ/o/TIWiu5ENCJG1BB7fuCKzpFM8GaS2UoBVt9NO+oI+3FcrBNbUkl3ilDe09aY4A== + dependencies: + abort-controller "^3.0.0" + buffer "^6.0.3" + events "^3.3.0" + process "^0.11.10" + readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" @@ -14924,6 +14918,11 @@ readline-sync@^1.4.9: resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b" integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw== +real-require@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.2.0.tgz#209632dea1810be2ae063a6ac084fee7e33fba78" + integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg== + rechoir@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca" @@ -15468,11 +15467,6 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" -rotating-file-stream@2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/rotating-file-stream/-/rotating-file-stream-2.1.5.tgz#6490d0a09e11dd4d441aa5d4d3676debed4a44e4" - integrity sha512-wnYazkT8oD5HXTj44WhB030aKo74OyICrPz/QKCUah59QD7Np4OhdoTC0WNZfhMx1ClsZp4lYMlAdof+DIkZ1Q== - run-parallel@^1.1.9: version "1.1.9" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" @@ -15511,6 +15505,11 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" +safe-stable-stringify@^2.3.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.0.tgz#95fadb1bcf8057a1363e11052122f5da36a69215" + integrity sha512-eehKHKpab6E741ud7ZIMcXhKcP6TSIezPkNZhy5U8xC6+VvrRdUA2tMgxGxaGl4cz7c2Ew5+mg5+wNB16KQqrA== + "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -16011,13 +16010,12 @@ socks@^2.3.3, socks@^2.6.1: ip "^1.1.5" smart-buffer "^4.1.0" -sonic-boom@^1.0.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-1.3.2.tgz#169c2671397a490adffb070510d516544a65c0ed" - integrity sha512-/B4tAuK2+hIlR94GhhWU1mJHWk5lt0CEuBvG0kvk1qIAzQc4iB1TieMio8DCZxY+Y7tsuzOxSUDOGmaUm3vXMg== +sonic-boom@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-3.2.0.tgz#ce9f2de7557e68be2e52c8df6d9b052e7d348143" + integrity sha512-SbbZ+Kqj/XIunvIAgUZRlqd6CGQYq71tRRbXR92Za8J/R3Yh4Av+TWENiSiEgnlwckYLyP0YZQWVfyNC0dzLaA== dependencies: atomic-sleep "^1.0.0" - flatstr "^1.0.12" source-list-map@^2.0.0, source-list-map@^2.0.1: version "2.0.1" @@ -16142,6 +16140,11 @@ split2@4.0.0: resolved "https://registry.yarnpkg.com/split2/-/split2-4.0.0.tgz#c76cb53ad55040ddff3a9c3b73fc88a4690f047c" integrity sha512-gjmavJzvQCAZzaEHWoJBOwqIUAiEvUOlguQ6uO0+0LTS1tlLa2YetTLWCrm049ouvLOa1l6SOGm3XaiRiCg9SQ== +split2@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809" + integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ== + sprintf-js@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" @@ -16765,6 +16768,13 @@ thenify@3.3.1, "thenify@>= 3.1.0 < 4": dependencies: any-promise "^1.0.0" +thread-stream@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-2.2.0.tgz#310c03a253f729094ce5d4638ef5186dfa80a9e8" + integrity sha512-rUkv4/fnb4rqy/gGy7VuqK6wE1+1DOCOWy4RMeaV69ZHMP11tQKZvZSip1yTgrKCMZzEMcCL/bKfHvSfDHx+iQ== + dependencies: + real-require "^0.2.0" + throttle-debounce@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"