From 5a04e686e9ef41b0af50ce564a38d6187253c76d Mon Sep 17 00:00:00 2001 From: Alex Layton Date: Wed, 27 Apr 2022 13:53:47 -0400 Subject: [PATCH] Fix build --- oada/.yarnrc.yml | 16 +- oada/libs/lib-arangodb/package.json | 4 +- oada/libs/lib-kafka/package.json | 2 +- oada/libs/pino-debug/package.json | 2 +- oada/package.json | 4 +- oada/services/auth/package.json | 4 +- oada/services/auth/src/dynReg.ts | 15 +- oada/services/auth/src/types.d.ts | 21 -- oada/services/http-handler/package.json | 17 +- oada/services/http-handler/src/resources.ts | 2 +- oada/services/http-handler/src/server.ts | 21 +- oada/services/http-handler/src/websockets.ts | 2 +- .../services/permissions-handler/package.json | 2 +- oada/services/rev-graph-update/package.json | 3 +- oada/services/startup/package.json | 2 +- oada/services/sync-handler/package.json | 6 +- oada/services/webhooks/package.json | 2 +- oada/services/well-known/package.json | 2 +- oada/services/write-handler/package.json | 2 +- oada/yarn.lock | 303 +++++++++--------- 20 files changed, 203 insertions(+), 229 deletions(-) diff --git a/oada/.yarnrc.yml b/oada/.yarnrc.yml index 76f12a06..ff1886df 100644 --- a/oada/.yarnrc.yml +++ b/oada/.yarnrc.yml @@ -8,30 +8,30 @@ packageExtensions: peerDependenciesMeta: ejs: optional: true - fastify-accepts@*: + "@fastify/accepts@*": dependencies: "@types/accepts": "*" peerDependencies: fastify: "*" - fastify-bearer-auth@*: + "@fastify/bearer-auth@*": peerDependencies: fastify: "*" - fastify-cors@*: + "@fastify/cors@*": peerDependencies: fastify: "*" - fastify-graceful-shutdown@*: + "fastify-graceful-shutdown@*": peerDependencies: fastify: "*" - fastify-healthcheck@*: + "fastify-healthcheck@*": peerDependencies: fastify: "*" - fastify-helmet@*: + "@fastify/helmet@*": peerDependencies: fastify: "*" - fastify-sensible@*: + "@fastify/sensible@*": peerDependencies: fastify: "*" - fastify-websocket@*: + "@fastify/websocket@*": peerDependencies: "@types/ws": "*" fastify: "*" diff --git a/oada/libs/lib-arangodb/package.json b/oada/libs/lib-arangodb/package.json index 7789769e..598d42e6 100644 --- a/oada/libs/lib-arangodb/package.json +++ b/oada/libs/lib-arangodb/package.json @@ -52,7 +52,6 @@ "@oada/types": "^2.0.1", "arangojs": "^7.7.0", "bcryptjs": "^2.4.3", - "bluebird": "^3.7.2", "clone-deep": "^4.0.1", "debug": "^4.3.4", "deep-equal": "^2.0.5", @@ -63,14 +62,13 @@ "devDependencies": { "@ava/typescript": "^3.0.1", "@types/bcryptjs": "^2.4.2", - "@types/bluebird": "^3.5.36", "@types/clone-deep": "^4.0.1", "@types/convict": "^6.1.1", "@types/debug": "^4.1.7", "@types/deep-equal": "^1.0.1", "@types/flat": "^5.0.2", "@types/json-pointer": "^1.0.31", - "@types/node": "^16.11.30", + "@types/node": "^16.11.31", "ava": "4.0.0-rc.1", "type-fest": "^2.12.2" } diff --git a/oada/libs/lib-kafka/package.json b/oada/libs/lib-kafka/package.json index b1893dd6..c5e702e5 100644 --- a/oada/libs/lib-kafka/package.json +++ b/oada/libs/lib-kafka/package.json @@ -43,7 +43,7 @@ "@types/bluebird": "^3.5.36", "@types/convict": "^6.1.1", "@types/debug": "^4.1.7", - "@types/node": "16.11.30", + "@types/node": "^16.11.31", "@types/uuid": "^8.3.4", "ava": "4.0.0-rc.1" } diff --git a/oada/libs/pino-debug/package.json b/oada/libs/pino-debug/package.json index 0d610799..40ad724a 100644 --- a/oada/libs/pino-debug/package.json +++ b/oada/libs/pino-debug/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@types/debug": "^4.1.7", - "@types/node": "^16.11.30" + "@types/node": "^16.11.31" }, "peerDependencies": { "debug": "*" diff --git a/oada/package.json b/oada/package.json index f1e2c855..c646b729 100644 --- a/oada/package.json +++ b/oada/package.json @@ -15,10 +15,10 @@ "@tsconfig/node16": "^1.0.2", "@types/eslint": "^8.4.1", "@types/mocha": "^9.1.1", - "@types/node": "^16.11.30", + "@types/node": "^16.11.31", "@typescript-eslint/eslint-plugin": "^5.21.0", "@typescript-eslint/parser": "^5.21.0", - "@yarnpkg/sdks": "^3.0.0-rc.2", + "@yarnpkg/sdks": "^3.0.0-rc.3", "eslint": "^8.14.0", "eslint-config-prettier": "^8.5.0", "eslint-config-xo": "^0.40.0", diff --git a/oada/services/auth/package.json b/oada/services/auth/package.json index 2bd82bb9..b8aa8cb7 100644 --- a/oada/services/auth/package.json +++ b/oada/services/auth/package.json @@ -49,9 +49,8 @@ "@oada/pino-debug": "^3.0.1", "@oada/well-known-json": "^2.0.1", "arangojs": "^7.7.0", - "axios": "^0.27.1", + "axios": "^0.27.2", "bcryptjs": "^2.4.3", - "bluebird": "^3.7.2", "body-parser": "^1.20.0", "chalk": "^4.1.2", "clone-deep": "^4.0.1", @@ -82,7 +81,6 @@ "devDependencies": { "@oada/types": "^2.0.1", "@types/bcryptjs": "^2.4.2", - "@types/bluebird": "^3.5.36", "@types/body-parser": "^1.19.2", "@types/clone-deep": "^4.0.1", "@types/connect-ensure-login": "^0.1.7", diff --git a/oada/services/auth/src/dynReg.ts b/oada/services/auth/src/dynReg.ts index 0b73e79e..bff2249d 100644 --- a/oada/services/auth/src/dynReg.ts +++ b/oada/services/auth/src/dynReg.ts @@ -67,13 +67,15 @@ const { } = config.get('auth.dynamicRegistration.softwareStatement'); const timeout = config.get('auth.dynamicRegistration.trustedListLookupTimeout'); -async function getSoftwareStatement({ software_statement }: Metadata) { - if (!software_statement) { - return undefined; +async function getSoftwareStatement({ + software_statement: softwareStatement, +}: Metadata) { + if (!softwareStatement) { + return; } const { payload, trusted, valid, details } = await validate.validate( - software_statement, + softwareStatement, { timeout } ); if (!valid) { @@ -83,8 +85,9 @@ async function getSoftwareStatement({ software_statement }: Metadata) { ); } - const statements: Metadata = + const statements: unknown = typeof payload === 'string' ? JSON.parse(payload) : payload; + assertMetadata(statements); return { ...statements, // Set the "trusted" status based on JWS library return value @@ -94,7 +97,7 @@ async function getSoftwareStatement({ software_statement }: Metadata) { const dynReg: RequestHandler = async (request, response) => { try { - const metadata = request.body; + const metadata: unknown = request.body; // TODO: More thorough checking of sent metadata assertMetadata(metadata); diff --git a/oada/services/auth/src/types.d.ts b/oada/services/auth/src/types.d.ts index 358f2ef3..46b5bf3a 100644 --- a/oada/services/auth/src/types.d.ts +++ b/oada/services/auth/src/types.d.ts @@ -15,27 +15,6 @@ * limitations under the License. */ -/* -declare module 'oada-error' { - import { RequestHandler } from 'express'; - export class OADAError extends Error { - constructor( - message: string, - code?: number, - userMessage?: string | null, - href?: string | null, - detail?: string | null - ); - } - // eslint-disable-next-line @typescript-eslint/naming-convention - export enum codes { - // eslint-disable-next-line @typescript-eslint/naming-convention - BAD_REQUEST, - } - export const middleware: () => RequestHandler; -} -*/ - declare module 'connect-arango' { import { Class } from 'type-fest'; import { Config } from 'arangojs'; diff --git a/oada/services/http-handler/package.json b/oada/services/http-handler/package.json index bceea1bb..56cf42ca 100644 --- a/oada/services/http-handler/package.json +++ b/oada/services/http-handler/package.json @@ -31,6 +31,13 @@ }, "homepage": "https://github.com/OADA/oada-srvc-http-handler#readme", "dependencies": { + "@fastify/accepts": "^3.0.0", + "@fastify/bearer-auth": "^7.0.0", + "@fastify/cors": "^7.0.0", + "@fastify/helmet": "^8.0.0", + "@fastify/request-context": "^3.0.0", + "@fastify/sensible": "^4.0.0", + "@fastify/websocket": "^5.0.0", "@oada/error": "^2.0.1", "@oada/formats-server": "^2.0.0", "@oada/lib-arangodb": "^3.0.1", @@ -40,20 +47,12 @@ "@oada/permissions-handler": "^3.0.1", "@oada/pino-debug": "^3.0.1", "@oada/types": "^2.0.1", - "bluebird": "^3.7.2", "cacache": "^16.0.6", "debug": "^4.3.4", "es-main": "^1.0.2", "fastify": "^3.28.0", - "fastify-accepts": "^2.2.0", - "fastify-bearer-auth": "^6.2.0", - "fastify-cors": "^6.0.3", "fastify-graceful-shutdown": "^3.1.0", "fastify-healthcheck": "^3.1.0", - "fastify-helmet": "^7.0.1", - "fastify-request-context": "^2.2.0", - "fastify-sensible": "^3.1.2", - "fastify-websocket": "^4.2.2", "json-ptr": "^3.1.0", "ksuid": "^3.0.0", "tslib": "^2.4.0", @@ -65,7 +64,7 @@ "@oada/write-handler": "^3.0.1", "@types/cacache": "^15.0.1", "@types/debug": "^4.1.7", - "@types/node": "^16.11.30", + "@types/node": "^16.11.31", "@types/type-is": "^1.6.3", "@types/uuid": "^8.3.4", "@types/ws": "^8.5.3", diff --git a/oada/services/http-handler/src/resources.ts b/oada/services/http-handler/src/resources.ts index f8237afb..c037037f 100644 --- a/oada/services/http-handler/src/resources.ts +++ b/oada/services/http-handler/src/resources.ts @@ -46,7 +46,7 @@ export interface Options { prefixPath(request: FastifyRequest): string; } -declare module 'fastify-request-context' { +declare module '@fastify/request-context' { interface RequestContextData { // Add path within OADA to request context oadaPath: string; diff --git a/oada/services/http-handler/src/server.ts b/oada/services/http-handler/src/server.ts index 794477f1..28ff8c4b 100644 --- a/oada/services/http-handler/src/server.ts +++ b/oada/services/http-handler/src/server.ts @@ -27,17 +27,18 @@ import resources from './resources.js'; import users from './users.js'; import websockets from './websockets.js'; -import type { HTTPVersion, Handler } from 'find-my-way'; import fastify, { FastifyRequest } from 'fastify'; -import bearerAuth from 'fastify-bearer-auth'; -import cors from 'fastify-cors'; -import esMain from 'es-main'; -import fastifyAccepts from 'fastify-accepts'; +import bearerAuth from '@fastify/bearer-auth'; +import cors from '@fastify/cors'; +import fastifyAccepts from '@fastify/accepts'; import fastifyGracefulShutdown from 'fastify-graceful-shutdown'; import fastifyHealthcheck from 'fastify-healthcheck'; -import { fastifyRequestContextPlugin } from 'fastify-request-context'; -import fastifySensible from 'fastify-sensible'; -import helmet from 'fastify-helmet'; +import { fastifyRequestContextPlugin } from '@fastify/request-context'; +import fastifySensible from '@fastify/sensible'; +import helmet from '@fastify/helmet'; + +import type { HTTPVersion, Handler } from 'find-my-way'; +import esMain from 'es-main'; /** * Supported values for X-OADA-Ensure-Link header @@ -110,7 +111,7 @@ export async function start(): Promise { app.log.info('OADA Server started on port %d', config.get('server.port')); } -declare module 'fastify-request-context' { +declare module '@fastify/request-context' { interface RequestContextData { // Add graph lookup result to request context user: TokenResponse['doc']; @@ -200,7 +201,7 @@ async function init(): Promise { await app.register(async (aApp) => { await aApp.register(bearerAuth, { keys: new Set(), - async auth(token, request: FastifyRequest) { + async auth(token: string, request: FastifyRequest) { try { const tok = await tokenLookup({ // Connection_id: request.id, diff --git a/oada/services/http-handler/src/websockets.ts b/oada/services/http-handler/src/websockets.ts index 2d66524d..f81e8aa1 100644 --- a/oada/services/http-handler/src/websockets.ts +++ b/oada/services/http-handler/src/websockets.ts @@ -36,7 +36,7 @@ import type { FastifyPluginAsync } from 'fastify'; import { JsonPointer } from 'json-ptr'; import type LightMyRequest from 'light-my-request'; import type WebSocket from 'ws'; -import fastifyWebsocket from 'fastify-websocket'; +import fastifyWebsocket from '@fastify/websocket'; import { is } from 'type-is'; import log from 'debug'; diff --git a/oada/services/permissions-handler/package.json b/oada/services/permissions-handler/package.json index e742d67a..daf1c3f5 100644 --- a/oada/services/permissions-handler/package.json +++ b/oada/services/permissions-handler/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@types/debug": "^4.1.7", - "@types/node": "^16.11.30", + "@types/node": "^16.11.31", "@types/type-is": "^1.6.3", "typescript": "^4.6.3" } diff --git a/oada/services/rev-graph-update/package.json b/oada/services/rev-graph-update/package.json index 0b85dc50..f70bdbcc 100644 --- a/oada/services/rev-graph-update/package.json +++ b/oada/services/rev-graph-update/package.json @@ -44,9 +44,8 @@ "@ava/typescript": "^3.0.1", "@oada/client": "^4.0.1", "@oada/write-handler": "^3.0.1", - "@types/bluebird": "^3.5.36", "@types/debug": "^4.1.7", - "@types/node": "^16.11.30", + "@types/node": "^16.11.31", "@types/randomstring": "^1.1.8", "ava": "4.0.0-rc.1", "type-fest": "^2.12.2", diff --git a/oada/services/startup/package.json b/oada/services/startup/package.json index 65a5920d..cd27472b 100644 --- a/oada/services/startup/package.json +++ b/oada/services/startup/package.json @@ -35,6 +35,6 @@ }, "devDependencies": { "@types/debug": "^4.1.7", - "@types/node": "^16.11.30" + "@types/node": "^16.11.31" } } diff --git a/oada/services/sync-handler/package.json b/oada/services/sync-handler/package.json index fae0a6eb..e5b96bf4 100644 --- a/oada/services/sync-handler/package.json +++ b/oada/services/sync-handler/package.json @@ -27,15 +27,13 @@ "@oada/lib-config": "^3.0.1", "@oada/lib-kafka": "^3.0.1", "@oada/pino-debug": "^3.0.1", - "axios": "^0.27.1", - "bluebird": "^3.7.2", + "axios": "^0.27.2", "debug": "^4.3.4", "tslib": "^2.4.0" }, "devDependencies": { "@oada/write-handler": "^3.0.1", - "@types/bluebird": "^3.5.36", "@types/debug": "^4.1.7", - "@types/node": "^16.11.30" + "@types/node": "^16.11.31" } } diff --git a/oada/services/webhooks/package.json b/oada/services/webhooks/package.json index 489d989d..410fa8b7 100644 --- a/oada/services/webhooks/package.json +++ b/oada/services/webhooks/package.json @@ -25,7 +25,7 @@ "@oada/lib-config": "^3.0.1", "@oada/lib-kafka": "^3.0.1", "@oada/pino-debug": "^3.0.1", - "axios": "^0.27.1", + "axios": "^0.27.2", "bluebird": "^3.7.2", "debug": "^4.3.4", "tslib": "^2.4.0" diff --git a/oada/services/well-known/package.json b/oada/services/well-known/package.json index 0161e459..44a0a275 100644 --- a/oada/services/well-known/package.json +++ b/oada/services/well-known/package.json @@ -32,7 +32,7 @@ "@oada/lib-config": "^3.0.1", "@oada/pino-debug": "^3.0.1", "@oada/well-known-json": "^2.0.1", - "axios": "^0.27.1", + "axios": "^0.27.2", "cors": "^2.8.5", "debug": "^4.3.4", "express": "^4.18.0", diff --git a/oada/services/write-handler/package.json b/oada/services/write-handler/package.json index 6ade9705..2a5eede3 100644 --- a/oada/services/write-handler/package.json +++ b/oada/services/write-handler/package.json @@ -56,7 +56,7 @@ "@types/bluebird": "^3.5.36", "@types/debug": "^4.1.7", "@types/json-pointer": "^1.0.31", - "@types/node": "^16.11.30", + "@types/node": "^16.11.31", "@types/object-assign-deep": "^0.4.0", "ava": "4.0.0-rc.1", "typescript": "^4.6.3" diff --git a/oada/yarn.lock b/oada/yarn.lock index 55c53d69..4df0fe8e 100644 --- a/oada/yarn.lock +++ b/oada/yarn.lock @@ -75,6 +75,16 @@ __metadata: languageName: node linkType: hard +"@fastify/accepts@npm:^3.0.0": + version: 3.0.0 + resolution: "@fastify/accepts@npm:3.0.0" + dependencies: + accepts: ^1.3.5 + fastify-plugin: ^3.0.0 + checksum: 2d968ff697fe1495b883e8f11e814122eee16d6a9224c913621a609cabf4464250bf6d2f20bf7882e37b464c6619e5b7125442f72d71ad9f3f7ea3ed7935056d + languageName: node + linkType: hard + "@fastify/ajv-compiler@npm:^1.0.0": version: 1.1.0 resolution: "@fastify/ajv-compiler@npm:1.1.0" @@ -84,6 +94,71 @@ __metadata: languageName: node linkType: hard +"@fastify/bearer-auth@npm:^7.0.0": + version: 7.0.0 + resolution: "@fastify/bearer-auth@npm:7.0.0" + dependencies: + fastify-plugin: ^3.0.0 + checksum: 70dd81e49a4dd44534b25793763f8e05cbec12196594cb05ca31f11f4eb1e49b2cf9578f653376952768dc62a777e4896c5b2b3ec3d35aa9d364d7362a66f828 + languageName: node + linkType: hard + +"@fastify/cors@npm:^7.0.0": + version: 7.0.0 + resolution: "@fastify/cors@npm:7.0.0" + dependencies: + fastify-plugin: ^3.0.0 + vary: ^1.1.2 + checksum: 1885eb60b6a64dc91c8ca47708b60de371982d8224e801d7ed60bf821bd045d0c99917c0cb7544dccd9ad1a3dd72368244f2ec2f58bc5fa46d10fe95ad43283a + languageName: node + linkType: hard + +"@fastify/helmet@npm:^8.0.0": + version: 8.0.0 + resolution: "@fastify/helmet@npm:8.0.0" + dependencies: + fastify-plugin: ^3.0.0 + helmet: ^5.0.1 + checksum: 2e3e23bc65b6b648c9211d1ac18f3189149471cfeaf35cbe36943069a59f129ef134a6aca1321cbca955f7f8cb25a45570df3b9c72465b6bcba5e9f10b3e4ced + languageName: node + linkType: hard + +"@fastify/request-context@npm:^3.0.0": + version: 3.0.0 + resolution: "@fastify/request-context@npm:3.0.0" + dependencies: + asynchronous-local-storage: ^1.0.2 + fastify-plugin: ^3.0.0 + peerDependencies: + fastify: ^3.0.0 + checksum: 93769a23ff509babb0e92311b7e5b15a64202554ee64fc7c4a653345aa3a1401f20b030653102fe1830d5c71d07f0534612bcdaacc884f87c63508e1fe4e42cb + languageName: node + linkType: hard + +"@fastify/sensible@npm:^4.0.0": + version: 4.0.0 + resolution: "@fastify/sensible@npm:4.0.0" + dependencies: + fast-deep-equal: ^3.1.1 + fastify-plugin: ^3.0.0 + forwarded: ^0.2.0 + http-errors: ^2.0.0 + type-is: ^1.6.18 + vary: ^1.1.2 + checksum: 50d655baa89cd78b8cb43793bb64f5241cda27343ccd6aa56338978c8f1b464bdb5fff9a166ceffa5f050ae2ac0064aad5a0dc1843800e0b17ebbf7d42465627 + languageName: node + linkType: hard + +"@fastify/websocket@npm:^5.0.0": + version: 5.0.0 + resolution: "@fastify/websocket@npm:5.0.0" + dependencies: + fastify-plugin: ^3.0.0 + ws: ^8.0.0 + checksum: 47031c2c3c1699b01c67a1a649518f7a96e7cbcb6191ad86e11895de58dd731e851f571f0ad20e316e64da86d357bf834b6f0063f7618e3a70c88a5c5b0211bf + languageName: node + linkType: hard + "@gar/promisify@npm:^1.0.1, @gar/promisify@npm:^1.1.3": version: 1.1.3 resolution: "@gar/promisify@npm:1.1.3" @@ -221,7 +296,6 @@ __metadata: "@oada/types": ^2.0.1 "@oada/well-known-json": ^2.0.1 "@types/bcryptjs": ^2.4.2 - "@types/bluebird": ^3.5.36 "@types/body-parser": ^1.19.2 "@types/clone-deep": ^4.0.1 "@types/connect-ensure-login": ^0.1.7 @@ -242,9 +316,8 @@ __metadata: "@types/urijs": ^1.19.19 "@types/uuid": ^8.3.4 arangojs: ^7.7.0 - axios: ^0.27.1 + axios: ^0.27.2 bcryptjs: ^2.4.3 - bluebird: ^3.7.2 body-parser: ^1.20.0 c8: ^7.11.2 chalk: ^4.1.2 @@ -373,6 +446,13 @@ __metadata: version: 0.0.0-use.local resolution: "@oada/http-handler@workspace:services/http-handler" dependencies: + "@fastify/accepts": ^3.0.0 + "@fastify/bearer-auth": ^7.0.0 + "@fastify/cors": ^7.0.0 + "@fastify/helmet": ^8.0.0 + "@fastify/request-context": ^3.0.0 + "@fastify/sensible": ^4.0.0 + "@fastify/websocket": ^5.0.0 "@oada/error": ^2.0.1 "@oada/formats-server": ^2.0.0 "@oada/lib-arangodb": ^3.0.1 @@ -386,25 +466,17 @@ __metadata: "@oada/write-handler": ^3.0.1 "@types/cacache": ^15.0.1 "@types/debug": ^4.1.7 - "@types/node": ^16.11.30 + "@types/node": ^16.11.31 "@types/type-is": ^1.6.3 "@types/uuid": ^8.3.4 "@types/ws": ^8.5.3 - bluebird: ^3.7.2 cacache: ^16.0.6 connect: ^3.7.0 debug: ^4.3.4 es-main: ^1.0.2 fastify: ^3.28.0 - fastify-accepts: ^2.2.0 - fastify-bearer-auth: ^6.2.0 - fastify-cors: ^6.0.3 fastify-graceful-shutdown: ^3.1.0 fastify-healthcheck: ^3.1.0 - fastify-helmet: ^7.0.1 - fastify-request-context: ^2.2.0 - fastify-sensible: ^3.1.2 - fastify-websocket: ^4.2.2 find-my-way: ^5.5.1 json-ptr: ^3.1.0 ksuid: ^3.0.0 @@ -443,18 +515,16 @@ __metadata: "@oada/oadaify": ^2.1.0 "@oada/types": ^2.0.1 "@types/bcryptjs": ^2.4.2 - "@types/bluebird": ^3.5.36 "@types/clone-deep": ^4.0.1 "@types/convict": ^6.1.1 "@types/debug": ^4.1.7 "@types/deep-equal": ^1.0.1 "@types/flat": ^5.0.2 "@types/json-pointer": ^1.0.31 - "@types/node": ^16.11.30 + "@types/node": ^16.11.31 arangojs: ^7.7.0 ava: 4.0.0-rc.1 bcryptjs: ^2.4.3 - bluebird: ^3.7.2 clone-deep: ^4.0.1 debug: ^4.3.4 deep-equal: ^2.0.5 @@ -492,7 +562,7 @@ __metadata: "@types/bluebird": ^3.5.36 "@types/convict": ^6.1.1 "@types/debug": ^4.1.7 - "@types/node": 16.11.30 + "@types/node": ^16.11.31 "@types/uuid": ^8.3.4 ava: 4.0.0-rc.1 bluebird: ^3.7.2 @@ -545,7 +615,7 @@ __metadata: "@oada/lib-kafka": ^3.0.1 "@oada/pino-debug": ^3.0.1 "@types/debug": ^4.1.7 - "@types/node": ^16.11.30 + "@types/node": ^16.11.31 "@types/type-is": ^1.6.3 debug: ^4.3.4 es-main: ^1.0.2 @@ -560,7 +630,7 @@ __metadata: resolution: "@oada/pino-debug@workspace:libs/pino-debug" dependencies: "@types/debug": ^4.1.7 - "@types/node": ^16.11.30 + "@types/node": ^16.11.31 pino: ^7.11.0 pino-caller: ^3.2.0 pino-debug: ^2.0.0 @@ -581,9 +651,8 @@ __metadata: "@oada/lib-kafka": ^3.0.1 "@oada/pino-debug": ^3.0.1 "@oada/write-handler": ^3.0.1 - "@types/bluebird": ^3.5.36 "@types/debug": ^4.1.7 - "@types/node": ^16.11.30 + "@types/node": ^16.11.31 "@types/randomstring": ^1.1.8 ajv: ^8.11.0 ava: 4.0.0-rc.1 @@ -618,7 +687,7 @@ __metadata: "@oada/lib-arangodb": ^3.0.1 "@oada/pino-debug": ^3.0.1 "@types/debug": ^4.1.7 - "@types/node": ^16.11.30 + "@types/node": ^16.11.31 debug: ^4.3.4 tslib: ^2.4.0 languageName: unknown @@ -633,11 +702,9 @@ __metadata: "@oada/lib-kafka": ^3.0.1 "@oada/pino-debug": ^3.0.1 "@oada/write-handler": ^3.0.1 - "@types/bluebird": ^3.5.36 "@types/debug": ^4.1.7 - "@types/node": ^16.11.30 - axios: ^0.27.1 - bluebird: ^3.7.2 + "@types/node": ^16.11.31 + axios: ^0.27.2 debug: ^4.3.4 tslib: ^2.4.0 languageName: unknown @@ -690,7 +757,7 @@ __metadata: "@oada/write-handler": ^3.0.1 "@types/bluebird": ^3.5.36 "@types/debug": ^4.1.7 - axios: ^0.27.1 + axios: ^0.27.2 bluebird: ^3.7.2 debug: ^4.3.4 tslib: ^2.4.0 @@ -725,7 +792,7 @@ __metadata: "@types/debug": ^4.1.7 "@types/express": ^4.17.13 "@types/helmet": ^4.0.0 - axios: ^0.27.1 + axios: ^0.27.2 cors: ^2.8.5 debug: ^4.3.4 express: ^4.18.0 @@ -748,7 +815,7 @@ __metadata: "@types/bluebird": ^3.5.36 "@types/debug": ^4.1.7 "@types/json-pointer": ^1.0.31 - "@types/node": ^16.11.30 + "@types/node": ^16.11.31 "@types/object-assign-deep": ^0.4.0 ava: 4.0.0-rc.1 bluebird: ^3.7.2 @@ -1162,10 +1229,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:16.11.30, @types/node@npm:>=13.13.4, @types/node@npm:^16.11.30": - version: 16.11.30 - resolution: "@types/node@npm:16.11.30" - checksum: 2195096506bf21290213ba0b2db99c89bd611c8ba5e0aa3455239980a6bb708dd84d705fba8c180fdb07dcb502c1957db703a4562b31ee85bf0427e01178fd85 +"@types/node@npm:*, @types/node@npm:>=13.13.4, @types/node@npm:^16.11.31": + version: 16.11.31 + resolution: "@types/node@npm:16.11.31" + checksum: 0bad289e12c7066cd2ea7a204d051a0bb09a32a29da39850812ea14c075f9e2b4aeaab23aa23447ef9e3aa6a30173bf3d3524e37bbeeb56fb8ffa4bbd783c5db languageName: node linkType: hard @@ -1479,17 +1546,17 @@ __metadata: languageName: node linkType: hard -"@yarnpkg/core@npm:^4.0.0-rc.2": - version: 4.0.0-rc.2 - resolution: "@yarnpkg/core@npm:4.0.0-rc.2" +"@yarnpkg/core@npm:^4.0.0-rc.3": + version: 4.0.0-rc.3 + resolution: "@yarnpkg/core@npm:4.0.0-rc.3" dependencies: "@arcanis/slice-ansi": ^1.1.1 "@types/semver": ^7.1.0 "@types/treeify": ^1.0.0 - "@yarnpkg/fslib": ^3.0.0-rc.2 - "@yarnpkg/libzip": ^3.0.0-rc.2 - "@yarnpkg/parsers": ^3.0.0-rc.2 - "@yarnpkg/shell": ^4.0.0-rc.2 + "@yarnpkg/fslib": ^3.0.0-rc.3 + "@yarnpkg/libzip": ^3.0.0-rc.3 + "@yarnpkg/parsers": ^3.0.0-rc.3 + "@yarnpkg/shell": ^4.0.0-rc.3 camelcase: ^5.3.1 chalk: ^3.0.0 ci-info: ^3.2.0 @@ -1508,47 +1575,47 @@ __metadata: treeify: ^1.1.0 tslib: ^1.13.0 tunnel: ^0.0.6 - checksum: 808f7d2412450541b10f8d94be25076574c776938498cc8369b32b460b21239db0e78c50981ab847b8a8499950b209044dad49f404347e6d6f14d16e7b1c82cf + checksum: 759a91ff4ddad547120fa186b51126fef674ba0a2091507acb8456f792fccd1f97a3ee9b1d05ff3799339d3d27eec99856d7c1630576170d4823537b9628a6a4 languageName: node linkType: hard -"@yarnpkg/fslib@npm:^3.0.0-rc.2": - version: 3.0.0-rc.2 - resolution: "@yarnpkg/fslib@npm:3.0.0-rc.2" +"@yarnpkg/fslib@npm:^3.0.0-rc.3": + version: 3.0.0-rc.3 + resolution: "@yarnpkg/fslib@npm:3.0.0-rc.3" dependencies: - "@yarnpkg/libzip": ^3.0.0-rc.2 + "@yarnpkg/libzip": ^3.0.0-rc.3 tslib: ^1.13.0 - checksum: 3cca8a6197a30e9f40c4eb00eafe2dcc65b570889e1af75875babccaf8039bf46f2e2fed4163f7e277150ff0b6e94f91817af1864ca3b90f2d541a19068afad0 + checksum: d8fadb8a10d3a18bf6367aac1b05fca1819361726f23c1752674e561d7ca4508e9aebc8511fcb2ddf751aa4e1ca4801c0ff5749f6edd5224e269b0e2e942a505 languageName: node linkType: hard -"@yarnpkg/libzip@npm:^3.0.0-rc.2": - version: 3.0.0-rc.2 - resolution: "@yarnpkg/libzip@npm:3.0.0-rc.2" +"@yarnpkg/libzip@npm:^3.0.0-rc.3": + version: 3.0.0-rc.3 + resolution: "@yarnpkg/libzip@npm:3.0.0-rc.3" dependencies: "@types/emscripten": ^1.39.6 tslib: ^1.13.0 - checksum: c5b22308798ce18c0ee5c0a004c344150f53ca07c2dd08d28ff3ffdd985259567729dcca92613fddf6b103a38abab4503db51cb8f59c73050f39c72facd5baf4 + checksum: 21bc2f8c554b967bde42620cc1f66c2013798b01d63349f1ddd087cd63121530ab80ce66e848e5f8c8ce43eec32f6e1299d2b5306d0b4ee2261d405a8e76f39e languageName: node linkType: hard -"@yarnpkg/parsers@npm:^3.0.0-rc.2": - version: 3.0.0-rc.2 - resolution: "@yarnpkg/parsers@npm:3.0.0-rc.2" +"@yarnpkg/parsers@npm:^3.0.0-rc.3": + version: 3.0.0-rc.3 + resolution: "@yarnpkg/parsers@npm:3.0.0-rc.3" dependencies: js-yaml: ^3.10.0 tslib: ^1.13.0 - checksum: 3a5657b12cbd77231b7214d3ecd8b2cba9c005150f911a78a957e4ebf1c44ec9358b7535f44e3015be5bf2d20946a35f8f73bc48c03a6c20957e47c0e364fd83 + checksum: 8d3d51280f0ba12d181bd88ab98c5cc77198a95f3f7c54d6204e1de167d6c15a5350950e82039d03e8df62e5e81edde4569932515080f9cce6c7990a7d017df9 languageName: node linkType: hard -"@yarnpkg/sdks@npm:^3.0.0-rc.2": - version: 3.0.0-rc.2 - resolution: "@yarnpkg/sdks@npm:3.0.0-rc.2" +"@yarnpkg/sdks@npm:^3.0.0-rc.3": + version: 3.0.0-rc.3 + resolution: "@yarnpkg/sdks@npm:3.0.0-rc.3" dependencies: - "@yarnpkg/core": ^4.0.0-rc.2 - "@yarnpkg/fslib": ^3.0.0-rc.2 - "@yarnpkg/parsers": ^3.0.0-rc.2 + "@yarnpkg/core": ^4.0.0-rc.3 + "@yarnpkg/fslib": ^3.0.0-rc.3 + "@yarnpkg/parsers": ^3.0.0-rc.3 chalk: ^3.0.0 clipanion: ^3.2.0-rc.10 comment-json: ^2.2.0 @@ -1556,16 +1623,16 @@ __metadata: tslib: ^1.13.0 bin: sdks: ./lib/cli.js - checksum: 00c862647d495b8e6e050f9d4d5e612fbeec70e0ade886d5251604299ee504195d6dadc323083cb14394ddc2ee78c672ef973978f8a20e3debca24c6eb238dfe + checksum: e38abf9f179659b67c46326c80735cfc05160a0ce8cf02fd6afa1d888d857a7089f2d9bfd8ad6a624f66c36f0dc6dcb9d3aa75a13280420f8e406b21ca49aac3 languageName: node linkType: hard -"@yarnpkg/shell@npm:^4.0.0-rc.2": - version: 4.0.0-rc.2 - resolution: "@yarnpkg/shell@npm:4.0.0-rc.2" +"@yarnpkg/shell@npm:^4.0.0-rc.3": + version: 4.0.0-rc.3 + resolution: "@yarnpkg/shell@npm:4.0.0-rc.3" dependencies: - "@yarnpkg/fslib": ^3.0.0-rc.2 - "@yarnpkg/parsers": ^3.0.0-rc.2 + "@yarnpkg/fslib": ^3.0.0-rc.3 + "@yarnpkg/parsers": ^3.0.0-rc.3 chalk: ^3.0.0 clipanion: ^3.2.0-rc.10 cross-spawn: 7.0.3 @@ -1574,7 +1641,7 @@ __metadata: tslib: ^1.13.0 bin: shell: ./lib/cli.js - checksum: d9a5abc8fe2b4c721ad3f4db6c7a522489949b3f63f27d2d0e3705e9dbddb3c2ff834d268a41c249056714f06153cc74fadd1913fa2ba8d1ed81ac400e302a9e + checksum: 00a916468ac578976c39c15aa576b526f9d8ec72a7235f8642ddd153f591298d566393487fa624e8f24ea3ed9ab8ce7782da9a8cad09191b57cc7bd16e29d165 languageName: node linkType: hard @@ -2085,13 +2152,13 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.27.1": - version: 0.27.1 - resolution: "axios@npm:0.27.1" +"axios@npm:^0.27.2": + version: 0.27.2 + resolution: "axios@npm:0.27.2" dependencies: follow-redirects: ^1.14.9 form-data: ^4.0.0 - checksum: 0da3131125429fcaeb5057c9b7249699c59d48a053d8aaa897089c96e5fa623cf2cf9c3ae36c307235dab495ab7409c87ffbd9b77407624a21403571a492c771 + checksum: 38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854 languageName: node linkType: hard @@ -3089,7 +3156,7 @@ __metadata: languageName: node linkType: hard -"depd@npm:^1.1.2, depd@npm:~1.1.2": +"depd@npm:^1.1.2": version: 1.1.2 resolution: "depd@npm:1.1.2" checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9 @@ -4123,32 +4190,23 @@ __metadata: languageName: node linkType: hard -"fastify-accepts@npm:^2.2.0": - version: 2.2.0 - resolution: "fastify-accepts@npm:2.2.0" - dependencies: - accepts: ^1.3.5 - fastify-plugin: ^3.0.0 - checksum: 446c23735acbc72f62f5be2bb9dcf3e15c1dcc38044ff1707dd9622d2cbf097e8a3fa132366891aabb8a92c9d2e868302be3989f7e25a984dc6f37df84ae585f - languageName: node - linkType: hard - -"fastify-bearer-auth@npm:^6.2.0": - version: 6.2.0 - resolution: "fastify-bearer-auth@npm:6.2.0" +"fastify-cors-deprecated@npm:fastify-cors@6.0.3": + version: 6.0.3 + resolution: "fastify-cors@npm:6.0.3" dependencies: fastify-plugin: ^3.0.0 - checksum: 0a5120113ef0a2014db424329b182c5f282299da3422d1cde939577d82450e361e982b1a566ea3bebd141927e9c426889208c804482ffad2d311d7d2e147348c + vary: ^1.1.2 + checksum: 054cf4e1cf0b20778ac24d9995a99f44e9b026ca9a028db0cbb6093922bcc931dff5f5bb185d19e881014392bb5886a8b5f9da6af3d3ab5e62b7a68f4eca33c4 languageName: node linkType: hard "fastify-cors@npm:^6.0.3": - version: 6.0.3 - resolution: "fastify-cors@npm:6.0.3" + version: 6.1.0 + resolution: "fastify-cors@npm:6.1.0" dependencies: - fastify-plugin: ^3.0.0 - vary: ^1.1.2 - checksum: 054cf4e1cf0b20778ac24d9995a99f44e9b026ca9a028db0cbb6093922bcc931dff5f5bb185d19e881014392bb5886a8b5f9da6af3d3ab5e62b7a68f4eca33c4 + fastify-cors-deprecated: "npm:fastify-cors@6.0.3" + process-warning: ^1.0.0 + checksum: dca7c39b4e515ea896aa07ad5c05c70100f427e4c92e3e0fae7cab7d8ccfc824c946723a7e90b4859a5802244932d0af5ee70d753f686092e8c47fca6700e370 languageName: node linkType: hard @@ -4178,16 +4236,6 @@ __metadata: languageName: node linkType: hard -"fastify-helmet@npm:^7.0.1": - version: 7.0.1 - resolution: "fastify-helmet@npm:7.0.1" - dependencies: - fastify-plugin: ^3.0.0 - helmet: ^5.0.1 - checksum: 80cdb855ea23981767d79cf9fe27e36cf655eae065f0e4caf8aac071922bf566cc3e268ca5d3911d3a587ed8ff1e55bf29d63979a6e3a2ae8bfa01e8433dc83e - languageName: node - linkType: hard - "fastify-plugin@npm:^3.0.0, fastify-plugin@npm:^3.0.1": version: 3.0.1 resolution: "fastify-plugin@npm:3.0.1" @@ -4195,32 +4243,6 @@ __metadata: languageName: node linkType: hard -"fastify-request-context@npm:^2.2.0": - version: 2.2.0 - resolution: "fastify-request-context@npm:2.2.0" - dependencies: - asynchronous-local-storage: ^1.0.2 - fastify-plugin: ^3.0.0 - peerDependencies: - fastify: ^3.0.0 - checksum: 2e09597bf407b6fb80915bf44b52c0da1cbdce18ea520660511912c5cc483be41ac17e07323dda2747cdf3c2d537c8b2be48ca2bda53cd10f745624f23bc31ac - languageName: node - linkType: hard - -"fastify-sensible@npm:^3.1.2": - version: 3.1.2 - resolution: "fastify-sensible@npm:3.1.2" - dependencies: - fast-deep-equal: ^3.1.1 - fastify-plugin: ^3.0.0 - forwarded: ^0.2.0 - http-errors: ^1.7.3 - type-is: ^1.6.18 - vary: ^1.1.2 - checksum: 160a3526c0f93ab8a0aee2a5c9dbdc29896f40fea14a7b467794583f7e159d6d4aa31fdca9a6e30bf294cad149c7121b05a124b42deaddcf437570661e89538f - languageName: node - linkType: hard - "fastify-warning@npm:^0.2.0": version: 0.2.0 resolution: "fastify-warning@npm:0.2.0" @@ -4228,16 +4250,6 @@ __metadata: languageName: node linkType: hard -"fastify-websocket@npm:^4.2.2": - version: 4.2.2 - resolution: "fastify-websocket@npm:4.2.2" - dependencies: - fastify-plugin: ^3.0.0 - ws: ^8.0.0 - checksum: 49d8fd0ee7a98fc589356410e8a7afa3d57fd4fc89cd5d5ee4617cee45915bb9418d3a9d0690f18535059225362166ca42e5582d974d70d6582d2db9c0695c56 - languageName: node - linkType: hard - "fastify@npm:^3.28.0": version: 3.28.0 resolution: "fastify@npm:3.28.0" @@ -4890,19 +4902,6 @@ __metadata: languageName: node linkType: hard -"http-errors@npm:^1.7.3": - version: 1.8.1 - resolution: "http-errors@npm:1.8.1" - dependencies: - depd: ~1.1.2 - inherits: 2.0.4 - setprototypeof: 1.2.0 - statuses: ">= 1.5.0 < 2" - toidentifier: 1.0.1 - checksum: d3c7e7e776fd51c0a812baff570bdf06fe49a5dc448b700ab6171b1250e4cf7db8b8f4c0b133e4bfe2451022a5790c1ca6c2cae4094dedd6ac8304a1267f91d2 - languageName: node - linkType: hard - "http-proxy-agent@npm:^4.0.1": version: 4.0.1 resolution: "http-proxy-agent@npm:4.0.1" @@ -6478,10 +6477,10 @@ __metadata: "@tsconfig/node16": ^1.0.2 "@types/eslint": ^8.4.1 "@types/mocha": ^9.1.1 - "@types/node": ^16.11.30 + "@types/node": ^16.11.31 "@typescript-eslint/eslint-plugin": ^5.21.0 "@typescript-eslint/parser": ^5.21.0 - "@yarnpkg/sdks": ^3.0.0-rc.2 + "@yarnpkg/sdks": ^3.0.0-rc.3 eslint: ^8.14.0 eslint-config-prettier: ^8.5.0 eslint-config-xo: ^0.40.0 @@ -8052,7 +8051,7 @@ __metadata: languageName: node linkType: hard -"statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0": +"statuses@npm:~1.5.0": version: 1.5.0 resolution: "statuses@npm:1.5.0" checksum: c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c