fix: memory leak

OADA · Mar 28, 2023 · 1a088f7 · 1a088f7
1 parent 92fc352
commit 1a088f7
Show file tree

Hide file tree

Showing 29 changed files with 198 additions and 179 deletions.
diff --git a/oada/libs/lib-arangodb/package.json b/oada/libs/lib-arangodb/package.json
@@ -73,9 +73,9 @@
     "@types/deep-equal": "^1.0.1",
     "@types/flat": "^5.0.2",
     "@types/json-pointer": "^1.0.31",
-    "@types/node": "^18.15.5",
+    "@types/node": "^18.15.10",
     "ava": "5.2.0",
-    "type-fest": "^3.6.1"
+    "type-fest": "^3.7.1"
   },
   "volta": {
     "node": "18.13.0"

diff --git a/oada/libs/lib-kafka/package.json b/oada/libs/lib-kafka/package.json
@@ -48,7 +48,7 @@
     "@ava/typescript": "^4.0.0",
     "@types/convict": "^6.1.1",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.5",
+    "@types/node": "^18.15.10",
     "@types/uuid": "^9.0.1",
     "ava": "5.2.0"
   },

diff --git a/oada/libs/lib-prom/package.json b/oada/libs/lib-prom/package.json
@@ -42,7 +42,7 @@
   "devDependencies": {
     "@ava/typescript": "^4.0.0",
     "@types/convict": "^6.1.1",
-    "@types/node": "^18.15.5",
+    "@types/node": "^18.15.10",
     "@types/ws": "^8.5.4",
     "ava": "5.2.0",
     "fastify-plugin": "^4.5.0"

diff --git a/oada/libs/pino-debug/package.json b/oada/libs/pino-debug/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.5"
+    "@types/node": "^18.15.10"
   },
   "peerDependencies": {
     "debug": "*"

diff --git a/oada/libs/pino-debug/src/index.ts b/oada/libs/pino-debug/src/index.ts
@@ -25,8 +25,11 @@ import { resolve } from 'node:path';
 // !!! This needs to be imported before _anything_ using pino or debug
 import pinoDebug from 'pino-debug';
 
-import type { Logger, LoggerOptions } from 'pino';
-import _pino from 'pino';
+import _pino, {
+  type ChildLoggerOptions,
+  type Logger,
+  type LoggerOptions,
+} from 'pino';
 import debug from 'debug';
 import isInteractive from 'is-interactive';
 import pinoCaller from 'pino-caller';
@@ -153,6 +156,6 @@ function createRootLogger(): Logger {
 }
 
 const rootLogger = createRootLogger();
-export function pino(options: LoggerOptions = {}): Logger {
-  return rootLogger.child(options);
+export function pino(options?: LoggerOptions) {
+  return rootLogger.child({}, options as ChildLoggerOptions);
 }
diff --git a/oada/package.json b/oada/package.json
@@ -13,15 +13,15 @@
     "g:pino-pretty": "pino-pretty"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.5.0",
+    "@commitlint/cli": "^17.5.1",
     "@commitlint/config-conventional": "^17.4.4",
     "@tsconfig/node18": "^1.0.1",
     "@types/eslint": "^8.21.3",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.15.5",
-    "@typescript-eslint/eslint-plugin": "^5.56.0",
-    "@typescript-eslint/parser": "^5.56.0",
-    "@yarnpkg/sdks": "^3.0.0-rc.40",
+    "@types/node": "^18.15.10",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
+    "@yarnpkg/sdks": "^3.0.0-rc.41",
     "c8": "^7.13.0",
     "eslint": "^8.36.0",
     "eslint-config-prettier": "^8.8.0",
@@ -34,7 +34,7 @@
     "eslint-plugin-escompat": "^3.4.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-filenames": "^1.3.2",
-    "eslint-plugin-github": "^4.6.1",
+    "eslint-plugin-github": "^4.7.0",
     "eslint-plugin-i18n-text": "^1.0.1",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-no-constructor-bind": "^2.0.4",
@@ -50,7 +50,7 @@
     "eslint-plugin-sonarjs": "^0.19.0",
     "eslint-plugin-unicorn": "^46.0.0",
     "get-port": "^6.1.2",
-    "prettier": "^2.8.6",
+    "prettier": "^2.8.7",
     "typescript": "5.0.2",
     "zx": "^7.2.1"
   },

diff --git a/oada/services/auth/package.json b/oada/services/auth/package.json
@@ -29,7 +29,7 @@
     "test-arango": "isTest=true mocha test/arango/index.js",
     "lint": "jshint --reporter node_modules/jshint-stylish .",
     "clean": "rm -rf test/oada-compliance && rm -rf coverage && yarn run build --clean",
-    "start": "node ${INSPECT} -r @oada/pino-debug --unhandled-rejections=strict dist/index.js",
+    "start": "node ${INSPECT} --unhandled-rejections=strict dist/index.js",
     "init": "node dist/init.js"
   },
   "mocha": {
@@ -105,7 +105,7 @@
     "@types/urijs": "^1.19.19",
     "@types/uuid": "^9.0.1",
     "c8": "^7.13.0",
-    "type-fest": "^3.6.1"
+    "type-fest": "^3.7.1"
   },
   "volta": {
     "node": "18.13.0"

diff --git a/oada/services/auth/src/index.ts b/oada/services/auth/src/index.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import '@oada/pino-debug';
+
 import { config, domainConfigs } from './config.js';
 
 import '@oada/lib-prom';

diff --git a/oada/services/http-handler/package.json b/oada/services/http-handler/package.json
@@ -16,7 +16,7 @@
     "build": "yarn g:tsc",
     "clean": "yarn run build --clean",
     "healthcheck": "node --enable-source-maps dist/healthcheck.js http://localhost:${PORT}/health",
-    "start": "node ${INSPECT} --enable-source-maps -r @oada/pino-debug --unhandled-rejections=strict dist/server.js"
+    "start": "node ${INSPECT} --enable-source-maps --unhandled-rejections=strict dist/server.js"
   },
   "mocha": {
     "require": [
@@ -42,7 +42,7 @@
     "@fastify/helmet": "^10.1.0",
     "@fastify/request-context": "^4.2.0",
     "@fastify/sensible": "^5.2.0",
-    "@fastify/websocket": "^7.1.3",
+    "@fastify/websocket": "^7.2.0",
     "@oada/error": "^2.0.1",
     "@oada/formats-server": "^3.4.3",
     "@oada/lib-arangodb": "^3.7.0",
@@ -71,7 +71,7 @@
     "@oada/write-handler": "^3.7.0",
     "@types/cacache": "^15.0.1",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.5",
+    "@types/node": "^18.15.10",
     "@types/type-is": "^1.6.3",
     "@types/uuid": "^9.0.1",
     "@types/ws": "^8.5.4",

diff --git a/oada/services/http-handler/src/server.ts b/oada/services/http-handler/src/server.ts
@@ -40,7 +40,7 @@ import { fastify as Fastify } from 'fastify';
 import bearerAuth from '@fastify/bearer-auth';
 import cors from '@fastify/cors';
 import fastifyAccepts from '@fastify/accepts';
-import { fastifyGracefulShutdown } from 'fastify-graceful-shutdown';
+import fastifyGracefulShutdown from 'fastify-graceful-shutdown';
 import fastifyHealthcheck from 'fastify-healthcheck';
 import fastifySensible from '@fastify/sensible';
 import helmet from '@fastify/helmet';
@@ -59,7 +59,6 @@ export enum EnsureLink {
 }
 
 // Set up logging stuff
-const logger = pino();
 const serializers = {
   // Customize logging for requests
   req(request: FastifyRequest) {
@@ -84,6 +83,9 @@ const serializers = {
     };
   },
 };
+const logger = pino({ serializers });
+// HACK: fastify overrides existing serializers. This circumvents that...
+// logger.serializers = serializers;
 
 mixins.push(() => ({
   reqId: requestContext.get('id'),
@@ -93,11 +95,7 @@ const trustProxy = config.get('trustProxy');
 // eslint-disable-next-line new-cap
 export const fastify = Fastify({
   trustProxy,
-  logger: {
-    ...logger,
-    // HACK: fastify overrides existing serializers. This circumvents that...
-    serializers,
-  },
+  logger,
   ignoreTrailingSlash: true,
   constraints: {
     oadaEnsureLink: {
@@ -181,6 +179,7 @@ await fastify.register(fastifySensible);
 
 await fastify.register(fastifyAccepts);
 
+// @ts-expect-error broken types
 await fastify.register(fastifyGracefulShutdown);
 
 /**

diff --git a/oada/services/http-handler/src/websockets.ts b/oada/services/http-handler/src/websockets.ts
@@ -124,7 +124,6 @@ function parseRequest(data: WebSocket.Data): SocketRequest {
 }
 
 const plugin: FastifyPluginAsync = async (fastify) => {
-  // @ts-expect-error IDEK
   await fastify.register(fastifyWebsocket);
 
   fastify.get('/*', { websocket: true }, ({ socket }) => {

diff --git a/oada/services/permissions-handler/package.json b/oada/services/permissions-handler/package.json
@@ -16,7 +16,7 @@
   "scripts": {
     "build": "yarn g:tsc",
     "clean": "yarn run build --clean",
-    "start": "node ${INSPECT} --enable-source-maps -r @oada/pino-debug --unhandled-rejections=strict dist/server.js",
+    "start": "node ${INSPECT} --enable-source-maps --unhandled-rejections=strict dist/server.js",
     "test": "mocha"
   },
   "mocha": {
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.5",
+    "@types/node": "^18.15.10",
     "@types/type-is": "^1.6.3"
   },
   "volta": {

diff --git a/oada/services/permissions-handler/src/server.ts b/oada/services/permissions-handler/src/server.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import '@oada/pino-debug';
+
 import { config } from './config.js';
 
 import '@oada/lib-prom';

diff --git a/oada/services/rev-graph-update/package.json b/oada/services/rev-graph-update/package.json
@@ -17,7 +17,7 @@
     "test": "yarn run build test && ava",
     "build": "yarn g:tsc",
     "clean": "yarn run build --clean",
-    "start": "node ${INSPECT} --enable-source-maps -r @oada/pino-debug --unhandled-rejections=strict dist/index.js"
+    "start": "node ${INSPECT} --enable-source-maps --unhandled-rejections=strict dist/index.js"
   },
   "ava": {
     "files": [
@@ -51,10 +51,10 @@
     "@oada/client": "^4.5.0",
     "@oada/write-handler": "^3.7.0",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.5",
+    "@types/node": "^18.15.10",
     "@types/randomstring": "^1.1.8",
     "ava": "5.2.0",
-    "type-fest": "^3.6.1"
+    "type-fest": "^3.7.1"
   },
   "volta": {
     "node": "18.13.0"

diff --git a/oada/services/rev-graph-update/src/index.ts b/oada/services/rev-graph-update/src/index.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import '@oada/pino-debug';
+
 import { config } from './config.js';
 
 import '@oada/lib-prom';

diff --git a/oada/services/shares/package.json b/oada/services/shares/package.json
@@ -16,7 +16,7 @@
   "scripts": {
     "build": "yarn g:tsc",
     "clean": "yarn run build --clean",
-    "start": "node ${INSPECT} -r @oada/pino-debug --enable-source-maps --unhandled-rejections=strict dist/server.js",
+    "start": "node ${INSPECT} --enable-source-maps --unhandled-rejections=strict dist/server.js",
     "test": "mocha"
   },
   "mocha": {

diff --git a/oada/services/shares/src/server.ts b/oada/services/shares/src/server.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import '@oada/pino-debug';
+
 import { config } from './config.js';
 
 import '@oada/lib-prom';

diff --git a/oada/services/startup/package.json b/oada/services/startup/package.json
@@ -14,7 +14,7 @@
   "scripts": {
     "build": "yarn g:tsc",
     "clean": "yarn run build --clean",
-    "start": "node ${INSPECT} -r @oada/pino-debug --enable-source-maps --unhandled-rejections=strict dist/index.js",
+    "start": "node ${INSPECT} --enable-source-maps --unhandled-rejections=strict dist/index.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.5"
+    "@types/node": "^18.15.10"
   },
   "volta": {
     "node": "18.13.0"

diff --git a/oada/services/startup/src/index.ts b/oada/services/startup/src/index.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import '@oada/pino-debug';
+
 import http from 'node:http';
 
 import { init as initArangoDB } from '@oada/lib-arangodb';

diff --git a/oada/services/sync-handler/package.json b/oada/services/sync-handler/package.json
@@ -14,7 +14,7 @@
   "scripts": {
     "build": "yarn g:tsc",
     "clean": "yarn run build --clean",
-    "start": "node ${INSPECT} --enable-source-maps -r @oada/pino-debug --unhandled-rejections=strict dist/server.js",
+    "start": "node ${INSPECT} --enable-source-maps --unhandled-rejections=strict dist/server.js",
     "test": "mocha"
   },
   "repository": {
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@oada/write-handler": "^3.7.0",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.5"
+    "@types/node": "^18.15.10"
   },
   "volta": {
     "node": "18.13.0"

diff --git a/oada/services/sync-handler/src/server.ts b/oada/services/sync-handler/src/server.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import '@oada/pino-debug';
+
 import { config } from './config.js';
 
 import '@oada/lib-prom';

diff --git a/oada/services/users/package.json b/oada/services/users/package.json
@@ -16,7 +16,7 @@
   "scripts": {
     "build": "yarn g:tsc",
     "clean": "yarn run build --clean",
-    "start": "node ${INSPECT} --enable-source-maps -r @oada/pino-debug --unhandled-rejections=strict dist/server.js"
+    "start": "node ${INSPECT} --enable-source-maps --unhandled-rejections=strict dist/server.js"
   },
   "bin": {
     "add": "./dist/useradd.js"

diff --git a/oada/services/users/src/server.ts b/oada/services/users/src/server.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import '@oada/pino-debug';
+
 import { config } from './config.js';
 
 import '@oada/lib-prom';

diff --git a/oada/services/webhooks/package.json b/oada/services/webhooks/package.json
@@ -14,7 +14,7 @@
   "scripts": {
     "build": "yarn g:tsc",
     "clean": "yarn run build --clean",
-    "start": "node ${INSPECT} -r @oada/pino-debug --enable-source-maps --unhandled-rejections=strict dist/server.js",
+    "start": "node ${INSPECT} --enable-source-maps --unhandled-rejections=strict dist/server.js",
     "test": "mocha"
   },
   "mocha": {

diff --git a/oada/services/webhooks/src/server.ts b/oada/services/webhooks/src/server.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import '@oada/pino-debug';
+
 import { config } from './config.js';
 
 import '@oada/lib-prom';

diff --git a/oada/services/well-known/package.json b/oada/services/well-known/package.json
@@ -28,7 +28,7 @@
   "scripts": {
     "build": "yarn g:tsc",
     "clean": "yarn run build --clean",
-    "start": "node ${INSPECT} --enable-source-maps -r @oada/pino-debug --unhandled-rejections=strict dist/index.js",
+    "start": "node ${INSPECT} --enable-source-maps --unhandled-rejections=strict dist/index.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {