diff --git a/package.json b/package.json index 3f86720..41aae9e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "hapi-demo", "version": "1.0.0", + "type": "commonjs", "description": "", "private": true, "main": "index.js", @@ -18,56 +19,56 @@ "author": "", "license": "ISC", "dependencies": { - "@hapi/cookie": "^11.0.2", - "@hapi/crumb": "^8.0.1", - "@hapi/hapi": "^20.1.2", - "@hapi/hoek": "^10.0.0", - "@hapi/inert": "^6.0.3", - "@hapi/yar": "^10.1.1", - "@types/hapi__hapi": "^20.0.10", - "@types/hapi__vision": "^5.5.3", - "@types/hapi__yar": "^10.1.1", + "@hapi/cookie": "^12.0.1", + "@hapi/crumb": "^9.0.1", + "@hapi/hapi": "^21.3.2", + "@hapi/hoek": "^11.0.2", + "@hapi/inert": "^7.1.0", + "@hapi/yar": "^11.0.1", + "@types/hapi__hapi": "^20.0.13", + "@types/hapi__vision": "^5.5.4", + "@types/hapi__yar": "^10.1.2", "archiver": "^5.3.1", - "bcrypt": "^5.0.1", - "fs-extra": "^10.1.0", - "hapi-auth-jwt2": "^10.2.0", - "hapi-pino": "^11.0.1", - "hapi-sequelizejs": "4.5.0", - "hapi-swagger": "^14.2.0", - "joi": "^17.4.0", - "json-merge-patch": "^1.0.1", - "jsonwebtoken": "^8.5.1", + "bcrypt": "^5.1.0", + "fs-extra": "^11.1.1", + "hapi-auth-jwt2": "^10.4.0", + "hapi-pino": "^12.1.0", + "hapi-sequelizejs": "4.6.1", + "hapi-swagger": "^16.0.1", + "joi": "^17.9.2", + "json-merge-patch": "^1.0.2", + "jsonwebtoken": "^9.0.0", "jstransformer-markdown-it": "^3.0.0", "markdown-it": "^13.0.1", - "multiparty": "^4.2.2", - "nodemon": "^2.0.7", - "pino": "^8.11.0", - "pino-pretty": "^9.1.1", + "multiparty": "^4.2.3", + "nodemon": "^2.0.22", + "pino": "^8.14.1", + "pino-pretty": "^10.0.0", "pug": "^3.0.2", "pug-alias": "^2.0.1", - "sequelize": "^6.6.2", - "sqlite3": "^5.0.2" + "sequelize": "^6.31.1", + "sqlite3": "^5.1.6" }, "devDependencies": { - "@hapi/code": "^9.0.1", - "@hapi/lab": "^25.0.1", - "@hapi/vision": "^6.1.0", - "@types/fs-extra": "^9.0.13", - "@types/hapi__cookie": "^10.1.4", - "@types/hapi__crumb": "^7.3.3", - "@types/node": "^17.0.45", + "@hapi/code": "^9.0.3", + "@hapi/lab": "^25.1.2", + "@hapi/vision": "^7.0.1", + "@types/fs-extra": "^11.0.1", + "@types/hapi__cookie": "^12.0.2", + "@types/hapi__crumb": "^7.3.4", + "@types/node": "^20.1.4", "cross-env": "^7.0.3", - "dotenv": "^10.0.0", - "ejs": "^3.1.6", - "fast-glob": "^3.2.11", - "file-type": "^16.5.0", - "log4js": "^6.4.1", - "ts-node": "^10.0.0", - "ts-node-dev": "^1.1.6", - "tsc-alias": "^1.7.0", - "tsconfig-paths": "^3.9.0", + "dotenv": "^16.0.3", + "ejs": "^3.1.9", + "fast-glob": "^3.2.12", + "file-type": "^18.4.0", + "log4js": "^6.9.1", + "ts-node": "^10.9.1", + "ts-node-dev": "^2.0.0", + "tsc-alias": "^1.8.6", + "tsconfig-paths": "^4.2.0", "tsx": "^3.12.7", - "typescript": "^4.3.2" + "typescript": "^5.0.4" }, "pnpm": { "peerDependencyRules": { @@ -76,7 +77,7 @@ ] }, "patchedDependencies": { - "hapi-sequelizejs@4.5.0": "patches/hapi-sequelizejs@4.5.0.patch" + "hapi-sequelizejs@4.6.1": "patches/hapi-sequelizejs@4.6.1.patch" } } } diff --git a/patches/hapi-sequelizejs@4.5.0.patch b/patches/hapi-sequelizejs@4.6.1.patch similarity index 100% rename from patches/hapi-sequelizejs@4.5.0.patch rename to patches/hapi-sequelizejs@4.6.1.patch diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a899b22..91661a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,68 +1,68 @@ lockfileVersion: '6.0' patchedDependencies: - hapi-sequelizejs@4.5.0: + hapi-sequelizejs@4.6.1: hash: oh4ow3b6h2y5yebnugrlmvjif4 - path: patches/hapi-sequelizejs@4.5.0.patch + path: patches/hapi-sequelizejs@4.6.1.patch dependencies: '@hapi/cookie': - specifier: ^11.0.2 - version: 11.0.2 + specifier: ^12.0.1 + version: 12.0.1 '@hapi/crumb': - specifier: ^8.0.1 - version: 8.0.1 + specifier: ^9.0.1 + version: 9.0.1 '@hapi/hapi': - specifier: ^20.1.2 - version: 20.3.0 + specifier: ^21.3.2 + version: 21.3.2 '@hapi/hoek': - specifier: ^10.0.0 - version: 10.0.1 + specifier: ^11.0.2 + version: 11.0.2 '@hapi/inert': - specifier: ^6.0.3 - version: 6.0.5 + specifier: ^7.1.0 + version: 7.1.0 '@hapi/yar': - specifier: ^10.1.1 - version: 10.1.1 + specifier: ^11.0.1 + version: 11.0.1 '@types/hapi__hapi': - specifier: ^20.0.10 + specifier: ^20.0.13 version: 20.0.13 '@types/hapi__vision': - specifier: 5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 '@types/hapi__yar': - specifier: ^10.1.1 + specifier: ^10.1.2 version: 10.1.2 archiver: specifier: ^5.3.1 version: 5.3.1 bcrypt: - specifier: ^5.0.1 + specifier: ^5.1.0 version: 5.1.0 fs-extra: - specifier: ^10.1.0 - version: 10.1.0 + specifier: ^11.1.1 + version: 11.1.1 hapi-auth-jwt2: - specifier: ^10.2.0 + specifier: ^10.4.0 version: 10.4.0 hapi-pino: - specifier: ^11.0.1 - version: 11.0.1 + specifier: ^12.1.0 + version: 12.1.0 hapi-sequelizejs: - specifier: 4.5.0 - version: 4.5.0(patch_hash=oh4ow3b6h2y5yebnugrlmvjif4)(@hapi/hapi@20.3.0)(sequelize@6.31.1) + specifier: 4.6.1 + version: 4.6.1(patch_hash=oh4ow3b6h2y5yebnugrlmvjif4)(@hapi/hapi@21.3.2)(sequelize@6.31.1) hapi-swagger: - specifier: ^14.2.0 - version: 14.5.5(@hapi/hapi@20.3.0)(joi@17.9.2) + specifier: ^16.0.1 + version: 16.0.1(@hapi/hapi@21.3.2)(joi@17.9.2) joi: - specifier: ^17.4.0 + specifier: ^17.9.2 version: 17.9.2 json-merge-patch: - specifier: ^1.0.1 + specifier: ^1.0.2 version: 1.0.2 jsonwebtoken: - specifier: ^8.5.1 - version: 8.5.1 + specifier: ^9.0.0 + version: 9.0.0 jstransformer-markdown-it: specifier: ^3.0.0 version: 3.0.0 @@ -70,17 +70,17 @@ dependencies: specifier: ^13.0.1 version: 13.0.1 multiparty: - specifier: ^4.2.2 + specifier: ^4.2.3 version: 4.2.3 nodemon: - specifier: ^2.0.7 + specifier: ^2.0.22 version: 2.0.22 pino: - specifier: ^8.11.0 + specifier: ^8.14.1 version: 8.14.1 pino-pretty: - specifier: ^9.1.1 - version: 9.4.0 + specifier: ^10.0.0 + version: 10.0.0 pug: specifier: ^3.0.2 version: 3.0.2 @@ -88,70 +88,70 @@ dependencies: specifier: ^2.0.1 version: 2.0.1 sequelize: - specifier: ^6.6.2 + specifier: ^6.31.1 version: 6.31.1(sqlite3@5.1.6) sqlite3: - specifier: ^5.0.2 + specifier: ^5.1.6 version: 5.1.6 devDependencies: '@hapi/code': - specifier: ^9.0.1 + specifier: ^9.0.3 version: 9.0.3 '@hapi/lab': - specifier: ^25.0.1 - version: 25.1.2(@hapi/eslint-plugin@6.0.0)(typescript@4.3.2) + specifier: ^25.1.2 + version: 25.1.2(@hapi/eslint-plugin@6.0.0)(typescript@5.0.4) '@hapi/vision': - specifier: ^6.1.0 - version: 6.1.0 + specifier: ^7.0.1 + version: 7.0.1 '@types/fs-extra': - specifier: ^9.0.13 - version: 9.0.13 + specifier: ^11.0.1 + version: 11.0.1 '@types/hapi__cookie': - specifier: ^10.1.4 - version: 10.1.4 + specifier: ^12.0.2 + version: 12.0.2 '@types/hapi__crumb': - specifier: ^7.3.3 + specifier: ^7.3.4 version: 7.3.4 '@types/node': - specifier: ^17.0.45 - version: 17.0.45 + specifier: ^20.1.4 + version: 20.1.4 cross-env: specifier: ^7.0.3 version: 7.0.3 dotenv: - specifier: ^10.0.0 - version: 10.0.0 + specifier: ^16.0.3 + version: 16.0.3 ejs: - specifier: ^3.1.6 + specifier: ^3.1.9 version: 3.1.9 fast-glob: - specifier: ^3.2.11 + specifier: ^3.2.12 version: 3.2.12 file-type: - specifier: ^16.5.0 - version: 16.5.4 + specifier: ^18.4.0 + version: 18.4.0 log4js: - specifier: ^6.4.1 + specifier: ^6.9.1 version: 6.9.1 ts-node: - specifier: ^10.0.0 - version: 10.9.1(@types/node@17.0.45)(typescript@4.3.2) + specifier: ^10.9.1 + version: 10.9.1(@types/node@20.1.4)(typescript@5.0.4) ts-node-dev: - specifier: ^1.1.6 - version: 1.1.8(typescript@4.3.2) + specifier: ^2.0.0 + version: 2.0.0(@types/node@20.1.4)(typescript@5.0.4) tsc-alias: - specifier: ^1.7.0 + specifier: ^1.8.6 version: 1.8.6 tsconfig-paths: - specifier: ^3.9.0 - version: 3.14.2 + specifier: ^4.2.0 + version: 4.2.0 tsx: specifier: ^3.12.7 version: 3.12.7 typescript: - specifier: 4.3.2 - version: 4.3.2 + specifier: ^5.0.4 + version: 5.0.4 packages: @@ -670,25 +670,12 @@ packages: dev: false optional: true - /@hapi/accept@5.0.2: - resolution: {integrity: sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw==} - dependencies: - '@hapi/boom': 9.1.4 - '@hapi/hoek': 9.3.0 - dev: false - /@hapi/accept@6.0.1: resolution: {integrity: sha512-aLkYj7zzgC3CSlEVOs84eBOEE3i9xZK2tdQEP+TOj2OFzMWCi9zjkRet82V3GGjecE//zFrCLKIykuaE0uM4bg==} dependencies: '@hapi/boom': 10.0.1 '@hapi/hoek': 11.0.2 - /@hapi/ammo@5.0.1: - resolution: {integrity: sha512-FbCNwcTbnQP4VYYhLNGZmA76xb2aHg9AMPiy18NZyWMG310P5KdFGyA9v2rm5ujrIny77dEEIkMOwl0Xv+fSSA==} - dependencies: - '@hapi/hoek': 9.3.0 - dev: false - /@hapi/ammo@6.0.1: resolution: {integrity: sha512-pmL+nPod4g58kXrMcsGLp05O2jF4P2Q3GiL8qYV7nKYEh3cGf+rV4P5Jyi2Uq0agGhVU63GtaSAfBEZOlrJn9w==} dependencies: @@ -698,6 +685,7 @@ packages: resolution: {integrity: sha512-ngu0tSEmrezoiIaNGG6rRvKOUkUuDdf4XTPnONHGYfSGRmDqPZX5oJL6HAdKTo1UQHECbdB4OzhWrfgVppjHUw==} dependencies: '@hapi/hoek': 9.3.0 + dev: false /@hapi/b64@6.0.1: resolution: {integrity: sha512-ZvjX4JQReUmBheeCq+S9YavcnMMHWqx3S0jHNXWIM1kQDxB9cyfSycpVvjfrKcIS8Mh5N3hmu/YKo4Iag9g2Kw==} @@ -713,6 +701,7 @@ packages: resolution: {integrity: sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==} dependencies: '@hapi/hoek': 9.3.0 + dev: false /@hapi/bossy@6.0.1: resolution: {integrity: sha512-FDccJWwjorRgnbYfRGAweq1QU3kQqTeGJNY0SwWssMo+L2CXRylifQ9VcYOz2yO2rtB/wtMe/Cyow2t7pcBs5g==} @@ -724,12 +713,6 @@ packages: '@hapi/validate': 2.0.1 dev: true - /@hapi/bounce@2.0.0: - resolution: {integrity: sha512-JesW92uyzOOyuzJKjoLHM1ThiOvHPOLDHw01YV8yh5nCso7sDwJho1h0Ad2N+E62bZyz46TG3xhAi/78Gsct6A==} - dependencies: - '@hapi/boom': 9.1.4 - '@hapi/hoek': 9.3.0 - /@hapi/bounce@3.0.1: resolution: {integrity: sha512-G+/Pp9c1Ha4FDP+3Sy/Xwg2O4Ahaw3lIZFSX+BL4uWi64CmiETuZPxhKDUD4xBMOUZbBlzvO8HjiK8ePnhBadA==} dependencies: @@ -738,45 +721,23 @@ packages: /@hapi/bourne@2.1.0: resolution: {integrity: sha512-i1BpaNDVLJdRBEKeJWkVO6tYX6DMFBuwMhSuWqLsY4ufeTKGVuV5rBsUhxPayXqnnWHgXUAmWK16H/ykO5Wj4Q==} + dev: false /@hapi/bourne@3.0.0: resolution: {integrity: sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w==} - /@hapi/call@8.0.1: - resolution: {integrity: sha512-bOff6GTdOnoe5b8oXRV3lwkQSb/LAWylvDMae6RgEWWntd0SHtkYbQukDHKlfaYtVnSAgIavJ0kqszF/AIBb6g==} - dependencies: - '@hapi/boom': 9.1.4 - '@hapi/hoek': 9.3.0 - dev: false - /@hapi/call@9.0.1: resolution: {integrity: sha512-uPojQRqEL1GRZR4xXPqcLMujQGaEpyVPRyBlD8Pp5rqgIwLhtveF9PkixiKru2THXvuN8mUrLeet5fqxKAAMGg==} dependencies: '@hapi/boom': 10.0.1 '@hapi/hoek': 11.0.2 - /@hapi/catbox-memory@5.0.1: - resolution: {integrity: sha512-QWw9nOYJq5PlvChLWV8i6hQHJYfvdqiXdvTupJFh0eqLZ64Xir7mKNi96d5/ZMUAqXPursfNDIDxjFgoEDUqeQ==} - dependencies: - '@hapi/boom': 9.1.4 - '@hapi/hoek': 9.3.0 - dev: false - /@hapi/catbox-memory@6.0.1: resolution: {integrity: sha512-sVb+/ZxbZIvaMtJfAbdyY+QJUQg9oKTwamXpEg/5xnfG5WbJLTjvEn4kIGKz9pN3ENNbIL/bIdctmHmqi/AdGA==} dependencies: '@hapi/boom': 10.0.1 '@hapi/hoek': 11.0.2 - /@hapi/catbox@11.1.1: - resolution: {integrity: sha512-u/8HvB7dD/6X8hsZIpskSDo4yMKpHxFd7NluoylhGrL6cUfYxdQPnvUp9YU2C6F9hsyBVLGulBd9vBN1ebfXOQ==} - dependencies: - '@hapi/boom': 9.1.4 - '@hapi/hoek': 9.3.0 - '@hapi/podium': 4.1.3 - '@hapi/validate': 1.1.3 - dev: false - /@hapi/catbox@12.1.1: resolution: {integrity: sha512-hDqYB1J+R0HtZg4iPH3LEnldoaBsar6bYp0EonBmNQ9t5CO+1CqgCul2ZtFveW1ReA5SQuze9GPSU7/aecERhw==} dependencies: @@ -791,33 +752,27 @@ packages: '@hapi/hoek': 11.0.2 dev: true - /@hapi/content@5.0.2: - resolution: {integrity: sha512-mre4dl1ygd4ZyOH3tiYBrOUBzV7Pu/EOs8VLGf58vtOEECWed8Uuw6B4iR9AN/8uQt42tB04qpVaMyoMQh0oMw==} - dependencies: - '@hapi/boom': 9.1.4 - dev: false - /@hapi/content@6.0.0: resolution: {integrity: sha512-CEhs7j+H0iQffKfe5Htdak5LBOz/Qc8TRh51cF+BFv0qnuph3Em4pjGVzJMkI2gfTDdlJKWJISGWS1rK34POGA==} dependencies: '@hapi/boom': 10.0.1 - /@hapi/cookie@11.0.2: - resolution: {integrity: sha512-LRpSuHC53urzml83c5eUHSPPt7YtK1CaaPZU9KmnhZlacVVojrWJzOUIcwOADDvCZjDxowCO3zPMaOqzEm9kgg==} + /@hapi/cookie@12.0.1: + resolution: {integrity: sha512-TpykARUIgTBvgbsgtYe5CrM/7XBGms2/22JD3N6dzct6bG1vcOC6pH1JWIos1O5zvQnyDSJ2pnaFk+DToHkAng==} dependencies: - '@hapi/boom': 9.1.4 - '@hapi/bounce': 2.0.0 - '@hapi/hoek': 9.3.0 - '@hapi/validate': 1.1.3 + '@hapi/boom': 10.0.1 + '@hapi/bounce': 3.0.1 + '@hapi/hoek': 11.0.2 + '@hapi/validate': 2.0.1 dev: false - /@hapi/crumb@8.0.1: - resolution: {integrity: sha512-aUBQG7IzP6N+J7rkoMU5flzFJiNuqnrQZ8hvJ+aHGlOQ3s1BIszs2zi3QLItmvNn4+hIJCWhsMQe3D7Abxe7Jg==} + /@hapi/crumb@9.0.1: + resolution: {integrity: sha512-rEFxTHhzS6w5MBFKLq/joseo0olpDemBLDTpstevtgPySzKRo7sO1KhA4jMCG+zlyv0nkJIZRKSNOlaneLKfaQ==} dependencies: - '@hapi/boom': 9.1.4 - '@hapi/cryptiles': 5.1.0 - '@hapi/hoek': 9.3.0 - '@hapi/validate': 1.1.3 + '@hapi/boom': 10.0.1 + '@hapi/cryptiles': 6.0.1 + '@hapi/hoek': 11.0.2 + '@hapi/validate': 2.0.1 dev: false /@hapi/cryptiles@5.1.0: @@ -825,6 +780,7 @@ packages: engines: {node: '>=12.0.0'} dependencies: '@hapi/boom': 9.1.4 + dev: false /@hapi/cryptiles@6.0.1: resolution: {integrity: sha512-9GM9ECEHfR8lk5ASOKG4+4ZsEzFqLfhiryIJ2ISePVB92OHLp/yne4m+zn7z9dgvM98TLpiFebjDFQ0UHcqxXQ==} @@ -846,37 +802,9 @@ packages: '@babel/core': 7.21.8(supports-color@8.1.1) dev: true - /@hapi/file@2.0.0: - resolution: {integrity: sha512-WSrlgpvEqgPWkI18kkGELEZfXr0bYLtr16iIN4Krh9sRnzBZN6nnWxHFxtsnP684wueEySBbXPDg/WfA9xJdBQ==} - dev: false - /@hapi/file@3.0.0: resolution: {integrity: sha512-w+lKW+yRrLhJu620jT3y+5g2mHqnKfepreykvdOcl9/6up8GrQQn+l3FRTsjHTKbkbfQFkuksHpdv2EcpKcJ4Q==} - /@hapi/hapi@20.3.0: - resolution: {integrity: sha512-zvPSRvaQyF3S6Nev9aiAzko2/hIFZmNSJNcs07qdVaVAvj8dGJSV4fVUuQSnufYJAGiSau+U5LxMLhx79se5WA==} - engines: {node: '>=12.0.0'} - dependencies: - '@hapi/accept': 5.0.2 - '@hapi/ammo': 5.0.1 - '@hapi/boom': 9.1.4 - '@hapi/bounce': 2.0.0 - '@hapi/call': 8.0.1 - '@hapi/catbox': 11.1.1 - '@hapi/catbox-memory': 5.0.1 - '@hapi/heavy': 7.0.1 - '@hapi/hoek': 9.3.0 - '@hapi/mimos': 6.0.0 - '@hapi/podium': 4.1.3 - '@hapi/shot': 5.0.5 - '@hapi/somever': 3.0.1 - '@hapi/statehood': 7.0.4 - '@hapi/subtext': 7.1.0 - '@hapi/teamwork': 5.1.1 - '@hapi/topo': 5.1.0 - '@hapi/validate': 1.1.3 - dev: false - /@hapi/hapi@21.3.2: resolution: {integrity: sha512-tbm0zmsdUj8iw4NzFV30FST/W4qzh/Lsw6Q5o5gAhOuoirWvxm8a4G3o60bqBw8nXvRNJ8uLtE0RKLlZINxHcQ==} engines: {node: '>=14.15.0'} @@ -900,14 +828,6 @@ packages: '@hapi/topo': 6.0.2 '@hapi/validate': 2.0.1 - /@hapi/heavy@7.0.1: - resolution: {integrity: sha512-vJ/vzRQ13MtRzz6Qd4zRHWS3FaUc/5uivV2TIuExGTM9Qk+7Zzqj0e2G7EpE6KztO9SalTbiIkTh7qFKj/33cA==} - dependencies: - '@hapi/boom': 9.1.4 - '@hapi/hoek': 9.3.0 - '@hapi/validate': 1.1.3 - dev: false - /@hapi/heavy@8.0.1: resolution: {integrity: sha512-gBD/NANosNCOp6RsYTsjo2vhr5eYA3BEuogk6cxY0QdhllkkTaJFYtTXv46xd6qhBVMbMMqcSdtqey+UQU3//w==} dependencies: @@ -922,22 +842,18 @@ packages: /@hapi/hoek@11.0.2: resolution: {integrity: sha512-aKmlCO57XFZ26wso4rJsW4oTUnrgTFw2jh3io7CAtO9w4UltBNwRXvXIVzzyfkaaLRo3nluP/19msA8vDUUuKw==} - /@hapi/hoek@9.2.0: - resolution: {integrity: sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==} - dev: false - /@hapi/hoek@9.3.0: resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==} - /@hapi/inert@6.0.5: - resolution: {integrity: sha512-eVAdUVhJLmmXLM/Zt7u5H5Vzazs9GKe4zfPK2b97ePHEfs3g/AQkxHfYQjJqMy11hvyB7a21Z6rBEA0R//dtXw==} + /@hapi/inert@7.1.0: + resolution: {integrity: sha512-5X+cl/Ozm0U9uPGGX1dSKhnhTQIf161bH/kkTN9OBVAZKFG+nrj8j/NMj6S1zBBZWmQrkVRNPfCUGrXzB4fCFQ==} dependencies: - '@hapi/ammo': 5.0.1 - '@hapi/boom': 9.1.4 - '@hapi/bounce': 2.0.0 - '@hapi/hoek': 9.3.0 - '@hapi/validate': 1.1.3 - lru-cache: 6.0.0 + '@hapi/ammo': 6.0.1 + '@hapi/boom': 10.0.1 + '@hapi/bounce': 3.0.1 + '@hapi/hoek': 11.0.2 + '@hapi/validate': 2.0.1 + lru-cache: 7.18.3 dev: false /@hapi/iron@6.0.0: @@ -948,6 +864,7 @@ packages: '@hapi/bourne': 2.1.0 '@hapi/cryptiles': 5.1.0 '@hapi/hoek': 9.3.0 + dev: false /@hapi/iron@7.0.1: resolution: {integrity: sha512-tEZnrOujKpS6jLKliyWBl3A9PaE+ppuL/+gkbyPPDb/l2KSKQyH4lhMkVb+sBhwN+qaxxlig01JRqB8dk/mPxQ==} @@ -958,7 +875,7 @@ packages: '@hapi/cryptiles': 6.0.1 '@hapi/hoek': 11.0.2 - /@hapi/lab@25.1.2(@hapi/eslint-plugin@6.0.0)(typescript@4.3.2): + /@hapi/lab@25.1.2(@hapi/eslint-plugin@6.0.0)(typescript@5.0.4): resolution: {integrity: sha512-HAlU2TbhGas5q/T2WZhWvTgM1fKwdZiJOy/TOwvdpc16hjEGnPMQJjpB7iwoq9NCjCDpgNnkpXyj8qjCLWf83A==} hasBin: true peerDependencies: @@ -983,31 +900,16 @@ packages: source-map: 0.7.4 source-map-support: 0.5.21 supports-color: 8.1.1 - typescript: 4.3.2 + typescript: 5.0.4 will-call: 1.0.1 dev: true - /@hapi/mimos@6.0.0: - resolution: {integrity: sha512-Op/67tr1I+JafN3R3XN5DucVSxKRT/Tc+tUszDwENoNpolxeXkhrJ2Czt6B6AAqrespHoivhgZBWYSuANN9QXg==} - dependencies: - '@hapi/hoek': 9.3.0 - mime-db: 1.52.0 - dev: false - /@hapi/mimos@7.0.1: resolution: {integrity: sha512-b79V+BrG0gJ9zcRx1VGcCI6r6GEzzZUgiGEJVoq5gwzuB2Ig9Cax8dUuBauQCFKvl2YWSWyOc8mZ8HDaJOtkew==} dependencies: '@hapi/hoek': 11.0.2 mime-db: 1.52.0 - /@hapi/nigel@4.0.2: - resolution: {integrity: sha512-ht2KoEsDW22BxQOEkLEJaqfpoKPXxi7tvabXy7B/77eFtOyG5ZEstfZwxHQcqAiZhp58Ae5vkhEqI03kawkYNw==} - engines: {node: '>=12.0.0'} - dependencies: - '@hapi/hoek': 9.3.0 - '@hapi/vise': 4.0.0 - dev: false - /@hapi/nigel@5.0.1: resolution: {integrity: sha512-uv3dtYuB4IsNaha+tigWmN8mQw/O9Qzl5U26Gm4ZcJVtDdB1AVJOwX3X5wOX+A07qzpEZnOMBAm8jjSqGsU6Nw==} engines: {node: '>=14.0.0'} @@ -1015,16 +917,6 @@ packages: '@hapi/hoek': 11.0.2 '@hapi/vise': 5.0.1 - /@hapi/pez@5.1.0: - resolution: {integrity: sha512-YfB0btnkLB3lb6Ry/1KifnMPBm5ZPfaAHWFskzOMAgDgXgcBgA+zjpIynyEiBfWEz22DBT8o1e2tAaBdlt8zbw==} - dependencies: - '@hapi/b64': 5.0.0 - '@hapi/boom': 9.1.4 - '@hapi/content': 5.0.2 - '@hapi/hoek': 9.3.0 - '@hapi/nigel': 4.0.2 - dev: false - /@hapi/pez@6.1.0: resolution: {integrity: sha512-+FE3sFPYuXCpuVeHQ/Qag1b45clR2o54QoonE/gKHv9gukxQ8oJJZPR7o3/ydDTK6racnCJXxOyT1T93FCJMIg==} dependencies: @@ -1040,6 +932,7 @@ packages: '@hapi/hoek': 9.3.0 '@hapi/teamwork': 5.1.1 '@hapi/validate': 1.1.3 + dev: false /@hapi/podium@5.0.1: resolution: {integrity: sha512-eznFTw6rdBhAijXFIlBOMJJd+lXTvqbrBIS4Iu80r2KTVIo4g+7fLy4NKp/8+UnSt5Ox6mJtAlKBU/Sf5080TQ==} @@ -1048,44 +941,18 @@ packages: '@hapi/teamwork': 6.0.0 '@hapi/validate': 2.0.1 - /@hapi/shot@5.0.5: - resolution: {integrity: sha512-x5AMSZ5+j+Paa8KdfCoKh+klB78otxF+vcJR/IoN91Vo2e5ulXIW6HUsFTCU+4W6P/Etaip9nmdAx2zWDimB2A==} - dependencies: - '@hapi/hoek': 9.3.0 - '@hapi/validate': 1.1.3 - dev: false - /@hapi/shot@6.0.1: resolution: {integrity: sha512-s5ynMKZXYoDd3dqPw5YTvOR/vjHvMTxc388+0qL0jZZP1+uwXuUD32o9DuuuLsmTlyXCWi02BJl1pBpwRuUrNA==} dependencies: '@hapi/hoek': 11.0.2 '@hapi/validate': 2.0.1 - /@hapi/somever@3.0.1: - resolution: {integrity: sha512-4ZTSN3YAHtgpY/M4GOtHUXgi6uZtG9nEZfNI6QrArhK0XN/RDVgijlb9kOmXwCR5VclDSkBul9FBvhSuKXx9+w==} - dependencies: - '@hapi/bounce': 2.0.0 - '@hapi/hoek': 9.3.0 - dev: false - /@hapi/somever@4.1.1: resolution: {integrity: sha512-lt3QQiDDOVRatS0ionFDNrDIv4eXz58IibQaZQDOg4DqqdNme8oa0iPWcE0+hkq/KTeBCPtEOjDOBKBKwDumVg==} dependencies: '@hapi/bounce': 3.0.1 '@hapi/hoek': 11.0.2 - /@hapi/statehood@7.0.4: - resolution: {integrity: sha512-Fia6atroOVmc5+2bNOxF6Zv9vpbNAjEXNcUbWXavDqhnJDlchwUUwKS5LCi5mGtCTxRhUKKHwuxuBZJkmLZ7fw==} - dependencies: - '@hapi/boom': 9.1.4 - '@hapi/bounce': 2.0.0 - '@hapi/bourne': 2.1.0 - '@hapi/cryptiles': 5.1.0 - '@hapi/hoek': 9.3.0 - '@hapi/iron': 6.0.0 - '@hapi/validate': 1.1.3 - dev: false - /@hapi/statehood@8.1.1: resolution: {integrity: sha512-YbK7PSVUA59NArAW5Np0tKRoIZ5VNYUicOk7uJmWZF6XyH5gGL+k62w77SIJb0AoAJ0QdGQMCQ/WOGL1S3Ydow==} dependencies: @@ -1097,18 +964,6 @@ packages: '@hapi/iron': 7.0.1 '@hapi/validate': 2.0.1 - /@hapi/subtext@7.1.0: - resolution: {integrity: sha512-n94cU6hlvsNRIpXaROzBNEJGwxC+HA69q769pChzej84On8vsU14guHDub7Pphr/pqn5b93zV3IkMPDU5AUiXA==} - dependencies: - '@hapi/boom': 9.1.4 - '@hapi/bourne': 2.1.0 - '@hapi/content': 5.0.2 - '@hapi/file': 2.0.0 - '@hapi/hoek': 9.3.0 - '@hapi/pez': 5.1.0 - '@hapi/wreck': 17.2.0 - dev: false - /@hapi/subtext@8.1.0: resolution: {integrity: sha512-PyaN4oSMtqPjjVxLny1k0iYg4+fwGusIhaom9B2StinBclHs7v46mIW706Y+Wo21lcgulGyXbQrmT/w4dus6ww==} dependencies: @@ -1123,6 +978,7 @@ packages: /@hapi/teamwork@5.1.1: resolution: {integrity: sha512-1oPx9AE5TIv+V6Ih54RP9lTZBso3rP8j4Xhb6iSVwPXtAM+sDopl5TFMv5Paw73UnpZJ9gjcrTE1BXrWt9eQrg==} engines: {node: '>=12.0.0'} + dev: false /@hapi/teamwork@6.0.0: resolution: {integrity: sha512-05HumSy3LWfXpmJ9cr6HzwhAavrHkJ1ZRCmNE2qJMihdM5YcWreWPfyN0yKT2ZjCM92au3ZkuodjBxOibxM67A==} @@ -1143,6 +999,7 @@ packages: dependencies: '@hapi/hoek': 9.3.0 '@hapi/topo': 5.1.0 + dev: false /@hapi/validate@2.0.1: resolution: {integrity: sha512-NZmXRnrSLK8MQ9y/CMqE9WSspgB9xA41/LlYR0k967aSZebWr4yNrpxIbov12ICwKy4APSlWXZga9jN5p6puPA==} @@ -1150,34 +1007,20 @@ packages: '@hapi/hoek': 11.0.2 '@hapi/topo': 6.0.2 - /@hapi/vise@4.0.0: - resolution: {integrity: sha512-eYyLkuUiFZTer59h+SGy7hUm+qE9p+UemePTHLlIWppEd+wExn3Df5jO04bFQTm7nleF5V8CtuYQYb+VFpZ6Sg==} - dependencies: - '@hapi/hoek': 9.3.0 - dev: false - /@hapi/vise@5.0.1: resolution: {integrity: sha512-XZYWzzRtINQLedPYlIkSkUr7m5Ddwlu99V9elh8CSygXstfv3UnWIXT0QD+wmR0VAG34d2Vx3olqcEhRRoTu9A==} dependencies: '@hapi/hoek': 11.0.2 - /@hapi/vision@6.1.0: - resolution: {integrity: sha512-ll0zJ13xDxCYIWvC1aq/8srK0bTXfqZYGT+YoTi/fS42gYYJ3dnvmS35r8T8XXtJ6F6cmya8G2cRlMR/z11LQw==} + /@hapi/vision@7.0.1: + resolution: {integrity: sha512-SXlwdeantb8Qa3xUG+Ca9pEl3bbS5utZfGez2xFhsYpz3BZH0+dgnZP16/S8KpYQCVTglq1j0Lup6Y7DHK5fXg==} dependencies: - '@hapi/boom': 9.1.4 - '@hapi/bounce': 2.0.0 - '@hapi/hoek': 9.3.0 - '@hapi/validate': 1.1.3 + '@hapi/boom': 10.0.1 + '@hapi/bounce': 3.0.1 + '@hapi/hoek': 11.0.2 + '@hapi/validate': 2.0.1 dev: true - /@hapi/wreck@17.2.0: - resolution: {integrity: sha512-pJ5kjYoRPYDv+eIuiLQqhGon341fr2bNIYZjuotuPJG/3Ilzr/XtI+JAp0A86E2bYfsS3zBPABuS2ICkaXFT8g==} - dependencies: - '@hapi/boom': 9.1.4 - '@hapi/bourne': 2.1.0 - '@hapi/hoek': 9.3.0 - dev: false - /@hapi/wreck@18.0.1: resolution: {integrity: sha512-OLHER70+rZxvDl75xq3xXOfd3e8XIvz8fWY0dqg92UvhZ29zo24vQgfqgHSYhB5ZiuFpSLeriOisAlxAo/1jWg==} dependencies: @@ -1185,12 +1028,11 @@ packages: '@hapi/bourne': 3.0.0 '@hapi/hoek': 11.0.2 - /@hapi/yar@10.1.1: - resolution: {integrity: sha512-FUI+cnCIMAws9mhLzITo12cdnLUWSWVPmSnh1ILaROjUCm1uA88DOGIZORUfHBf/+NMI10V2d+nyV2PZtKVd7g==} + /@hapi/yar@11.0.1: + resolution: {integrity: sha512-mC+jjn/VD7+hlT4lnHPXJDdwWFAjfeyFp11AlBRmAJYwy1WaboapgakoL9LE6kbPaerva2MJ6I8N2YlYlEfA5Q==} dependencies: - '@hapi/hoek': 9.3.0 - '@hapi/statehood': 7.0.4 - uuid: 8.3.2 + '@hapi/hoek': 11.0.2 + '@hapi/statehood': 8.1.1 dev: false /@humanwhocodes/config-array@0.11.8(supports-color@8.1.1): @@ -1369,19 +1211,21 @@ packages: '@types/ms': 0.7.31 dev: false - /@types/fs-extra@9.0.13: - resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} + /@types/fs-extra@11.0.1: + resolution: {integrity: sha512-MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA==} dependencies: - '@types/node': 17.0.45 + '@types/jsonfile': 6.1.1 + '@types/node': 20.1.4 dev: true /@types/hapi__catbox@10.2.4: resolution: {integrity: sha512-A6ivRrXD5glmnJna1UAGw87QNZRp/vdFO9U4GS+WhOMWzHnw+oTGkMvg0g6y1930CbeheGOCm7A1qHsqH7AXqg==} + dev: false - /@types/hapi__cookie@10.1.4: - resolution: {integrity: sha512-CESd2IRnTYAnr+gxHGTXIuLOvi5+M2dw4aG6efP+K6bVTdE385Cu63k/DNLO6iQX0hoXtxCYUKy1QyQEy/Xg5A==} + /@types/hapi__cookie@12.0.2: + resolution: {integrity: sha512-PgLSIGXcM73SgrKQcwgM1Hej9fN46nzkzweZmNsX645pgRmjXvMGonKSQxNRN8uniLJggj2WXsqluNx3CtaUlg==} dependencies: - '@types/hapi__hapi': 20.0.13 + '@hapi/hapi': 21.3.2 joi: 17.9.2 dev: true @@ -1401,24 +1245,28 @@ packages: '@types/hapi__catbox': 10.2.4 '@types/hapi__mimos': 4.1.4 '@types/hapi__shot': 4.1.2 - '@types/node': 17.0.45 + '@types/node': 20.1.4 joi: 17.9.2 + dev: false /@types/hapi__mimos@4.1.4: resolution: {integrity: sha512-i9hvJpFYTT/qzB5xKWvDYaSXrIiNqi4ephi+5Lo6+DoQdwqPXQgmVVOZR+s3MBiHoFqsCZCX9TmVWG3HczmTEQ==} dependencies: '@types/mime-db': 1.43.1 + dev: false /@types/hapi__shot@4.1.2: resolution: {integrity: sha512-8wWgLVP1TeGqgzZtCdt+F+k15DWQvLG1Yv6ZzPfb3D5WIo5/S+GGKtJBVo2uNEcqabP5Ifc71QnJTDnTmw1axA==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.1.4 + dev: false - /@types/hapi__vision@5.5.3: - resolution: {integrity: sha512-R4+r9345+5LCM8/0OQ1J8UVVPwnOwMdUVtPrtJE4oNbZ31+rLSy/bLoGpuZJwjROeC006YXbibnRF1hcVQFjGA==} + /@types/hapi__vision@5.5.4: + resolution: {integrity: sha512-izom5NELHvOa9aCOKiyqp60NXQltFyA0ytMCsprexrls7wXoJMzEDWcAoF1oqsCYnrXMPpsGi8sToTO4hwubBg==} dependencies: - '@types/hapi__hapi': 20.0.13 + '@hapi/hapi': 21.3.2 handlebars: 4.7.7 + joi: 17.9.2 dev: false /@types/hapi__yar@10.1.2: @@ -1433,19 +1281,22 @@ packages: resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} dev: false - /@types/json5@0.0.29: - resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} + /@types/jsonfile@6.1.1: + resolution: {integrity: sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==} + dependencies: + '@types/node': 20.1.4 dev: true /@types/mime-db@1.43.1: resolution: {integrity: sha512-kGZJY+R+WnR5Rk+RPHUMERtb2qBRViIHCBdtUrY+NmwuGb8pQdfTqQiCKPrxpdoycl8KWm2DLdkpoSdt479XoQ==} + dev: false /@types/ms@0.7.31: resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==} dev: false - /@types/node@17.0.45: - resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} + /@types/node@20.1.4: + resolution: {integrity: sha512-At4pvmIOki8yuwLtd7BNHl3CiWNbtclUbNtScGx4OHfBd4/oWoJC8KRCIxXwkdndzhxOsPXihrsOoydxBjlE9Q==} /@types/strip-bom@3.0.0: resolution: {integrity: sha512-xevGOReSYGM7g/kUBZzPqCrR/KYAo+F0yiPc85WFTJa0MSLtyFTVTU6cJu/aV4mid7IffDIWqo69THF2o4JiEQ==} @@ -2025,9 +1876,9 @@ packages: resolution: {integrity: sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==} dev: false - /dotenv@10.0.0: - resolution: {integrity: sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==} - engines: {node: '>=10'} + /dotenv@16.0.3: + resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==} + engines: {node: '>=12'} dev: true /dottie@2.0.3: @@ -2314,13 +2165,13 @@ packages: flat-cache: 3.0.4 dev: true - /file-type@16.5.4: - resolution: {integrity: sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==} - engines: {node: '>=10'} + /file-type@18.4.0: + resolution: {integrity: sha512-o6MQrZKTAK6WpvmQk3jqTVUmqxYBxW5bloUfrdH1ZnRFDvvAPNr+l+rgOxM3nkqWT+3khaj3FRMDydWe0xhu+w==} + engines: {node: '>=14.16'} dependencies: readable-web-to-node-stream: 3.0.2 - strtok3: 6.3.0 - token-types: 4.2.1 + strtok3: 7.0.0 + token-types: 5.0.1 dev: true /filelist@1.0.4: @@ -2374,9 +2225,9 @@ packages: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} dev: false - /fs-extra@10.1.0: - resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} - engines: {node: '>=12'} + /fs-extra@11.1.1: + resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==} + engines: {node: '>=14.14'} dependencies: graceful-fs: 4.2.11 jsonfile: 6.1.0 @@ -2477,8 +2328,8 @@ packages: is-glob: 4.0.3 dev: true - /glob@7.1.7: - resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==} + /glob@7.2.3: + resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 @@ -2486,17 +2337,17 @@ packages: minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 - dev: false - /glob@7.2.3: - resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} + /glob@8.0.3: + resolution: {integrity: sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==} + engines: {node: '>=12'} dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.1.2 + minimatch: 5.1.6 once: 1.4.0 - path-is-absolute: 1.0.1 + dev: false /glob@8.1.0: resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} @@ -2561,41 +2412,40 @@ packages: jsonwebtoken: 9.0.0 dev: false - /hapi-pino@11.0.1: - resolution: {integrity: sha512-H09Cwh9pjpGJOBopswqszX5K5pygOke+5Wo25TCjG1MqTqDy7zzwFKkVHrY8IhsTdy99lewxBrOWsCMrcN8zPg==} + /hapi-pino@12.1.0: + resolution: {integrity: sha512-qPfigyVQjPM1cfGZuF/rSo82hS/s02Dtvvq0RvKFKBlJoilxCvx5zBLOI29odeKsft1h+lj6yOWIKT9Vz7M54g==} dependencies: - '@hapi/hoek': 10.0.1 - '@types/hapi__hapi': 20.0.13 + '@hapi/hoek': 11.0.2 abstract-logging: 2.0.1 get-caller-file: 2.0.5 pino: 8.14.1 dev: false - /hapi-sequelizejs@4.5.0(patch_hash=oh4ow3b6h2y5yebnugrlmvjif4)(@hapi/hapi@20.3.0)(sequelize@6.31.1): - resolution: {integrity: sha512-+A2Qgu2lIM8kz7PDxbDtmhGJbnobRPdOEMkmc7NvhElZr5AIkbhoYcV/dmqI70tw671zvRjS9A255igShyigow==} + /hapi-sequelizejs@4.6.1(patch_hash=oh4ow3b6h2y5yebnugrlmvjif4)(@hapi/hapi@21.3.2)(sequelize@6.31.1): + resolution: {integrity: sha512-lMQJSO5UNVr3qc1FYJYXUqbdTCKV9h5OGcOQ5au5u6CWWFpks2wpA90EknNW9lL2+dmYcsV1sSl/tscngM215g==} engines: {node: '>=12.0.0', npm: '>=5.6.0'} peerDependencies: - '@hapi/hapi': 19.x || 20.x + '@hapi/hapi': 19.x || 20.x || 21.x sequelize: 5.x || 6.x dependencies: - '@hapi/hapi': 20.3.0 - '@hapi/hoek': 9.2.0 - glob: 7.1.7 + '@hapi/hapi': 21.3.2 + '@hapi/hoek': 10.0.1 + glob: 8.0.3 joi: 17.9.2 sequelize: 6.31.1(sqlite3@5.1.6) dev: false patched: true - /hapi-swagger@14.5.5(@hapi/hapi@20.3.0)(joi@17.9.2): - resolution: {integrity: sha512-qhqmr48+CZrhHDwhg0bHuQ3EW1VWnP71fG8gg5FPAEjF5iIHxIVtRZvioN3dPcBEuk/EqiLoPj/x3va51TbEEA==} - engines: {node: '>=12.0.0'} + /hapi-swagger@16.0.1(@hapi/hapi@21.3.2)(joi@17.9.2): + resolution: {integrity: sha512-G07CZ7t6ytZt7Om0sTvpwxvuoLb260dlBdHjxwilsX7WboBAItdm4xXTkfJoe/KpjXatyqVVT5uVckBrhvFY6g==} + engines: {node: '>=14.0.0'} peerDependencies: - '@hapi/hapi': ^20.2.2 + '@hapi/hapi': '>=20.x.x' joi: 17.x dependencies: - '@hapi/boom': 9.1.4 - '@hapi/hapi': 20.3.0 - '@hapi/hoek': 9.3.0 + '@hapi/boom': 10.0.1 + '@hapi/hapi': 21.3.2 + '@hapi/hoek': 10.0.1 handlebars: 4.7.7 http-status: 1.6.2 joi: 17.9.2 @@ -2901,13 +2751,6 @@ packages: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} dev: true - /json5@1.0.2: - resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==} - hasBin: true - dependencies: - minimist: 1.2.8 - dev: true - /json5@2.2.3: resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} engines: {node: '>=6'} @@ -2928,22 +2771,6 @@ packages: graceful-fs: 4.2.11 dev: false - /jsonwebtoken@8.5.1: - resolution: {integrity: sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==} - engines: {node: '>=4', npm: '>=1.4.28'} - dependencies: - jws: 3.2.2 - lodash.includes: 4.3.0 - lodash.isboolean: 3.0.3 - lodash.isinteger: 4.0.4 - lodash.isnumber: 3.0.3 - lodash.isplainobject: 4.0.6 - lodash.isstring: 4.0.1 - lodash.once: 4.1.1 - ms: 2.1.3 - semver: 5.7.1 - dev: false - /jsonwebtoken@9.0.0: resolution: {integrity: sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==} engines: {node: '>=12', npm: '>=6'} @@ -3035,42 +2862,18 @@ packages: resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==} dev: false - /lodash.includes@4.3.0: - resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==} - dev: false - - /lodash.isboolean@3.0.3: - resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==} - dev: false - /lodash.isequal@4.5.0: resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==} dev: false - /lodash.isinteger@4.0.4: - resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==} - dev: false - - /lodash.isnumber@3.0.3: - resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==} - dev: false - /lodash.isplainobject@4.0.6: resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==} dev: false - /lodash.isstring@4.0.1: - resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==} - dev: false - /lodash.merge@4.6.2: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} dev: true - /lodash.once@4.1.1: - resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==} - dev: false - /lodash.union@4.6.0: resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==} dev: false @@ -3105,6 +2908,11 @@ packages: yallist: 4.0.0 dev: false + /lru-cache@7.18.3: + resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==} + engines: {node: '>=12'} + dev: false + /make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} @@ -3517,9 +3325,9 @@ packages: engines: {node: '>=8'} dev: true - /peek-readable@4.1.0: - resolution: {integrity: sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==} - engines: {node: '>=8'} + /peek-readable@5.0.0: + resolution: {integrity: sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==} + engines: {node: '>=14.16'} dev: true /pg-connection-string@2.5.0: @@ -3541,8 +3349,8 @@ packages: split2: 4.2.0 dev: false - /pino-pretty@9.4.0: - resolution: {integrity: sha512-NIudkNLxnl7MGj1XkvsqVyRgo6meFP82ECXF2PlOI+9ghmbGuBUUqKJ7IZPIxpJw4vhhSva0IuiDSAuGh6TV9g==} + /pino-pretty@10.0.0: + resolution: {integrity: sha512-zKFjYXBzLaLTEAN1ayKpHXtL5UeRQC7R3lvhKe7fWs7hIVEjKGG/qIXwQt9HmeUp71ogUd/YcW+LmMwRp4KT6Q==} hasBin: true dependencies: colorette: 2.0.20 @@ -4166,12 +3974,12 @@ packages: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} - /strtok3@6.3.0: - resolution: {integrity: sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==} - engines: {node: '>=10'} + /strtok3@7.0.0: + resolution: {integrity: sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==} + engines: {node: '>=14.16'} dependencies: '@tokenizer/token': 0.3.0 - peek-readable: 4.1.0 + peek-readable: 5.0.0 dev: true /supports-color@5.5.0: @@ -4262,9 +4070,9 @@ packages: resolution: {integrity: sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==} dev: false - /token-types@4.2.1: - resolution: {integrity: sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==} - engines: {node: '>=10'} + /token-types@5.0.1: + resolution: {integrity: sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==} + engines: {node: '>=14.16'} dependencies: '@tokenizer/token': 0.3.0 ieee754: 1.2.1 @@ -4290,8 +4098,8 @@ packages: hasBin: true dev: true - /ts-node-dev@1.1.8(typescript@4.3.2): - resolution: {integrity: sha512-Q/m3vEwzYwLZKmV6/0VlFxcZzVV/xcgOt+Tx/VjaaRHyiBcFlV0541yrT09QjzzCxlDZ34OzKjrFAynlmtflEg==} + /ts-node-dev@2.0.0(@types/node@20.1.4)(typescript@5.0.4): + resolution: {integrity: sha512-ywMrhCfH6M75yftYvrvNarLEY+SUXtUvU8/0Z6llrHQVBx12GiFk5sStF8UdfE/yfzk9IAq7O5EEbTQsxlBI8w==} engines: {node: '>=0.8.0'} hasBin: true peerDependencies: @@ -4309,12 +4117,16 @@ packages: rimraf: 2.7.1 source-map-support: 0.5.21 tree-kill: 1.2.2 - ts-node: 9.1.1(typescript@4.3.2) + ts-node: 10.9.1(@types/node@20.1.4)(typescript@5.0.4) tsconfig: 7.0.0 - typescript: 4.3.2 + typescript: 5.0.4 + transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - '@types/node' dev: true - /ts-node@10.9.1(@types/node@17.0.45)(typescript@4.3.2): + /ts-node@10.9.1(@types/node@20.1.4)(typescript@5.0.4): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -4333,34 +4145,18 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 17.0.45 + '@types/node': 20.1.4 acorn: 8.8.2 acorn-walk: 8.2.0 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 4.3.2 + typescript: 5.0.4 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true - /ts-node@9.1.1(typescript@4.3.2): - resolution: {integrity: sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==} - engines: {node: '>=10.0.0'} - hasBin: true - peerDependencies: - typescript: '>=2.7' - dependencies: - arg: 4.1.3 - create-require: 1.1.1 - diff: 4.0.2 - make-error: 1.3.6 - source-map-support: 0.5.21 - typescript: 4.3.2 - yn: 3.1.1 - dev: true - /tsc-alias@1.8.6: resolution: {integrity: sha512-vq+i6VpE83IeMsSJVcFN03ZBofADhr8/gIJXjxpbnTRfN/MFXy0+SBaKG2o7p95QqXBGkeG98HYz3IkOOveFbg==} hasBin: true @@ -4373,11 +4169,11 @@ packages: plimit-lit: 1.5.0 dev: true - /tsconfig-paths@3.14.2: - resolution: {integrity: sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==} + /tsconfig-paths@4.2.0: + resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==} + engines: {node: '>=6'} dependencies: - '@types/json5': 0.0.29 - json5: 1.0.2 + json5: 2.2.3 minimist: 1.2.8 strip-bom: 3.0.0 dev: true @@ -4414,9 +4210,9 @@ packages: engines: {node: '>=10'} dev: true - /typescript@4.3.2: - resolution: {integrity: sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==} - engines: {node: '>=4.2.0'} + /typescript@5.0.4: + resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==} + engines: {node: '>=12.20'} hasBin: true dev: true @@ -4546,7 +4342,7 @@ packages: /wkx@0.5.0: resolution: {integrity: sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.1.4 dev: false /word-wrap@1.2.3: diff --git a/source/auth/index.ts b/source/auth/index.ts index 6897a5c..5bcd30f 100644 --- a/source/auth/index.ts +++ b/source/auth/index.ts @@ -20,12 +20,12 @@ export async function validateSession(request: Req, session) { const result = await User.findOne({ where: { id: session.id } }) if (result == null) { loggerSite.debug(`${"cooike中存储的用户不存在"}`) - return { valid: false } + return { isValid: false } } loggerSite.debug(`${"当前登录ID:" + session.id}`) - return { valid: true, credentials: result } + return { isValid: true, credentials: result } } else { loggerSite.debug(`${"用户未登录兵器cooike中不存在信息"}`) - return { valid: false } + return { isValid: false } } } diff --git a/source/db/data.db b/source/db/data.db index 01d5138..1d2d798 100644 Binary files a/source/db/data.db and b/source/db/data.db differ diff --git a/source/models/user.ts b/source/models/user.ts index f1049fe..d34ccf5 100644 --- a/source/models/user.ts +++ b/source/models/user.ts @@ -10,8 +10,8 @@ interface UserAttributes { deleted_at?: Date } -export interface UserInput extends Optional {} -export interface UserOutput extends Required {} +export interface UserInput extends Optional { } +export interface UserOutput extends Required { } export type TUserModel = ReturnType type DT = typeof DataTypes diff --git a/source/models/user_info.ts b/source/models/user_info.ts index 48288a8..753945d 100644 --- a/source/models/user_info.ts +++ b/source/models/user_info.ts @@ -42,7 +42,6 @@ export default function UserInfoModel(sequelize: Sequelize, DataTypes: DT) { user_id: { type: DataTypes.INTEGER, allowNull: false, - onDelete: "CASCADE", references: { model: "user", key: 'id', @@ -79,7 +78,7 @@ export default function UserInfoModel(sequelize: Sequelize, DataTypes: DT) { } UserInfo.associate = function (models) { // User删除时对应的UserInfo同步删除 - models["user_info"].belongsTo(models["user"], { foreignKey: "user_id" }) + models["user_info"].belongsTo(models["user"], { foreignKey: "user_id", onDelete: "CASCADE", hooks: true }) } return UserInfo } diff --git a/source/run.ts b/source/run.ts index 3f6ff2a..1e884c6 100644 --- a/source/run.ts +++ b/source/run.ts @@ -23,7 +23,7 @@ const run = async (): Promise => { }) await server.register([ { - plugin: require("hapi-sequelizejs"), + plugin: require('hapi-sequelizejs'), options: [ { name: "data", // identifier @@ -63,7 +63,7 @@ const run = async (): Promise => { return "/login" }, appendNext: true, - validateFunc: validateSession, + validate: validateSession, }) server.auth.default("session") //===== session ===== End diff --git a/template/ui/header.pug b/template/ui/header.pug index 5ac78f2..fa7a136 100644 --- a/template/ui/header.pug +++ b/template/ui/header.pug @@ -34,7 +34,7 @@ nav.is-fixed-top.navbar(role='navigation', aria-label='main navigation', style=" else .navbar-item.has-dropdown.is-hoverable a.navbar-link - div #{user.nickname} + div #{user.username} .navbar-dropdown.is-right a.navbar-item(hx-get="/user?htmx" hx-push-url="/user" hx-trigger="click" hx-target="#single-page" hx-swap="innerHTML") | 用户资料