/g, '\n').replace(/<\/p>/g, '\n\n');
const searchableTextContent = JSDOM.fragment(searchableContent).textContent;
const now = new Date();
+ // @ts-ignore
const filter_results = Object.values(req.cachedFilters).reduce((results, cachedFilter) => {
// Check the filter hasn't expired before applying:
if (cachedFilter.expires_at !== null && cachedFilter.expires_at < now) {
@@ -981,12 +1020,12 @@ const startServer = async () => {
});
};
- ids.forEach(id => {
+ channelIds.forEach(id => {
subscribe(`${redisPrefix}${id}`, listener);
});
if (typeof attachCloseHandler === 'function') {
- attachCloseHandler(ids.map(id => `${redisPrefix}${id}`), listener);
+ attachCloseHandler(channelIds.map(id => `${redisPrefix}${id}`), listener);
}
return listener;
@@ -998,8 +1037,6 @@ const startServer = async () => {
* @returns {function(string, string): void}
*/
const streamToHttp = (req, res) => {
- const accountId = req.accountId || req.remoteAddress;
-
const channelName = channelNameFromPath(req);
connectedClients.labels({ type: 'eventsource' }).inc();
@@ -1018,7 +1055,8 @@ const startServer = async () => {
const heartbeat = setInterval(() => res.write(':thump\n'), 15000);
req.on('close', () => {
- log.verbose(req.requestId, `Ending stream for ${accountId}`);
+ req.log.info({ accountId: req.accountId }, `Ending stream`);
+
// We decrement these counters here instead of in streamHttpEnd as in that
// method we don't have knowledge of the channel names
connectedClients.labels({ type: 'eventsource' }).dec();
@@ -1062,15 +1100,15 @@ const startServer = async () => {
*/
const streamToWs = (req, ws, streamName) => (event, payload) => {
if (ws.readyState !== ws.OPEN) {
- log.error(req.requestId, 'Tried writing to closed socket');
+ req.log.error('Tried writing to closed socket');
return;
}
const message = JSON.stringify({ stream: streamName, event, payload });
- ws.send(message, (/** @type {Error} */ err) => {
+ ws.send(message, (/** @type {Error|undefined} */ err) => {
if (err) {
- log.error(req.requestId, `Failed to send to websocket: ${err}`);
+ req.log.error({err}, `Failed to send to websocket`);
}
});
};
@@ -1087,20 +1125,19 @@ const startServer = async () => {
app.use(api);
- api.use(setRequestId);
- api.use(setRemoteAddress);
-
api.use(authenticationMiddleware);
api.use(errorMiddleware);
api.get('/api/v1/streaming/*', (req, res) => {
+ // @ts-ignore
channelNameToIds(req, channelNameFromPath(req), req.query).then(({ channelIds, options }) => {
const onSend = streamToHttp(req, res);
const onEnd = streamHttpEnd(req, subscriptionHeartbeat(channelIds));
- streamFrom(channelIds, req, onSend, onEnd, 'eventsource', options.needsFiltering);
+ // @ts-ignore
+ streamFrom(channelIds, req, req.log, onSend, onEnd, 'eventsource', options.needsFiltering);
}).catch(err => {
- log.verbose(req.requestId, 'Subscription error:', err.toString());
+ res.log.info({ err }, 'Subscription error:', err.toString());
httpNotFound(res);
});
});
@@ -1109,6 +1146,7 @@ const startServer = async () => {
* @typedef StreamParams
* @property {string} [tag]
* @property {string} [list]
+ * @property {string} [antenna]
* @property {string} [only_media]
*/
@@ -1252,6 +1290,7 @@ const startServer = async () => {
break;
case 'list':
+ // @ts-ignore
authorizeListAccess(params.list, req).then(() => {
resolve({
channelIds: [`timeline:list:${params.list}`],
@@ -1263,6 +1302,7 @@ const startServer = async () => {
break;
case 'antenna':
+ // @ts-ignore
authorizeAntennaAccess(params.antenna, req).then(() => {
resolve({
channelIds: [`timeline:antenna:${params.antenna}`],
@@ -1284,11 +1324,11 @@ const startServer = async () => {
* @returns {string[]}
*/
const streamNameFromChannelName = (channelName, params) => {
- if (channelName === 'list') {
+ if (channelName === 'list' && params.list) {
return [channelName, params.list];
- } else if (channelName === 'antenna') {
+ } else if (channelName === 'antenna' && params.antenna) {
return [channelName, params.antenna];
- } else if (['hashtag', 'hashtag:local'].includes(channelName)) {
+ } else if (['hashtag', 'hashtag:local'].includes(channelName) && params.tag) {
return [channelName, params.tag];
} else {
return [channelName];
@@ -1297,8 +1337,9 @@ const startServer = async () => {
/**
* @typedef WebSocketSession
- * @property {WebSocket} websocket
- * @property {http.IncomingMessage} request
+ * @property {WebSocket & { isAlive: boolean}} websocket
+ * @property {http.IncomingMessage & ResolvedAccount} request
+ * @property {import('pino').Logger} logger
* @property {Object.} subscriptions
*/
@@ -1308,8 +1349,8 @@ const startServer = async () => {
* @param {StreamParams} params
* @returns {void}
*/
- const subscribeWebsocketToChannel = ({ socket, request, subscriptions }, channelName, params) => {
- checkScopes(request, channelName).then(() => channelNameToIds(request, channelName, params)).then(({
+ const subscribeWebsocketToChannel = ({ websocket, request, logger, subscriptions }, channelName, params) => {
+ checkScopes(request, logger, channelName).then(() => channelNameToIds(request, channelName, params)).then(({
channelIds,
options,
}) => {
@@ -1317,9 +1358,9 @@ const startServer = async () => {
return;
}
- const onSend = streamToWs(request, socket, streamNameFromChannelName(channelName, params));
+ const onSend = streamToWs(request, websocket, streamNameFromChannelName(channelName, params));
const stopHeartbeat = subscriptionHeartbeat(channelIds);
- const listener = streamFrom(channelIds, request, onSend, undefined, 'websocket', options.needsFiltering);
+ const listener = streamFrom(channelIds, request, logger, onSend, undefined, 'websocket', options.needsFiltering);
connectedChannels.labels({ type: 'websocket', channel: channelName }).inc();
@@ -1329,14 +1370,17 @@ const startServer = async () => {
stopHeartbeat,
};
}).catch(err => {
- log.verbose(request.requestId, 'Subscription error:', err.toString());
- socket.send(JSON.stringify({ error: err.toString() }));
+ logger.error({ err }, 'Subscription error');
+ websocket.send(JSON.stringify({ error: err.toString() }));
});
};
-
- const removeSubscription = (subscriptions, channelIds, request) => {
- log.verbose(request.requestId, `Ending stream from ${channelIds.join(', ')} for ${request.accountId}`);
+ /**
+ * @param {WebSocketSession} session
+ * @param {string[]} channelIds
+ */
+ const removeSubscription = ({ request, logger, subscriptions }, channelIds) => {
+ logger.info({ channelIds, accountId: request.accountId }, `Ending stream`);
const subscription = subscriptions[channelIds.join(';')];
@@ -1360,16 +1404,17 @@ const startServer = async () => {
* @param {StreamParams} params
* @returns {void}
*/
- const unsubscribeWebsocketFromChannel = ({ socket, request, subscriptions }, channelName, params) => {
+ const unsubscribeWebsocketFromChannel = (session, channelName, params) => {
+ const { websocket, request, logger } = session;
+
channelNameToIds(request, channelName, params).then(({ channelIds }) => {
- removeSubscription(subscriptions, channelIds, request);
+ removeSubscription(session, channelIds);
}).catch(err => {
- log.verbose(request.requestId, 'Unsubscribe error:', err);
+ logger.error({err}, 'Unsubscribe error');
// If we have a socket that is alive and open still, send the error back to the client:
- // FIXME: In other parts of the code ws === socket
- if (socket.isAlive && socket.readyState === socket.OPEN) {
- socket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
+ if (websocket.isAlive && websocket.readyState === websocket.OPEN) {
+ websocket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
}
});
};
@@ -1377,16 +1422,14 @@ const startServer = async () => {
/**
* @param {WebSocketSession} session
*/
- const subscribeWebsocketToSystemChannel = ({ socket, request, subscriptions }) => {
+ const subscribeWebsocketToSystemChannel = ({ websocket, request, subscriptions }) => {
const accessTokenChannelId = `timeline:access_token:${request.accessTokenId}`;
const systemChannelId = `timeline:system:${request.accountId}`;
const listener = createSystemMessageListener(request, {
-
onKill() {
- socket.close();
+ websocket.close();
},
-
});
subscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
@@ -1423,18 +1466,15 @@ const startServer = async () => {
/**
* @param {WebSocket & { isAlive: boolean }} ws
- * @param {http.IncomingMessage} req
+ * @param {http.IncomingMessage & ResolvedAccount} req
+ * @param {import('pino').Logger} log
*/
- function onConnection(ws, req) {
+ function onConnection(ws, req, log) {
// Note: url.parse could throw, which would terminate the connection, so we
// increment the connected clients metric straight away when we establish
// the connection, without waiting:
connectedClients.labels({ type: 'websocket' }).inc();
- // Setup request properties:
- req.requestId = uuid.v4();
- req.remoteAddress = ws._socket.remoteAddress;
-
// Setup connection keep-alive state:
ws.isAlive = true;
ws.on('pong', () => {
@@ -1445,8 +1485,9 @@ const startServer = async () => {
* @type {WebSocketSession}
*/
const session = {
- socket: ws,
+ websocket: ws,
request: req,
+ logger: log,
subscriptions: {},
};
@@ -1454,27 +1495,30 @@ const startServer = async () => {
const subscriptions = Object.keys(session.subscriptions);
subscriptions.forEach(channelIds => {
- removeSubscription(session.subscriptions, channelIds.split(';'), req);
+ removeSubscription(session, channelIds.split(';'));
});
// Decrement the metrics for connected clients:
connectedClients.labels({ type: 'websocket' }).dec();
- // ensure garbage collection:
- session.socket = null;
- session.request = null;
- session.subscriptions = {};
+ // We need to delete the session object as to ensure it correctly gets
+ // garbage collected, without doing this we could accidentally hold on to
+ // references to the websocket, the request, and the logger, causing
+ // memory leaks.
+ //
+ // @ts-ignore
+ delete session;
});
// Note: immediately after the `error` event is emitted, the `close` event
// is emitted. As such, all we need to do is log the error here.
- ws.on('error', (err) => {
- log.error('websocket', err.toString());
+ ws.on('error', (/** @type {Error} */ err) => {
+ log.error(err);
});
ws.on('message', (data, isBinary) => {
if (isBinary) {
- log.warn('websocket', 'Received binary data, closing connection');
+ log.warn('Received binary data, closing connection');
ws.close(1003, 'The mastodon streaming server does not support binary messages');
return;
}
@@ -1509,18 +1553,20 @@ const startServer = async () => {
setInterval(() => {
wss.clients.forEach(ws => {
+ // @ts-ignore
if (ws.isAlive === false) {
ws.terminate();
return;
}
+ // @ts-ignore
ws.isAlive = false;
ws.ping('', false);
});
}, 30000);
attachServerWithConfig(server, address => {
- log.warn(`Streaming API now listening on ${address}`);
+ logger.info(`Streaming API now listening on ${address}`);
});
const onExit = () => {
@@ -1528,8 +1574,10 @@ const startServer = async () => {
process.exit(0);
};
+ /** @param {Error} err */
const onError = (err) => {
- log.error(err);
+ logger.error(err);
+
server.close();
process.exit(0);
};
@@ -1553,7 +1601,7 @@ const attachServerWithConfig = (server, onSuccess) => {
}
});
} else {
- server.listen(+process.env.PORT || 4000, process.env.BIND || '127.0.0.1', () => {
+ server.listen(+(process.env.PORT || 4000), process.env.BIND || '127.0.0.1', () => {
if (onSuccess) {
onSuccess(`${server.address().address}:${server.address().port}`);
}
diff --git a/streaming/logging.js b/streaming/logging.js
new file mode 100644
index 0000000000..64ee474875
--- /dev/null
+++ b/streaming/logging.js
@@ -0,0 +1,119 @@
+const { pino } = require('pino');
+const { pinoHttp, stdSerializers: pinoHttpSerializers } = require('pino-http');
+const uuid = require('uuid');
+
+/**
+ * Generates the Request ID for logging and setting on responses
+ * @param {http.IncomingMessage} req
+ * @param {http.ServerResponse} [res]
+ * @returns {import("pino-http").ReqId}
+ */
+function generateRequestId(req, res) {
+ if (req.id) {
+ return req.id;
+ }
+
+ req.id = uuid.v4();
+
+ // Allow for usage with WebSockets:
+ if (res) {
+ res.setHeader('X-Request-Id', req.id);
+ }
+
+ return req.id;
+}
+
+/**
+ * Request log sanitizer to prevent logging access tokens in URLs
+ * @param {http.IncomingMessage} req
+ */
+function sanitizeRequestLog(req) {
+ const log = pinoHttpSerializers.req(req);
+ if (typeof log.url === 'string' && log.url.includes('access_token')) {
+ // Doorkeeper uses SecureRandom.urlsafe_base64 per RFC 6749 / RFC 6750
+ log.url = log.url.replace(/(access_token)=([a-zA-Z0-9\-_]+)/gi, '$1=[Redacted]');
+ }
+ return log;
+}
+
+const logger = pino({
+ name: "streaming",
+ // Reformat the log level to a string:
+ formatters: {
+ level: (label) => {
+ return {
+ level: label
+ };
+ },
+ },
+ redact: {
+ paths: [
+ 'req.headers["sec-websocket-key"]',
+ // Note: we currently pass the AccessToken via the websocket subprotocol
+ // field, an anti-pattern, but this ensures it doesn't end up in logs.
+ 'req.headers["sec-websocket-protocol"]',
+ 'req.headers.authorization',
+ 'req.headers.cookie',
+ 'req.query.access_token'
+ ]
+ }
+});
+
+const httpLogger = pinoHttp({
+ logger,
+ genReqId: generateRequestId,
+ serializers: {
+ req: sanitizeRequestLog
+ }
+});
+
+/**
+ * Attaches a logger to the request object received by http upgrade handlers
+ * @param {http.IncomingMessage} request
+ */
+function attachWebsocketHttpLogger(request) {
+ generateRequestId(request);
+
+ request.log = logger.child({
+ req: sanitizeRequestLog(request),
+ });
+}
+
+/**
+ * Creates a logger instance for the Websocket connection to use.
+ * @param {http.IncomingMessage} request
+ * @param {import('./index.js').ResolvedAccount} resolvedAccount
+ */
+function createWebsocketLogger(request, resolvedAccount) {
+ // ensure the request.id is always present.
+ generateRequestId(request);
+
+ return logger.child({
+ req: {
+ id: request.id
+ },
+ account: {
+ id: resolvedAccount.accountId ?? null
+ }
+ });
+}
+
+exports.logger = logger;
+exports.httpLogger = httpLogger;
+exports.attachWebsocketHttpLogger = attachWebsocketHttpLogger;
+exports.createWebsocketLogger = createWebsocketLogger;
+
+/**
+ * Initializes the log level based on the environment
+ * @param {Object} env
+ * @param {string} environment
+ */
+exports.initializeLogLevel = function initializeLogLevel(env, environment) {
+ if (env.LOG_LEVEL && Object.keys(logger.levels.values).includes(env.LOG_LEVEL)) {
+ logger.level = env.LOG_LEVEL;
+ } else if (environment === 'development') {
+ logger.level = 'debug';
+ } else {
+ logger.level = 'info';
+ }
+};
diff --git a/streaming/package.json b/streaming/package.json
index 149055ca1b..52a9979702 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -21,9 +21,10 @@
"express": "^4.18.2",
"ioredis": "^5.3.2",
"jsdom": "^23.0.0",
- "npmlog": "^7.0.1",
"pg": "^8.5.0",
"pg-connection-string": "^2.6.0",
+ "pino": "^8.17.2",
+ "pino-http": "^9.0.0",
"prom-client": "^15.0.0",
"uuid": "^9.0.0",
"ws": "^8.12.1"
@@ -31,11 +32,11 @@
"devDependencies": {
"@types/cors": "^2.8.16",
"@types/express": "^4.17.17",
- "@types/npmlog": "^7.0.0",
"@types/pg": "^8.6.6",
"@types/uuid": "^9.0.0",
"@types/ws": "^8.5.9",
"eslint-define-config": "^2.0.0",
+ "pino-pretty": "^10.3.1",
"typescript": "^5.0.4"
},
"optionalDependencies": {
diff --git a/yarn.lock b/yarn.lock
index f09a5aac13..4c9a4c53f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2545,7 +2545,6 @@ __metadata:
dependencies:
"@types/cors": "npm:^2.8.16"
"@types/express": "npm:^4.17.17"
- "@types/npmlog": "npm:^7.0.0"
"@types/pg": "npm:^8.6.6"
"@types/uuid": "npm:^9.0.0"
"@types/ws": "npm:^8.5.9"
@@ -2556,9 +2555,11 @@ __metadata:
express: "npm:^4.18.2"
ioredis: "npm:^5.3.2"
jsdom: "npm:^23.0.0"
- npmlog: "npm:^7.0.1"
pg: "npm:^8.5.0"
pg-connection-string: "npm:^2.6.0"
+ pino: "npm:^8.17.2"
+ pino-http: "npm:^9.0.0"
+ pino-pretty: "npm:^10.3.1"
prom-client: "npm:^15.0.0"
typescript: "npm:^5.0.4"
utf-8-validate: "npm:^6.0.3"
@@ -3347,15 +3348,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/npmlog@npm:^7.0.0":
- version: 7.0.0
- resolution: "@types/npmlog@npm:7.0.0"
- dependencies:
- "@types/node": "npm:*"
- checksum: e94cb1d7dc6b1251d58d0a3cbf0c5b9e9b7c7649774cf816b9277fc10e1a09e65f2854357c4972d04d477f8beca3c8accb5e8546d594776e59e35ddfee79aff2
- languageName: node
- linkType: hard
-
"@types/object-assign@npm:^4.0.30":
version: 4.0.33
resolution: "@types/object-assign@npm:4.0.33"
@@ -4333,13 +4325,6 @@ __metadata:
languageName: node
linkType: hard
-"aproba@npm:^1.0.3 || ^2.0.0":
- version: 2.0.0
- resolution: "aproba@npm:2.0.0"
- checksum: d06e26384a8f6245d8c8896e138c0388824e259a329e0c9f196b4fa533c82502a6fd449586e3604950a0c42921832a458bb3aa0aa9f0ba449cfd4f50fd0d09b5
- languageName: node
- linkType: hard
-
"are-docs-informative@npm:^0.0.2":
version: 0.0.2
resolution: "are-docs-informative@npm:0.0.2"
@@ -4347,16 +4332,6 @@ __metadata:
languageName: node
linkType: hard
-"are-we-there-yet@npm:^4.0.0":
- version: 4.0.0
- resolution: "are-we-there-yet@npm:4.0.0"
- dependencies:
- delegates: "npm:^1.0.0"
- readable-stream: "npm:^4.1.0"
- checksum: 760008e32948e9f738c5a288792d187e235fee0f170e042850bc7ff242f2a499f3f2874d6dd43ac06f5d9f5306137bc51bbdd4ae0bb11379c58b01678e0f684d
- languageName: node
- linkType: hard
-
"argparse@npm:^1.0.7":
version: 1.0.10
resolution: "argparse@npm:1.0.10"
@@ -4622,11 +4597,11 @@ __metadata:
linkType: hard
"async-mutex@npm:^0.4.0":
- version: 0.4.0
- resolution: "async-mutex@npm:0.4.0"
+ version: 0.4.1
+ resolution: "async-mutex@npm:0.4.1"
dependencies:
tslib: "npm:^2.4.0"
- checksum: 6541695f80c1d6c5acbf3f7f04e8ff0733b3e029312c48d77bb95243fbe21fc5319f45ac3d72ce08551e6df83dc32440285ce9a3ac17bfc5d385ff0cc8ccd62a
+ checksum: 3c412736c0bc4a9a2cfd948276a8caab8686aa615866a5bd20986e616f8945320acb310058a17afa1b31b8de6f634a78b7ec2217a33d7559b38f68bb85a95854
languageName: node
linkType: hard
@@ -4678,13 +4653,20 @@ __metadata:
languageName: node
linkType: hard
+"atomic-sleep@npm:^1.0.0":
+ version: 1.0.0
+ resolution: "atomic-sleep@npm:1.0.0"
+ checksum: e329a6665512736a9bbb073e1761b4ec102f7926cce35037753146a9db9c8104f5044c1662e4a863576ce544fb8be27cd2be6bc8c1a40147d03f31eb1cfb6e8a
+ languageName: node
+ linkType: hard
+
"autoprefixer@npm:^10.4.14":
- version: 10.4.16
- resolution: "autoprefixer@npm:10.4.16"
+ version: 10.4.17
+ resolution: "autoprefixer@npm:10.4.17"
dependencies:
- browserslist: "npm:^4.21.10"
- caniuse-lite: "npm:^1.0.30001538"
- fraction.js: "npm:^4.3.6"
+ browserslist: "npm:^4.22.2"
+ caniuse-lite: "npm:^1.0.30001578"
+ fraction.js: "npm:^4.3.7"
normalize-range: "npm:^0.1.2"
picocolors: "npm:^1.0.0"
postcss-value-parser: "npm:^4.2.0"
@@ -4692,7 +4674,7 @@ __metadata:
postcss: ^8.1.0
bin:
autoprefixer: bin/autoprefixer
- checksum: e00256e754d481a026d928bca729b25954074dd142dbec022f0a7db0d3bbc0dc2e2dc7542e94fec22eff81e21fe140e6856448e2d9a002660cb1e2ad434daee0
+ checksum: 1d21cc8edb7bf993682094ceed03a32c18f5293f071182a64c2c6defb44bbe91d576ad775d2347469a81997b80cea0bbc4ad3eeb5b12710f9feacf2e6c04bb51
languageName: node
linkType: hard
@@ -5230,7 +5212,7 @@ __metadata:
languageName: node
linkType: hard
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2":
version: 4.22.2
resolution: "browserslist@npm:4.22.2"
dependencies:
@@ -5456,10 +5438,10 @@ __metadata:
languageName: node
linkType: hard
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001565":
- version: 1.0.30001568
- resolution: "caniuse-lite@npm:1.0.30001568"
- checksum: 13f01e5a2481134bd61cf565ce9fecbd8e107902927a0dcf534230a92191a81f1715792170f5f39719c767c3a96aa6df9917a8d5601f15bbd5e4041a8cfecc99
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001565, caniuse-lite@npm:^1.0.30001578":
+ version: 1.0.30001578
+ resolution: "caniuse-lite@npm:1.0.30001578"
+ checksum: c3bd9c08a945cee4f0cc284a217ebe9c2613e04d5aef4b48f1871a779b1875c34286469eb8d7d94bd028b5a354613e676ad503b6bf8db20a2f154574bd5fde48
languageName: node
linkType: hard
@@ -5763,15 +5745,6 @@ __metadata:
languageName: node
linkType: hard
-"color-support@npm:^1.1.3":
- version: 1.1.3
- resolution: "color-support@npm:1.1.3"
- bin:
- color-support: bin.js
- checksum: 8ffeaa270a784dc382f62d9be0a98581db43e11eee301af14734a6d089bd456478b1a8b3e7db7ca7dc5b18a75f828f775c44074020b51c05fc00e6d0992b1cc6
- languageName: node
- linkType: hard
-
"colord@npm:^2.9.1, colord@npm:^2.9.3":
version: 2.9.3
resolution: "colord@npm:2.9.3"
@@ -5779,7 +5752,7 @@ __metadata:
languageName: node
linkType: hard
-"colorette@npm:^2.0.20":
+"colorette@npm:^2.0.20, colorette@npm:^2.0.7":
version: 2.0.20
resolution: "colorette@npm:2.0.20"
checksum: e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40
@@ -5911,13 +5884,6 @@ __metadata:
languageName: node
linkType: hard
-"console-control-strings@npm:^1.1.0":
- version: 1.1.0
- resolution: "console-control-strings@npm:1.1.0"
- checksum: 7ab51d30b52d461412cd467721bb82afe695da78fff8f29fe6f6b9cbaac9a2328e27a22a966014df9532100f6dd85370460be8130b9c677891ba36d96a343f50
- languageName: node
- linkType: hard
-
"constants-browserify@npm:^1.0.0":
version: 1.0.0
resolution: "constants-browserify@npm:1.0.0"
@@ -6454,6 +6420,13 @@ __metadata:
languageName: node
linkType: hard
+"dateformat@npm:^4.6.3":
+ version: 4.6.3
+ resolution: "dateformat@npm:4.6.3"
+ checksum: e2023b905e8cfe2eb8444fb558562b524807a51cdfe712570f360f873271600b5c94aebffaf11efb285e2c072264a7cf243eadb68f3eba0f8cc85fb86cd25df6
+ languageName: node
+ linkType: hard
+
"debounce@npm:^1.2.1":
version: 1.2.1
resolution: "debounce@npm:1.2.1"
@@ -6689,13 +6662,6 @@ __metadata:
languageName: node
linkType: hard
-"delegates@npm:^1.0.0":
- version: 1.0.0
- resolution: "delegates@npm:1.0.0"
- checksum: ba05874b91148e1db4bf254750c042bf2215febd23a6d3cda2e64896aef79745fbd4b9996488bd3cafb39ce19dbce0fd6e3b6665275638befffe1c9b312b91b5
- languageName: node
- linkType: hard
-
"denque@npm:^2.1.0":
version: 2.1.0
resolution: "denque@npm:2.1.0"
@@ -7961,6 +7927,13 @@ __metadata:
languageName: node
linkType: hard
+"fast-copy@npm:^3.0.0":
+ version: 3.0.1
+ resolution: "fast-copy@npm:3.0.1"
+ checksum: a8310dbcc4c94ed001dc3e0bbc3c3f0491bb04e6c17163abe441a54997ba06cdf1eb532c2f05e54777c6f072c84548c23ef0ecd54665cd611be1d42f37eca258
+ languageName: node
+ linkType: hard
+
"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
version: 3.1.3
resolution: "fast-deep-equal@npm:3.1.3"
@@ -8002,6 +7975,20 @@ __metadata:
languageName: node
linkType: hard
+"fast-redact@npm:^3.1.1":
+ version: 3.3.0
+ resolution: "fast-redact@npm:3.3.0"
+ checksum: d81562510681e9ba6404ee5d3838ff5257a44d2f80937f5024c099049ff805437d0fae0124458a7e87535cc9dcf4de305bb075cab8f08d6c720bbc3447861b4e
+ languageName: node
+ linkType: hard
+
+"fast-safe-stringify@npm:^2.1.1":
+ version: 2.1.1
+ resolution: "fast-safe-stringify@npm:2.1.1"
+ checksum: d90ec1c963394919828872f21edaa3ad6f1dddd288d2bd4e977027afff09f5db40f94e39536d4646f7e01761d704d72d51dce5af1b93717f3489ef808f5f4e4d
+ languageName: node
+ linkType: hard
+
"fastest-levenshtein@npm:^1.0.16":
version: 1.0.16
resolution: "fastest-levenshtein@npm:1.0.16"
@@ -8283,10 +8270,10 @@ __metadata:
languageName: node
linkType: hard
-"fraction.js@npm:^4.3.6":
- version: 4.3.6
- resolution: "fraction.js@npm:4.3.6"
- checksum: d224bf62e350c4dbe66c6ac5ad9c4ec6d3c8e64c13323686dbebe7c8cc118491c297dca4961d3c93f847670794cb05e6d8b706f0e870846ab66a9c4491d0e914
+"fraction.js@npm:^4.3.7":
+ version: 4.3.7
+ resolution: "fraction.js@npm:4.3.7"
+ checksum: df291391beea9ab4c263487ffd9d17fed162dbb736982dee1379b2a8cc94e4e24e46ed508c6d278aded9080ba51872f1bc5f3a5fd8d7c74e5f105b508ac28711
languageName: node
linkType: hard
@@ -8416,22 +8403,6 @@ __metadata:
languageName: node
linkType: hard
-"gauge@npm:^5.0.0":
- version: 5.0.1
- resolution: "gauge@npm:5.0.1"
- dependencies:
- aproba: "npm:^1.0.3 || ^2.0.0"
- color-support: "npm:^1.1.3"
- console-control-strings: "npm:^1.1.0"
- has-unicode: "npm:^2.0.1"
- signal-exit: "npm:^4.0.1"
- string-width: "npm:^4.2.3"
- strip-ansi: "npm:^6.0.1"
- wide-align: "npm:^1.1.5"
- checksum: 845f9a2534356cd0e9c1ae590ed471bbe8d74c318915b92a34e8813b8d3441ca8e0eb0fa87a48081e70b63b84d398c5e66a13b8e8040181c10b9d77e9fe3287f
- languageName: node
- linkType: hard
-
"gensync@npm:^1.0.0-beta.2":
version: 1.0.0-beta.2
resolution: "gensync@npm:1.0.0-beta.2"
@@ -8780,13 +8751,6 @@ __metadata:
languageName: node
linkType: hard
-"has-unicode@npm:^2.0.1":
- version: 2.0.1
- resolution: "has-unicode@npm:2.0.1"
- checksum: ebdb2f4895c26bb08a8a100b62d362e49b2190bcfd84b76bc4be1a3bd4d254ec52d0dd9f2fbcc093fc5eb878b20c52146f9dfd33e2686ed28982187be593b47c
- languageName: node
- linkType: hard
-
"has-value@npm:^0.3.1":
version: 0.3.1
resolution: "has-value@npm:0.3.1"
@@ -8863,6 +8827,13 @@ __metadata:
languageName: node
linkType: hard
+"help-me@npm:^5.0.0":
+ version: 5.0.0
+ resolution: "help-me@npm:5.0.0"
+ checksum: 054c0e2e9ae2231c85ab5e04f75109b9d068ffcc54e58fb22079822a5ace8ff3d02c66fd45379c902ad5ab825e5d2e1451fcc2f7eab1eb49e7d488133ba4cacb
+ languageName: node
+ linkType: hard
+
"history@npm:^4.10.1, history@npm:^4.9.0":
version: 4.10.1
resolution: "history@npm:4.10.1"
@@ -10579,6 +10550,13 @@ __metadata:
languageName: node
linkType: hard
+"joycon@npm:^3.1.1":
+ version: 3.1.1
+ resolution: "joycon@npm:3.1.1"
+ checksum: 131fb1e98c9065d067fd49b6e685487ac4ad4d254191d7aa2c9e3b90f4e9ca70430c43cad001602bdbdabcf58717d3b5c5b7461c1bd8e39478c8de706b3fe6ae
+ languageName: node
+ linkType: hard
+
"jpeg-autorotate@npm:^7.1.1":
version: 7.1.1
resolution: "jpeg-autorotate@npm:7.1.1"
@@ -11975,18 +11953,6 @@ __metadata:
languageName: node
linkType: hard
-"npmlog@npm:^7.0.1":
- version: 7.0.1
- resolution: "npmlog@npm:7.0.1"
- dependencies:
- are-we-there-yet: "npm:^4.0.0"
- console-control-strings: "npm:^1.1.0"
- gauge: "npm:^5.0.0"
- set-blocking: "npm:^2.0.0"
- checksum: d4e6a2aaa7b5b5d2e2ed8f8ac3770789ca0691a49f3576b6a8c97d560a4c3305d2c233a9173d62be737e6e4506bf9e89debd6120a3843c1d37315c34f90fef71
- languageName: node
- linkType: hard
-
"nth-check@npm:^1.0.2":
version: 1.0.2
resolution: "nth-check@npm:1.0.2"
@@ -12159,6 +12125,13 @@ __metadata:
languageName: node
linkType: hard
+"on-exit-leak-free@npm:^2.1.0":
+ version: 2.1.2
+ resolution: "on-exit-leak-free@npm:2.1.2"
+ checksum: faea2e1c9d696ecee919026c32be8d6a633a7ac1240b3b87e944a380e8a11dc9c95c4a1f8fb0568de7ab8db3823e790f12bda45296b1d111e341aad3922a0570
+ languageName: node
+ linkType: hard
+
"on-finished@npm:2.4.1":
version: 2.4.1
resolution: "on-finished@npm:2.4.1"
@@ -12726,6 +12699,80 @@ __metadata:
languageName: node
linkType: hard
+"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:v1.1.0":
+ version: 1.1.0
+ resolution: "pino-abstract-transport@npm:1.1.0"
+ dependencies:
+ readable-stream: "npm:^4.0.0"
+ split2: "npm:^4.0.0"
+ checksum: 6e9b9d5a2c0a37f91ecaf224d335daae1ae682b1c79a05b06ef9e0f0a5d289f8e597992217efc857796dae6f1067e9b4882f95c6228ff433ddc153532cae8aca
+ languageName: node
+ linkType: hard
+
+"pino-http@npm:^9.0.0":
+ version: 9.0.0
+ resolution: "pino-http@npm:9.0.0"
+ dependencies:
+ get-caller-file: "npm:^2.0.5"
+ pino: "npm:^8.17.1"
+ pino-std-serializers: "npm:^6.2.2"
+ process-warning: "npm:^3.0.0"
+ checksum: 05496cb76cc9908658e50c4620fbdf7b0b5d99fb529493d601c3e4635b0bf7ce12b8a8eed7b5b520089f643b099233d61dd71f7cdfad8b66e59b9b81d79b6512
+ languageName: node
+ linkType: hard
+
+"pino-pretty@npm:^10.3.1":
+ version: 10.3.1
+ resolution: "pino-pretty@npm:10.3.1"
+ dependencies:
+ colorette: "npm:^2.0.7"
+ dateformat: "npm:^4.6.3"
+ fast-copy: "npm:^3.0.0"
+ fast-safe-stringify: "npm:^2.1.1"
+ help-me: "npm:^5.0.0"
+ joycon: "npm:^3.1.1"
+ minimist: "npm:^1.2.6"
+ on-exit-leak-free: "npm:^2.1.0"
+ pino-abstract-transport: "npm:^1.0.0"
+ pump: "npm:^3.0.0"
+ readable-stream: "npm:^4.0.0"
+ secure-json-parse: "npm:^2.4.0"
+ sonic-boom: "npm:^3.0.0"
+ strip-json-comments: "npm:^3.1.1"
+ bin:
+ pino-pretty: bin.js
+ checksum: 6964fba5acc7a9f112e4c6738d602e123daf16cb5f6ddc56ab4b6bb05059f28876d51da8f72358cf1172e95fa12496b70465431a0836df693c462986d050686b
+ languageName: node
+ linkType: hard
+
+"pino-std-serializers@npm:^6.0.0, pino-std-serializers@npm:^6.2.2":
+ version: 6.2.2
+ resolution: "pino-std-serializers@npm:6.2.2"
+ checksum: 8f1c7f0f0d8f91e6c6b5b2a6bfb48f06441abeb85f1c2288319f736f9c6d814fbeebe928d2314efc2ba6018fa7db9357a105eca9fc99fc1f28945a8a8b28d3d5
+ languageName: node
+ linkType: hard
+
+"pino@npm:^8.17.1, pino@npm:^8.17.2":
+ version: 8.17.2
+ resolution: "pino@npm:8.17.2"
+ dependencies:
+ atomic-sleep: "npm:^1.0.0"
+ fast-redact: "npm:^3.1.1"
+ on-exit-leak-free: "npm:^2.1.0"
+ pino-abstract-transport: "npm:v1.1.0"
+ pino-std-serializers: "npm:^6.0.0"
+ process-warning: "npm:^3.0.0"
+ quick-format-unescaped: "npm:^4.0.3"
+ real-require: "npm:^0.2.0"
+ safe-stable-stringify: "npm:^2.3.1"
+ sonic-boom: "npm:^3.7.0"
+ thread-stream: "npm:^2.0.0"
+ bin:
+ pino: bin.js
+ checksum: 9e55af6cd9d1833a4dbe64924fc73163295acd3c988a9c7db88926669f2574ab7ec607e8487b6dd71dbdad2d7c1c1aac439f37e59233f37220b1a9d88fa2ce01
+ languageName: node
+ linkType: hard
+
"pirates@npm:^4.0.4":
version: 4.0.6
resolution: "pirates@npm:4.0.6"
@@ -13328,6 +13375,13 @@ __metadata:
languageName: node
linkType: hard
+"process-warning@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "process-warning@npm:3.0.0"
+ checksum: 60f3c8ddee586f0706c1e6cb5aa9c86df05774b9330d792d7c8851cf0031afd759d665404d07037e0b4901b55c44a423f07bdc465c63de07d8d23196bb403622
+ languageName: node
+ linkType: hard
+
"process@npm:^0.11.10":
version: 0.11.10
resolution: "process@npm:0.11.10"
@@ -13505,6 +13559,13 @@ __metadata:
languageName: node
linkType: hard
+"quick-format-unescaped@npm:^4.0.3":
+ version: 4.0.4
+ resolution: "quick-format-unescaped@npm:4.0.4"
+ checksum: fe5acc6f775b172ca5b4373df26f7e4fd347975578199e7d74b2ae4077f0af05baa27d231de1e80e8f72d88275ccc6028568a7a8c9ee5e7368ace0e18eff93a4
+ languageName: node
+ linkType: hard
+
"raf-schd@npm:^4.0.3":
version: 4.0.3
resolution: "raf-schd@npm:4.0.3"
@@ -13786,8 +13847,8 @@ __metadata:
linkType: hard
"react-redux@npm:^9.0.4":
- version: 9.0.4
- resolution: "react-redux@npm:9.0.4"
+ version: 9.1.0
+ resolution: "react-redux@npm:9.1.0"
dependencies:
"@types/use-sync-external-store": "npm:^0.0.3"
use-sync-external-store: "npm:^1.0.0"
@@ -13803,7 +13864,7 @@ __metadata:
optional: true
redux:
optional: true
- checksum: 23af10014b129aeb051de729bde01de21175170b860deefb7ad83483feab5816253f770a4cea93333fc22a53ac9ac699b27f5c3705c388dab53dbcb2906a571a
+ checksum: 53161b5dc4d109020fbc42d26906ace92fed9ba1d7ab6274af60e9c0684583d20d1c8ec6d58601ac7b833c6468a652bbf3d4a102149d1793cb8a28b05b042f73
languageName: node
linkType: hard
@@ -14039,15 +14100,16 @@ __metadata:
languageName: node
linkType: hard
-"readable-stream@npm:^4.1.0":
- version: 4.4.0
- resolution: "readable-stream@npm:4.4.0"
+"readable-stream@npm:^4.0.0":
+ version: 4.4.2
+ resolution: "readable-stream@npm:4.4.2"
dependencies:
abort-controller: "npm:^3.0.0"
buffer: "npm:^6.0.3"
events: "npm:^3.3.0"
process: "npm:^0.11.10"
- checksum: 83f5a11285e5ebefb7b22a43ea77a2275075639325b4932a328a1fb0ee2475b83b9cc94326724d71c6aa3b60fa87e2b16623530b1cac34f3825dcea0996fdbe4
+ string_decoder: "npm:^1.3.0"
+ checksum: cf7cc8daa2b57872d120945a20a1458c13dcb6c6f352505421115827b18ac4df0e483ac1fe195cb1f5cd226e1073fc55b92b569269d8299e8530840bcdbba40c
languageName: node
linkType: hard
@@ -14071,6 +14133,13 @@ __metadata:
languageName: node
linkType: hard
+"real-require@npm:^0.2.0":
+ version: 0.2.0
+ resolution: "real-require@npm:0.2.0"
+ checksum: 23eea5623642f0477412ef8b91acd3969015a1501ed34992ada0e3af521d3c865bb2fe4cdbfec5fe4b505f6d1ef6a03e5c3652520837a8c3b53decff7e74b6a0
+ languageName: node
+ linkType: hard
+
"redent@npm:^3.0.0":
version: 3.0.0
resolution: "redent@npm:3.0.0"
@@ -14616,6 +14685,13 @@ __metadata:
languageName: node
linkType: hard
+"safe-stable-stringify@npm:^2.3.1":
+ version: 2.4.3
+ resolution: "safe-stable-stringify@npm:2.4.3"
+ checksum: 81dede06b8f2ae794efd868b1e281e3c9000e57b39801c6c162267eb9efda17bd7a9eafa7379e1f1cacd528d4ced7c80d7460ad26f62ada7c9e01dec61b2e768
+ languageName: node
+ linkType: hard
+
"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.1.0":
version: 2.1.2
resolution: "safer-buffer@npm:2.1.2"
@@ -14649,15 +14725,15 @@ __metadata:
linkType: hard
"sass@npm:^1.62.1":
- version: 1.69.7
- resolution: "sass@npm:1.69.7"
+ version: 1.70.0
+ resolution: "sass@npm:1.70.0"
dependencies:
chokidar: "npm:>=3.0.0 <4.0.0"
immutable: "npm:^4.0.0"
source-map-js: "npm:>=0.6.2 <2.0.0"
bin:
sass: sass.js
- checksum: 773d0938e7d4ff3972d3fda3132f34fe98a2f712e028a58e28fecd615434795eff3266eddc38d5e13f03b90c0d6360d0e737b30bff2949a47280c64a18e0fb18
+ checksum: 7c309ee1c096d591746d122da9f1ebd65b4c4b3a60c2cc0ec720fd98fe1205fa8b44c9f563d113b9fdfeb25af1e32ec9b3e048bd4b8e05d267f020953bd7baf0
languageName: node
linkType: hard
@@ -14729,6 +14805,13 @@ __metadata:
languageName: node
linkType: hard
+"secure-json-parse@npm:^2.4.0":
+ version: 2.7.0
+ resolution: "secure-json-parse@npm:2.7.0"
+ checksum: f57eb6a44a38a3eeaf3548228585d769d788f59007454214fab9ed7f01fbf2e0f1929111da6db28cf0bcc1a2e89db5219a59e83eeaec3a54e413a0197ce879e4
+ languageName: node
+ linkType: hard
+
"select-hose@npm:^2.0.0":
version: 2.0.0
resolution: "select-hose@npm:2.0.0"
@@ -15132,6 +15215,15 @@ __metadata:
languageName: node
linkType: hard
+"sonic-boom@npm:^3.0.0, sonic-boom@npm:^3.7.0":
+ version: 3.7.0
+ resolution: "sonic-boom@npm:3.7.0"
+ dependencies:
+ atomic-sleep: "npm:^1.0.0"
+ checksum: 57a3d560efb77f4576db111168ee2649c99e7869fda6ce0ec2a4e5458832d290ba58d74b073ddb5827d9a30f96d23cff79157993d919e1a6d5f28d8b6391c7f0
+ languageName: node
+ linkType: hard
+
"source-list-map@npm:^2.0.0":
version: 2.0.1
resolution: "source-list-map@npm:2.0.1"
@@ -15290,7 +15382,7 @@ __metadata:
languageName: node
linkType: hard
-"split2@npm:^4.1.0":
+"split2@npm:^4.0.0, split2@npm:^4.1.0":
version: 4.2.0
resolution: "split2@npm:4.2.0"
checksum: b292beb8ce9215f8c642bb68be6249c5a4c7f332fc8ecadae7be5cbdf1ea95addc95f0459ef2e7ad9d45fd1064698a097e4eb211c83e772b49bc0ee423e91534
@@ -15455,7 +15547,7 @@ __metadata:
languageName: node
linkType: hard
-"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
version: 4.2.3
resolution: "string-width@npm:4.2.3"
dependencies:
@@ -15548,7 +15640,7 @@ __metadata:
languageName: node
linkType: hard
-"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1":
+"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
version: 1.3.0
resolution: "string_decoder@npm:1.3.0"
dependencies:
@@ -16094,6 +16186,15 @@ __metadata:
languageName: node
linkType: hard
+"thread-stream@npm:^2.0.0":
+ version: 2.4.1
+ resolution: "thread-stream@npm:2.4.1"
+ dependencies:
+ real-require: "npm:^0.2.0"
+ checksum: ce29265810b9550ce896726301ff006ebfe96b90292728f07cfa4c379740585583046e2a8018afc53aca66b18fed12b33a84f3883e7ebc317185f6682898b8f8
+ languageName: node
+ linkType: hard
+
"thunky@npm:^1.0.2":
version: 1.1.0
resolution: "thunky@npm:1.1.0"
@@ -17340,15 +17441,6 @@ __metadata:
languageName: node
linkType: hard
-"wide-align@npm:^1.1.5":
- version: 1.1.5
- resolution: "wide-align@npm:1.1.5"
- dependencies:
- string-width: "npm:^1.0.2 || 2 || 3 || 4"
- checksum: 1d9c2a3e36dfb09832f38e2e699c367ef190f96b82c71f809bc0822c306f5379df87bab47bed27ea99106d86447e50eb972d3c516c2f95782807a9d082fbea95
- languageName: node
- linkType: hard
-
"wildcard@npm:^2.0.0":
version: 2.0.1
resolution: "wildcard@npm:2.0.1"