@natlibfi/melinda-rest-api-commons 2.3.2-alpha.7 → 2.3.2-alpha.8

package/dist/amqp.js

@@ -8,10 +8,11 @@ var _amqplib = _interopRequireDefault(require("amqplib"));
 var _marcRecord = require("@natlibfi/marc-record");
 var _melindaCommons = require("@natlibfi/melinda-commons");
 var _melindaBackendCommons = require("@natlibfi/melinda-backend-commons");
+var _debug = _interopRequireDefault(require("debug"));
 var _constants = require("./constants");
-var _utils = require("./utils");
 var _util = require("util");
 var _httpStatus = _interopRequireDefault(require("http-status"));
+var _utils = require("./utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
 *
@@ -19,7 +20,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 *
 * Shared modules for microservices of Melinda rest api batch import system
 *
-* Copyright (C) 2020-2021 University Of Helsinki (The National Library Of Finland)
+* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)
 *
 * This file is part of melinda-rest-api-commons
 *
@@ -41,10 +42,19 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 *
 */
 
-async function _default(AMQP_URL) {
+//import {logError} from './utils';
+
+async function _default(AMQP_URL, runHealthCheck = false) {
+  const logger = (0, _melindaBackendCommons.createLogger)();
+  const debug = (0, _debug.default)('@natlibfi/melinda-rest-api-commons:amqp');
+  const debugHC = debug.extend('HC');
+  debug(`Creating an AMQP operator to ${AMQP_URL}`);
   const connection = await _amqplib.default.connect(AMQP_URL);
   const channel = await connection.createChannel();
-  const logger = (0, _melindaBackendCommons.createLogger)();
+  const healthCheckLoop = runHealthCheck ? healthCheck() : 'Not running health check';
+  debug(`Connection: ${connection}`);
+  debug(`Channel: ${channel}`);
+  debug(`HealthCheckLoop ${healthCheckLoop}`);
   return {
     checkQueue,
     consumeChunk,
@@ -53,8 +63,39 @@ async function _default(AMQP_URL) {
     nackMessages,
     sendToQueue,
     removeQueue,
-    messagesToRecords
+    messagesToRecords,
+    closeChannel,
+    closeConnection
   };
+  async function closeChannel() {
+    debug(`Closing channel`);
+    await channel.close();
+    debug(`Channel: ${channel}`);
+  }
+  async function closeConnection() {
+    debug(`Closing connection`);
+    await connection.close();
+    debug(`Connection: ${connection}`);
+  }
+  async function healthCheck(wait = false) {
+    const setTimeoutPromise = (0, _util.promisify)(setTimeout);
+    if (wait) {
+      await setTimeoutPromise(wait);
+      return healthCheck(false);
+    }
+    try {
+      debugHC(`Health checking amqp by asserting a queue`);
+      await channel.assertQueue('HEALTHCHECK', {
+        durable: false
+      });
+      debugHC(`Waiting 200ms before running healthCheck next`);
+      return healthCheck('200');
+    } catch (error) {
+      const errorToThrow = error;
+      debugHC(`HealthCheck error ${JSON.stringify(error)}`);
+      handleAmqpErrors(errorToThrow);
+    }
+  }
 
   // eslint-disable-next-line max-statements
   async function checkQueue({
@@ -63,7 +104,7 @@ async function _default(AMQP_URL) {
     toRecord = true,
     purge = false
   }) {
-    logger.silly(`checkQueue: ${queue}, Style: ${style}: toRecord: ${toRecord}, Purge: ${purge}`);
+    debug(`checkQueue: ${queue}, Style: ${style}, toRecord: ${toRecord}, Purge: ${purge}`);
     try {
       errorUndefinedQueue(queue);
       const channelInfo = await channel.assertQueue(queue, {
@@ -72,19 +113,20 @@ async function _default(AMQP_URL) {
       if (purge) {
         await purgeQueue(purge);
         logger.verbose(`Queue ${queue} has purged ${channelInfo.messageCount} messages`);
+        debug(`Queue ${queue} has purged ${channelInfo.messageCount} messages`);
         return checkQueue({
           queue,
           style
         });
       }
-      if (channelInfo.messageCount < 1) {
-        logger.silly(`checkQueue: ${channelInfo.messageCount} - ${queue} is empty`);
-        return false;
-      }
-      logger.silly(`Queue ${queue} has ${channelInfo.messageCount} messages`);
       if (style === 'messages') {
         return channelInfo.messageCount;
       }
+      if (channelInfo.messageCount < 1) {
+        debug(`checkQueue: ${channelInfo.messageCount} - ${queue} is empty`);
+        return false;
+      }
+      debug(`Queue ${queue} has ${channelInfo.messageCount} messages`);
 
       // Note: returns one message (+ record, of toRecord: true)
       // note: if toRecord is false returns just plain message / false
@@ -103,16 +145,17 @@ async function _default(AMQP_URL) {
       // Defaults:
       throw new _melindaCommons.Error(_httpStatus.default.UNPROCESSABLE_ENTITY);
     } catch (error) {
-      (0, _utils.logError)(error);
+      handleAmqpErrors(error);
     }
     function purgeQueue(purge) {
+      debug(`Purging queue: ${queue}, purge: ${purge}`);
       if (purge) {
         return channel.purgeQueue(queue);
       }
     }
   }
   async function consumeChunk(queue, toRecord) {
-    logger.silly(`Prepared to consumeChunk from queue: ${queue}`);
+    debug(`Prepared to consumeChunk from queue: ${queue}`);
     try {
       await channel.assertQueue(queue, {
         durable: true
@@ -121,7 +164,7 @@ async function _default(AMQP_URL) {
       // getData: next chunk (100) messages
       const messages = await getData(queue);
       const headers = getHeaderInfo(messages[0]);
-      logger.debug(`consumeChunk (${messages ? messages.length : '0'} from queue ${queue}) ${toRecord ? 'to records' : 'just messages'}`);
+      debug(`consumeChunk (${messages ? messages.length : '0'} from queue ${queue}) ${toRecord ? 'to records' : 'just messages'}`);
       if (toRecord) {
         const records = await messagesToRecords(messages);
         return {
@@ -135,11 +178,11 @@ async function _default(AMQP_URL) {
         messages
       };
     } catch (error) {
-      (0, _utils.logError)(error);
+      handleAmqpErrors(error);
     }
   }
   async function consumeOne(queue, toRecord) {
-    logger.silly(`Prepared to consumeOne from queue: ${queue}`);
+    debug(`Prepared to consumeOne from queue: ${queue}`);
     try {
       await channel.assertQueue(queue, {
         durable: true
@@ -147,13 +190,13 @@ async function _default(AMQP_URL) {
 
       // Returns false if 0 items in queue
       const message = await channel.get(queue);
-      logger.silly(`Message: ${(0, _util.inspect)(message, {
+      debug(`Message: ${(0, _util.inspect)(message, {
         colors: true,
         maxArrayLength: 3,
         depth: 3
       })}`);
       // Do not spam the logs
-      logger.debug(`consumeOne from queue: ${queue} ${toRecord ? 'to records' : 'just the message'}`);
+      debug(`consumeOne from queue: ${queue} ${toRecord ? 'to records' : 'just the message'}`);
       if (message) {
         if (toRecord) {
           const headers = getHeaderInfo(message);
@@ -168,18 +211,18 @@ async function _default(AMQP_URL) {
       }
       return false;
     } catch (error) {
-      (0, _utils.logError)(error);
+      handleAmqpErrors(error);
     }
   }
   function ackMessages(messages) {
     messages.forEach(message => {
-      logger.silly(`Ack message ${message.properties.correlationId}`);
+      debug(`Ack message ${message.properties.correlationId}`);
       channel.ack(message);
     });
   }
   function nackMessages(messages) {
     messages.forEach(message => {
-      logger.silly(`Nack message ${message.properties.correlationId}`);
+      debug(`Nack message ${message.properties.correlationId}`);
       channel.nack(message);
     });
   }
@@ -189,25 +232,34 @@ async function _default(AMQP_URL) {
     headers,
     data
   }) {
+    debug(`sendToQueue`);
+    // eslint-disable-next-line no-useless-catch
     try {
-      logger.silly(`Queue ${queue}`);
-      logger.silly(`CorrelationId ${correlationId}`);
-      logger.silly(`Data ${JSON.stringify(data)}`);
-      logger.silly(`Headers ${JSON.stringify(headers)}`);
+      debug(`Queue ${queue}`);
+      debug(`CorrelationId ${correlationId}`);
+      debug(`Data ${JSON.stringify(data)}`);
+      debug(`Headers ${JSON.stringify(headers)}`);
       errorUndefinedQueue(queue);
+      debug(`Asserting queue: ${queue}`);
       await channel.assertQueue(queue, {
         durable: true
       });
-      channel.sendToQueue(queue, Buffer.from(JSON.stringify({
+      debug(`Actually sendToQueue: ${queue}`);
+      await channel.sendToQueue(queue, Buffer.from(JSON.stringify({
         data
       })), {
         correlationId,
         persistent: true,
         headers
       });
-      logger.silly(`Send message for ${correlationId} to queue: ${queue}`);
+      debug(`Send message for ${correlationId} to queue: ${queue}`);
     } catch (error) {
-      (0, _utils.logError)(error);
+      const errorToThrow = error;
+      //if (error instanceof ApiError) {
+      //  throw error;
+      //}
+      debug(`SendToQueue errored: ${JSON.stringify(error)}`);
+      handleAmqpErrors(errorToThrow);
     }
   }
   async function removeQueue(queue) {
@@ -216,11 +268,13 @@ async function _default(AMQP_URL) {
     // this might be doable also with assertQueue before deleteQueue
     const tempChannel = await connection.createChannel();
     logger.verbose(`Removing queue ${queue}.`);
+    debug(`Removing queue ${queue}.`);
     await tempChannel.deleteQueue(queue);
     if (tempChannel) {
-      // eslint-disable-line functional/no-conditional-statement
       await tempChannel.close();
+      return;
     }
+    return;
   }
 
   // ----------------
@@ -228,26 +282,26 @@ async function _default(AMQP_URL) {
   // ----------------
 
   function messagesToRecords(messages) {
-    logger.debug(`Parsing messages (${messages.length}) to records`);
+    debug(`Parsing messages (${messages.length}) to records`);
     return messages.map(message => {
       const content = JSON.parse(message.content.toString());
       return new _marcRecord.MarcRecord(content.data);
     });
   }
   async function getData(queue) {
-    logger.debug(`Getting queue data from ${queue}`);
+    debug(`Getting queue data from ${queue}`);
     try {
       const {
         messageCount
       } = await channel.checkQueue(queue);
-      logger.silly(`There is ${messageCount} messages in queue ${queue}`);
+      debug(`There is ${messageCount} messages in queue ${queue}`);
       const messagesToGet = messageCount >= _constants.CHUNK_SIZE ? _constants.CHUNK_SIZE : messageCount;
-      logger.silly(`Getting ${messagesToGet} messages from queue ${queue}`);
+      debug(`Getting ${messagesToGet} messages from queue ${queue}`);
       const messages = await pump(messagesToGet);
-      logger.debug(`Returning ${messages.length} unique messages`);
+      debug(`Returning ${messages.length} unique messages`);
       return messages;
     } catch (error) {
-      (0, _utils.logError)(error);
+      handleAmqpErrors(error);
     }
     async function pump(count, results = [], identifiers = []) {
       if (count === 0) {
@@ -273,5 +327,14 @@ async function _default(AMQP_URL) {
       throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, `Undefined queue!`);
     }
   }
+  function handleAmqpErrors(error) {
+    const newError = error;
+    //debug(`HandleAmqpErrors got an error: ${JSON.stringify(error)}`);
+    if (error instanceof _melindaCommons.Error) {
+      throw new _melindaCommons.Error(newError.status, newError.payload);
+    }
+    (0, _utils.logError)(error);
+    throw newError;
+  }
 }
 //# sourceMappingURL=amqp.js.map

package/dist/amqp.js.map

@@ -1 +1 @@
-{"version":3,"file":"amqp.js","names":["AMQP_URL","connection","amqplib","connect","channel","createChannel","logger","createLogger","checkQueue","consumeChunk","consumeOne","ackMessages","nackMessages","sendToQueue","removeQueue","messagesToRecords","queue","style","toRecord","purge","silly","errorUndefinedQueue","channelInfo","assertQueue","durable","purgeQueue","verbose","messageCount","ApiError","httpStatus","UNPROCESSABLE_ENTITY","error","logError","messages","getData","headers","getHeaderInfo","debug","length","records","message","get","inspect","colors","maxArrayLength","depth","forEach","properties","correlationId","ack","nack","data","JSON","stringify","Buffer","from","persistent","tempChannel","deleteQueue","close","map","content","parse","toString","MarcRecord","messagesToGet","CHUNK_SIZE","pump","count","results","identifiers","identifier","deliveryTag","fields","includes","concat","undefined","INTERNAL_SERVER_ERROR"],"sources":["../src/amqp.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Shared modules for microservices of Melinda rest api batch import system\n*\n* Copyright (C) 2020-2021 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-rest-api-commons\n*\n* melinda-rest-api-commons program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Affero General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-rest-api-commons is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Affero General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport amqplib from 'amqplib';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {CHUNK_SIZE} from './constants';\nimport {logError} from './utils';\nimport {inspect} from 'util';\nimport httpStatus from 'http-status';\n\nexport default async function (AMQP_URL) {\n  const connection = await amqplib.connect(AMQP_URL);\n  const channel = await connection.createChannel();\n  const logger = createLogger();\n\n  return {checkQueue, consumeChunk, consumeOne, ackMessages, nackMessages, sendToQueue, removeQueue, messagesToRecords};\n\n  // eslint-disable-next-line max-statements\n  async function checkQueue({queue, style = 'basic', toRecord = true, purge = false}) {\n    logger.silly(`checkQueue: ${queue}, Style: ${style}: toRecord: ${toRecord}, Purge: ${purge}`);\n\n    try {\n\n      errorUndefinedQueue(queue);\n      const channelInfo = await channel.assertQueue(queue, {durable: true});\n\n      if (purge) {\n        await purgeQueue(purge);\n        logger.verbose(`Queue ${queue} has purged ${channelInfo.messageCount} messages`);\n        return checkQueue({queue, style});\n      }\n\n      if (channelInfo.messageCount < 1) {\n        logger.silly(`checkQueue: ${channelInfo.messageCount} - ${queue} is empty`);\n        return false;\n      }\n      logger.silly(`Queue ${queue} has ${channelInfo.messageCount} messages`);\n\n      if (style === 'messages') {\n        return channelInfo.messageCount;\n      }\n\n      // Note: returns one message (+ record, of toRecord: true)\n      // note: if toRecord is false returns just plain message / false\n      // note: if toRecord is true returns {headers, records, messages} -object / false\n      // should this be more consistent?\n      if (style === 'one') {\n        return consumeOne(queue, toRecord);\n      }\n\n      // Note: returns a chunk of (100) messages (+ records, if toRecord: true)\n      // returns {headers, records, messages} object or {headers, messages} object depending on toRecord\n      if (style === 'basic') {\n        return consumeChunk(queue, toRecord);\n      }\n\n      // Defaults:\n      throw new ApiError(httpStatus.UNPROCESSABLE_ENTITY);\n    } catch (error) {\n      logError(error);\n    }\n\n    function purgeQueue(purge) {\n      if (purge) {\n        return channel.purgeQueue(queue);\n      }\n    }\n  }\n\n  async function consumeChunk(queue, toRecord) {\n    logger.silly(`Prepared to consumeChunk from queue: ${queue}`);\n    try {\n      await channel.assertQueue(queue, {durable: true});\n\n      // getData: next chunk (100) messages\n      const messages = await getData(queue);\n      const headers = getHeaderInfo(messages[0]);\n      logger.debug(`consumeChunk (${messages ? messages.length : '0'} from queue ${queue}) ${toRecord ? 'to records' : 'just messages'}`);\n\n      if (toRecord) {\n        const records = await messagesToRecords(messages);\n        return {headers, records, messages};\n      }\n\n      return {headers, messages};\n    } catch (error) {\n      logError(error);\n    }\n  }\n\n  async function consumeOne(queue, toRecord) {\n    logger.silly(`Prepared to consumeOne from queue: ${queue}`);\n    try {\n      await channel.assertQueue(queue, {durable: true});\n\n      // Returns false if 0 items in queue\n      const message = await channel.get(queue);\n\n      logger.silly(`Message: ${inspect(message, {colors: true, maxArrayLength: 3, depth: 3})}`);\n      // Do not spam the logs\n      logger.debug(`consumeOne from queue: ${queue} ${toRecord ? 'to records' : 'just the message'}`);\n\n      if (message) {\n        if (toRecord) {\n          const headers = getHeaderInfo(message);\n          const records = messagesToRecords([message]);\n          return {headers, records, messages: [message]};\n        }\n\n        return message;\n      }\n\n      return false;\n    } catch (error) {\n      logError(error);\n    }\n  }\n\n  function ackMessages(messages) {\n    messages.forEach(message => {\n      logger.silly(`Ack message ${message.properties.correlationId}`);\n      channel.ack(message);\n    });\n  }\n\n  function nackMessages(messages) {\n    messages.forEach(message => {\n      logger.silly(`Nack message ${message.properties.correlationId}`);\n      channel.nack(message);\n    });\n  }\n\n  async function sendToQueue({queue, correlationId, headers, data}) {\n    try {\n      logger.silly(`Queue ${queue}`);\n      logger.silly(`CorrelationId ${correlationId}`);\n      logger.silly(`Data ${JSON.stringify(data)}`);\n      logger.silly(`Headers ${JSON.stringify(headers)}`);\n\n      errorUndefinedQueue(queue);\n      await channel.assertQueue(queue, {durable: true});\n\n      channel.sendToQueue(\n        queue,\n        Buffer.from(JSON.stringify({data})),\n        {\n          correlationId,\n          persistent: true,\n          headers\n        }\n      );\n      logger.silly(`Send message for ${correlationId} to queue: ${queue}`);\n    } catch (error) {\n      logError(error);\n    }\n  }\n\n  async function removeQueue(queue) {\n    // deleteQueue borks the channel if the queue does not exist\n    // -> use throwaway tempChannel to avoid killing actual channel in use\n    // this might be doable also with assertQueue before deleteQueue\n    const tempChannel = await connection.createChannel();\n    logger.verbose(`Removing queue ${queue}.`);\n    await tempChannel.deleteQueue(queue);\n    if (tempChannel) { // eslint-disable-line functional/no-conditional-statement\n      await tempChannel.close();\n    }\n  }\n\n  // ----------------\n  // Helper functions\n  // ----------------\n\n  function messagesToRecords(messages) {\n    logger.debug(`Parsing messages (${messages.length}) to records`);\n\n    return messages.map(message => {\n      const content = JSON.parse(message.content.toString());\n      return new MarcRecord(content.data);\n    });\n  }\n\n  async function getData(queue) {\n    logger.debug(`Getting queue data from ${queue}`);\n    try {\n      const {messageCount} = await channel.checkQueue(queue);\n      logger.silly(`There is ${messageCount} messages in queue ${queue}`);\n      const messagesToGet = messageCount >= CHUNK_SIZE ? CHUNK_SIZE : messageCount;\n      logger.silly(`Getting ${messagesToGet} messages from queue ${queue}`);\n\n      const messages = await pump(messagesToGet);\n\n      logger.debug(`Returning ${messages.length} unique messages`);\n\n      return messages;\n    } catch (error) {\n      logError(error);\n    }\n\n    async function pump(count, results = [], identifiers = []) {\n      if (count === 0) {\n        return results;\n      }\n\n      const message = await channel.get(queue);\n      const identifier = {\n        correlationId: message.properties.correlationId,\n        deliveryTag: message.fields.deliveryTag\n      };\n      // Filter not unique messages\n      if (identifiers.includes(identifier)) {\n        return pump(count - 1, results, identifiers);\n      }\n\n      return pump(count - 1, results.concat(message), identifiers.concat(identifier));\n    }\n  }\n\n  function getHeaderInfo(data) {\n    return data.properties.headers;\n  }\n\n  function errorUndefinedQueue(queue) {\n    if (queue === undefined || queue === '' || queue === null) {\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Undefined queue!`);\n    }\n  }\n}\n\n\n"],"mappings":"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"}
+{"version":3,"file":"amqp.js","names":["AMQP_URL","runHealthCheck","logger","createLogger","debug","createDebugLogger","debugHC","extend","connection","amqplib","connect","channel","createChannel","healthCheckLoop","healthCheck","checkQueue","consumeChunk","consumeOne","ackMessages","nackMessages","sendToQueue","removeQueue","messagesToRecords","closeChannel","closeConnection","close","wait","setTimeoutPromise","promisify","setTimeout","assertQueue","durable","error","errorToThrow","JSON","stringify","handleAmqpErrors","queue","style","toRecord","purge","errorUndefinedQueue","channelInfo","purgeQueue","verbose","messageCount","ApiError","httpStatus","UNPROCESSABLE_ENTITY","messages","getData","headers","getHeaderInfo","length","records","message","get","inspect","colors","maxArrayLength","depth","forEach","properties","correlationId","ack","nack","data","Buffer","from","persistent","tempChannel","deleteQueue","map","content","parse","toString","MarcRecord","messagesToGet","CHUNK_SIZE","pump","count","results","identifiers","identifier","deliveryTag","fields","includes","concat","undefined","INTERNAL_SERVER_ERROR","newError","status","payload","logError"],"sources":["../src/amqp.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Shared modules for microservices of Melinda rest api batch import system\n*\n* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-rest-api-commons\n*\n* melinda-rest-api-commons program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Affero General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-rest-api-commons is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Affero General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport amqplib from 'amqplib';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport createDebugLogger from 'debug';\nimport {CHUNK_SIZE} from './constants';\n//import {logError} from './utils';\nimport {promisify, inspect} from 'util';\nimport httpStatus from 'http-status';\nimport {logError} from './utils';\n\nexport default async function (AMQP_URL, runHealthCheck = false) {\n  const logger = createLogger();\n  const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:amqp');\n  const debugHC = debug.extend('HC');\n\n  debug(`Creating an AMQP operator to ${AMQP_URL}`);\n  const connection = await amqplib.connect(AMQP_URL);\n  const channel = await connection.createChannel();\n\n  const healthCheckLoop = runHealthCheck ? healthCheck() : 'Not running health check';\n\n  debug(`Connection: ${connection}`);\n  debug(`Channel: ${channel}`);\n  debug(`HealthCheckLoop ${healthCheckLoop}`);\n\n  return {checkQueue, consumeChunk, consumeOne, ackMessages, nackMessages, sendToQueue, removeQueue, messagesToRecords, closeChannel, closeConnection};\n\n  async function closeChannel() {\n    debug(`Closing channel`);\n    await channel.close();\n    debug(`Channel: ${channel}`);\n  }\n\n  async function closeConnection() {\n    debug(`Closing connection`);\n    await connection.close();\n    debug(`Connection: ${connection}`);\n  }\n\n  async function healthCheck(wait = false) {\n    const setTimeoutPromise = promisify(setTimeout);\n    if (wait) {\n      await setTimeoutPromise(wait);\n      return healthCheck(false);\n    }\n\n    try {\n      debugHC(`Health checking amqp by asserting a queue`);\n      await channel.assertQueue('HEALTHCHECK', {durable: false});\n      debugHC(`Waiting 200ms before running healthCheck next`);\n      return healthCheck('200');\n    } catch (error) {\n      const errorToThrow = error;\n      debugHC(`HealthCheck error ${JSON.stringify(error)}`);\n      handleAmqpErrors(errorToThrow);\n    }\n  }\n\n  // eslint-disable-next-line max-statements\n  async function checkQueue({queue, style = 'basic', toRecord = true, purge = false}) {\n    debug(`checkQueue: ${queue}, Style: ${style}, toRecord: ${toRecord}, Purge: ${purge}`);\n\n    try {\n\n      errorUndefinedQueue(queue);\n      const channelInfo = await channel.assertQueue(queue, {durable: true});\n\n      if (purge) {\n        await purgeQueue(purge);\n        logger.verbose(`Queue ${queue} has purged ${channelInfo.messageCount} messages`);\n        debug(`Queue ${queue} has purged ${channelInfo.messageCount} messages`);\n        return checkQueue({queue, style});\n      }\n\n      if (style === 'messages') {\n        return channelInfo.messageCount;\n      }\n\n      if (channelInfo.messageCount < 1) {\n        debug(`checkQueue: ${channelInfo.messageCount} - ${queue} is empty`);\n        return false;\n      }\n      debug(`Queue ${queue} has ${channelInfo.messageCount} messages`);\n\n      // Note: returns one message (+ record, of toRecord: true)\n      // note: if toRecord is false returns just plain message / false\n      // note: if toRecord is true returns {headers, records, messages} -object / false\n      // should this be more consistent?\n      if (style === 'one') {\n        return consumeOne(queue, toRecord);\n      }\n\n      // Note: returns a chunk of (100) messages (+ records, if toRecord: true)\n      // returns {headers, records, messages} object or {headers, messages} object depending on toRecord\n      if (style === 'basic') {\n        return consumeChunk(queue, toRecord);\n      }\n\n      // Defaults:\n      throw new ApiError(httpStatus.UNPROCESSABLE_ENTITY);\n    } catch (error) {\n      handleAmqpErrors(error);\n    }\n\n    function purgeQueue(purge) {\n      debug(`Purging queue: ${queue}, purge: ${purge}`);\n      if (purge) {\n        return channel.purgeQueue(queue);\n      }\n    }\n  }\n\n  async function consumeChunk(queue, toRecord) {\n    debug(`Prepared to consumeChunk from queue: ${queue}`);\n    try {\n      await channel.assertQueue(queue, {durable: true});\n\n      // getData: next chunk (100) messages\n      const messages = await getData(queue);\n      const headers = getHeaderInfo(messages[0]);\n      debug(`consumeChunk (${messages ? messages.length : '0'} from queue ${queue}) ${toRecord ? 'to records' : 'just messages'}`);\n\n      if (toRecord) {\n        const records = await messagesToRecords(messages);\n        return {headers, records, messages};\n      }\n\n      return {headers, messages};\n    } catch (error) {\n      handleAmqpErrors(error);\n    }\n  }\n\n  async function consumeOne(queue, toRecord) {\n    debug(`Prepared to consumeOne from queue: ${queue}`);\n    try {\n      await channel.assertQueue(queue, {durable: true});\n\n      // Returns false if 0 items in queue\n      const message = await channel.get(queue);\n\n      debug(`Message: ${inspect(message, {colors: true, maxArrayLength: 3, depth: 3})}`);\n      // Do not spam the logs\n      debug(`consumeOne from queue: ${queue} ${toRecord ? 'to records' : 'just the message'}`);\n\n      if (message) {\n        if (toRecord) {\n          const headers = getHeaderInfo(message);\n          const records = messagesToRecords([message]);\n          return {headers, records, messages: [message]};\n        }\n\n        return message;\n      }\n\n      return false;\n    } catch (error) {\n      handleAmqpErrors(error);\n    }\n  }\n\n  function ackMessages(messages) {\n    messages.forEach(message => {\n      debug(`Ack message ${message.properties.correlationId}`);\n      channel.ack(message);\n    });\n  }\n\n  function nackMessages(messages) {\n    messages.forEach(message => {\n      debug(`Nack message ${message.properties.correlationId}`);\n      channel.nack(message);\n    });\n  }\n\n  async function sendToQueue({queue, correlationId, headers, data}) {\n    debug(`sendToQueue`);\n    // eslint-disable-next-line no-useless-catch\n    try {\n      debug(`Queue ${queue}`);\n      debug(`CorrelationId ${correlationId}`);\n      debug(`Data ${JSON.stringify(data)}`);\n      debug(`Headers ${JSON.stringify(headers)}`);\n\n      errorUndefinedQueue(queue);\n\n      debug(`Asserting queue: ${queue}`);\n      await channel.assertQueue(queue, {durable: true});\n\n      debug(`Actually sendToQueue: ${queue}`);\n      await channel.sendToQueue(\n        queue,\n        Buffer.from(JSON.stringify({data})),\n        {\n          correlationId,\n          persistent: true,\n          headers\n        }\n      );\n      debug(`Send message for ${correlationId} to queue: ${queue}`);\n\n\n    } catch (error) {\n      const errorToThrow = error;\n      //if (error instanceof ApiError) {\n      //  throw error;\n      //}\n      debug(`SendToQueue errored: ${JSON.stringify(error)}`);\n      handleAmqpErrors(errorToThrow);\n    }\n  }\n\n  async function removeQueue(queue) {\n    // deleteQueue borks the channel if the queue does not exist\n    // -> use throwaway tempChannel to avoid killing actual channel in use\n    // this might be doable also with assertQueue before deleteQueue\n    const tempChannel = await connection.createChannel();\n    logger.verbose(`Removing queue ${queue}.`);\n    debug(`Removing queue ${queue}.`);\n    await tempChannel.deleteQueue(queue);\n\n    if (tempChannel) {\n      await tempChannel.close();\n      return;\n    }\n\n    return;\n  }\n\n  // ----------------\n  // Helper functions\n  // ----------------\n\n  function messagesToRecords(messages) {\n    debug(`Parsing messages (${messages.length}) to records`);\n\n    return messages.map(message => {\n      const content = JSON.parse(message.content.toString());\n      return new MarcRecord(content.data);\n    });\n  }\n\n  async function getData(queue) {\n    debug(`Getting queue data from ${queue}`);\n    try {\n      const {messageCount} = await channel.checkQueue(queue);\n      debug(`There is ${messageCount} messages in queue ${queue}`);\n      const messagesToGet = messageCount >= CHUNK_SIZE ? CHUNK_SIZE : messageCount;\n      debug(`Getting ${messagesToGet} messages from queue ${queue}`);\n\n      const messages = await pump(messagesToGet);\n\n      debug(`Returning ${messages.length} unique messages`);\n\n      return messages;\n    } catch (error) {\n      handleAmqpErrors(error);\n    }\n\n    async function pump(count, results = [], identifiers = []) {\n      if (count === 0) {\n        return results;\n      }\n\n      const message = await channel.get(queue);\n      const identifier = {\n        correlationId: message.properties.correlationId,\n        deliveryTag: message.fields.deliveryTag\n      };\n      // Filter not unique messages\n      if (identifiers.includes(identifier)) {\n        return pump(count - 1, results, identifiers);\n      }\n\n      return pump(count - 1, results.concat(message), identifiers.concat(identifier));\n    }\n  }\n\n  function getHeaderInfo(data) {\n    return data.properties.headers;\n  }\n\n  function errorUndefinedQueue(queue) {\n    if (queue === undefined || queue === '' || queue === null) {\n      throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Undefined queue!`);\n    }\n  }\n\n  function handleAmqpErrors(error) {\n    const newError = error;\n    //debug(`HandleAmqpErrors got an error: ${JSON.stringify(error)}`);\n    if (error instanceof ApiError) {\n      throw new ApiError(newError.status, newError.payload);\n    }\n    logError(error);\n    throw newError;\n  }\n}\n\n\n"],"mappings":"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"}

package/dist/amqp.spec.js

@@ -0,0 +1,252 @@
+"use strict";
+
+var _chai = require("chai");
+var _fixura = require("@natlibfi/fixura");
+var _fixugen = _interopRequireDefault(require("@natlibfi/fixugen"));
+var _debug = _interopRequireDefault(require("debug"));
+var _index = require("./index");
+var _melindaCommons = require("@natlibfi/melinda-commons");
+var _util = require("util");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+*
+* @licstart  The following is the entire license notice for the JavaScript code in this file.
+*
+* Shared modules for microservices of Melinda rest api batch import system
+*
+* Copyright (C) 2022 University Of Helsinki (The National Library Of Finland)
+*
+* This file is part of melinda-rest-api-commons
+*
+* melinda-rest-api-commons program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* melinda-rest-api-commons is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* @licend  The above is the entire license notice
+* for the JavaScript code in this file.
+*
+*/
+
+//import inspect from 'util';
+
+const debug = (0, _debug.default)('@natlibfi/melinda-rest-api-commons:amqp:test');
+//const debugData = debug.extend('data');
+
+const setTimeoutPromise = (0, _util.promisify)(setTimeout);
+(0, _fixugen.default)({
+  callback,
+  path: [__dirname, '..', 'test-fixtures', 'amqp'],
+  recurse: false,
+  useMetadataFile: true,
+  fixura: {
+    failWhenNotFound: false,
+    reader: _fixura.READERS.JSON
+  }
+});
+
+// eslint-disable-next-line max-statements
+async function callback() {
+  const testData = {
+    queue: 'TESTQUEUE',
+    correlationId: '5b7be681-0d4d-47ca-b5d7-1531173ec6bf',
+    data: {
+      'leader': '02518cam a2200745zi 4500',
+      'fields': [{
+        'tag': '001',
+        'value': '000019640'
+      }]
+    }
+  };
+  debug(`Testing amqp against a local AMQP instance - we'll need some kind of mockup for this`);
+  const amqpUrl = 'amqp://127.0.0.1:5672/';
+  debug(`Connecting to ${amqpUrl}, with healthCheck running`);
+  const amqpOperator = await (0, _index.amqpFactory)(amqpUrl, true);
+  debug(`**********`);
+  await testHealthCheckLoopWorking(amqpOperator);
+  debug(`**********`);
+  await testHealthCheckLoopErroring(amqpOperator);
+  await amqpOperator.closeConnection();
+  debug(`--- Create a new amqpOperator2 ----`);
+  debug(`Connecting to ${amqpUrl}, without healthCheck running`);
+  const amqpOperator2 = await (0, _index.amqpFactory)(amqpUrl);
+  debug(`**********`);
+  debug(`*** Test purging the queue: ${testData.queue} *******`);
+  const purgeMessage = await amqpOperator2.checkQueue({
+    queue: testData.queue,
+    toRecord: false,
+    purge: true
+  });
+  (0, _chai.expect)(purgeMessage).to.eql(false);
+  await testSendToQueue(amqpOperator2, testData);
+  debug(`* wait, otherwise queue is not ready *`);
+  await setTimeoutPromise('100');
+  debug(`*** Test getting messageCount from theQueue: ${testData.queue} *******`);
+  const messageCount = await amqpOperator2.checkQueue({
+    queue: testData.queue,
+    style: 'messages'
+  });
+  debug(messageCount);
+  (0, _chai.expect)(messageCount).to.eql(1);
+  debug(`*** Test checking theQueue: ${testData.queue} *******`);
+  const message = await amqpOperator2.checkQueue({
+    queue: testData.queue,
+    style: 'one',
+    toRecord: false,
+    purge: false
+  });
+  (0, _chai.expect)(message).to.not.equal('goo');
+  debug(message);
+  debug(`*** Test nacking the message: ${testData.queue} *******`);
+  await amqpOperator2.nackMessages([message]);
+  debug(`* wait, otherwise queue is not ready *`);
+  await setTimeoutPromise('100');
+  const messageCountAfterNack = await amqpOperator2.checkQueue({
+    queue: testData.queue,
+    style: 'messages'
+  });
+  debug(`After nack: ${messageCountAfterNack}`);
+  (0, _chai.expect)(messageCountAfterNack).to.eql(1);
+  const message2 = await amqpOperator2.checkQueue({
+    queue: testData.queue,
+    style: 'one',
+    toRecord: false,
+    purge: false
+  });
+  debug(`*** Test acking the message: ${testData.queue} *******`);
+  await amqpOperator2.ackMessages([message2]);
+  debug(`* wait, otherwise queue is not ready *`);
+  await setTimeoutPromise('100');
+  const messageCountAfterAck = await amqpOperator2.checkQueue({
+    queue: testData.queue,
+    style: 'messages'
+  });
+  debug(`After ack: ${messageCountAfterAck}`);
+  (0, _chai.expect)(messageCountAfterAck).to.eql(0);
+  debug(`*** Test removing the the queue: ${testData.queue} *******`);
+  const removeResult = await amqpOperator2.removeQueue(testData.queue);
+  debug(removeResult);
+  debug(`**********`);
+  try {
+    await testUndefinedQueue(amqpOperator2, testData);
+  } catch (error) {
+    //expect(error()).to.be.an('apierror');
+    const errorAsString = JSON.stringify(error);
+    (0, _chai.expect)(error).to.be.an.instanceof(_melindaCommons.Error);
+    (0, _chai.expect)(errorAsString).to.eql(`{"status":500,"payload":"Undefined queue!"}`);
+  }
+  debug(`**********`);
+  debug(`--- Closing amqpOperator2 ----`);
+  await amqpOperator2.closeChannel();
+  await amqpOperator2.closeConnection();
+  debug(`**********`);
+  try {
+    await testSendToQueue(amqpOperator2, testData);
+  } catch (error) {
+    (0, _chai.expect)(error.message).to.eql(`Channel closed`);
+    debug(`We got an error: ${JSON.stringify(error)}`);
+  }
+  debug(`**********`);
+  debug(`Done`);
+  //}
+
+  async function testHealthCheckLoopWorking(amqpOperator) {
+    debug(`Testing healthCheckLoop for ${amqpOperator}`);
+    debug(`Waiting 0.5s and expecting healthCheckLoop to work`);
+    await setTimeoutPromise('500');
+    debug(`Amqp Operator should have been alive.`);
+  }
+  async function testHealthCheckLoopErroring(amqpOperator) {
+    debug(`Testing healthCheckLoop with closed channel`);
+    amqpOperator.closeChannel();
+    debug(`Waiting 0.5s and expecting healthCheckLoop to throw error`);
+    await setTimeoutPromise('500');
+    debug(`amqpOperator should have errored`);
+  }
+  async function testSendToQueue(amqpOperator, testData) {
+    // Test sendToQueue
+    debug(`*** Testing sendToQueue ***`);
+    const {
+      queue,
+      correlationId,
+      data
+    } = testData;
+    const headers = {
+      correlationId
+    };
+    await amqpOperator.sendToQueue({
+      queue,
+      correlationId,
+      headers,
+      data
+    });
+    return;
+  }
+
+  /*
+  async function testCheckQueue(amqpOperator, testData) {
+    debug(`Testing checkQueue`);
+    const {queue} = testData;
+    const message = await amqpOperator.checkQueue({queue, style: 'one', toRecord: false, purge: false});
+    debug(message);
+    return message;
+  //expect(message).to.be.defined;
+  }
+  */
+
+  async function testUndefinedQueue(amqpOperator, testData) {
+    // Test sendToQueue
+    debug(`Testing sendToQueue with undefined queue`);
+    const {
+      correlationId,
+      data
+    } = testData;
+    const headers = {
+      correlationId
+    };
+    const queue = undefined;
+    (0, _chai.expect)(await amqpOperator.sendToQueue({
+      queue,
+      correlationId,
+      headers,
+      data
+    })).to.throw();
+  }
+
+  /*
+    await amqpOperator.sendToQueue({queue, correlationId, headers, data});
+    await amqpOperator.ackMessages([message]);
+  const message2 = await amqpOperator.checkQueue({queue, style: 'one', toRecord: false, purge: false});
+  await amqpOperator.ackMessages([message2]);
+   expect(message2).to.be(true);
+    //debug(`FOO: ${JSON.stringify(message)}`);
+    // http:
+  // await amqpOperator.sendToQueue({queue: 'REQUESTS', correlationId, headers, data});
+   // validator:
+  // const message = await amqpOperator.checkQueue({queue: 'REQUESTS', style: 'one', toRecord: false, purge: false});
+  //    await amqpOperator.ackMessages([message]);
+  //  const message = await amqpOperator.checkQueue({queue: validatorQueue, style: 'one', toRecord: false, purge: false});
+  // amqpOperator.removeQueue(validatorQueue);
+  //await amqpOperator.checkQueue({queue: operationQueue, style: 'messages', purge: true});
+  //     await amqpOperator.checkQueue({queue: `${headers.operation}.${correlationId}`, style: 'messages', purge: true});
+   // importer
+  /*
+  const {headers, records, messages} = await amqpOperator.checkQueue({queue: `${operation}.${correlationId}`, style: 'basic', toRecord: true, purge: purgeQueues});
+  await amqpOperator.nackMessages(messages);
+  await amqpOperator.sendToQueue({
+     const {messages} = await amqpOperator.checkQueue({queue, style: 'basic', toRecords: false, purge: false});
+  await amqpOperator.ackMessages(messages);
+  const processMessage = await amqpOperator.checkQueue({queue: processQueue, style: 'one', toRecord: false, purge: false});
+  const {headers: firstMessageHeaders, messages} = await amqpOperator.checkQueue({queue, style: 'basic', toRecord: false, purge: false});
+   const queueMessagesCount = await amqpOperator.checkQueue({queue, style: 'messages'});
+    */
+}
+//# sourceMappingURL=amqp.spec.js.map

package/dist/amqp.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"amqp.spec.js","names":["debug","createDebugLogger","setTimeoutPromise","promisify","setTimeout","generateTests","callback","path","__dirname","recurse","useMetadataFile","fixura","failWhenNotFound","reader","READERS","JSON","testData","queue","correlationId","data","amqpUrl","amqpOperator","amqpFactory","testHealthCheckLoopWorking","testHealthCheckLoopErroring","closeConnection","amqpOperator2","purgeMessage","checkQueue","toRecord","purge","expect","to","eql","testSendToQueue","messageCount","style","message","not","equal","nackMessages","messageCountAfterNack","message2","ackMessages","messageCountAfterAck","removeResult","removeQueue","testUndefinedQueue","error","errorAsString","stringify","be","an","instanceof","ApiError","closeChannel","headers","sendToQueue","undefined","throw"],"sources":["../src/amqp.spec.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Shared modules for microservices of Melinda rest api batch import system\n*\n* Copyright (C) 2022 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-rest-api-commons\n*\n* melinda-rest-api-commons program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Affero General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-rest-api-commons is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Affero General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport {expect} from 'chai';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport createDebugLogger from 'debug';\nimport {amqpFactory} from './index';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\n//import inspect from 'util';\nimport {promisify} from 'util';\n\nconst debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:amqp:test');\n//const debugData = debug.extend('data');\n\nconst setTimeoutPromise = promisify(setTimeout);\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'amqp'],\n  recurse: false,\n  useMetadataFile: true,\n  fixura: {\n    failWhenNotFound: false,\n    reader: READERS.JSON\n  }\n});\n\n// eslint-disable-next-line max-statements\nasync function callback() {\n\n  const testData = {\n    queue: 'TESTQUEUE',\n    correlationId: '5b7be681-0d4d-47ca-b5d7-1531173ec6bf',\n    data: {'leader': '02518cam a2200745zi 4500', 'fields': [{'tag': '001', 'value': '000019640'}]}\n  };\n\n  debug(`Testing amqp against a local AMQP instance - we'll need some kind of mockup for this`);\n  const amqpUrl = 'amqp://127.0.0.1:5672/';\n\n  debug(`Connecting to ${amqpUrl}, with healthCheck running`);\n  const amqpOperator = await amqpFactory(amqpUrl, true);\n\n  debug(`**********`);\n  await testHealthCheckLoopWorking(amqpOperator);\n\n  debug(`**********`);\n  await testHealthCheckLoopErroring(amqpOperator);\n\n  await amqpOperator.closeConnection();\n\n  debug(`--- Create a new amqpOperator2 ----`);\n  debug(`Connecting to ${amqpUrl}, without healthCheck running`);\n  const amqpOperator2 = await amqpFactory(amqpUrl);\n\n  debug(`**********`);\n  debug(`*** Test purging the queue: ${testData.queue} *******`);\n  const purgeMessage = await amqpOperator2.checkQueue({queue: testData.queue, toRecord: false, purge: true});\n  expect(purgeMessage).to.eql(false);\n  await testSendToQueue(amqpOperator2, testData);\n  debug(`* wait, otherwise queue is not ready *`);\n  await setTimeoutPromise('100');\n\n  debug(`*** Test getting messageCount from theQueue: ${testData.queue} *******`);\n  const messageCount = await amqpOperator2.checkQueue({queue: testData.queue, style: 'messages'});\n  debug(messageCount);\n  expect(messageCount).to.eql(1);\n\n  debug(`*** Test checking theQueue: ${testData.queue} *******`);\n  const message = await amqpOperator2.checkQueue({queue: testData.queue, style: 'one', toRecord: false, purge: false});\n  expect(message).to.not.equal('goo');\n  debug(message);\n\n  debug(`*** Test nacking the message: ${testData.queue} *******`);\n  await amqpOperator2.nackMessages([message]);\n  debug(`* wait, otherwise queue is not ready *`);\n  await setTimeoutPromise('100');\n\n  const messageCountAfterNack = await amqpOperator2.checkQueue({queue: testData.queue, style: 'messages'});\n  debug(`After nack: ${messageCountAfterNack}`);\n  expect(messageCountAfterNack).to.eql(1);\n\n  const message2 = await amqpOperator2.checkQueue({queue: testData.queue, style: 'one', toRecord: false, purge: false});\n\n  debug(`*** Test acking the message: ${testData.queue} *******`);\n  await amqpOperator2.ackMessages([message2]);\n  debug(`* wait, otherwise queue is not ready *`);\n  await setTimeoutPromise('100');\n\n  const messageCountAfterAck = await amqpOperator2.checkQueue({queue: testData.queue, style: 'messages'});\n  debug(`After ack: ${messageCountAfterAck}`);\n  expect(messageCountAfterAck).to.eql(0);\n\n  debug(`*** Test removing the the queue: ${testData.queue} *******`);\n  const removeResult = await amqpOperator2.removeQueue(testData.queue);\n  debug(removeResult);\n\n\n  debug(`**********`);\n  try {\n    await testUndefinedQueue(amqpOperator2, testData);\n  } catch (error) {\n  //expect(error()).to.be.an('apierror');\n    const errorAsString = JSON.stringify(error);\n    expect(error).to.be.an.instanceof(ApiError);\n    expect(errorAsString).to.eql(`{\"status\":500,\"payload\":\"Undefined queue!\"}`);\n  }\n  debug(`**********`);\n\n  debug(`--- Closing amqpOperator2 ----`);\n  await amqpOperator2.closeChannel();\n  await amqpOperator2.closeConnection();\n\n  debug(`**********`);\n\n  try {\n    await testSendToQueue(amqpOperator2, testData);\n  } catch (error) {\n    expect(error.message).to.eql(`Channel closed`);\n    debug(`We got an error: ${JSON.stringify(error)}`);\n  }\n  debug(`**********`);\n\n  debug(`Done`);\n  //}\n\n  async function testHealthCheckLoopWorking(amqpOperator) {\n    debug(`Testing healthCheckLoop for ${amqpOperator}`);\n    debug(`Waiting 0.5s and expecting healthCheckLoop to work`);\n    await setTimeoutPromise('500');\n    debug(`Amqp Operator should have been alive.`);\n  }\n\n  async function testHealthCheckLoopErroring(amqpOperator) {\n    debug(`Testing healthCheckLoop with closed channel`);\n    amqpOperator.closeChannel();\n    debug(`Waiting 0.5s and expecting healthCheckLoop to throw error`);\n    await setTimeoutPromise('500');\n    debug(`amqpOperator should have errored`);\n  }\n\n  async function testSendToQueue(amqpOperator, testData) {\n  // Test sendToQueue\n    debug(`*** Testing sendToQueue ***`);\n\n    const {queue, correlationId, data} = testData;\n    const headers = {correlationId};\n\n    await amqpOperator.sendToQueue({queue, correlationId, headers, data});\n    return;\n  }\n\n  /*\n  async function testCheckQueue(amqpOperator, testData) {\n    debug(`Testing checkQueue`);\n    const {queue} = testData;\n    const message = await amqpOperator.checkQueue({queue, style: 'one', toRecord: false, purge: false});\n    debug(message);\n    return message;\n  //expect(message).to.be.defined;\n  }\n*/\n\n  async function testUndefinedQueue(amqpOperator, testData) {\n  // Test sendToQueue\n    debug(`Testing sendToQueue with undefined queue`);\n    const {correlationId, data} = testData;\n    const headers = {correlationId};\n    const queue = undefined;\n\n    expect(await amqpOperator.sendToQueue({queue, correlationId, headers, data})).to.throw();\n  }\n\n\n  /*\n\n\n  await amqpOperator.sendToQueue({queue, correlationId, headers, data});\n\n\n  await amqpOperator.ackMessages([message]);\n  const message2 = await amqpOperator.checkQueue({queue, style: 'one', toRecord: false, purge: false});\n  await amqpOperator.ackMessages([message2]);\n\n  expect(message2).to.be(true);\n\n\n  //debug(`FOO: ${JSON.stringify(message)}`);\n\n\n  // http:\n  // await amqpOperator.sendToQueue({queue: 'REQUESTS', correlationId, headers, data});\n\n  // validator:\n  // const message = await amqpOperator.checkQueue({queue: 'REQUESTS', style: 'one', toRecord: false, purge: false});\n  //    await amqpOperator.ackMessages([message]);\n  //  const message = await amqpOperator.checkQueue({queue: validatorQueue, style: 'one', toRecord: false, purge: false});\n  // amqpOperator.removeQueue(validatorQueue);\n  //await amqpOperator.checkQueue({queue: operationQueue, style: 'messages', purge: true});\n  //     await amqpOperator.checkQueue({queue: `${headers.operation}.${correlationId}`, style: 'messages', purge: true});\n\n  // importer\n  /*\nconst {headers, records, messages} = await amqpOperator.checkQueue({queue: `${operation}.${correlationId}`, style: 'basic', toRecord: true, purge: purgeQueues});\n await amqpOperator.nackMessages(messages);\n  await amqpOperator.sendToQueue({\n     const {messages} = await amqpOperator.checkQueue({queue, style: 'basic', toRecords: false, purge: false});\n await amqpOperator.ackMessages(messages);\n  const processMessage = await amqpOperator.checkQueue({queue: processQueue, style: 'one', toRecord: false, purge: false});\n const {headers: firstMessageHeaders, messages} = await amqpOperator.checkQueue({queue, style: 'basic', toRecord: false, purge: false});\n   const queueMessagesCount = await amqpOperator.checkQueue({queue, style: 'messages'});\n\n\n  */\n\n}\n\n"],"mappings":"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"}

package/package.json

@@ -14,7 +14,7 @@
 		"url": "git@github.com:natlibfi/melinda-rest-api-commons.git"
 	},
 	"license": "AGPL-3.0+",
-	"version": "2.3.2-alpha.7",
+	"version": "2.3.2-alpha.8",
 	"main": "./dist/index.js",
 	"engines": {
 		"node": ">=14"
@@ -28,7 +28,8 @@
 		"lint:dev": "eslint ./src --fix",
 		"test": "npm run lint && npm run test:base -- src/**/*.spec.js",
 		"test:dev": "npm run lint:dev && npm run test:base -- src/**/*.spec.js",
-		"test:base": "cross-env NODE_ENV=test nyc mocha --require @babel/register",
+		"test:base": "cross-env NODE_ENV=test nyc mocha --require @babel/register --exclude src/amqp.spec.js",
+		"test:local": "cross-env NODE_ENV=test nyc mocha --require @babel/register -- src/amqp.spec.js",
 		"dev": "NODE_ENV=development cross-env DEBUG=1 nodemon",
 		"build": "babel src --source-maps --copy-files --delete-dir-on-start --out-dir=dist"
 	},