Fix and test mongo.js ; Initialize setTimeOutPromise just once [MRA-845] ; Dependency & Maintenance Update (#298)

* Add test timeout

* Node-tests: audit-level: moderate

* [MRA-845] initialize setTimeOutPromise just once

* Update deps
* Update mongodb v6
* HealthCheck delay to integer

* Fix and test mongo.js (#304)

* Add db parameter to mongoOperator (defaults to 'rest-api')
* Use returnDocument: 'after' instead of returnNewDocument to actually return updated document
* Do not add queueItem if createBulk's stream fails
* Return result for findOneAndUpdate if result.ok does not exist (mongodb update)
* Fix setImportJobState errors
* Fix checking queueItemState in checkTimeOut
* Do not return _id in getOne()
* Do not return _id in queryById()
* Fix createProjection for query
* Fix projection for queryById
* Fix queryById to return timeouted queueItem

* Add comments and debug
* Add tests for mongo.js and comment non-tested parts in mongo.js

* Use parseBoolean (note: any non-empty, non-"false" string === true)

* Add debug
* Fix removeContent & add tests
* Move tests to tests-directory ; split mongo tests by function

* 4.2.4-alpha.14

Author: ammsalme

.github/workflows/melinda-node-tests.yml

@@ -25,7 +25,7 @@ jobs:
       env:
         NPM_CONFIG_IGNORE_SCRIPTS: true
     - run: npm update
-    - run: npm audit --package-lock-only --production --audit-level=high
+    - run: npm audit --package-lock-only --production --audit-level=moderate
     - run: npm i
     - run: npm test
     - run: npm run build --if-present

package-lock.json

@@ -14,7 +14,7 @@
     "url": "[email protected]:natlibfi/melinda-rest-api-commons.git"
   },
   "license": "MIT",
-  "version": "4.2.3",
+  "version": "4.2.4-alpha.14",
   "main": "./dist/index.js",
   "engines": {
     "node": ">=18"
@@ -28,32 +28,32 @@
     "lint": "eslint ./src",
     "lint:dev": "eslint ./src --fix",
     "test": "npm run lint && npm run test:base",
-    "test:base": "cross-env NODE_ENV=test nyc mocha --package ./package.json --exclude src/amqp.health.spec.js --exclude src/amqp.tests.spec.js",
-    "test:dev": "npm run lint:dev && cross-env NODE_ENV=test nyc mocha --package ./package.json --exclude src/amqp.health.spec.js --exclude src/amqp.tests.spec.js",
-    "test:local": "cross-env NODE_ENV=test nyc mocha --package ./package.json -- src/amqp.*.spec.js",
-    "test:healthcheck": "cross-env NODE_ENV=test nyc mocha --require @babel/register -- src/amqp.health.spec.js",
+    "test:base": "cross-env NODE_ENV=test nyc mocha --package ./package.json --exclude tests/amqp.health.spec.js --exclude tests/amqp.tests.spec.js",
+    "test:dev": "npm run lint:dev && cross-env NODE_ENV=test nyc mocha --package ./package.json --exclude tests/amqp.health.spec.js --exclude tests/amqp.tests.spec.js",
+    "test:local": "cross-env NODE_ENV=test nyc mocha --package ./package.json -- tests/amqp.*.spec.js",
+    "test:healthcheck": "cross-env NODE_ENV=test nyc mocha --require @babel/register -- tests/amqp.health.spec.js",
     "dev": "nodemon",
     "dev:debug": "cross-env LOG_LEVEL=debug DEBUG=@natlibfi/* NODE_ENV=test nodemon"
   },
   "dependencies": {
-    "@natlibfi/marc-record": "^9.1.1",
-    "@natlibfi/marc-record-serializers": "^10.1.4",
-    "@natlibfi/marc-record-validate": "^8.0.11",
-    "@natlibfi/marc-record-validators-melinda": "^11.4.8",
-    "@natlibfi/melinda-backend-commons": "^2.3.5",
-    "@natlibfi/melinda-commons": "^13.0.18",
-    "amqplib": "^0.10.4",
-    "debug": "^4.3.7",
+    "@natlibfi/marc-record": "^9.1.3",
+    "@natlibfi/marc-record-serializers": "^10.1.5",
+    "@natlibfi/marc-record-validate": "^8.0.12",
+    "@natlibfi/marc-record-validators-melinda": "^11.5.4",
+    "@natlibfi/melinda-backend-commons": "^2.3.6",
+    "@natlibfi/melinda-commons": "^13.0.19",
+    "amqplib": "^0.10.5",
+    "debug": "^4.4.0",
     "http-status": "^2.1.0",
     "moment": "^2.30.1",
     "mongo-sanitize": "^1.1.0",
-    "mongodb": "^4.17.2"
+    "mongodb": "^6.13.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.25.9",
-    "@babel/core": "^7.26.0",
-    "@babel/plugin-transform-runtime": "^7.25.9",
-    "@babel/preset-env": "^7.26.0",
+    "@babel/cli": "^7.26.4",
+    "@babel/core": "^7.26.8",
+    "@babel/plugin-transform-runtime": "^7.26.8",
+    "@babel/preset-env": "^7.26.8",
     "@babel/register": "^7.25.9",
     "@natlibfi/eslint-config-melinda-backend": "^3.0.5",
     "@natlibfi/fixugen": "^2.0.12",
@@ -64,8 +64,8 @@
     "chai": "^4.5.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.57.1",
-    "mocha": "^11.0.1",
-    "nodemon": "^3.1.7",
+    "mocha": "^11.1.0",
+    "nodemon": "^3.1.9",
     "nyc": "^17.1.0"
   },
   "overrides": {
@@ -99,28 +99,30 @@
   },
   "mocha": {
     "spec": [
-      "src/*.spec.js",
-      "src/**/*.spec.js"
+      "tests/*.spec.js",
+      "tests/**/*.spec.js"
     ],
     "require": [
       "@babel/register"
     ],
     "inline-diffs": true,
     "maxDiffSize": 25000,
     "bail": true,
-    "exit": true
+    "exit": true,
+    "timeout": 10000
   },
   "nodemonConfig": {
     "exec": "npm run test:dev",
     "watch": [
+      "tests/*",
       "src/*",
       "test-fixtures/*"
     ]
   },
   "nyc": {
     "exclude": [
-      "src/*.spec.js",
-      "src/**/*.spec.js"
+      "tests/*.spec.js",
+      "tests/**/*.spec.js"
     ],
     "reporter": [
       "text"

package.json

@@ -13,6 +13,7 @@ export default async function (AMQP_URL, runHealthCheck = false) {
   const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:amqp');
   const debugHC = debug.extend('HC');
   const debugData = debug.extend('data');
+  const setTimeoutPromise = promisify(setTimeout);
 
   debug(`Creating an AMQP operator to ${AMQP_URL}`);
   const connection = await amqplib.connect(AMQP_URL);
@@ -39,7 +40,6 @@ export default async function (AMQP_URL, runHealthCheck = false) {
   }
 
   async function healthCheck(wait = false) {
-    const setTimeoutPromise = promisify(setTimeout);
     if (wait) {
       await setTimeoutPromise(wait);
       return healthCheck(false);
@@ -49,7 +49,7 @@ export default async function (AMQP_URL, runHealthCheck = false) {
       debugHC(`Health checking amqp by asserting a queue`);
       await channel.assertQueue('HEALTHCHECK', {durable: false});
       debugHC(`Waiting 200ms before running healthCheck next`);
-      return healthCheck('200');
+      return healthCheck(200);
     } catch (error) {
       debugHC(`HealthCheck error ${JSON.stringify(error)}`);
       handleAmqpErrors(error);