fix: build

backend/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/backend",
-  "version": "1.0.0",
   "description": "A reference implementation for a StApps backend",
+  "version": "2.1.0",
   "license": "AGPL-3.0-only",
   "author": "André Bierlein <andre.mt.bierlein@gmail.com>",
   "contributors": [
@@ -18,9 +18,10 @@
     "build": "npm run lint && npm run compile",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
     "check-configuration": "openstapps-configuration",
-    "compile": "rimraf lib && tsc && prepend lib/cli.js '#!/usr/bin/env node\n'",
+    "compile": "rimraf lib && tsc",
     "documentation": "typedoc --includeVersion --out docs --readme README.md --listInvalidSymbolLinks --entryPointStrategy expand src && openstapps-core-tools openapi ./node_modules/@openstapps/core/lib ./docs/openapi && openapi build-docs docs/openapi/openapi.json -o docs/openapi/index.html",
-    "version": "npm run changelog",
+    "lint": "eslint -c .eslintrc.json --ignore-path .eslintignore --ext .ts src/ test/",
+    "lint:fix": "eslint --fix -c .eslintrc.json --ignore-path .eslintignore --ext .ts src/ test/",
     "prepublishOnly": "npm ci && npm run build",
     "preversion": "npm run prepublishOnly",
     "push": "git push && git push origin \"v$npm_package_version\"",
@@ -29,14 +30,14 @@
     "test": "npm run test-unit && npm run test-integration",
     "test-unit": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 nyc mocha --require ts-node/register --exit 'test/**/*.spec.ts'",
     "test-integration": "docker-compose -f integration-test.yml pull && docker-compose -f integration-test.yml up --build --abort-on-container-exit --exit-code-from apicli",
-    "lint": "eslint -c .eslintrc.json --ignore-path .eslintignore --ext .ts src/ test/",
-    "lint:fix": "eslint --fix -c .eslintrc.json --ignore-path .eslintignore --ext .ts src/ test/"
+    "test-unit": "env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 nyc mocha --require ts-node/register --exit 'test/**/*.spec.ts'",
+    "version": "npm run changelog"
   },
   "dependencies": {
     "@elastic/elasticsearch": "8.4.0",
-    "@openstapps/core": "1.0.1",
-    "@openstapps/core-tools": "0.34.0",
-    "@openstapps/logger": "1.1.1",
+    "@openstapps/core": "workspace:*",
+    "@openstapps/core-tools": "workspace:*",
+    "@openstapps/logger": "workspace:*",
     "@redocly/cli": "1.0.0-beta.125",
     "@types/node": "14.18.43",
     "config": "3.3.9",
@@ -44,7 +45,7 @@
     "express": "4.18.2",
     "express-prom-bundle": "6.6.0",
     "express-promise-router": "4.1.1",
-    "got": "11.8.6",
+    "got": "12.6.0",
     "moment": "2.29.4",
     "morgan": "1.10.0",
     "nock": "13.3.1",
@@ -57,9 +58,9 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@openstapps/configuration": "0.34.0",
-    "@openstapps/es-mapping-generator": "0.6.0",
-    "@openstapps/eslint-config": "1.1.0",
+    "@openstapps/configuration": "workspace:*",
+    "@openstapps/es-mapping-generator": "workspace:*",
+    "@openstapps/eslint-config": "workspace:*",
     "@testdeck/mocha": "0.3.3",
     "@types/chai": "4.3.4",
     "@types/chai-as-promised": "7.1.5",
@@ -69,14 +70,15 @@
     "@types/geojson": "1.0.6",
     "@types/mocha": "10.0.1",
     "@types/morgan": "1.9.4",
+    "@types/node": "18.15.3",
     "@types/node-cron": "3.0.7",
     "@types/nodemailer": "6.4.7",
     "@types/promise-queue": "2.2.0",
     "@types/sinon-express-mock": "1.3.9",
     "@types/supertest": "2.0.12",
     "@types/uuid": "8.3.4",
-    "@typescript-eslint/eslint-plugin": "5.42.0",
-    "@typescript-eslint/parser": "5.42.0",
+    "@typescript-eslint/eslint-plugin": "5.49.0",
+    "@typescript-eslint/parser": "5.49.0",
     "chai": "4.3.7",
     "chai-as-promised": "7.1.1",
     "conventional-changelog-cli": "2.2.2",
@@ -85,14 +87,13 @@
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-jsdoc": "39.9.1",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-unicorn": "43.0.2",
+    "eslint-plugin-unicorn": "45.0.2",
     "get-port": "5.1.1",
     "mocha": "10.2.0",
     "mocked-env": "1.3.5",
     "nyc": "15.1.0",
-    "prepend-file-cli": "1.0.6",
     "prettier": "2.8.8",
-    "rimraf": "3.0.2",
+    "rimraf": "4.4.0",
     "sinon": "14.0.2",
     "sinon-express-mock": "2.2.1",
     "supertest": "6.3.3",

backend/backend/src/cli.ts

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 /*
  * Copyright (C) 2019 StApps
  * This program is free software: you can redistribute it and/or modify
@@ -68,16 +70,19 @@ async function onError(error: {code: string; syscall: string}) {
 
   // handle specific listen errors with friendly messages
   switch (error.code) {
-    case 'EACCES':
+    case 'EACCES': {
       await Logger.error(`${bind} requires elevated privileges`);
       process.exit(1);
       break;
-    case 'EADDRINUSE':
+    }
+    case 'EADDRINUSE': {
       await Logger.error(`${bind} is already in use`);
       process.exit(1);
       break;
-    default:
+    }
+    default: {
       throw error;
+    }
   }
 }
 
@@ -87,11 +92,11 @@ async function onError(error: {code: string; syscall: string}) {
 function onListening() {
   const addr = server.address();
 
-  if (addr !== null) {
+  if (addr === null) {
+    void Logger.error(`Failed to start binding`);
+  } else {
     const bind = typeof addr === 'string' ? `pipe ${addr}` : `port ${addr.port}`;
     Logger.ok(`Listening on ${bind}`);
-  } else {
-    void Logger.error(`Failed to start binding`);
   }
 }
 

backend/backend/src/notification/mail-queue.ts

@@ -83,18 +83,18 @@ export class MailQueue {
       throw new Error('Failed to initialize the SMTP transport for the mail queue');
     }
 
-    if (!this.transport.isVerified()) {
-      this.verificationCounter++;
-      setTimeout(() => {
-        Logger.warn('Transport not verified yet. Trying to send mails here...');
-        this.checkForVerification();
-      }, MailQueue.VERIFICATION_TIMEOUT);
-    } else {
+    if (this.transport.isVerified()) {
       Logger.ok('Transport for mail queue was verified. We can send mails now');
       // if the transport finally was verified send all our mails from the dry queue
       for (const mail of this.dryQueue) {
         void this.addToQueue(mail);
       }
+    } else {
+      this.verificationCounter++;
+      setTimeout(() => {
+        Logger.warn('Transport not verified yet. Trying to send mails here...');
+        this.checkForVerification();
+      }, MailQueue.VERIFICATION_TIMEOUT);
     }
   }
 
@@ -104,12 +104,12 @@ export class MailQueue {
    * @param mail Information required for sending a mail
    */
   public async push(mail: MailOptions) {
-    if (!this.transport.isVerified()) {
+    if (this.transport.isVerified()) {
+      await this.addToQueue(mail);
+    } else {
       // the transport has verification, but is not verified yet
       // push to a dry queue which gets pushed to the real queue when the transport is verified
       this.dryQueue.push(mail);
-    } else {
-      await this.addToQueue(mail);
     }
   }
 }

backend/backend/src/routes/plugin-register-route.ts

@@ -47,10 +47,12 @@ export async function pluginRegisterHandler(
   _app: Express.Application,
 ): Promise<SCPluginRegisterResponse> {
   switch (request.action) {
-    case 'add':
+    case 'add': {
       return addPlugin(request.plugin);
-    case 'remove':
+    }
+    case 'remove': {
       return removePlugin(request.route);
+    }
   }
 }
 

backend/backend/src/storage/elasticsearch/monitoring.ts

@@ -114,17 +114,21 @@ export async function setUp(
     // make a schedule for each trigger
     for (const trigger of watcher.triggers) {
       switch (trigger.executionTime) {
-        case 'hourly':
+        case 'hourly': {
           trigger.executionTime = '5 * * * *';
           break;
-        case 'daily':
+        }
+        case 'daily': {
           trigger.executionTime = '5 0 * * *';
           break;
-        case 'weekly':
+        }
+        case 'weekly': {
           trigger.executionTime = '5 0 * * 0';
           break;
-        case 'monthly':
+        }
+        case 'monthly': {
           trigger.executionTime = '5 0 1 * *';
+        }
       }
 
       cron.schedule(trigger.executionTime, async () => {