feat: stability improvements

OADA · Mar 31, 2023 · 82f6d3b · 82f6d3b
1 parent 1a088f7
commit 82f6d3b
Show file tree

Hide file tree

Showing 23 changed files with 239 additions and 207 deletions.
diff --git a/oada/.eslintrc.yaml b/oada/.eslintrc.yaml
@@ -131,6 +131,8 @@ rules:
   node/no-missing-import: off
   import/no-unresolved: off
   unicorn/prefer-spread: off
+  unicorn/prevent-abbreviations:
+    [warn, { replacements: { db: false, req: false } }]
   no-constructor-bind/no-constructor-bind: error
   no-constructor-bind/no-constructor-state: error
   sort-imports: [warn, { allowSeparatedGroups: true }]

diff --git a/oada/libs/lib-arangodb/package.json b/oada/libs/lib-arangodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/lib-arangodb",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "All OADA Arango interface code in one place.",
   "main": "dist/index.js",
   "type": "module",
@@ -55,7 +55,7 @@
     "@oada/lib-config": "^3.7.0",
     "@oada/oadaify": "^2.1.0",
     "@oada/types": "^3.4.3",
-    "arangojs": "^8.1.0",
+    "arangojs": "^8.2.0",
     "bcryptjs": "^2.4.3",
     "clone-deep": "^4.0.1",
     "debug": "^4.3.4",
@@ -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.10",
+    "@types/node": "^18.15.11",
     "ava": "5.2.0",
-    "type-fest": "^3.7.1"
+    "type-fest": "^3.7.2"
   },
   "volta": {
     "node": "18.13.0"

diff --git a/oada/libs/lib-arangodb/src/init.ts b/oada/libs/lib-arangodb/src/init.ts
@@ -159,9 +159,7 @@ export async function run(): Promise<void> {
         };
         // Override global ensureDefaults if this column explicitly specifies a value for it:
         const colSpecificEnsureDefaults =
-          colinfo.ensureDefaults === undefined
-            ? ensureDefaults
-            : colinfo.ensureDefaults;
+          colinfo.ensureDefaults ?? ensureDefaults;
 
         // TODO: clean up this any nonsense
         for await (const document of data) {

diff --git a/oada/libs/lib-config/package.json b/oada/libs/lib-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/lib-config",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "Confing wrapper",
   "main": "dist/index.js",
   "type": "module",

diff --git a/oada/libs/lib-kafka/package.json b/oada/libs/lib-kafka/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/lib-kafka",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "OADA Kafka library",
   "main": "./dist/index.js",
   "type": "module",
@@ -48,7 +48,7 @@
     "@ava/typescript": "^4.0.0",
     "@types/convict": "^6.1.1",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.10",
+    "@types/node": "^18.15.11",
     "@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.10",
+    "@types/node": "^18.15.11",
     "@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
@@ -1,6 +1,6 @@
 {
   "name": "@oada/pino-debug",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "OADA pino-debug wrapper",
   "main": "dist/index.js",
   "engines": {
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.10"
+    "@types/node": "^18.15.11"
   },
   "peerDependencies": {
     "debug": "*"

diff --git a/oada/package.json b/oada/package.json
@@ -16,14 +16,15 @@
     "@commitlint/cli": "^17.5.1",
     "@commitlint/config-conventional": "^17.4.4",
     "@tsconfig/node18": "^1.0.1",
-    "@types/eslint": "^8.21.3",
+    "@types/eslint": "^8.37.0",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.15.10",
+    "@types/node": "^18.15.11",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
-    "@yarnpkg/sdks": "^3.0.0-rc.41",
+    "@yarnpkg/sdks": "^3.0.0-rc.42",
+    "browserslist": "^4.21.5",
     "c8": "^7.13.0",
-    "eslint": "^8.36.0",
+    "eslint": "^8.37.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-config-xo": "^0.43.1",
     "eslint-config-xo-typescript": "^0.56.0",
@@ -45,13 +46,14 @@
     "eslint-plugin-optimize-regex": "^1.2.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-regexp": "^1.13.0",
+    "eslint-plugin-regexp": "^1.14.0",
     "eslint-plugin-security": "^1.7.1",
     "eslint-plugin-sonarjs": "^0.19.0",
     "eslint-plugin-unicorn": "^46.0.0",
     "get-port": "^6.1.2",
     "prettier": "^2.8.7",
-    "typescript": "5.0.2",
+    "typescript": "5.0.3",
+    "update-browserslist-db": "^1.0.10",
     "zx": "^7.2.1"
   },
   "dependencies": {

diff --git a/oada/services/auth/package.json b/oada/services/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/auth",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "Reference implementation of OADA Authentication and Authorization server.",
   "bin": {
     "token": "./dist/token.js"
@@ -54,7 +54,7 @@
     "@oada/pino-debug": "^3.7.0",
     "@oada/types": "^3.4.3",
     "@oada/well-known-json": "^4.0.0",
-    "arangojs": "^8.1.0",
+    "arangojs": "^8.2.0",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.20.2",
     "chalk": "^5.2.0",
@@ -105,7 +105,7 @@
     "@types/urijs": "^1.19.19",
     "@types/uuid": "^9.0.1",
     "c8": "^7.13.0",
-    "type-fest": "^3.7.1"
+    "type-fest": "^3.7.2"
   },
   "volta": {
     "node": "18.13.0"

diff --git a/oada/services/auth/src/index.ts b/oada/services/auth/src/index.ts
@@ -20,6 +20,7 @@ import '@oada/pino-debug';
 import { config, domainConfigs } from './config.js';
 
 import '@oada/lib-prom';
+import { arango as database } from '@oada/lib-arangodb';
 
 import https from 'node:https';
 import path from 'node:path';
@@ -31,8 +32,9 @@ import bodyParser from 'body-parser';
 import express from 'express';
 import session from 'express-session';
 
+import ArangoSessionStore from 'connect-arango';
+import type { Database } from 'arangojs';
 import URI from 'urijs';
-import connectArango from 'connect-arango';
 import cors from 'cors';
 import debug from 'debug';
 import got from 'got';
@@ -72,9 +74,6 @@ declare module 'express-session' {
 const info = debug('auth#index:info');
 const trace = debug('auth#index:trace');
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
-const ArangoSessionStore = connectArango(session);
-
 export default run;
 async function run() {
   // Deepcode ignore UseCsurfForExpress: helmet handles this
@@ -105,11 +104,8 @@ async function run() {
       resave: false,
       saveUninitialized: false,
       store: new ArangoSessionStore({
-        collectionName: config.get('arangodb.collections.sessions').name,
-        db: {
-          databaseName: config.get('arangodb.database'),
-          url: config.get('arangodb.connectionString'),
-        },
+        collection: config.get('arangodb.collections.sessions').name,
+        db: database as Database,
       }),
     })
   );

diff --git a/oada/services/auth/src/types.d.ts b/oada/services/auth/src/types.d.ts
@@ -17,18 +17,16 @@
 
 declare module 'connect-arango' {
   import type { Class } from 'type-fest';
-  import type { Config } from 'arangojs';
+  import type { Database } from 'arangojs';
   import session from 'express-session';
-  class ArangoSore extends session.Store {}
+  class ArangoStore extends session.Store {}
   export interface Options {
-    collectionName: string;
-    db: Config;
-    ttl?: number;
+    collection: string;
+    db: Database;
   }
 
-  function connect(s: typeof session): Class<ArangoSore, [Options]>;
-
-  export = connect;
+  const c: Class<ArangoStore, [Options]>;
+  export = c;
 }
 
 declare module 'es-main' {

diff --git a/oada/services/http-handler/package.json b/oada/services/http-handler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/http-handler",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "type": "module",
   "description": "",
   "main": "dist/server.js",
@@ -71,7 +71,7 @@
     "@oada/write-handler": "^3.7.0",
     "@types/cacache": "^15.0.1",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.10",
+    "@types/node": "^18.15.11",
     "@types/type-is": "^1.6.3",
     "@types/uuid": "^9.0.1",
     "@types/ws": "^8.5.4",

diff --git a/oada/services/http-handler/src/requester.ts b/oada/services/http-handler/src/requester.ts
@@ -20,7 +20,9 @@ import { Requester } from '@oada/lib-kafka';
 import { config } from './config.js';
 
 // TODO: Is it better to have one requester per topic?
-export default new Requester({
+const requester = new Requester({
   consumeTopic: config.get('kafka.topics.httpResponse'),
   group: 'http-handlers',
 });
+
+export default requester;
diff --git a/oada/services/permissions-handler/package.json b/oada/services/permissions-handler/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@oada/permissions-handler",
   "description": "",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "type": "module",
   "author": "",
   "license": "Apache-2.0",
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.10",
+    "@types/node": "^18.15.11",
     "@types/type-is": "^1.6.3"
   },
   "volta": {

diff --git a/oada/services/rev-graph-update/package.json b/oada/services/rev-graph-update/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/rev-graph-update",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "type": "module",
   "description": "",
   "author": "",
@@ -51,10 +51,10 @@
     "@oada/client": "^4.5.0",
     "@oada/write-handler": "^3.7.0",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.10",
+    "@types/node": "^18.15.11",
     "@types/randomstring": "^1.1.8",
     "ava": "5.2.0",
-    "type-fest": "^3.7.1"
+    "type-fest": "^3.7.2"
   },
   "volta": {
     "node": "18.13.0"

diff --git a/oada/services/shares/package.json b/oada/services/shares/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/shares",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "type": "module",
   "description": "",
   "author": "",

diff --git a/oada/services/startup/package.json b/oada/services/startup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/startup",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "type": "module",
   "description": "Handles startup of services for docker in OADA docker implementation.",
   "main": "dist/index.js",
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.10"
+    "@types/node": "^18.15.11"
   },
   "volta": {
     "node": "18.13.0"

diff --git a/oada/services/sync-handler/package.json b/oada/services/sync-handler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/sync-handler",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "type": "module",
   "description": "",
   "main": "dist/server.js",
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@oada/write-handler": "^3.7.0",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.15.10"
+    "@types/node": "^18.15.11"
   },
   "volta": {
     "node": "18.13.0"

diff --git a/oada/services/users/package.json b/oada/services/users/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/users",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "type": "module",
   "description": "",
   "author": "Alex Layton <alex@layton.in>",

diff --git a/oada/services/webhooks/package.json b/oada/services/webhooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/webhooks",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "type": "module",
   "description": "",
   "main": "dist/server.js",

diff --git a/oada/services/well-known/package.json b/oada/services/well-known/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/well-known",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "type": "module",
   "description": "Microservice for serving well-known at an OADA cloud.  Plays nicely with oada-ref-auth-js.",
   "repository": {

diff --git a/oada/services/write-handler/package.json b/oada/services/write-handler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/write-handler",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "type": "module",
   "description": "",
   "engines": {
@@ -60,7 +60,7 @@
     "@oada/types": "^3.4.3",
     "@types/debug": "^4.1.7",
     "@types/json-pointer": "^1.0.31",
-    "@types/node": "^18.15.10",
+    "@types/node": "^18.15.11",
     "@types/object-assign-deep": "^0.4.0",
     "ava": "5.2.0"
   },