From 57229ef7e7a72f8785049c54d80d0fe5baf2e9dd Mon Sep 17 00:00:00 2001 From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com> Date: Thu, 18 Jan 2024 19:13:11 +0800 Subject: [PATCH] upgrade typegoose and mongoose --- package.json | 4 +- src/api.server.ts | 2 +- src/common/LotteryCache.ts | 5 +- src/controllers/chain.controller.ts | 2 +- src/controllers/sign.controller.ts | 3 +- src/decorators/dbconn.ts | 8 +- src/models/ActivityInfo.ts | 4 +- src/models/ActivityUser.ts | 4 +- src/models/Base.ts | 2 +- src/models/LotteryStats.ts | 2 +- src/plugins/apiauth.ts | 9 +- src/tasks/DailyCheckIn.ts | 2 +- src/tasks/ShareCode.ts | 5 +- src/tasks/TwitterConnect.ts | 2 +- src/tasks/base/ITask.ts | 19 +- typings/extend.d.ts | 2 +- yarn.lock | 341 ++++++++++------------------ 17 files changed, 160 insertions(+), 256 deletions(-) diff --git a/package.json b/package.json index e8991f1..de588d1 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@fastify/formbody": "^7.4.0", "@fastify/helmet": "^10.1.0", "@fastify/jwt": "^6.7.1", - "@typegoose/typegoose": "^7.4.6", + "@typegoose/typegoose": "^12.1.0", "bson": "^4.0.4", "dotenv": "^16.0.3", "ethers": "^5.6.8", @@ -26,7 +26,7 @@ "fastify-plugin": "^3.0.0", "fastify-xml-body-parser": "^2.2.0", "mongodb-extended-json": "^1.11.1", - "mongoose": "5.10.3", + "mongoose": "8.1.0", "node-schedule": "^2.0.0", "siwe": "^2.1.4", "tracer": "^1.1.6", diff --git a/src/api.server.ts b/src/api.server.ts index ef7fb98..615b0df 100644 --- a/src/api.server.ts +++ b/src/api.server.ts @@ -86,7 +86,7 @@ export class ApiServer { async connectDB() { const options = { useNewUrlParser: true, - poolSize: 5, + maxPoolSize: 5, keepAlive: true, keepAliveInitialDelay: 300000, useUnifiedTopology: true, diff --git a/src/common/LotteryCache.ts b/src/common/LotteryCache.ts index 81bd45f..2eab9dc 100644 --- a/src/common/LotteryCache.ts +++ b/src/common/LotteryCache.ts @@ -1,11 +1,12 @@ -import { LotteryStats } from 'models/LotteryStats' +import { LotteryStats, LotteryStatsClass } from 'models/LotteryStats' import { singleton } from 'zutils' import { formatDate } from 'zutils/utils/date.util' +import { DocumentType } from '@typegoose/typegoose' const EXPIRE_TIME = 1000 * 60 * 60 @singleton export class LotteryCache { - map: Map = new Map() + map: Map> = new Map() lastUsed: Map = new Map() public async getData(user: string, activity: string) { diff --git a/src/controllers/chain.controller.ts b/src/controllers/chain.controller.ts index 98c3013..d1ce347 100644 --- a/src/controllers/chain.controller.ts +++ b/src/controllers/chain.controller.ts @@ -26,7 +26,7 @@ export default class ChainController extends BaseController { if (!record || record.amount < minClaimNum) { throw new ZError(10, 'no enough usdt') } - const amount = record.amount + '' + const amount = record.amount record.amount = 0 await record.save() const token = process.env.USDT_CONTRACT diff --git a/src/controllers/sign.controller.ts b/src/controllers/sign.controller.ts index f0b27d9..06b8e21 100644 --- a/src/controllers/sign.controller.ts +++ b/src/controllers/sign.controller.ts @@ -1,6 +1,5 @@ import { ZError, SyncLocker, ZRedisClient, BaseController, ROLE_ANON, role, router } from 'zutils' import { BOOST_CFG } from 'configs/boost' -import logger from 'logger/logger' import { ActivityUser } from 'models/ActivityUser' import { DEFAULT_EXPIRED, NonceRecord } from 'models/NonceRecord' import { ScoreRecord } from 'models/ScoreRecord' @@ -84,7 +83,7 @@ class SignController extends BaseController { if (accountData.locked) { throw new ZError(12, 'user locked') } - accountData.lastLogin = Date.now() + accountData.lastLogin = new Date() await accountData.save() new LoginRecordQueue().addLog(req, accountData.id, activity, source) diff --git a/src/decorators/dbconn.ts b/src/decorators/dbconn.ts index 88d3b84..ca7bf68 100644 --- a/src/decorators/dbconn.ts +++ b/src/decorators/dbconn.ts @@ -10,10 +10,10 @@ export function dbconn(name?: string) { const dbName = ('db_' + name).toUpperCase() const url = process.env[dbName] target['db'] = mongoose.createConnection(url, { - useNewUrlParser: true, - useCreateIndex: true, - useFindAndModify: false, - useUnifiedTopology: true, + // useNewUrlParser: true, + // useCreateIndex: true, + // useFindAndModify: false, + // useUnifiedTopology: true, }) } } diff --git a/src/models/ActivityInfo.ts b/src/models/ActivityInfo.ts index c6f8d70..a323ae5 100644 --- a/src/models/ActivityInfo.ts +++ b/src/models/ActivityInfo.ts @@ -65,10 +65,10 @@ export class TaskCfg { return this.isStart() && !this.isEnd() } } -interface ActivityInfoClass extends Base, TimeStamps {} +export interface ActivityInfoClass extends TimeStamps {} @dbconn() @modelOptions({ schemaOptions: { collection: 'activity_info', timestamps: true } }) -class ActivityInfoClass extends BaseModule { +export class ActivityInfoClass extends BaseModule { @prop() public _id: string diff --git a/src/models/ActivityUser.ts b/src/models/ActivityUser.ts index c44dcb8..b4487b4 100644 --- a/src/models/ActivityUser.ts +++ b/src/models/ActivityUser.ts @@ -44,7 +44,7 @@ export class TaskStatus { data: any } -interface ActivityUserClass extends Base, TimeStamps {} +export interface ActivityUserClass extends Base, TimeStamps {} @dbconn() @index({ address: 1, activity: 1 }, { unique: true }) @index({ inviteCode: 1, activity: 1 }, { unique: true }) @@ -68,7 +68,7 @@ interface ActivityUserClass extends Base, TimeStamps {} this.inviteCode = convert({ numStr: shortId, base: 16, to: 52, alphabet }) } }) -class ActivityUserClass extends BaseModule { +export class ActivityUserClass extends BaseModule { @prop({ required: true }) public address: string diff --git a/src/models/Base.ts b/src/models/Base.ts index 1235e88..00fe4f5 100644 --- a/src/models/Base.ts +++ b/src/models/Base.ts @@ -70,7 +70,7 @@ export abstract class BaseModule { let records = await this.find(opt).sort(sort).skip(start).limit(limit) let total = await this.countDocuments(opt) if (json) { - records.map((o: T) => o.toJson()) + records.map(o => o.toJson()) } return { records, total, start, limit } } diff --git a/src/models/LotteryStats.ts b/src/models/LotteryStats.ts index 72b6b6a..927fb16 100644 --- a/src/models/LotteryStats.ts +++ b/src/models/LotteryStats.ts @@ -12,7 +12,7 @@ import { BaseModule } from './Base' schemaOptions: { collection: 'lottery_stats', timestamps: true }, options: { allowMixed: Severity.ALLOW }, }) -class LotteryStatsClass extends BaseModule { +export class LotteryStatsClass extends BaseModule { @prop() public user: string @prop() diff --git a/src/plugins/apiauth.ts b/src/plugins/apiauth.ts index 971a9d6..2acf45a 100644 --- a/src/plugins/apiauth.ts +++ b/src/plugins/apiauth.ts @@ -1,14 +1,15 @@ import { FastifyPluginAsync, FastifyReply, FastifyRequest } from 'fastify' import fastifyPlugin from 'fastify-plugin' -import { ActivityInfo } from 'models/ActivityInfo' -import { ActivityUser } from 'models/ActivityUser' +import { ActivityInfo, ActivityInfoClass } from 'models/ActivityInfo' +import { ActivityUser, ActivityUserClass } from 'models/ActivityUser' import { ROLE_ANON } from 'zutils' +import { DocumentType } from '@typegoose/typegoose' declare module 'fastify' { interface FastifyRequest { roles?: string[] - user?: typeof ActivityUser - activity?: typeof ActivityInfo + user?: DocumentType + activity?: DocumentType token?: string } interface FastifyInstance { diff --git a/src/tasks/DailyCheckIn.ts b/src/tasks/DailyCheckIn.ts index 735b22f..e3bab49 100644 --- a/src/tasks/DailyCheckIn.ts +++ b/src/tasks/DailyCheckIn.ts @@ -67,7 +67,7 @@ export default class DailyCheckIn extends ITask { let seq = count % countCfg let score = cfg.params.score[seq] || 0 + cfg.score const user = this.user - if (user.boost > 1 && Date.now() < user.boostExpire) { + if (user.boost > 1 && Date.now() < user.boostExpire.getTime()) { score = Math.floor(score * user.boost) } await updateRankScore({ diff --git a/src/tasks/ShareCode.ts b/src/tasks/ShareCode.ts index 57a991b..2bec2df 100644 --- a/src/tasks/ShareCode.ts +++ b/src/tasks/ShareCode.ts @@ -1,13 +1,14 @@ -import { ActivityUser, TaskStatus, TaskStatusEnum } from 'models/ActivityUser' +import { ActivityUser, ActivityUserClass, TaskStatus, TaskStatusEnum } from 'models/ActivityUser' import { ITask } from './base/ITask' import { TaskCfg } from 'models/ActivityInfo' import { updateRankScore } from 'services/rank.svr' import { ActivityItem } from 'models/ActivityItem' import { LotteryCache } from 'common/LotteryCache' import { checkHadGacha } from 'services/chain.svr' +import { DocumentType } from '@typegoose/typegoose' const updateInviteScore = async ( - user: typeof ActivityUser, + user: DocumentType, scores: number[], items: any[], level: number, diff --git a/src/tasks/TwitterConnect.ts b/src/tasks/TwitterConnect.ts index 0a62244..4018641 100644 --- a/src/tasks/TwitterConnect.ts +++ b/src/tasks/TwitterConnect.ts @@ -1,6 +1,6 @@ import { checkTwitter } from 'services/oauth.svr' import { ITask } from './base/ITask' -import { ActivityUser, TaskStatusEnum } from 'models/ActivityUser' +import { TaskStatusEnum } from 'models/ActivityUser' import { ZError } from 'zutils' import { TaskCfg } from 'models/ActivityInfo' diff --git a/src/tasks/base/ITask.ts b/src/tasks/base/ITask.ts index 2835a15..8ba8b83 100644 --- a/src/tasks/base/ITask.ts +++ b/src/tasks/base/ITask.ts @@ -1,17 +1,24 @@ -import { ActivityInfo, TaskCfg } from 'models/ActivityInfo' +import { ActivityInfo, ActivityInfoClass, TaskCfg } from 'models/ActivityInfo' import { ActivityItem } from 'models/ActivityItem' -import { ActivityUser, TaskStatus, TaskStatusEnum } from 'models/ActivityUser' +import { ActivityUser, ActivityUserClass, TaskStatus, TaskStatusEnum } from 'models/ActivityUser' import { updateRankScore } from 'services/rank.svr' +import { DocumentType } from '@typegoose/typegoose' export abstract class ITask { static desc: string static show: boolean = true static auto: boolean = false - user: typeof ActivityUser - activity: typeof ActivityInfo + user: DocumentType + activity: DocumentType - constructor({ user, activity }: { user: typeof ActivityUser; activity: typeof ActivityInfo }) { + constructor({ + user, + activity, + }: { + user: DocumentType + activity: DocumentType + }) { // do nothing this.user = user this.activity = activity @@ -27,7 +34,7 @@ export abstract class ITask { } let claimAmount = task.data.claimAmount || 0 let score = cfg.score - if (user.boost > 1 && Date.now() < user.boostExpire) { + if (user.boost > 1 && Date.now() < user.boostExpire.getTime()) { score = Math.floor(score * user.boost) } let finishAmount = cfg.repeat > 1 ? task.data.finishAmount || 0 : 1 diff --git a/typings/extend.d.ts b/typings/extend.d.ts index f417a2e..b33d824 100644 --- a/typings/extend.d.ts +++ b/typings/extend.d.ts @@ -3,7 +3,7 @@ import fastify from 'fastify' declare module 'fastify' { interface FastifyRequest { roles?: string[] - user?: any + // user?: any token?: string permissions?: string[][] depts?: string[] diff --git a/yarn.lock b/yarn.lock index ae1e16d..c48552d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -547,6 +547,13 @@ tweetnacl "^1.0.3" tweetnacl-util "^0.15.1" +"@mongodb-js/saslprep@^1.1.0": + version "1.1.4" + resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.1.4.tgz#24ec1c4915a65f5c506bb88c081731450d91bb1c" + integrity sha512-8zJ8N1x51xo9hwPh6AWnKdLGEC5N3lDa6kms1YHmFBoRhTpJR6HG8wWk0td1MVCu9cD4YBrvjZEtd5Obw0Fbnw== + dependencies: + sparse-bitfield "^3.0.3" + "@noble/hashes@^1.1.2": version "1.3.3" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.3.tgz#39908da56a4adc270147bb07968bf3b16cfe1699" @@ -652,16 +659,16 @@ resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz" integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== -"@typegoose/typegoose@^7.4.6": - version "7.6.3" - resolved "https://registry.npmjs.org/@typegoose/typegoose/-/typegoose-7.6.3.tgz" - integrity sha512-u12nUEmpMa0e+K8UuzAZvSnWZ7JZGo0yMs7HR4mG47gJJhVe/PIAzfXVPV+CJQBZrMSPyaEZ6HRKjmDxnjEgFg== +"@typegoose/typegoose@^12.1.0": + version "12.1.0" + resolved "https://registry.yarnpkg.com/@typegoose/typegoose/-/typegoose-12.1.0.tgz#06da94152fef00e69978ecd5de6db83a7ae420b7" + integrity sha512-RhqsFvTCTshtYxuzsHCGwPLJXgX1sc5aguZJ4w3ax6shVHaVQSG4VZddo/BowfP+0CSjp4J8XeCtrunkzkhJOg== dependencies: lodash "^4.17.20" - loglevel "^1.7.0" - reflect-metadata "^0.1.13" - semver "^7.3.2" - tslib "^2.0.1" + loglevel "^1.8.1" + reflect-metadata "^0.2.1" + semver "^7.5.4" + tslib "^2.6.2" "@types/bn.js@^4.11.3": version "4.11.6" @@ -738,11 +745,6 @@ resolved "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^16.11.0": - version "16.18.23" - resolved "https://registry.npmjs.org/@types/node/-/node-16.18.23.tgz" - integrity sha512-XAMpaw1s1+6zM+jn2tmw8MyaRDIJfXxqmIQIS0HfoGYPuf7dUWeiUKopwq13KFX9lEp1+THGtlaaYx39Nxr58g== - "@types/pbkdf2@^3.0.0": version "3.1.0" resolved "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.0.tgz" @@ -786,6 +788,18 @@ resolved "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz" integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ== +"@types/webidl-conversions@*": + version "7.0.3" + resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz#1306dbfa53768bcbcfc95a1c8cde367975581859" + integrity sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA== + +"@types/whatwg-url@^11.0.2": + version "11.0.4" + resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-11.0.4.tgz#ffed0dc8d89d91f62e3f368fcbda222a487c4f63" + integrity sha512-lXCmTWSHJvf0TRSO58nm978b8HJ/EdsSsEKLd3ODHFjo+3VGAyyTp4v50nWvwtzBxSMQrVOK7tcuN0zGPLICMw== + dependencies: + "@types/webidl-conversions" "*" + "@typescript-eslint/eslint-plugin@^6.19.0": version "6.19.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.0.tgz#db03f3313b57a30fbbdad2e6929e88fc7feaf9ba" @@ -1131,24 +1145,11 @@ binary-extensions@^2.0.0: resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -bl@^2.2.0: - version "2.2.1" - resolved "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz" - integrity sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g== - dependencies: - readable-stream "^2.3.5" - safe-buffer "^5.1.1" - blakejs@^1.1.0: version "1.2.1" resolved "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz" integrity sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ== -bluebird@3.5.1: - version "3.5.1" - resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz" - integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA== - bluebird@^3.5.0: version "3.7.2" resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz" @@ -1260,7 +1261,7 @@ bs58check@^2.1.2: create-hash "^1.1.0" safe-buffer "^5.1.2" -bson@^1.0.1, bson@^1.1.4: +bson@^1.0.1: version "1.1.6" resolved "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz" integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg== @@ -1272,6 +1273,11 @@ bson@^4.0.4: dependencies: buffer "^5.6.0" +bson@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/bson/-/bson-6.2.0.tgz#4b6acafc266ba18eeee111373c2699304a9ba0a3" + integrity sha512-ID1cI+7bazPDyL9wYy9GaQ8gEEohWvcUl/Yf0dIdutJxnmInEEyCsb4awy/OiBfall7zBA179Pahi3vCdFze3Q== + buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz" @@ -1315,13 +1321,6 @@ builtin-modules@^1.1.1: resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz" integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ== -busboy@^1.6.0: - version "1.6.0" - resolved "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz" - integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA== - dependencies: - streamsearch "^1.1.0" - bytes@3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz" @@ -1518,11 +1517,6 @@ core-util-is@1.0.2: resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - cors@^2.8.1: version "2.8.5" resolved "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz" @@ -1619,14 +1613,7 @@ debug@2.6.9, debug@^2.2.0: dependencies: ms "2.0.0" -debug@3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - -debug@^4.0.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: +debug@4.x, debug@^4.0.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -1667,7 +1654,7 @@ delayed-stream@~1.0.0: resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -denque@^1.4.1, denque@^1.5.0: +denque@^1.5.0: version "1.5.1" resolved "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz" integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw== @@ -2104,13 +2091,6 @@ evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -express-fileupload@^1.1.6: - version "1.4.0" - resolved "https://registry.npmjs.org/express-fileupload/-/express-fileupload-1.4.0.tgz" - integrity sha512-RjzLCHxkv3umDeZKeFeMg8w7qe0V09w3B7oGZprr/oO2H/ISCgNzuqzn7gV3HRWb37GjRk429CCpSLS2KNTqMQ== - dependencies: - busboy "^1.6.0" - express@^4.14.0: version "4.18.2" resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz" @@ -2263,23 +2243,6 @@ fastfall@^1.5.0: dependencies: reusify "^1.0.0" -fastify-file-upload@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/fastify-file-upload/-/fastify-file-upload-3.0.1.tgz" - integrity sha512-GTIixiN8rHCn/PYyPKgeOCYimldhRlKyx/eKoOcPD1YhUuKdp2NzokURQlx35Po6tFqTgSE1ZPUd/93otr40xw== - dependencies: - "@types/node" "^16.11.0" - express-fileupload "^1.1.6" - fastify-plugin "^2.0.0" - middie "^5.1.0" - -fastify-plugin@^2.0.0: - version "2.3.4" - resolved "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-2.3.4.tgz" - integrity sha512-I+Oaj6p9oiRozbam30sh39BiuiqBda7yK2nmSPVwDCfIBlKnT8YB3MY+pRQc2Fcd07bf6KPGklHJaQ2Qu81TYQ== - dependencies: - semver "^7.3.2" - fastify-plugin@^3.0.0: version "3.0.1" resolved "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-3.0.1.tgz" @@ -2774,7 +2737,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2866,11 +2829,6 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - isexe@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" @@ -2975,10 +2933,10 @@ jsprim@^1.2.2: json-schema "0.4.0" verror "1.10.0" -kareem@2.3.1: - version "2.3.1" - resolved "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz" - integrity sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw== +kareem@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.5.1.tgz#7b8203e11819a8e77a34b3517d3ead206764d15d" + integrity sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA== keccak@^3.0.0: version "3.0.3" @@ -3040,9 +2998,9 @@ lodash@^4.17.20: resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -loglevel@^1.7.0: +loglevel@^1.8.1: version "1.8.1" - resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4" integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg== long-timeout@0.1.1: @@ -3124,15 +3082,6 @@ micromatch@^4.0.4: braces "^3.0.2" picomatch "^2.3.1" -middie@^5.1.0: - version "5.4.0" - resolved "https://registry.npmjs.org/middie/-/middie-5.4.0.tgz" - integrity sha512-L508bk0XEoZdoR//a4mIunV/YIcoK0uer5sNQEKMeBrEKdBpH7JyhFp2kReWrNa9J6AWazUL9UxZyzlV+tku0g== - dependencies: - fastify-plugin "^3.0.0" - path-to-regexp "^6.1.0" - reusify "^1.0.4" - mime-db@1.52.0: version "1.52.0" resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz" @@ -3252,6 +3201,14 @@ moment@^2.10.6: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== +mongodb-connection-string-url@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.0.tgz#b4f87f92fd8593f3b9365f592515a06d304a1e9c" + integrity sha512-t1Vf+m1I5hC2M5RJx/7AtxgABy1cZmIPQRMXw+gEIPn/cZNF3Oiy+l0UIypUwVB5trcWHq3crg2g3uAR9aAwsQ== + dependencies: + "@types/whatwg-url" "^11.0.2" + whatwg-url "^13.0.0" + mongodb-extended-json@^1.11.1: version "1.11.1" resolved "https://registry.yarnpkg.com/mongodb-extended-json/-/mongodb-extended-json-1.11.1.tgz#e31d3958982f90caede82cb4fea930ece4805a32" @@ -3266,56 +3223,39 @@ mongodb-extended-json@^1.11.1: moment "^2.10.6" raf "^3.1.0" -mongodb@3.6.1: - version "3.6.1" - resolved "https://registry.npmjs.org/mongodb/-/mongodb-3.6.1.tgz" - integrity sha512-uH76Zzr5wPptnjEKJRQnwTsomtFOU/kQEU8a9hKHr2M7y9qVk7Q4Pkv0EQVp88742z9+RwvsdTw6dRjDZCNu1g== +mongodb@6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-6.3.0.tgz#ec9993b19f7ed2ea715b903fcac6171c9d1d38ca" + integrity sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA== dependencies: - bl "^2.2.0" - bson "^1.1.4" - denque "^1.4.1" - require_optional "^1.0.1" - safe-buffer "^5.1.2" - optionalDependencies: - saslprep "^1.0.0" + "@mongodb-js/saslprep" "^1.1.0" + bson "^6.2.0" + mongodb-connection-string-url "^3.0.0" -mongoose-legacy-pluralize@1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz" - integrity sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ== - -mongoose@5.10.3: - version "5.10.3" - resolved "https://registry.npmjs.org/mongoose/-/mongoose-5.10.3.tgz" - integrity sha512-FLemltuzcsCHlFpEZ3bYOiNhJfHful+GoS+3uRgdEWGlY0HKfOjm9xsISM/tql8vRvhjr7qveuRfoBBGO3xNtw== +mongoose@8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-8.1.0.tgz#25be9a39295c0cbffc971fdd4fb6302dceeb2ded" + integrity sha512-kOA4Xnq2goqNpN9EmYElGNWfxA9H80fxcr7UdJKWi3UMflza0R7wpTihCpM67dE/0MNFljoa0sjQtlXVkkySAQ== dependencies: - bson "^1.1.4" - kareem "2.3.1" - mongodb "3.6.1" - mongoose-legacy-pluralize "1.0.2" - mpath "0.7.0" - mquery "3.2.2" - ms "2.1.2" - regexp-clone "1.0.0" - safe-buffer "5.2.1" - sift "7.0.1" - sliced "1.0.1" + bson "^6.2.0" + kareem "2.5.1" + mongodb "6.3.0" + mpath "0.9.0" + mquery "5.0.0" + ms "2.1.3" + sift "16.0.1" -mpath@0.7.0: - version "0.7.0" - resolved "https://registry.npmjs.org/mpath/-/mpath-0.7.0.tgz" - integrity sha512-Aiq04hILxhz1L+f7sjGyn7IxYzWm1zLNNXcfhDtx04kZ2Gk7uvFdgZ8ts1cWa/6d0TQmag2yR8zSGZUmp0tFNg== +mpath@0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.9.0.tgz#0c122fe107846e31fc58c75b09c35514b3871904" + integrity sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew== -mquery@3.2.2: - version "3.2.2" - resolved "https://registry.npmjs.org/mquery/-/mquery-3.2.2.tgz" - integrity sha512-XB52992COp0KP230I3qloVUbkLUxJIu328HBP2t2EsxSFtf4W1HPSOBWOXf1bqxK4Xbb66lfMJ+Bpfd9/yZE1Q== +mquery@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/mquery/-/mquery-5.0.0.tgz#a95be5dfc610b23862df34a47d3e5d60e110695d" + integrity sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg== dependencies: - bluebird "3.5.1" - debug "3.1.0" - regexp-clone "^1.0.0" - safe-buffer "5.1.2" - sliced "1.0.1" + debug "4.x" ms@2.0.0: version "2.0.0" @@ -3560,11 +3500,6 @@ path-to-regexp@0.1.7: resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== -path-to-regexp@^6.1.0: - version "6.2.1" - resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz" - integrity sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw== - path-type@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz" @@ -3645,11 +3580,6 @@ prettier@^3.2.3: resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.3.tgz#98501d99141a9a10d5ceaf74cf39c8b7cbddd380" integrity sha512-QNhUTBq+mqt1oH1dTfY3phOKNhcDdJkfttHI6u0kj7M2+c+7fmNKlgh2GhnHiqMcbxJ+a0j2igz/2jfl9QKLuw== -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - process-warning@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/process-warning/-/process-warning-2.2.0.tgz" @@ -3691,6 +3621,11 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== +punycode@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" + integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== + qs@6.11.0: version "6.11.0" resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" @@ -3766,19 +3701,6 @@ raw-body@2.5.2: iconv-lite "0.4.24" unpipe "1.0.0" -readable-stream@^2.3.5: - version "2.3.8" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz" - integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - readable-stream@^3.6.0: version "3.6.2" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz" @@ -3837,15 +3759,10 @@ redis@^3.1.2: redis-errors "^1.2.0" redis-parser "^3.0.0" -reflect-metadata@^0.1.13: - version "0.1.13" - resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz" - integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== - -regexp-clone@1.0.0, regexp-clone@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz" - integrity sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw== +reflect-metadata@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.1.tgz#8d5513c0f5ef2b4b9c3865287f3c0940c1f67f74" + integrity sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw== request@^2.79.0: version "2.88.2" @@ -3878,24 +3795,11 @@ require-from-string@^2.0.2: resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -require_optional@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz" - integrity sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g== - dependencies: - resolve-from "^2.0.0" - semver "^5.1.0" - resolve-alpn@^1.0.0, resolve-alpn@^1.2.0: version "1.2.1" resolved "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz" integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== -resolve-from@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz" - integrity sha512-qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ== - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" @@ -3968,16 +3872,16 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-buffer@~5.1.0: + version "5.1.2" + resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + safe-regex2@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/safe-regex2/-/safe-regex2-2.0.0.tgz" @@ -3995,13 +3899,6 @@ safe-stable-stringify@^2.3.1: resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -saslprep@^1.0.0: - version "1.0.3" - resolved "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz" - integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag== - dependencies: - sparse-bitfield "^3.0.3" - scrypt-js@3.0.1, scrypt-js@^3.0.0, scrypt-js@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz" @@ -4021,12 +3918,12 @@ secure-json-parse@^2.5.0: resolved "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz" integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw== -semver@^5.1.0, semver@^5.3.0: +semver@^5.3.0: version "5.7.1" resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^7.3.2, semver@^7.3.7: +semver@^7.3.7: version "7.5.0" resolved "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz" integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== @@ -4124,10 +4021,10 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -sift@7.0.1: - version "7.0.1" - resolved "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz" - integrity sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g== +sift@16.0.1: + version "16.0.1" + resolved "https://registry.yarnpkg.com/sift/-/sift-16.0.1.tgz#e9c2ccc72191585008cf3e36fc447b2d2633a053" + integrity sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ== simple-concat@^1.0.0: version "1.0.1" @@ -4158,11 +4055,6 @@ slash@^3.0.0: resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -sliced@1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz" - integrity sha512-VZBmZP8WU3sMOZm1bdgTadsQbcscK0UM8oKxKVBs4XAhUo2Xxzm/OFMGBkPusxw9xL3Uy8LrzEqGqJhclsr0yA== - sonic-boom@^3.1.0: version "3.3.0" resolved "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.3.0.tgz" @@ -4251,11 +4143,6 @@ stream-combiner@^0.2.2: duplexer "~0.1.1" through "~2.3.4" -streamsearch@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz" - integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== - strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz" @@ -4268,13 +4155,6 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" @@ -4418,6 +4298,13 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" +tr46@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469" + integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw== + dependencies: + punycode "^2.3.0" + tr46@~0.0.3: version "0.0.3" resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz" @@ -4503,11 +4390,6 @@ tslib@^1.13.0, tslib@^1.8.1: resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.1: - version "2.5.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz" - integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== - tslib@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" @@ -4642,7 +4524,7 @@ utf8@3.0.0: resolved "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz" integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ== -util-deprecate@^1.0.1, util-deprecate@~1.0.1: +util-deprecate@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== @@ -4936,6 +4818,11 @@ webidl-conversions@^3.0.0: resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + websocket@^1.0.32: version "1.0.34" resolved "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz" @@ -4948,6 +4835,14 @@ websocket@^1.0.32: utf-8-validate "^5.0.2" yaeti "^0.0.6" +whatwg-url@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-13.0.0.tgz#b7b536aca48306394a34e44bda8e99f332410f8f" + integrity sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig== + dependencies: + tr46 "^4.1.1" + webidl-conversions "^7.0.0" + whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"