@natlibfi/melinda-rest-api-commons 2.2.0-alpha.9 → 2.3.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/amqp.js.map +1 -1
- package/dist/constants.js.map +1 -1
- package/dist/helpers/conversion.js.map +1 -1
- package/dist/helpers/conversion.spec.js.map +1 -1
- package/dist/helpers/format.js.map +1 -1
- package/dist/helpers/format.spec.js.map +1 -1
- package/dist/helpers/validation.js.map +1 -1
- package/dist/helpers/validation.spec.js.map +1 -1
- package/dist/index.js +9 -0
- package/dist/index.js.map +1 -1
- package/dist/mongo.js +109 -23
- package/dist/mongo.js.map +1 -1
- package/dist/mongoLog.js +121 -0
- package/dist/mongoLog.js.map +1 -0
- package/dist/utils.js +71 -21
- package/dist/utils.js.map +1 -1
- package/package.json +11 -11
package/dist/amqp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/amqp.js"],"names":["AMQP_URL","connection","amqplib","connect","channel","createChannel","logger","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","messages","getData","headers","getHeaderInfo","debug","length","records","message","get","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"],"mappings":";;;;;;;AA4BA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;AAnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAWe,wBAAgBA,QAAhB,EAA0B;AACvC,QAAMC,UAAU,GAAG,MAAMC,iBAAQC,OAAR,CAAgBH,QAAhB,CAAzB;AACA,QAAMI,OAAO,GAAG,MAAMH,UAAU,CAACI,aAAX,EAAtB;AACA,QAAMC,MAAM,GAAG,0CAAf;AAEA,SAAO;AAACC,IAAAA,UAAD;AAAaC,IAAAA,YAAb;AAA2BC,IAAAA,UAA3B;AAAuCC,IAAAA,WAAvC;AAAoDC,IAAAA,YAApD;AAAkEC,IAAAA,WAAlE;AAA+EC,IAAAA,WAA/E;AAA4FC,IAAAA;AAA5F,GAAP,CALuC,CAOvC;;AACA,iBAAeP,UAAf,CAA0B;AAACQ,IAAAA,KAAD;AAAQC,IAAAA,KAAK,GAAG,OAAhB;AAAyBC,IAAAA,QAAQ,GAAG,IAApC;AAA0CC,IAAAA,KAAK,GAAG;AAAlD,GAA1B,EAAoF;AAClFZ,IAAAA,MAAM,CAACa,KAAP,CAAc,eAAcJ,KAAM,YAAWC,KAAM,eAAcC,QAAS,YAAWC,KAAM,EAA3F;;AAEA,QAAI;AAEFE,MAAAA,mBAAmB,CAACL,KAAD,CAAnB;AACA,YAAMM,WAAW,GAAG,MAAMjB,OAAO,CAACkB,WAAR,CAAoBP,KAApB,EAA2B;AAACQ,QAAAA,OAAO,EAAE;AAAV,OAA3B,CAA1B;;AAEA,UAAIL,KAAJ,EAAW;AACT,cAAMM,UAAU,CAACN,KAAD,CAAhB;AACAZ,QAAAA,MAAM,CAACmB,OAAP,CAAgB,SAAQV,KAAM,eAAcM,WAAW,CAACK,YAAa,WAArE;AACA,eAAOnB,UAAU,CAAC;AAACQ,UAAAA,KAAD;AAAQC,UAAAA;AAAR,SAAD,CAAjB;AACD;;AAED,UAAIK,WAAW,CAACK,YAAZ,GAA2B,CAA/B,EAAkC;AAChCpB,QAAAA,MAAM,CAACa,KAAP,CAAc,eAAcE,WAAW,CAACK,YAAa,MAAKX,KAAM,WAAhE;AACA,eAAO,KAAP;AACD;;AACDT,MAAAA,MAAM,CAACa,KAAP,CAAc,SAAQJ,KAAM,QAAOM,WAAW,CAACK,YAAa,WAA5D;;AAEA,UAAIV,KAAK,KAAK,UAAd,EAA0B;AACxB,eAAOK,WAAW,CAACK,YAAnB;AACD,OAnBC,CAqBF;AACA;AACA;AACA;;;AACA,UAAIV,KAAK,KAAK,KAAd,EAAqB;AACnB,eAAOP,UAAU,CAACM,KAAD,EAAQE,QAAR,CAAjB;AACD,OA3BC,CA6BF;AACA;;;AACA,UAAID,KAAK,KAAK,OAAd,EAAuB;AACrB,eAAOR,YAAY,CAACO,KAAD,EAAQE,QAAR,CAAnB;AACD,OAjCC,CAmCF;;;AACA,YAAM,IAAIU,qBAAJ,CAAaC,oBAAWC,oBAAxB,CAAN;AACD,KArCD,CAqCE,OAAOC,KAAP,EAAc;AACd,2BAASA,KAAT;AACD;;AAED,aAASN,UAAT,CAAoBN,KAApB,EAA2B;AACzB,UAAIA,KAAJ,EAAW;AACT,eAAOd,OAAO,CAACoB,UAAR,CAAmBT,KAAnB,CAAP;AACD;AACF;AACF;;AAED,iBAAeP,YAAf,CAA4BO,KAA5B,EAAmCE,QAAnC,EAA6C;AAC3CX,IAAAA,MAAM,CAACa,KAAP,CAAc,wCAAuCJ,KAAM,EAA3D;;AACA,QAAI;AACF,YAAMX,OAAO,CAACkB,WAAR,CAAoBP,KAApB,EAA2B;AAACQ,QAAAA,OAAO,EAAE;AAAV,OAA3B,CAAN,CADE,CAGF;;AACA,YAAMQ,QAAQ,GAAG,MAAMC,OAAO,CAACjB,KAAD,CAA9B;AACA,YAAMkB,OAAO,GAAGC,aAAa,CAACH,QAAQ,CAAC,CAAD,CAAT,CAA7B;AACAzB,MAAAA,MAAM,CAAC6B,KAAP,CAAc,iBAAgBJ,QAAQ,GAAGA,QAAQ,CAACK,MAAZ,GAAqB,GAAI,eAAcrB,KAAM,KAAIE,QAAQ,GAAG,YAAH,GAAkB,eAAgB,EAAjI;;AAEA,UAAIA,QAAJ,EAAc;AACZ,cAAMoB,OAAO,GAAG,MAAMvB,iBAAiB,CAACiB,QAAD,CAAvC;AACA,eAAO;AAACE,UAAAA,OAAD;AAAUI,UAAAA,OAAV;AAAmBN,UAAAA;AAAnB,SAAP;AACD;;AAED,aAAO;AAACE,QAAAA,OAAD;AAAUF,QAAAA;AAAV,OAAP;AACD,KAdD,CAcE,OAAOD,KAAP,EAAc;AACd,2BAASA,KAAT;AACD;AACF;;AAED,iBAAerB,UAAf,CAA0BM,KAA1B,EAAiCE,QAAjC,EAA2C;AACzCX,IAAAA,MAAM,CAACa,KAAP,CAAc,sCAAqCJ,KAAM,EAAzD;;AACA,QAAI;AACF,YAAMX,OAAO,CAACkB,WAAR,CAAoBP,KAApB,EAA2B;AAACQ,QAAAA,OAAO,EAAE;AAAV,OAA3B,CAAN,CADE,CAGF;;AACA,YAAMe,OAAO,GAAG,MAAMlC,OAAO,CAACmC,GAAR,CAAYxB,KAAZ,CAAtB;AAEAT,MAAAA,MAAM,CAACa,KAAP,CAAc,YAAW,mBAAQmB,OAAR,EAAiB;AAACE,QAAAA,MAAM,EAAE,IAAT;AAAeC,QAAAA,cAAc,EAAE,CAA/B;AAAkCC,QAAAA,KAAK,EAAE;AAAzC,OAAjB,CAA8D,EAAvF,EANE,CAOF;;AACApC,MAAAA,MAAM,CAAC6B,KAAP,CAAc,0BAAyBpB,KAAM,IAAGE,QAAQ,GAAG,YAAH,GAAkB,kBAAmB,EAA7F;;AAEA,UAAIqB,OAAJ,EAAa;AACX,YAAIrB,QAAJ,EAAc;AACZ,gBAAMgB,OAAO,GAAGC,aAAa,CAACI,OAAD,CAA7B;AACA,gBAAMD,OAAO,GAAGvB,iBAAiB,CAAC,CAACwB,OAAD,CAAD,CAAjC;AACA,iBAAO;AAACL,YAAAA,OAAD;AAAUI,YAAAA,OAAV;AAAmBN,YAAAA,QAAQ,EAAE,CAACO,OAAD;AAA7B,WAAP;AACD;;AAED,eAAOA,OAAP;AACD;;AAED,aAAO,KAAP;AACD,KArBD,CAqBE,OAAOR,KAAP,EAAc;AACd,2BAASA,KAAT;AACD;AACF;;AAED,WAASpB,WAAT,CAAqBqB,QAArB,EAA+B;AAC7BA,IAAAA,QAAQ,CAACY,OAAT,CAAiBL,OAAO,IAAI;AAC1BhC,MAAAA,MAAM,CAACa,KAAP,CAAc,eAAcmB,OAAO,CAACM,UAAR,CAAmBC,aAAc,EAA7D;AACAzC,MAAAA,OAAO,CAAC0C,GAAR,CAAYR,OAAZ;AACD,KAHD;AAID;;AAED,WAAS3B,YAAT,CAAsBoB,QAAtB,EAAgC;AAC9BA,IAAAA,QAAQ,CAACY,OAAT,CAAiBL,OAAO,IAAI;AAC1BhC,MAAAA,MAAM,CAACa,KAAP,CAAc,gBAAemB,OAAO,CAACM,UAAR,CAAmBC,aAAc,EAA9D;AACAzC,MAAAA,OAAO,CAAC2C,IAAR,CAAaT,OAAb;AACD,KAHD;AAID;;AAED,iBAAe1B,WAAf,CAA2B;AAACG,IAAAA,KAAD;AAAQ8B,IAAAA,aAAR;AAAuBZ,IAAAA,OAAvB;AAAgCe,IAAAA;AAAhC,GAA3B,EAAkE;AAChE,QAAI;AACF1C,MAAAA,MAAM,CAACa,KAAP,CAAc,SAAQJ,KAAM,EAA5B;AACAT,MAAAA,MAAM,CAACa,KAAP,CAAc,iBAAgB0B,aAAc,EAA5C;AACAvC,MAAAA,MAAM,CAACa,KAAP,CAAc,QAAO8B,IAAI,CAACC,SAAL,CAAeF,IAAf,CAAqB,EAA1C;AACA1C,MAAAA,MAAM,CAACa,KAAP,CAAc,WAAU8B,IAAI,CAACC,SAAL,CAAejB,OAAf,CAAwB,EAAhD;AAEAb,MAAAA,mBAAmB,CAACL,KAAD,CAAnB;AACA,YAAMX,OAAO,CAACkB,WAAR,CAAoBP,KAApB,EAA2B;AAACQ,QAAAA,OAAO,EAAE;AAAV,OAA3B,CAAN;AAEAnB,MAAAA,OAAO,CAACQ,WAAR,CACEG,KADF,EAEEoC,MAAM,CAACC,IAAP,CAAYH,IAAI,CAACC,SAAL,CAAe;AAACF,QAAAA;AAAD,OAAf,CAAZ,CAFF,EAGE;AACEH,QAAAA,aADF;AAEEQ,QAAAA,UAAU,EAAE,IAFd;AAGEpB,QAAAA;AAHF,OAHF;AASA3B,MAAAA,MAAM,CAACa,KAAP,CAAc,oBAAmB0B,aAAc,cAAa9B,KAAM,EAAlE;AACD,KAnBD,CAmBE,OAAOe,KAAP,EAAc;AACd,2BAASA,KAAT;AACD;AACF;;AAED,iBAAejB,WAAf,CAA2BE,KAA3B,EAAkC;AAChC;AACA;AACA;AACA,UAAMuC,WAAW,GAAG,MAAMrD,UAAU,CAACI,aAAX,EAA1B;AACAC,IAAAA,MAAM,CAACmB,OAAP,CAAgB,kBAAiBV,KAAM,GAAvC;AACA,UAAMuC,WAAW,CAACC,WAAZ,CAAwBxC,KAAxB,CAAN;;AACA,QAAIuC,WAAJ,EAAiB;AAAE;AACjB,YAAMA,WAAW,CAACE,KAAZ,EAAN;AACD;AACF,GA7JsC,CA+JvC;AACA;AACA;;;AAEA,WAAS1C,iBAAT,CAA2BiB,QAA3B,EAAqC;AACnCzB,IAAAA,MAAM,CAAC6B,KAAP,CAAc,qBAAoBJ,QAAQ,CAACK,MAAO,cAAlD;AAEA,WAAOL,QAAQ,CAAC0B,GAAT,CAAanB,OAAO,IAAI;AAC7B,YAAMoB,OAAO,GAAGT,IAAI,CAACU,KAAL,CAAWrB,OAAO,CAACoB,OAAR,CAAgBE,QAAhB,EAAX,CAAhB;AACA,aAAO,IAAIC,sBAAJ,CAAeH,OAAO,CAACV,IAAvB,CAAP;AACD,KAHM,CAAP;AAID;;AAED,iBAAehB,OAAf,CAAuBjB,KAAvB,EAA8B;AAC5BT,IAAAA,MAAM,CAAC6B,KAAP,CAAc,2BAA0BpB,KAAM,EAA9C;;AACA,QAAI;AACF,YAAM;AAACW,QAAAA;AAAD,UAAiB,MAAMtB,OAAO,CAACG,UAAR,CAAmBQ,KAAnB,CAA7B;AACAT,MAAAA,MAAM,CAACa,KAAP,CAAc,YAAWO,YAAa,sBAAqBX,KAAM,EAAjE;AACA,YAAM+C,aAAa,GAAGpC,YAAY,IAAIqC,qBAAhB,GAA6BA,qBAA7B,GAA0CrC,YAAhE;AACApB,MAAAA,MAAM,CAACa,KAAP,CAAc,WAAU2C,aAAc,wBAAuB/C,KAAM,EAAnE;AAEA,YAAMgB,QAAQ,GAAG,MAAMiC,IAAI,CAACF,aAAD,CAA3B;AAEAxD,MAAAA,MAAM,CAAC6B,KAAP,CAAc,aAAYJ,QAAQ,CAACK,MAAO,kBAA1C;AAEA,aAAOL,QAAP;AACD,KAXD,CAWE,OAAOD,KAAP,EAAc;AACd,2BAASA,KAAT;AACD;;AAED,mBAAekC,IAAf,CAAoBC,KAApB,EAA2BC,OAAO,GAAG,EAArC,EAAyCC,WAAW,GAAG,EAAvD,EAA2D;AACzD,UAAIF,KAAK,KAAK,CAAd,EAAiB;AACf,eAAOC,OAAP;AACD;;AAED,YAAM5B,OAAO,GAAG,MAAMlC,OAAO,CAACmC,GAAR,CAAYxB,KAAZ,CAAtB;AACA,YAAMqD,UAAU,GAAG;AACjBvB,QAAAA,aAAa,EAAEP,OAAO,CAACM,UAAR,CAAmBC,aADjB;AAEjBwB,QAAAA,WAAW,EAAE/B,OAAO,CAACgC,MAAR,CAAeD;AAFX,OAAnB,CANyD,CAUzD;;AACA,UAAIF,WAAW,CAACI,QAAZ,CAAqBH,UAArB,CAAJ,EAAsC;AACpC,eAAOJ,IAAI,CAACC,KAAK,GAAG,CAAT,EAAYC,OAAZ,EAAqBC,WAArB,CAAX;AACD;;AAED,aAAOH,IAAI,CAACC,KAAK,GAAG,CAAT,EAAYC,OAAO,CAACM,MAAR,CAAelC,OAAf,CAAZ,EAAqC6B,WAAW,CAACK,MAAZ,CAAmBJ,UAAnB,CAArC,CAAX;AACD;AACF;;AAED,WAASlC,aAAT,CAAuBc,IAAvB,EAA6B;AAC3B,WAAOA,IAAI,CAACJ,UAAL,CAAgBX,OAAvB;AACD;;AAED,WAASb,mBAAT,CAA6BL,KAA7B,EAAoC;AAClC,QAAIA,KAAK,KAAK0D,SAAV,IAAuB1D,KAAK,KAAK,EAAjC,IAAuCA,KAAK,KAAK,IAArD,EAA2D;AACzD,YAAM,IAAIY,qBAAJ,CAAaC,oBAAW8C,qBAAxB,EAAgD,kBAAhD,CAAN;AACD;AACF;AACF","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"],"file":"amqp.js"}
|
|
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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"}
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"constants.js","names":["QUEUE_ITEM_STATE","VALIDATOR","PENDING_QUEUING","PENDING_VALIDATION","QUEUING_IN_PROGRESS","UPLOADING","VALIDATING","WAITING_FOR_RECORDS","IMPORTER","IMPORTING","IN_PROCESS","IN_QUEUE","DONE","ERROR","ABORT","IMPORT_JOB_STATE","EMPTY","QUEUING","PROCESSING","OPERATIONS","CREATE","UPDATE","CHUNK_SIZE","CONVERSION_FORMATS","MARCXML","ISO2709","JSON","ALEPHSEQ"],"sources":["../src/constants.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\n// QueueItemState flows: see README.md\n\nexport const QUEUE_ITEM_STATE = {\n VALIDATOR: {\n PENDING_QUEUING: 'PENDING_QUEUING',\n PENDING_VALIDATION: 'PENDING_VALIDATION',\n QUEUING_IN_PROGRESS: 'QUEUING_IN_PROGRESS',\n UPLOADING: 'UPLOADING',\n VALIDATING: 'VALIDATING',\n WAITING_FOR_RECORDS: 'WAITING_FOR_RECORDS'\n },\n IMPORTER: {\n IMPORTING: 'IMPORTING',\n IN_PROCESS: 'IN_PROCESS',\n IN_QUEUE: 'IN_QUEUE'\n },\n DONE: 'DONE',\n ERROR: 'ERROR',\n ABORT: 'ABORT'\n};\n\nexport const IMPORT_JOB_STATE = {\n EMPTY: 'EMPTY',\n QUEUING: 'QUEUING',\n IN_QUEUE: 'IN_QUEUE',\n IMPORTING: 'IMPORTING',\n PROCESSING: 'PROCESSING',\n DONE: 'DONE',\n ERROR: 'ERROR',\n ABORT: 'ABORT'\n};\n\nexport const OPERATIONS = {\n CREATE: 'CREATE',\n UPDATE: 'UPDATE'\n};\n\nexport const CHUNK_SIZE = 100;\n\nexport const CONVERSION_FORMATS = {\n MARCXML: 'MARCXML',\n ISO2709: 'ISO2709',\n JSON: 'JSON',\n ALEPHSEQ: 'ALEPHSEQ'\n};\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEO,MAAMA,gBAAgB,GAAG;EAC9BC,SAAS,EAAE;IACTC,eAAe,EAAE,iBADR;IAETC,kBAAkB,EAAE,oBAFX;IAGTC,mBAAmB,EAAE,qBAHZ;IAITC,SAAS,EAAE,WAJF;IAKTC,UAAU,EAAE,YALH;IAMTC,mBAAmB,EAAE;EANZ,CADmB;EAS9BC,QAAQ,EAAE;IACRC,SAAS,EAAE,WADH;IAERC,UAAU,EAAE,YAFJ;IAGRC,QAAQ,EAAE;EAHF,CAToB;EAc9BC,IAAI,EAAE,MAdwB;EAe9BC,KAAK,EAAE,OAfuB;EAgB9BC,KAAK,EAAE;AAhBuB,CAAzB;;AAmBA,MAAMC,gBAAgB,GAAG;EAC9BC,KAAK,EAAE,OADuB;EAE9BC,OAAO,EAAE,SAFqB;EAG9BN,QAAQ,EAAE,UAHoB;EAI9BF,SAAS,EAAE,WAJmB;EAK9BS,UAAU,EAAE,YALkB;EAM9BN,IAAI,EAAE,MANwB;EAO9BC,KAAK,EAAE,OAPuB;EAQ9BC,KAAK,EAAE;AARuB,CAAzB;;AAWA,MAAMK,UAAU,GAAG;EACxBC,MAAM,EAAE,QADgB;EAExBC,MAAM,EAAE;AAFgB,CAAnB;;AAKA,MAAMC,UAAU,GAAG,GAAnB;;AAEA,MAAMC,kBAAkB,GAAG;EAChCC,OAAO,EAAE,SADuB;EAEhCC,OAAO,EAAE,SAFuB;EAGhCC,IAAI,EAAE,MAH0B;EAIhCC,QAAQ,EAAE;AAJsB,CAA3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"conversion.js","names":["logger","createLogger","serialize","unserialize","record","format","verbose","CONVERSION_FORMATS","MARCXML","to","ISO2709","JSON","Json","ALEPHSEQ","AlephSequential","ConversionError","httpStatus","UNSUPPORTED_MEDIA_TYPE","err","logError","BAD_REQUEST","data","validationOptions","subfieldValues","silly","debug","stringify","from"],"sources":["../../src/helpers/conversion.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 httpStatus from 'http-status';\nimport {MARCXML, ISO2709, Json, AlephSequential} from '@natlibfi/marc-record-serializers';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ConversionError} from '@natlibfi/melinda-commons';\nimport {CONVERSION_FORMATS} from '../constants';\nimport {logError} from '../utils';\n\nexport default function () {\n const logger = createLogger();\n\n return {serialize, unserialize};\n\n // This uses format as a number form contants CONVERSION_FORMATS\n function serialize(record, format) {\n logger.verbose(`Serializing record to ${format}`);\n try {\n if (format === CONVERSION_FORMATS.MARCXML) {\n return MARCXML.to(record);\n }\n\n if (format === CONVERSION_FORMATS.ISO2709) {\n return ISO2709.to(record);\n }\n\n if (format === CONVERSION_FORMATS.JSON) {\n return Json.to(record);\n }\n\n if (format === CONVERSION_FORMATS.ALEPHSEQ) {\n return AlephSequential.to(record);\n }\n\n throw new ConversionError(httpStatus.UNSUPPORTED_MEDIA_TYPE);\n } catch (err) {\n logError(err);\n if (err instanceof ConversionError) { // eslint-disable-line functional/no-conditional-statement\n throw err;\n }\n throw new ConversionError(httpStatus.BAD_REQUEST, 'Error while serializing record');\n }\n }\n\n // eslint-disable-next-line max-statements\n function unserialize(data, format, validationOptions = {subfieldValues: false}) {\n logger.verbose(`Unserializing record from ${format}`);\n logger.silly(`Format: ${format}`);\n logger.debug(`Validation options: ${JSON.stringify(validationOptions)}`);\n logger.silly(`Data: ${JSON.stringify(data)}`);\n try {\n if (format === CONVERSION_FORMATS.MARCXML) {\n logger.silly('Unserialize format marcxml');\n return MARCXML.from(data, validationOptions);\n }\n\n if (format === CONVERSION_FORMATS.ISO2709) {\n logger.silly('Unserialize format iso2709');\n return ISO2709.from(data, validationOptions);\n }\n\n if (format === CONVERSION_FORMATS.JSON) {\n logger.silly('Unserialize format json');\n return Json.from(data, validationOptions);\n }\n\n if (format === CONVERSION_FORMATS.ALEPHSEQ) {\n logger.silly('Unserialize format aleph sequential');\n return AlephSequential.from(data, validationOptions);\n }\n\n throw new ConversionError(httpStatus.UNSUPPORTED_MEDIA_TYPE);\n } catch (err) {\n logError(err);\n if (err instanceof ConversionError) { // eslint-disable-line functional/no-conditional-statement\n throw err;\n }\n throw new ConversionError(httpStatus.BAD_REQUEST, 'Error while unserializing record');\n }\n }\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"conversion.spec.js","names":["describe","getFixture","fixtureFactory","root","__dirname","conversionService","createConversionService","marcRecord","MarcRecord","JSON","parse","components","subfieldValues","marcXml","iso2709","json","alephSeq","it","service","expect","to","be","an","and","respondTo","serialize","throw","data","CONVERSION_FORMATS","MARCXML","equal","ISO2709","ALEPHSEQ","unserialize","record","equalsTo","ConversionError"],"sources":["../../src/helpers/conversion.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) 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 {expect} from 'chai';\nimport fixtureFactory from '@natlibfi/fixura';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {Error as ConversionError} from '@natlibfi/melinda-commons';\nimport createConversionService from './conversion';\nimport {CONVERSION_FORMATS} from '../constants';\n\ndescribe('services/conversion', () => {\n const {getFixture} = fixtureFactory({root: [\n __dirname,\n '..',\n '..',\n 'test-fixtures',\n 'conversion'\n ]});\n const conversionService = createConversionService();\n\n const marcRecord = new MarcRecord(JSON.parse(getFixture({components: ['json1']})), {subfieldValues: false});\n const marcXml = getFixture({components: ['marcxml1']});\n const iso2709 = getFixture({components: ['iso2709_1']});\n const json = getFixture({components: ['json1']});\n const alephSeq = getFixture({components: ['aleph_sequential']});\n\n\n describe('factory', () => {\n it('Should create the expected object', () => {\n const service = createConversionService();\n expect(service).to.be.an('object').and\n .respondTo('serialize')\n .respondTo('unserialize');\n });\n });\n\n describe('#serialize', () => {\n it('Should throw because of unsupported format', () => {\n expect(conversionService.serialize).to.throw();\n });\n\n it('Should serialize to MARCXML', () => {\n const data = conversionService.serialize(marcRecord, CONVERSION_FORMATS.MARCXML);\n expect(data).to.equal(marcXml);\n });\n\n it('Should serialize to ISO2709', () => {\n const data = conversionService.serialize(marcRecord, CONVERSION_FORMATS.ISO2709);\n expect(data).to.equal(iso2709);\n });\n\n it('Should serialize to JSON', () => {\n const data = conversionService.serialize(marcRecord, CONVERSION_FORMATS.JSON);\n expect(data).to.equal(json);\n });\n\n it('Should serialize to aleph sequential', () => {\n const data = conversionService.serialize(marcRecord, CONVERSION_FORMATS.ALEPHSEQ);\n expect(data).to.equal(alephSeq);\n });\n\n });\n\n describe('#unserialize', () => {\n it('Should throw because of unsupported format', () => {\n expect(conversionService.unserialize).to.throw();\n });\n\n it('Should unserialize from MARCXML', async () => {\n const record = await conversionService.unserialize(marcXml, CONVERSION_FORMATS.MARCXML);\n expect(record.equalsTo(marcRecord)).to.equal(true);\n });\n\n it('Should unserialize from ISO2709', () => {\n const record = conversionService.unserialize(iso2709, CONVERSION_FORMATS.ISO2709);\n expect(record.equalsTo(marcRecord)).to.equal(true);\n });\n\n it('Should unserialize from JSON', () => {\n const record = conversionService.unserialize(json, CONVERSION_FORMATS.JSON);\n expect(record.equalsTo(marcRecord)).to.equal(true);\n });\n\n it('Should unserialize from Aleph sequential', () => {\n const record = conversionService.unserialize(alephSeq, CONVERSION_FORMATS.ALEPHSEQ);\n expect(record.equalsTo(marcRecord)).to.equal(true);\n });\n\n\n it('Should throw because the record could not be unserialized', () => {\n expect(() => {\n conversionService.unserialize('', CONVERSION_FORMATS.JSON);\n }).to.throw(ConversionError);\n });\n });\n});\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"format.js","names":["formatRecord","record","settings","logger","createLogger","verbose","newRecord","MarcRecord","clone","subfieldValues","generateMissingSIDs","forEach","options","replacePrefixes","toObject","oldPrefix","newPrefix","prefixReplaceCodes","pattern","replacement","getDatafields","field","subfields","filter","code","includes","subfield","value","replace","f035Filters","fSIDFilters","f035s","f035ToSidInfo","get","fSIDs","sidsToSidInfo","sidsToBeAdded","genNewSids","length","f035SidInfo","some","fSIDInfo","SID","sidField","insertField","map","sidInfo","tag","ind1","ind2","SIDs","flatMap","sub","undefined","wantedSub","regexp","test","findIndex","slice","indexOf","BIB_FORMAT_SETTINGS"],"sources":["../../src/helpers/format.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 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 {MarcRecord} from '@natlibfi/marc-record';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\n\nexport function formatRecord(record, settings = []) {\n const logger = createLogger();\n\n logger.verbose('Applying formating');\n const newRecord = MarcRecord.clone(record, {subfieldValues: false});\n\n generateMissingSIDs();\n\n settings.forEach(options => {\n replacePrefixes(options);\n });\n\n return newRecord.toObject();\n\n // Replace prefix in all specified subfields\n function replacePrefixes(options) {\n const {oldPrefix, newPrefix, prefixReplaceCodes} = options;\n const pattern = `(${oldPrefix})`;\n const replacement = `(${newPrefix})`;\n newRecord.getDatafields()\n .forEach(field => {\n field.subfields\n .filter(({code}) => prefixReplaceCodes.includes(code))\n .forEach(subfield => {\n subfield.value = subfield.value.replace(pattern, replacement); // eslint-disable-line functional/immutable-data\n });\n });\n }\n\n\n function generateMissingSIDs() {\n const f035Filters = [/^\\(FI-BTJ\\)/u, /^\\(FI-TATI\\)/u];\n const fSIDFilters = ['FI-BTJ', 'tati'];\n const f035s = f035ToSidInfo(newRecord.get(/^035$/u));\n const fSIDs = sidsToSidInfo(newRecord.get(/^SID$/u));\n\n const sidsToBeAdded = genNewSids(fSIDs.length === 0\n ? f035s\n // test that SIDs are not there yet\n : f035s.filter(f035SidInfo => fSIDs.some(fSIDInfo => f035SidInfo.SID !== fSIDInfo.SID && f035SidInfo.value !== fSIDInfo.value)));\n\n // Add new SIDs\n return sidsToBeAdded.forEach(sidField => newRecord.insertField(sidField));\n\n function genNewSids(sidsToBeAdded) {\n return sidsToBeAdded.map(sidInfo => ({tag: 'SID', ind1: ' ', ind2: ' ', subfields: [{code: 'c', value: sidInfo.value}, {code: 'b', value: sidInfo.SID}]}));\n }\n\n function sidsToSidInfo(SIDs) {\n return SIDs.flatMap(({subfields}) => {\n const [SID] = subfields.filter(sub => sub.code === 'b' && fSIDFilters.includes(sub.value)).map(sub => sub.value);\n const [value] = subfields.filter(sub => sub.code === 'c' && sub.value !== undefined).map(sub => sub.value);\n\n if (SID && value) {\n return {\n SID,\n value\n };\n }\n\n return undefined;\n }).filter(value => value !== undefined);\n }\n\n function f035ToSidInfo(f035s) {\n return f035s.flatMap(({subfields}) => {\n const [wantedSub] = subfields.filter(sub => sub.code === 'a' && f035Filters.some(regexp => regexp.test(sub.value)));\n\n if (wantedSub) {\n return {\n SID: fSIDFilters[f035Filters.findIndex(regexp => regexp.test(wantedSub.value))],\n value: wantedSub.value.slice(wantedSub.value.indexOf(')') + 1)\n };\n }\n\n return undefined;\n }).filter(value => value !== undefined);\n }\n }\n}\n\n// If placed in config.js testing needs envs\nexport const BIB_FORMAT_SETTINGS = [\n {\n oldPrefix: 'FI-MELINDA',\n newPrefix: 'FIN01',\n prefixReplaceCodes: ['w']\n },\n {\n oldPrefix: 'FI-ASTERI-S',\n newPrefix: 'FIN10',\n prefixReplaceCodes: ['0']\n },\n {\n oldPrefix: 'FI-ASTERI-N',\n newPrefix: 'FIN11',\n prefixReplaceCodes: ['0']\n }\n];\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"format.spec.js","names":["describe","FIXTURES_PATH","__dirname","getFixture","fixtureFactory","root","reader","READERS","JSON","it","record","MarcRecord","components","result","formatRecord","toObject","BIB_FORMAT_SETTINGS","expected","expect","to","eql"],"sources":["../../src/helpers/format.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) 2020 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 fixtureFactory, {READERS} from '@natlibfi/fixura';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {formatRecord, BIB_FORMAT_SETTINGS} from './format';\n\ndescribe('services/format', () => {\n const FIXTURES_PATH = [\n __dirname,\n '..',\n '..',\n 'test-fixtures',\n 'format'\n ];\n const {getFixture} = fixtureFactory({root: FIXTURES_PATH, reader: READERS.JSON});\n\n describe('fiAsteriN0Fin11', () => {\n it('Should succeed', () => {\n const record = new MarcRecord(getFixture({\n components: [\n 'in',\n 'fiAsteriN0Fin11.json'\n ]\n }));\n const result = formatRecord(record.toObject(), BIB_FORMAT_SETTINGS);\n const expected = getFixture({\n components: [\n 'out',\n 'fiAsteriN0Fin11.json'\n ]\n });\n\n expect(result).to.eql(expected);\n });\n });\n\n describe('fiAsteriS0Fin10', () => {\n it('Should succeed', () => {\n const record = new MarcRecord(getFixture({\n components: [\n 'in',\n 'fiAsteriS0Fin10.json'\n ]\n }));\n const result = formatRecord(record.toObject(), BIB_FORMAT_SETTINGS);\n const expected = getFixture({\n components: [\n 'out',\n 'fiAsteriS0Fin10.json'\n ]\n });\n\n expect(result).to.eql(expected);\n });\n });\n\n describe('fiMelindaWFin01', () => {\n it('Should succeed', () => {\n const record = new MarcRecord(getFixture({\n components: [\n 'in',\n 'fiMelindaWFin01.json'\n ]\n }));\n const result = formatRecord(record.toObject(), BIB_FORMAT_SETTINGS);\n const expected = getFixture({\n components: [\n 'out',\n 'fiMelindaWFin01.json'\n ]\n });\n\n expect(result).to.eql(expected);\n });\n });\n\n describe('f035fibtj', () => {\n it('Should add FI-BTJ SID', () => {\n const record = new MarcRecord(getFixture({\n components: [\n 'in',\n 'f035fibtj.json'\n ]\n }));\n const result = formatRecord(record.toObject());\n const expected = getFixture({\n components: [\n 'out',\n 'f035fibtj.json'\n ]\n });\n\n expect(result).to.eql(expected);\n });\n });\n\n describe('f035tati', () => {\n it('Should add tati SID', () => {\n const record = new MarcRecord(getFixture({\n components: [\n 'in',\n 'f035tati.json'\n ]\n }));\n const result = formatRecord(record.toObject());\n const expected = getFixture({\n components: [\n 'out',\n 'f035tati.json'\n ]\n });\n\n expect(result).to.eql(expected);\n });\n });\n\n describe('f035fibtjAndTati', () => {\n it('Should add tati SID and skip FI-BTJ SID', () => {\n const record = new MarcRecord(getFixture({\n components: [\n 'in',\n 'f035fibtjAndTati.json'\n ]\n }));\n const result = formatRecord(record.toObject());\n const expected = getFixture({\n components: [\n 'out',\n 'f035fibtjAndTati.json'\n ]\n });\n\n expect(result).to.eql(expected);\n });\n });\n});\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"validation.js","names":["logger","createLogger","verbose","validate","validateFactory","fieldStructure","tag","valuePattern","unvalidRecord","record","valid","report","fix","validateFixes","subfieldValues","failed","messages"],"sources":["../../src/helpers/validation.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 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 validateFactory from '@natlibfi/marc-record-validate';\nimport {\n FieldStructure as fieldStructure\n} from '@natlibfi/marc-record-validators-melinda';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\n\nexport default async () => {\n const logger = createLogger();\n\n logger.verbose('Running inbuilt record validations');\n const validate = validateFactory([await fieldStructure([{tag: /^003$/u, valuePattern: /^FI-MELINDA$/u}])]);\n\n return async unvalidRecord => {\n const {record, valid, report} = await validate(unvalidRecord, {fix: false, validateFixes: false}, {subfieldValues: false});\n\n return {\n record,\n failed: valid === false,\n messages: report\n };\n };\n};\n"],"mappings":";;;;;;;AA4BA;;AACA;;AAGA;;;;AAhCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;eAQe,YAAY;EACzB,MAAMA,MAAM,GAAG,IAAAC,mCAAA,GAAf;EAEAD,MAAM,CAACE,OAAP,CAAe,oCAAf;EACA,MAAMC,QAAQ,GAAG,IAAAC,2BAAA,EAAgB,CAAC,MAAM,IAAAC,2CAAA,EAAe,CAAC;IAACC,GAAG,EAAE,QAAN;IAAgBC,YAAY,EAAE;EAA9B,CAAD,CAAf,CAAP,CAAhB,CAAjB;EAEA,OAAO,MAAMC,aAAN,IAAuB;IAC5B,MAAM;MAACC,MAAD;MAASC,KAAT;MAAgBC;IAAhB,IAA0B,MAAMR,QAAQ,CAACK,aAAD,EAAgB;MAACI,GAAG,EAAE,KAAN;MAAaC,aAAa,EAAE;IAA5B,CAAhB,EAAoD;MAACC,cAAc,EAAE;IAAjB,CAApD,CAA9C;IAEA,OAAO;MACLL,MADK;MAELM,MAAM,EAAEL,KAAK,KAAK,KAFb;MAGLM,QAAQ,EAAEL;IAHL,CAAP;EAKD,CARD;AASD,C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"validation.spec.js","names":["describe","FIXTURES_PATH","__dirname","getFixture","fixtureFactory","root","reader","READERS","JSON","it","validator","createValidator","record","MarcRecord","components","result","toObject","expected","expect","to","eql","failed","equal"],"sources":["../../src/helpers/validation.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) 2020 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 fixtureFactory, {READERS} from '@natlibfi/fixura';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport createValidator from './validation';\n\ndescribe('services/validate', () => {\n const FIXTURES_PATH = [\n __dirname,\n '..',\n '..',\n 'test-fixtures',\n 'validation'\n ];\n const {getFixture} = fixtureFactory({root: FIXTURES_PATH, reader: READERS.JSON});\n\n describe('f003-fi-melinda', () => {\n it('Should have failed: false', async () => {\n const validator = await createValidator();\n const record = new MarcRecord(getFixture({\n components: [\n 'in',\n 'f003-fi-melinda.json'\n ]\n }));\n const result = await validator(record.toObject());\n const expected = getFixture({\n components: [\n 'out',\n 'f003-fi-melinda.json'\n ]\n });\n expect(result).to.eql(expected);\n expect(result.failed).to.equal(false);\n });\n });\n\n describe('f003-not-fi-melinda', () => {\n it('Should have failed: true', async () => {\n const validator = await createValidator();\n const record = new MarcRecord(getFixture({\n components: [\n 'in',\n 'f003-not-fi-melinda.json'\n ]\n }));\n const result = await validator(record.toObject());\n const expected = getFixture({\n components: [\n 'out',\n 'f003-not-fi-melinda.json'\n ]\n });\n expect(result).to.eql(expected);\n expect(result.failed).to.equal(true);\n });\n });\n});\n\n"],"mappings":";;AA4BA;;AACA;;AACA;;AACA;;;;;;;;AA/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOAA,QAAQ,CAAC,mBAAD,EAAsB,MAAM;EAClC,MAAMC,aAAa,GAAG,CACpBC,SADoB,EAEpB,IAFoB,EAGpB,IAHoB,EAIpB,eAJoB,EAKpB,YALoB,CAAtB;EAOA,MAAM;IAACC;EAAD,IAAe,IAAAC,eAAA,EAAe;IAACC,IAAI,EAAEJ,aAAP;IAAsBK,MAAM,EAAEC,eAAA,CAAQC;EAAtC,CAAf,CAArB;EAEAR,QAAQ,CAAC,iBAAD,EAAoB,MAAM;IAChCS,EAAE,CAAC,2BAAD,EAA8B,YAAY;MAC1C,MAAMC,SAAS,GAAG,MAAM,IAAAC,mBAAA,GAAxB;MACA,MAAMC,MAAM,GAAG,IAAIC,sBAAJ,CAAeV,UAAU,CAAC;QACvCW,UAAU,EAAE,CACV,IADU,EAEV,sBAFU;MAD2B,CAAD,CAAzB,CAAf;MAMA,MAAMC,MAAM,GAAG,MAAML,SAAS,CAACE,MAAM,CAACI,QAAP,EAAD,CAA9B;MACA,MAAMC,QAAQ,GAAGd,UAAU,CAAC;QAC1BW,UAAU,EAAE,CACV,KADU,EAEV,sBAFU;MADc,CAAD,CAA3B;MAMA,IAAAI,YAAA,EAAOH,MAAP,EAAeI,EAAf,CAAkBC,GAAlB,CAAsBH,QAAtB;MACA,IAAAC,YAAA,EAAOH,MAAM,CAACM,MAAd,EAAsBF,EAAtB,CAAyBG,KAAzB,CAA+B,KAA/B;IACD,CAjBC,CAAF;EAkBD,CAnBO,CAAR;EAqBAtB,QAAQ,CAAC,qBAAD,EAAwB,MAAM;IACpCS,EAAE,CAAC,0BAAD,EAA6B,YAAY;MACzC,MAAMC,SAAS,GAAG,MAAM,IAAAC,mBAAA,GAAxB;MACA,MAAMC,MAAM,GAAG,IAAIC,sBAAJ,CAAeV,UAAU,CAAC;QACvCW,UAAU,EAAE,CACV,IADU,EAEV,0BAFU;MAD2B,CAAD,CAAzB,CAAf;MAMA,MAAMC,MAAM,GAAG,MAAML,SAAS,CAACE,MAAM,CAACI,QAAP,EAAD,CAA9B;MACA,MAAMC,QAAQ,GAAGd,UAAU,CAAC;QAC1BW,UAAU,EAAE,CACV,KADU,EAEV,0BAFU;MADc,CAAD,CAA3B;MAMA,IAAAI,YAAA,EAAOH,MAAP,EAAeI,EAAf,CAAkBC,GAAlB,CAAsBH,QAAtB;MACA,IAAAC,YAAA,EAAOH,MAAM,CAACM,MAAd,EAAsBF,EAAtB,CAAyBG,KAAzB,CAA+B,IAA/B;IACD,CAjBC,CAAF;EAkBD,CAnBO,CAAR;AAoBD,CAnDO,CAAR"}
|
package/dist/index.js
CHANGED
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
var _exportNames = {
|
|
7
7
|
mongoFactory: true,
|
|
8
|
+
mongoLogFactory: true,
|
|
8
9
|
amqpFactory: true,
|
|
9
10
|
conversions: true,
|
|
10
11
|
validations: true,
|
|
@@ -64,6 +65,12 @@ Object.defineProperty(exports, "mongoFactory", {
|
|
|
64
65
|
return _mongo.default;
|
|
65
66
|
}
|
|
66
67
|
});
|
|
68
|
+
Object.defineProperty(exports, "mongoLogFactory", {
|
|
69
|
+
enumerable: true,
|
|
70
|
+
get: function () {
|
|
71
|
+
return _mongoLog.default;
|
|
72
|
+
}
|
|
73
|
+
});
|
|
67
74
|
Object.defineProperty(exports, "validations", {
|
|
68
75
|
enumerable: true,
|
|
69
76
|
get: function () {
|
|
@@ -73,6 +80,8 @@ Object.defineProperty(exports, "validations", {
|
|
|
73
80
|
|
|
74
81
|
var _mongo = _interopRequireDefault(require("./mongo"));
|
|
75
82
|
|
|
83
|
+
var _mongoLog = _interopRequireDefault(require("./mongoLog"));
|
|
84
|
+
|
|
76
85
|
var _amqp = _interopRequireDefault(require("./amqp"));
|
|
77
86
|
|
|
78
87
|
var _conversion = _interopRequireDefault(require("./helpers/conversion"));
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"index.js","names":[],"sources":["../src/index.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 mongoFactory from './mongo';\nimport mongoLogFactory from './mongoLog';\nimport amqpFactory from './amqp';\nimport conversions from './helpers/conversion';\nimport validations from './helpers/validation';\nimport * as format from './helpers/format';\nimport {logError, createImportJobState, createImportJobStateForQuery, createRecordResponseItem, addRecordResponseItem} from './utils';\n\nexport {mongoFactory, mongoLogFactory, amqpFactory, conversions, validations, format, logError, createImportJobState, createImportJobStateForQuery, createRecordResponseItem, addRecordResponseItem};\nexport * from './constants';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;AACA;;AAGA;;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}
|
package/dist/mongo.js
CHANGED
|
@@ -50,6 +50,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
50
50
|
* for the JavaScript code in this file.
|
|
51
51
|
*
|
|
52
52
|
*/
|
|
53
|
+
//import isDeepStrictEqual from 'util';
|
|
53
54
|
|
|
54
55
|
/* QueueItem:
|
|
55
56
|
{
|
|
@@ -71,9 +72,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
71
72
|
"CREATE": "EMPTY",
|
|
72
73
|
"UPDATE": "EMPTY"
|
|
73
74
|
},
|
|
75
|
+
blobSize: 1,
|
|
76
|
+
records: [],
|
|
77
|
+
errorMessage: '',
|
|
78
|
+
errorStatus: '',
|
|
74
79
|
"creationTime":"2020-01-01T00:00:00.000Z",
|
|
75
80
|
"modificationTime":"2020-01-01T00:00:01.000Z",
|
|
76
|
-
"handledIds": []
|
|
77
81
|
}
|
|
78
82
|
*/
|
|
79
83
|
async function _default(MONGO_URI, collection) {
|
|
@@ -104,7 +108,9 @@ async function _default(MONGO_URI, collection) {
|
|
|
104
108
|
pushIds,
|
|
105
109
|
pushMessages,
|
|
106
110
|
setOperation,
|
|
107
|
-
setOperations
|
|
111
|
+
setOperations,
|
|
112
|
+
addBlobSize,
|
|
113
|
+
setBlobSize
|
|
108
114
|
};
|
|
109
115
|
|
|
110
116
|
async function createPrio({
|
|
@@ -126,14 +132,16 @@ async function _default(MONGO_URI, collection) {
|
|
|
126
132
|
...operationSettings
|
|
127
133
|
},
|
|
128
134
|
queueItemState: _constants.QUEUE_ITEM_STATE.VALIDATOR.PENDING_VALIDATION,
|
|
135
|
+
blobSize: 1,
|
|
129
136
|
importJobState: {
|
|
130
137
|
CREATE: _constants.IMPORT_JOB_STATE.EMPTY,
|
|
131
138
|
UPDATE: _constants.IMPORT_JOB_STATE.EMPTY
|
|
132
139
|
},
|
|
140
|
+
records: [],
|
|
141
|
+
errorMessage: '',
|
|
142
|
+
errorStatus: '',
|
|
133
143
|
creationTime: time,
|
|
134
|
-
modificationTime: time
|
|
135
|
-
handledIds: [],
|
|
136
|
-
rejectedIds: []
|
|
144
|
+
modificationTime: time
|
|
137
145
|
};
|
|
138
146
|
|
|
139
147
|
try {
|
|
@@ -175,14 +183,16 @@ async function _default(MONGO_URI, collection) {
|
|
|
175
183
|
contentType,
|
|
176
184
|
recordLoadParams,
|
|
177
185
|
queueItemState: stream ? _constants.QUEUE_ITEM_STATE.VALIDATOR.UPLOADING : _constants.QUEUE_ITEM_STATE.VALIDATOR.WAITING_FOR_RECORDS,
|
|
186
|
+
blobSize: 0,
|
|
178
187
|
importJobState: {
|
|
179
188
|
CREATE: _constants.IMPORT_JOB_STATE.EMPTY,
|
|
180
189
|
UPDATE: _constants.IMPORT_JOB_STATE.EMPTY
|
|
181
190
|
},
|
|
191
|
+
records: [],
|
|
192
|
+
errorMessage: '',
|
|
193
|
+
errorStatus: '',
|
|
182
194
|
creationTime: time,
|
|
183
|
-
modificationTime: time
|
|
184
|
-
handledIds: [],
|
|
185
|
-
rejectedIds: []
|
|
195
|
+
modificationTime: time
|
|
186
196
|
}; // eslint-disable-next-line functional/no-conditional-statement
|
|
187
197
|
|
|
188
198
|
if (stream) {
|
|
@@ -279,12 +289,27 @@ async function _default(MONGO_URI, collection) {
|
|
|
279
289
|
return false;
|
|
280
290
|
}
|
|
281
291
|
|
|
282
|
-
async function query(params) {
|
|
283
|
-
const
|
|
292
|
+
async function query(params, showParams = {}) {
|
|
293
|
+
const {
|
|
294
|
+
showOperations = 0,
|
|
295
|
+
showOperationSettings = 0,
|
|
296
|
+
showRecordLoadParams = 0,
|
|
297
|
+
showImportJobState = 0
|
|
298
|
+
} = showParams;
|
|
299
|
+
const {
|
|
300
|
+
limit = 1000,
|
|
301
|
+
skip = 0,
|
|
302
|
+
...rest
|
|
303
|
+
} = params;
|
|
304
|
+
const result = await db.collection(collection).find(rest, {
|
|
284
305
|
projection: {
|
|
285
|
-
_id: 0
|
|
306
|
+
_id: 0,
|
|
307
|
+
operations: showOperations,
|
|
308
|
+
operationSettings: showOperationSettings,
|
|
309
|
+
recordLoadParams: showRecordLoadParams,
|
|
310
|
+
importJobState: showImportJobState
|
|
286
311
|
}
|
|
287
|
-
}).toArray();
|
|
312
|
+
}).limit(parseInt(limit, 10)).skip(parseInt(skip, 10)).toArray();
|
|
288
313
|
logger.debug(`Query result: ${result.length > 0 ? 'Found!' : 'Not found!'}`);
|
|
289
314
|
return result;
|
|
290
315
|
}
|
|
@@ -413,13 +438,26 @@ async function _default(MONGO_URI, collection) {
|
|
|
413
438
|
}); // njsscan-ignore: node_nosqli_injection
|
|
414
439
|
|
|
415
440
|
if (result) {
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
441
|
+
const {
|
|
442
|
+
operationSettings
|
|
443
|
+
} = result;
|
|
444
|
+
|
|
445
|
+
if (operationSettings.prio === false && operationSettings.noStream === false) {
|
|
446
|
+
return {
|
|
447
|
+
contentType: result.contentType,
|
|
448
|
+
readStream: gridFSBucket.openDownloadStreamByName(clean)
|
|
449
|
+
};
|
|
450
|
+
}
|
|
451
|
+
|
|
452
|
+
logger.debug(`OperationSetting for ${correlationId}: ${JSON.stringify(operationSettings)}`);
|
|
453
|
+
throw new _melindaCommons.Error(_httpStatus.default.BAD_REQUEST, {
|
|
454
|
+
message: `Content is only available for streamBulk jobs. ${correlationId} is not a streamBulk job.`
|
|
455
|
+
});
|
|
420
456
|
}
|
|
421
457
|
|
|
422
|
-
throw new _melindaCommons.Error(_httpStatus.default.NOT_FOUND
|
|
458
|
+
throw new _melindaCommons.Error(_httpStatus.default.NOT_FOUND, {
|
|
459
|
+
message: `Job ${correlationId} not found.`
|
|
460
|
+
});
|
|
423
461
|
}
|
|
424
462
|
|
|
425
463
|
async function removeContent(params) {
|
|
@@ -545,7 +583,7 @@ async function _default(MONGO_URI, collection) {
|
|
|
545
583
|
errorMessage = undefined,
|
|
546
584
|
errorStatus = undefined
|
|
547
585
|
}) {
|
|
548
|
-
const errorString = errorMessage || errorStatus ? `, Error message: '${errorMessage || ''}', Error status: '${errorStatus || ''}'` : '';
|
|
586
|
+
const errorString = errorMessage || errorStatus ? `, Error message: '${JSON.stringify(errorMessage) || ''}', Error status: '${errorStatus || ''}'` : '';
|
|
549
587
|
logger.info(`Setting queue-item state ${state} for ${correlationId}${errorString} to ${collection}`);
|
|
550
588
|
const stateInQueueItemStates = Object.values(_constants.QUEUE_ITEM_STATE).indexOf(state) > -1;
|
|
551
589
|
const stateInQueueItemStatesValidator = Object.values(_constants.QUEUE_ITEM_STATE.VALIDATOR).indexOf(state) > -1;
|
|
@@ -648,16 +686,17 @@ async function _default(MONGO_URI, collection) {
|
|
|
648
686
|
addOperation,
|
|
649
687
|
removeOperation = undefined
|
|
650
688
|
}) {
|
|
651
|
-
const cleanCorrelationId = (0, _mongoSanitize.default)(correlationId);
|
|
652
|
-
|
|
689
|
+
const cleanCorrelationId = (0, _mongoSanitize.default)(correlationId);
|
|
653
690
|
const queueItem = await db.collection(collection).findOne({
|
|
654
691
|
correlationId: cleanCorrelationId
|
|
655
692
|
});
|
|
656
|
-
logger.
|
|
693
|
+
logger.silly(`We found a queueItem: ${JSON.stringify(queueItem)}`);
|
|
657
694
|
const oldOperations = queueItem.operations;
|
|
658
|
-
logger.info(`Setting queue-item
|
|
695
|
+
logger.info(`Setting queue-item operations from ${JSON.stringify(oldOperations)} by adding ${addOperation} and removing ${removeOperation} for ${correlationId} to ${collection}`);
|
|
659
696
|
const operationsAfterRemove = oldOperations.filter(operation => operation !== removeOperation);
|
|
660
|
-
const operationsAfterRemoveAndAdd =
|
|
697
|
+
const operationsAfterRemoveAndAdd = operationsAfterRemove.includes(addOperation) ? operationsAfterRemove : [...operationsAfterRemove, addOperation];
|
|
698
|
+
logger.silly(`operationsAfterRemove: ${operationsAfterRemove}`);
|
|
699
|
+
logger.silly(`operationAfterRemoveAndAdd: ${operationsAfterRemoveAndAdd}`);
|
|
661
700
|
const result = await db.collection(collection).findOneAndUpdate({
|
|
662
701
|
correlationId: cleanCorrelationId
|
|
663
702
|
}, {
|
|
@@ -673,5 +712,52 @@ async function _default(MONGO_URI, collection) {
|
|
|
673
712
|
});
|
|
674
713
|
return result.ok; // logger.debug(JSON.stringify(result));
|
|
675
714
|
}
|
|
715
|
+
|
|
716
|
+
async function addBlobSize({
|
|
717
|
+
correlationId
|
|
718
|
+
}) {
|
|
719
|
+
const cleanCorrelationId = (0, _mongoSanitize.default)(correlationId);
|
|
720
|
+
const result = await db.collection(collection).findOneAndUpdate({
|
|
721
|
+
correlationId: cleanCorrelationId,
|
|
722
|
+
queueItemState: _constants.QUEUE_ITEM_STATE.VALIDATOR.WAITING_FOR_RECORDS
|
|
723
|
+
}, {
|
|
724
|
+
$inc: {
|
|
725
|
+
blobSize: 1
|
|
726
|
+
},
|
|
727
|
+
$set: {
|
|
728
|
+
modificationTime: (0, _moment.default)().toDate()
|
|
729
|
+
}
|
|
730
|
+
}, {
|
|
731
|
+
projection: {
|
|
732
|
+
_id: 0
|
|
733
|
+
},
|
|
734
|
+
returnNewDocument: true
|
|
735
|
+
});
|
|
736
|
+
logger.verbose(`AddBlobSizeResult in mongo: ${JSON.stringify(result)}`);
|
|
737
|
+
return result;
|
|
738
|
+
}
|
|
739
|
+
|
|
740
|
+
async function setBlobSize({
|
|
741
|
+
correlationId,
|
|
742
|
+
blobSize
|
|
743
|
+
}) {
|
|
744
|
+
const cleanCorrelationId = (0, _mongoSanitize.default)(correlationId);
|
|
745
|
+
const cleanBlobSize = (0, _mongoSanitize.default)(blobSize);
|
|
746
|
+
const result = await db.collection(collection).findOneAndUpdate({
|
|
747
|
+
correlationId: cleanCorrelationId
|
|
748
|
+
}, {
|
|
749
|
+
$set: {
|
|
750
|
+
blobSize: cleanBlobSize,
|
|
751
|
+
modificationTime: (0, _moment.default)().toDate()
|
|
752
|
+
}
|
|
753
|
+
}, {
|
|
754
|
+
projection: {
|
|
755
|
+
_id: 0
|
|
756
|
+
},
|
|
757
|
+
returnNewDocument: true
|
|
758
|
+
});
|
|
759
|
+
logger.verbose(`SetBlobSizeResult in mongo: ${JSON.stringify(result)}`);
|
|
760
|
+
return result;
|
|
761
|
+
}
|
|
676
762
|
}
|
|
677
763
|
//# sourceMappingURL=mongo.js.map
|
package/dist/mongo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/mongo.js"],"names":["MONGO_URI","collection","logger","client","MongoClient","connect","useNewUrlParser","useUnifiedTopology","db","gridFSBucket","GridFSBucket","bucketName","createPrio","createBulk","checkAndSetState","checkAndSetImportJobState","query","queryById","remove","readContent","removeContent","getOne","getStream","setState","setImportJobState","pushIds","pushMessages","setOperation","setOperations","correlationId","cataloger","oCatalogerIn","operation","operationSettings","time","toDate","newQueueItem","operations","prio","queueItemState","QUEUE_ITEM_STATE","VALIDATOR","PENDING_VALIDATION","importJobState","CREATE","IMPORT_JOB_STATE","EMPTY","UPDATE","creationTime","modificationTime","handledIds","rejectedIds","result","insertOne","acknowledged","info","ApiError","httpStatus","INTERNAL_SERVER_ERROR","error","contentType","recordLoadParams","stream","UPLOADING","WAITING_FOR_RECORDS","Promise","resolve","reject","outputStream","openUploadStream","on","chunk","write","end","undefined","debug","state","errorMessage","errorStatus","timeOut","checkTimeOut","params","find","projection","_id","toArray","length","checkModTime","findOne","queueitemState","oldState","ABORT","ERROR","DONE","includes","silly","timeoutTime","add","isBefore","finalImportJobStates","REQUEST_TIMEOUT","JSON","stringify","clean","noContent","deleteOne","err","MongoDriverError","message","indexOf","readStream","openDownloadStreamByName","NOT_FOUND","delete","cleanQueueItemState","verbose","updateOne","$set","$push","$each","messages","messageField","cleanMessageField","errorString","stateInQueueItemStates","Object","values","stateInQueueItemStatesValidator","stateInQueueItemStatesImporter","IMPORTER","BAD_REQUEST","updateValues","keys","forEach","key","findOneAndUpdate","returnNewDocument","cleanCorrelationId","cleanImportJobState","OPERATIONS","newJobState","newOperation","oldOperation","cleanNewOperation","ok","addOperation","removeOperation","queueItem","oldOperations","operationsAfterRemove","filter","operationsAfterRemoveAndAdd"],"mappings":"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","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 {MongoClient, GridFSBucket, MongoDriverError} from 'mongodb';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {QUEUE_ITEM_STATE, IMPORT_JOB_STATE, OPERATIONS} from './constants';\nimport {logError} from './utils.js';\nimport moment from 'moment';\nimport httpStatus from 'http-status';\nimport sanitize from 'mongo-sanitize';\n\n/* QueueItem:\n{\n \"correlationId\":\"FOO\",\n \"cataloger\":\"xxx0000\",\n \"oCatalogerIn\":\"xxx0000\"\n \"operation\":\"UPDATE\",\n \"operations\":[\"UPDATE\", \"CREATE\"]\n \"contentType\":\"application/json\",\n \"recordLoadParams\": {\n \"pActiveLibrary\": \"XXX00\",\n \"pInputFile\": \"filename.seq\",\n \"pRejectFile\": \"filename.rej\",\n \"pLogFile\": \"filename.syslog\",\n \"pOldNew\": \"NEW\"\n },\n \"queueItemState\":\"PENDING_QUEUING\",\n \"importJobState\": {\n \"CREATE\": \"EMPTY\",\n \"UPDATE\": \"EMPTY\"\n },\n \"creationTime\":\"2020-01-01T00:00:00.000Z\",\n \"modificationTime\":\"2020-01-01T00:00:01.000Z\",\n \"handledIds\": []\n}\n*/\n\nexport default async function (MONGO_URI, collection) {\n const logger = createLogger();\n\n // Connect to mongo (MONGO)\n const client = await MongoClient.connect(MONGO_URI, {useNewUrlParser: true, useUnifiedTopology: true});\n const db = client.db('rest-api');\n const gridFSBucket = new GridFSBucket(db, {bucketName: collection});\n\n return {createPrio, createBulk, checkAndSetState, checkAndSetImportJobState, query, queryById, remove, readContent, removeContent, getOne, getStream, setState, setImportJobState, pushIds, pushMessages, setOperation, setOperations};\n\n async function createPrio({correlationId, cataloger, oCatalogerIn, operation, operationSettings}) {\n const time = moment().toDate();\n const newQueueItem = {\n correlationId,\n cataloger,\n operation,\n operations: [operation],\n oCatalogerIn,\n operationSettings: {\n prio: true,\n ...operationSettings\n },\n queueItemState: QUEUE_ITEM_STATE.VALIDATOR.PENDING_VALIDATION,\n importJobState: {\n CREATE: IMPORT_JOB_STATE.EMPTY,\n UPDATE: IMPORT_JOB_STATE.EMPTY\n },\n creationTime: time,\n modificationTime: time,\n handledIds: [],\n rejectedIds: []\n };\n try {\n const result = await db.collection(collection).insertOne(newQueueItem);\n if (result.acknowledged) {\n logger.info(`New PRIO queue item for ${operation} ${correlationId} has been made in ${collection}`);\n return;\n }\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n } catch (error) {\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n }\n }\n\n async function createBulk({correlationId, cataloger, oCatalogerIn, operation, contentType, recordLoadParams, stream, operationSettings}) {\n const time = moment().toDate();\n const newQueueItem = {\n correlationId,\n cataloger,\n oCatalogerIn,\n operation,\n operations: [operation],\n operationSettings: {\n prio: false,\n ...operationSettings\n },\n contentType,\n recordLoadParams,\n queueItemState: stream ? QUEUE_ITEM_STATE.VALIDATOR.UPLOADING : QUEUE_ITEM_STATE.VALIDATOR.WAITING_FOR_RECORDS,\n importJobState: {\n CREATE: IMPORT_JOB_STATE.EMPTY,\n UPDATE: IMPORT_JOB_STATE.EMPTY\n },\n creationTime: time,\n modificationTime: time,\n handledIds: [],\n rejectedIds: []\n };\n\n // eslint-disable-next-line functional/no-conditional-statement\n if (stream) {\n try {\n // No await here, promises later\n db.collection(collection).insertOne(newQueueItem);\n logger.info(`New BULK queue item for ${operation} ${correlationId} has been made in ${collection}!`);\n return new Promise((resolve, reject) => {\n const outputStream = gridFSBucket.openUploadStream(correlationId);\n\n stream\n .on('error', reject)\n .on('data', chunk => outputStream.write(chunk))\n .on('end', () => outputStream.end(undefined, undefined, () => {\n resolve(correlationId);\n }));\n });\n } catch (error) {\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n }\n }\n\n logger.debug(`No stream`);\n // eslint-disable-next-line functional/no-conditional-statement\n if (!stream) {\n try {\n const result = await db.collection(collection).insertOne(newQueueItem);\n if (result.acknowledged) {\n logger.info(`New noStream BULK queue item for ${operation} ${correlationId} has been made in ${collection}`);\n return {correlationId, queueItemState: QUEUE_ITEM_STATE.VALIDATOR.WAITING_FOR_RECORDS};\n }\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n } catch (error) {\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n }\n }\n }\n\n // Check state that the queueItem has not waited too long and set state\n async function checkAndSetState({correlationId, state, errorMessage = undefined, errorStatus = undefined}) {\n // checkTimeOut returns true, if queueItem is fresher than 1 minute and it's state is not ABORT/ERROR\n // otherwise it sets queueItem to state ABORT (408, 'Timeout')\n const timeOut = await checkTimeOut({correlationId});\n if (timeOut) {\n return setState({correlationId, state, errorMessage, errorStatus});\n }\n return false;\n }\n\n // Check state that the queueItem has not waited too long and set state\n async function checkAndSetImportJobState({correlationId, operation, importJobState, errorMessage = '', errorStatus = ''}) {\n // checkTimeOut returns true, if queueItem is fresher than 1 minute and it's state is not ABORT/ERROR\n // otherwise it sets queueItem to state ABORT (408, 'Timeout')\n logger.debug(`${correlationId}, ${importJobState}, ${operation}`);\n const timeOut = await checkTimeOut({correlationId, operation, importJobState});\n if (timeOut) {\n return setImportJobState({correlationId, operation, importJobState, errorMessage, errorStatus});\n }\n return false;\n }\n\n async function query(params) {\n const result = await db.collection(collection).find(params, {projection: {_id: 0}})\n .toArray();\n logger.debug(`Query result: ${result.length > 0 ? 'Found!' : 'Not found!'}`);\n return result;\n }\n\n async function queryById({correlationId, checkModTime = false}) {\n const result = await db.collection(collection).findOne({correlationId});\n if (checkModTime) {\n const timeOut = await checkTimeOut({correlationId});\n if (timeOut) {\n return queryById({correlationId});\n }\n return result;\n }\n\n return result;\n }\n\n // Check that if the item has waited too long\n // If the last modification time for the queueItem is older than 1 minute\n // set state to ABORT and return false, otherwise return true\n // If the state is already ABORT or ERROR return false\n\n async function checkTimeOut({correlationId}) {\n const {modificationTime, queueitemState: oldState, importJobState} = await db.collection(collection).findOne({correlationId});\n\n // should we check for DONE too?\n if ([QUEUE_ITEM_STATE.ABORT, QUEUE_ITEM_STATE.ERROR, QUEUE_ITEM_STATE.DONE].includes(oldState)) {\n logger.silly(`${correlationId} has already state: ${oldState}`);\n return false;\n }\n\n const timeoutTime = moment(modificationTime).add(1, 'm');\n logger.silly(`timeOut @ ${timeoutTime}`);\n\n if (timeoutTime.isBefore()) {\n const finalImportJobStates = [IMPORT_JOB_STATE.ABORT, IMPORT_JOB_STATE.DONE, IMPORT_JOB_STATE.EMPTY, IMPORT_JOB_STATE.ERROR];\n if (!finalImportJobStates.includes(importJobState.CREATE)) { // eslint-disable-line\n await setImportJobState({correlationId, operation: 'CREATE', importJobState: IMPORT_JOB_STATE.ABORT});\n }\n\n if (!finalImportJobStates.includes(importJobState.UPDATE)) { // eslint-disable-line\n await setImportJobState({correlationId, operation: 'UPDATE', importJobState: IMPORT_JOB_STATE.ABORT});\n }\n\n await setState({correlationId, state: QUEUE_ITEM_STATE.ABORT, errorStatus: httpStatus.REQUEST_TIMEOUT, errorMessage: `Timeout in ${oldState}`});\n\n return false;\n }\n\n return true;\n }\n\n async function remove(params) {\n logger.silly(`${JSON.stringify(params)}`);\n logger.info(`Removing from Mongo (${collection}) id: ${params.correlationId}`);\n const clean = sanitize(params.correlationId);\n logger.silly(`mongo/remove: clean: ${JSON.stringify(clean)}`);\n\n try {\n //const metadataResult = await getFileMetadata({filename: clean});\n //logger.debug(`mongo/remove: metadataResult: ${JSON.stringify(metadataResult)}`);\n const noContent = await removeContent(params);\n if (noContent) {\n await db.collection(collection).deleteOne({correlationId: clean});\n return true;\n }\n } catch (err) {\n if (err instanceof MongoDriverError) {\n if (err.message.indexOf('File not found for id') !== -1) {\n logger.silly(`mongo/remove: File not found, removing queueItem ${JSON.stringify(clean)} from ${collection}`);\n await db.collection(collection).deleteOne({correlationId: clean});\n return true;\n }\n logger.error(err.message);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, err.message);\n }\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, err.message);\n }\n }\n\n async function readContent(correlationId) {\n logger.info(`Reading content from mongo for id: ${correlationId} in ${collection}`);\n const clean = sanitize(correlationId);\n const result = await db.collection(collection).findOne({correlationId: clean}); // njsscan-ignore: node_nosqli_injection\n\n if (result) {\n return {\n contentType: result.contentType,\n readStream: gridFSBucket.openDownloadStreamByName(clean)\n };\n }\n\n throw new ApiError(httpStatus.NOT_FOUND);\n }\n\n async function removeContent(params) {\n logger.info(`Removing content from mongo for id: ${params.correlationId} in ${collection}`);\n const clean = sanitize(params.correlationId);\n\n const result = await db.collection(collection).findOne({correlationId: clean}); // njsscan-ignore: node_nosqli_injection\n logger.silly(`mongo/removeContent: result ${JSON.stringify(result)}`);\n\n if (result) {\n await gridFSBucket.delete(clean);\n return true;\n }\n\n return true;\n }\n\n // eslint-disable-next-line max-statements\n function getOne({queueItemState, importJobState = undefined}) {\n\n logger.silly(`queueItemState: ${queueItemState}, importJobState: ${JSON.stringify(importJobState)}`);\n const cleanQueueItemState = queueItemState ? {queueItemState: sanitize(queueItemState)} : undefined;\n\n try {\n\n // Just queueItemState\n if (queueItemState && importJobState === undefined) {\n logger.silly(`Checking DB ${collection} for just ${JSON.stringify(cleanQueueItemState.queueItemState)}`);\n return db.collection(collection).findOne({...cleanQueueItemState});\n }\n\n // importJobState\n if (importJobState && queueItemState === undefined) {\n logger.silly(`Checking DB ${collection} for ${JSON.stringify(importJobState)}`);\n return db.collection(collection).findOne({...importJobState});\n }\n\n // importJobState and queueItemState\n if (importJobState && queueItemState) {\n logger.silly(`Checking DB ${collection} for ${queueItemState} and ${JSON.stringify(importJobState)}`);\n return db.collection(collection).findOne({...cleanQueueItemState, ...importJobState});\n }\n\n logger.debug(`getOne not working!`);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, 'Missing parameters, cannot get queueItem');\n\n } catch (error) {\n logError(error);\n }\n }\n\n function getStream(correlationId) {\n logger.info(`Forming stream from mongo for ${correlationId} in ${collection}`);\n const clean = sanitize(correlationId);\n try {\n // Return content stream\n return gridFSBucket.openDownloadStreamByName(clean);\n } catch (error) {\n logError(error);\n }\n }\n\n async function pushIds({correlationId, handledIds, rejectedIds}) {\n logger.verbose(`Push ids (${handledIds.length}) and rejectedIds (${rejectedIds.length}) ${correlationId} to ${collection}`);\n logger.debug(`ids (${handledIds.length}): ${JSON.stringify(handledIds)}, rejectedIds ${rejectedIds.length}: ${JSON.stringify(rejectedIds)}`);\n const clean = sanitize(correlationId);\n await db.collection(collection).updateOne({\n correlationId: clean\n }, {\n $set: {\n modificationTime: moment().toDate()\n },\n $push: {\n handledIds: {$each: handledIds},\n rejectedIds: {$each: rejectedIds}\n }\n });\n }\n\n async function pushMessages({correlationId, messages, messageField = 'messages'}) {\n logger.verbose(`Push messages (${messages.length}) to ${messageField} ${correlationId} to ${collection}`);\n logger.silly(`Messages (${messages.length}): ${JSON.stringify(messages)}}`);\n const clean = sanitize(correlationId);\n const cleanMessageField = sanitize(messageField);\n await db.collection(collection).updateOne({\n correlationId: clean\n }, {\n $set: {\n modificationTime: moment().toDate()\n },\n $push: {\n [cleanMessageField]: {$each: messages}\n }\n });\n }\n\n function setState({correlationId, state, errorMessage = undefined, errorStatus = undefined}) {\n const errorString = errorMessage || errorStatus ? `, Error message: '${errorMessage || ''}', Error status: '${errorStatus || ''}'` : '';\n logger.info(`Setting queue-item state ${state} for ${correlationId}${errorString} to ${collection}`);\n\n const stateInQueueItemStates = Object.values(QUEUE_ITEM_STATE).indexOf(state) > -1;\n const stateInQueueItemStatesValidator = Object.values(QUEUE_ITEM_STATE.VALIDATOR).indexOf(state) > -1;\n const stateInQueueItemStatesImporter = Object.values(QUEUE_ITEM_STATE.IMPORTER).indexOf(state) > -1;\n if (!stateInQueueItemStates && !stateInQueueItemStatesValidator && !stateInQueueItemStatesImporter) {\n throw new ApiError(httpStatus.BAD_REQUEST, 'Trying to set invalid state');\n }\n\n const clean = sanitize(correlationId);\n const updateValues = {\n queueItemState: state,\n modificationTime: moment().toDate(),\n errorMessage,\n errorStatus\n };\n\n // Do not update value that are undefined\n // eslint-disable-next-line functional/immutable-data\n Object.keys(updateValues).forEach(key => updateValues[key] === undefined && delete updateValues[key]);\n\n return db.collection(collection)\n .findOneAndUpdate(\n {correlationId: clean},\n {$set: updateValues},\n {projection: {_id: 0}, returnNewDocument: true}\n );\n }\n\n function setImportJobState({correlationId, operation, importJobState}) {\n\n // should this also get importJobState as previously created object? {}\n logger.info(`Setting queue-item importJobState: {${operation}: ${importJobState}} for ${correlationId}`);\n const cleanCorrelationId = sanitize(correlationId);\n const cleanImportJobState = sanitize(importJobState);\n\n if (!(operation in OPERATIONS)) {\n throw new ApiError('400', 'Invalid operation for import job state');\n }\n\n if (!(cleanImportJobState in IMPORT_JOB_STATE)) {\n throw new ApiError('400', 'Invalid import job state');\n }\n\n const newJobState = operation === OPERATIONS.CREATE ? {'importJobState.CREATE': cleanImportJobState} : {'importJobState.UPDATE': cleanImportJobState};\n return db.collection(collection).findOneAndUpdate({\n correlationId: cleanCorrelationId\n }, {\n $set: {\n ...newJobState,\n modificationTime: moment().toDate()\n }\n }, {projection: {_id: 0}, returnNewDocument: true});\n }\n\n async function setOperation({correlationId, operation}) {\n const newOperation = operation;\n const {operation: oldOperation} = await db.collection(collection).findOne({correlationId});\n logger.info(`Setting queue-item operation from ${oldOperation} to ${newOperation} for ${correlationId} to ${collection}`);\n const cleanCorrelationId = sanitize(correlationId);\n const cleanNewOperation = sanitize(newOperation);\n\n const result = await db.collection(collection).findOneAndUpdate({\n correlationId: cleanCorrelationId\n }, {\n $set: {\n operation: cleanNewOperation,\n modificationTime: moment().toDate()\n }\n }, {projection: {_id: 0}, returnNewDocument: true});\n\n return result.ok;\n // logger.debug(JSON.stringify(result));\n }\n\n async function setOperations({correlationId, addOperation, removeOperation = undefined}) {\n const cleanCorrelationId = sanitize(correlationId);\n\n //logger.info(`Setting queue-item operation from ${JSON.stringify(oldOperations)} by adding ${addOperation} and removing ${removeOperation} for ${correlationId} to ${collection}`);\n\n const queueItem = await db.collection(collection).findOne({correlationId: cleanCorrelationId});\n logger.debug(`We fould a queueItem: ${JSON.stringify(queueItem)}`);\n\n const oldOperations = queueItem.operations;\n\n logger.info(`Setting queue-item operation from ${JSON.stringify(oldOperations)} by adding ${addOperation} and removing ${removeOperation} for ${correlationId} to ${collection}`);\n\n const operationsAfterRemove = oldOperations.filter(operation => operation !== removeOperation);\n const operationsAfterRemoveAndAdd = [addOperation, ...operationsAfterRemove];\n\n const result = await db.collection(collection).findOneAndUpdate({\n correlationId: cleanCorrelationId\n }, {\n $set: {\n operations: operationsAfterRemoveAndAdd,\n modificationTime: moment().toDate()\n }\n }, {projection: {_id: 0}, returnNewDocument: true});\n\n return result.ok;\n // logger.debug(JSON.stringify(result));\n }\n}\n"],"file":"mongo.js"}
|
|
1
|
+
{"version":3,"file":"mongo.js","names":["MONGO_URI","collection","logger","createLogger","client","MongoClient","connect","useNewUrlParser","useUnifiedTopology","db","gridFSBucket","GridFSBucket","bucketName","createPrio","createBulk","checkAndSetState","checkAndSetImportJobState","query","queryById","remove","readContent","removeContent","getOne","getStream","setState","setImportJobState","pushIds","pushMessages","setOperation","setOperations","addBlobSize","setBlobSize","correlationId","cataloger","oCatalogerIn","operation","operationSettings","time","moment","toDate","newQueueItem","operations","prio","queueItemState","QUEUE_ITEM_STATE","VALIDATOR","PENDING_VALIDATION","blobSize","importJobState","CREATE","IMPORT_JOB_STATE","EMPTY","UPDATE","records","errorMessage","errorStatus","creationTime","modificationTime","result","insertOne","acknowledged","info","ApiError","httpStatus","INTERNAL_SERVER_ERROR","error","logError","contentType","recordLoadParams","stream","UPLOADING","WAITING_FOR_RECORDS","Promise","resolve","reject","outputStream","openUploadStream","on","chunk","write","end","undefined","debug","state","timeOut","checkTimeOut","params","showParams","showOperations","showOperationSettings","showRecordLoadParams","showImportJobState","limit","skip","rest","find","projection","_id","parseInt","toArray","length","checkModTime","findOne","queueitemState","oldState","ABORT","ERROR","DONE","includes","silly","timeoutTime","add","isBefore","finalImportJobStates","REQUEST_TIMEOUT","JSON","stringify","clean","sanitize","noContent","deleteOne","err","MongoDriverError","message","indexOf","noStream","readStream","openDownloadStreamByName","BAD_REQUEST","NOT_FOUND","delete","cleanQueueItemState","handledIds","rejectedIds","verbose","updateOne","$set","$push","$each","messages","messageField","cleanMessageField","errorString","stateInQueueItemStates","Object","values","stateInQueueItemStatesValidator","stateInQueueItemStatesImporter","IMPORTER","updateValues","keys","forEach","key","findOneAndUpdate","returnNewDocument","cleanCorrelationId","cleanImportJobState","OPERATIONS","newJobState","newOperation","oldOperation","cleanNewOperation","ok","addOperation","removeOperation","queueItem","oldOperations","operationsAfterRemove","filter","operationsAfterRemoveAndAdd","$inc","cleanBlobSize"],"sources":["../src/mongo.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 {MongoClient, GridFSBucket, MongoDriverError} from 'mongodb';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {QUEUE_ITEM_STATE, IMPORT_JOB_STATE, OPERATIONS} from './constants';\nimport {logError} from './utils.js';\nimport moment from 'moment';\nimport httpStatus from 'http-status';\nimport sanitize from 'mongo-sanitize';\n//import isDeepStrictEqual from 'util';\n\n/* QueueItem:\n{\n \"correlationId\":\"FOO\",\n \"cataloger\":\"xxx0000\",\n \"oCatalogerIn\":\"xxx0000\"\n \"operation\":\"UPDATE\",\n \"operations\":[\"UPDATE\", \"CREATE\"]\n \"contentType\":\"application/json\",\n \"recordLoadParams\": {\n \"pActiveLibrary\": \"XXX00\",\n \"pInputFile\": \"filename.seq\",\n \"pRejectFile\": \"filename.rej\",\n \"pLogFile\": \"filename.syslog\",\n \"pOldNew\": \"NEW\"\n },\n \"queueItemState\":\"PENDING_QUEUING\",\n \"importJobState\": {\n \"CREATE\": \"EMPTY\",\n \"UPDATE\": \"EMPTY\"\n },\n blobSize: 1,\n records: [],\n errorMessage: '',\n errorStatus: '',\n \"creationTime\":\"2020-01-01T00:00:00.000Z\",\n \"modificationTime\":\"2020-01-01T00:00:01.000Z\",\n}\n*/\n\nexport default async function (MONGO_URI, collection) {\n const logger = createLogger();\n\n // Connect to mongo (MONGO)\n const client = await MongoClient.connect(MONGO_URI, {useNewUrlParser: true, useUnifiedTopology: true});\n const db = client.db('rest-api');\n const gridFSBucket = new GridFSBucket(db, {bucketName: collection});\n\n return {createPrio, createBulk, checkAndSetState, checkAndSetImportJobState, query, queryById, remove, readContent, removeContent, getOne, getStream, setState, setImportJobState, pushIds, pushMessages, setOperation, setOperations, addBlobSize, setBlobSize};\n\n async function createPrio({correlationId, cataloger, oCatalogerIn, operation, operationSettings}) {\n const time = moment().toDate();\n const newQueueItem = {\n correlationId,\n cataloger,\n operation,\n operations: [operation],\n oCatalogerIn,\n operationSettings: {\n prio: true,\n ...operationSettings\n },\n queueItemState: QUEUE_ITEM_STATE.VALIDATOR.PENDING_VALIDATION,\n blobSize: 1,\n importJobState: {\n CREATE: IMPORT_JOB_STATE.EMPTY,\n UPDATE: IMPORT_JOB_STATE.EMPTY\n },\n records: [],\n errorMessage: '',\n errorStatus: '',\n creationTime: time,\n modificationTime: time\n };\n try {\n const result = await db.collection(collection).insertOne(newQueueItem);\n if (result.acknowledged) {\n logger.info(`New PRIO queue item for ${operation} ${correlationId} has been made in ${collection}`);\n return;\n }\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n } catch (error) {\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n }\n }\n\n async function createBulk({correlationId, cataloger, oCatalogerIn, operation, contentType, recordLoadParams, stream, operationSettings}) {\n const time = moment().toDate();\n const newQueueItem = {\n correlationId,\n cataloger,\n oCatalogerIn,\n operation,\n operations: [operation],\n operationSettings: {\n prio: false,\n ...operationSettings\n },\n contentType,\n recordLoadParams,\n queueItemState: stream ? QUEUE_ITEM_STATE.VALIDATOR.UPLOADING : QUEUE_ITEM_STATE.VALIDATOR.WAITING_FOR_RECORDS,\n blobSize: 0,\n importJobState: {\n CREATE: IMPORT_JOB_STATE.EMPTY,\n UPDATE: IMPORT_JOB_STATE.EMPTY\n },\n records: [],\n errorMessage: '',\n errorStatus: '',\n creationTime: time,\n modificationTime: time\n };\n\n // eslint-disable-next-line functional/no-conditional-statement\n if (stream) {\n try {\n // No await here, promises later\n db.collection(collection).insertOne(newQueueItem);\n logger.info(`New BULK queue item for ${operation} ${correlationId} has been made in ${collection}!`);\n return new Promise((resolve, reject) => {\n const outputStream = gridFSBucket.openUploadStream(correlationId);\n\n stream\n .on('error', reject)\n .on('data', chunk => outputStream.write(chunk))\n .on('end', () => outputStream.end(undefined, undefined, () => {\n resolve(correlationId);\n }));\n });\n } catch (error) {\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n }\n }\n\n logger.debug(`No stream`);\n // eslint-disable-next-line functional/no-conditional-statement\n if (!stream) {\n try {\n const result = await db.collection(collection).insertOne(newQueueItem);\n if (result.acknowledged) {\n logger.info(`New noStream BULK queue item for ${operation} ${correlationId} has been made in ${collection}`);\n return {correlationId, queueItemState: QUEUE_ITEM_STATE.VALIDATOR.WAITING_FOR_RECORDS};\n }\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n } catch (error) {\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n }\n }\n }\n\n // Check state that the queueItem has not waited too long and set state\n async function checkAndSetState({correlationId, state, errorMessage = undefined, errorStatus = undefined}) {\n // checkTimeOut returns true, if queueItem is fresher than 1 minute and it's state is not ABORT/ERROR\n // otherwise it sets queueItem to state ABORT (408, 'Timeout')\n const timeOut = await checkTimeOut({correlationId});\n if (timeOut) {\n return setState({correlationId, state, errorMessage, errorStatus});\n }\n return false;\n }\n\n // Check state that the queueItem has not waited too long and set state\n async function checkAndSetImportJobState({correlationId, operation, importJobState, errorMessage = '', errorStatus = ''}) {\n // checkTimeOut returns true, if queueItem is fresher than 1 minute and it's state is not ABORT/ERROR\n // otherwise it sets queueItem to state ABORT (408, 'Timeout')\n logger.debug(`${correlationId}, ${importJobState}, ${operation}`);\n const timeOut = await checkTimeOut({correlationId, operation, importJobState});\n if (timeOut) {\n return setImportJobState({correlationId, operation, importJobState, errorMessage, errorStatus});\n }\n return false;\n }\n\n async function query(params, showParams = {}) {\n const {showOperations = 0, showOperationSettings = 0, showRecordLoadParams = 0, showImportJobState = 0} = showParams;\n const {limit = 1000, skip = 0, ...rest} = params;\n const result = await db.collection(collection).find(rest, {projection: {\n _id: 0,\n operations: showOperations,\n operationSettings: showOperationSettings,\n recordLoadParams: showRecordLoadParams,\n importJobState: showImportJobState\n }})\n .limit(parseInt(limit, 10))\n .skip(parseInt(skip, 10))\n .toArray();\n logger.debug(`Query result: ${result.length > 0 ? 'Found!' : 'Not found!'}`);\n return result;\n }\n\n async function queryById({correlationId, checkModTime = false}) {\n const result = await db.collection(collection).findOne({correlationId});\n if (checkModTime) {\n const timeOut = await checkTimeOut({correlationId});\n if (timeOut) {\n return queryById({correlationId});\n }\n return result;\n }\n\n return result;\n }\n\n // Check that if the item has waited too long\n // If the last modification time for the queueItem is older than 1 minute\n // set state to ABORT and return false, otherwise return true\n // If the state is already ABORT or ERROR return false\n\n async function checkTimeOut({correlationId}) {\n const {modificationTime, queueitemState: oldState, importJobState} = await db.collection(collection).findOne({correlationId});\n\n // should we check for DONE too?\n if ([QUEUE_ITEM_STATE.ABORT, QUEUE_ITEM_STATE.ERROR, QUEUE_ITEM_STATE.DONE].includes(oldState)) {\n logger.silly(`${correlationId} has already state: ${oldState}`);\n return false;\n }\n\n const timeoutTime = moment(modificationTime).add(1, 'm');\n logger.silly(`timeOut @ ${timeoutTime}`);\n\n if (timeoutTime.isBefore()) {\n const finalImportJobStates = [IMPORT_JOB_STATE.ABORT, IMPORT_JOB_STATE.DONE, IMPORT_JOB_STATE.EMPTY, IMPORT_JOB_STATE.ERROR];\n if (!finalImportJobStates.includes(importJobState.CREATE)) { // eslint-disable-line\n await setImportJobState({correlationId, operation: 'CREATE', importJobState: IMPORT_JOB_STATE.ABORT});\n }\n\n if (!finalImportJobStates.includes(importJobState.UPDATE)) { // eslint-disable-line\n await setImportJobState({correlationId, operation: 'UPDATE', importJobState: IMPORT_JOB_STATE.ABORT});\n }\n\n await setState({correlationId, state: QUEUE_ITEM_STATE.ABORT, errorStatus: httpStatus.REQUEST_TIMEOUT, errorMessage: `Timeout in ${oldState}`});\n\n return false;\n }\n\n return true;\n }\n\n async function remove(params) {\n logger.silly(`${JSON.stringify(params)}`);\n logger.info(`Removing from Mongo (${collection}) id: ${params.correlationId}`);\n const clean = sanitize(params.correlationId);\n logger.silly(`mongo/remove: clean: ${JSON.stringify(clean)}`);\n\n try {\n //const metadataResult = await getFileMetadata({filename: clean});\n //logger.debug(`mongo/remove: metadataResult: ${JSON.stringify(metadataResult)}`);\n const noContent = await removeContent(params);\n if (noContent) {\n await db.collection(collection).deleteOne({correlationId: clean});\n return true;\n }\n } catch (err) {\n if (err instanceof MongoDriverError) {\n if (err.message.indexOf('File not found for id') !== -1) {\n logger.silly(`mongo/remove: File not found, removing queueItem ${JSON.stringify(clean)} from ${collection}`);\n await db.collection(collection).deleteOne({correlationId: clean});\n return true;\n }\n logger.error(err.message);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, err.message);\n }\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, err.message);\n }\n }\n\n async function readContent(correlationId) {\n logger.info(`Reading content from mongo for id: ${correlationId} in ${collection}`);\n const clean = sanitize(correlationId);\n const result = await db.collection(collection).findOne({correlationId: clean}); // njsscan-ignore: node_nosqli_injection\n\n if (result) {\n const {operationSettings} = result;\n if (operationSettings.prio === false && operationSettings.noStream === false) {\n return {\n contentType: result.contentType,\n readStream: gridFSBucket.openDownloadStreamByName(clean)\n };\n }\n logger.debug(`OperationSetting for ${correlationId}: ${JSON.stringify(operationSettings)}`);\n throw new ApiError(httpStatus.BAD_REQUEST, {message: `Content is only available for streamBulk jobs. ${correlationId} is not a streamBulk job.`});\n }\n\n throw new ApiError(httpStatus.NOT_FOUND, {message: `Job ${correlationId} not found.`});\n }\n\n async function removeContent(params) {\n logger.info(`Removing content from mongo for id: ${params.correlationId} in ${collection}`);\n const clean = sanitize(params.correlationId);\n\n const result = await db.collection(collection).findOne({correlationId: clean}); // njsscan-ignore: node_nosqli_injection\n logger.silly(`mongo/removeContent: result ${JSON.stringify(result)}`);\n\n if (result) {\n await gridFSBucket.delete(clean);\n return true;\n }\n\n return true;\n }\n\n // eslint-disable-next-line max-statements\n function getOne({queueItemState, importJobState = undefined}) {\n\n logger.silly(`queueItemState: ${queueItemState}, importJobState: ${JSON.stringify(importJobState)}`);\n const cleanQueueItemState = queueItemState ? {queueItemState: sanitize(queueItemState)} : undefined;\n\n try {\n\n // Just queueItemState\n if (queueItemState && importJobState === undefined) {\n logger.silly(`Checking DB ${collection} for just ${JSON.stringify(cleanQueueItemState.queueItemState)}`);\n return db.collection(collection).findOne({...cleanQueueItemState});\n }\n\n // importJobState\n if (importJobState && queueItemState === undefined) {\n logger.silly(`Checking DB ${collection} for ${JSON.stringify(importJobState)}`);\n return db.collection(collection).findOne({...importJobState});\n }\n\n // importJobState and queueItemState\n if (importJobState && queueItemState) {\n logger.silly(`Checking DB ${collection} for ${queueItemState} and ${JSON.stringify(importJobState)}`);\n return db.collection(collection).findOne({...cleanQueueItemState, ...importJobState});\n }\n\n logger.debug(`getOne not working!`);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, 'Missing parameters, cannot get queueItem');\n\n } catch (error) {\n logError(error);\n }\n }\n\n function getStream(correlationId) {\n logger.info(`Forming stream from mongo for ${correlationId} in ${collection}`);\n const clean = sanitize(correlationId);\n try {\n // Return content stream\n return gridFSBucket.openDownloadStreamByName(clean);\n } catch (error) {\n logError(error);\n }\n }\n\n async function pushIds({correlationId, handledIds, rejectedIds}) {\n logger.verbose(`Push ids (${handledIds.length}) and rejectedIds (${rejectedIds.length}) ${correlationId} to ${collection}`);\n logger.debug(`ids (${handledIds.length}): ${JSON.stringify(handledIds)}, rejectedIds ${rejectedIds.length}: ${JSON.stringify(rejectedIds)}`);\n const clean = sanitize(correlationId);\n await db.collection(collection).updateOne({\n correlationId: clean\n }, {\n $set: {\n modificationTime: moment().toDate()\n },\n $push: {\n handledIds: {$each: handledIds},\n rejectedIds: {$each: rejectedIds}\n }\n });\n }\n\n async function pushMessages({correlationId, messages, messageField = 'messages'}) {\n logger.verbose(`Push messages (${messages.length}) to ${messageField} ${correlationId} to ${collection}`);\n logger.silly(`Messages (${messages.length}): ${JSON.stringify(messages)}}`);\n const clean = sanitize(correlationId);\n const cleanMessageField = sanitize(messageField);\n await db.collection(collection).updateOne({\n correlationId: clean\n }, {\n $set: {\n modificationTime: moment().toDate()\n },\n $push: {\n [cleanMessageField]: {$each: messages}\n }\n });\n }\n\n function setState({correlationId, state, errorMessage = undefined, errorStatus = undefined}) {\n const errorString = errorMessage || errorStatus ? `, Error message: '${JSON.stringify(errorMessage) || ''}', Error status: '${errorStatus || ''}'` : '';\n logger.info(`Setting queue-item state ${state} for ${correlationId}${errorString} to ${collection}`);\n\n const stateInQueueItemStates = Object.values(QUEUE_ITEM_STATE).indexOf(state) > -1;\n const stateInQueueItemStatesValidator = Object.values(QUEUE_ITEM_STATE.VALIDATOR).indexOf(state) > -1;\n const stateInQueueItemStatesImporter = Object.values(QUEUE_ITEM_STATE.IMPORTER).indexOf(state) > -1;\n if (!stateInQueueItemStates && !stateInQueueItemStatesValidator && !stateInQueueItemStatesImporter) {\n throw new ApiError(httpStatus.BAD_REQUEST, 'Trying to set invalid state');\n }\n\n const clean = sanitize(correlationId);\n const updateValues = {\n queueItemState: state,\n modificationTime: moment().toDate(),\n errorMessage,\n errorStatus\n };\n\n // Do not update value that are undefined\n // eslint-disable-next-line functional/immutable-data\n Object.keys(updateValues).forEach(key => updateValues[key] === undefined && delete updateValues[key]);\n\n return db.collection(collection)\n .findOneAndUpdate(\n {correlationId: clean},\n {$set: updateValues},\n {projection: {_id: 0}, returnNewDocument: true}\n );\n }\n\n function setImportJobState({correlationId, operation, importJobState}) {\n\n // should this also get importJobState as previously created object? {}\n logger.info(`Setting queue-item importJobState: {${operation}: ${importJobState}} for ${correlationId}`);\n const cleanCorrelationId = sanitize(correlationId);\n const cleanImportJobState = sanitize(importJobState);\n\n if (!(operation in OPERATIONS)) {\n throw new ApiError('400', 'Invalid operation for import job state');\n }\n\n if (!(cleanImportJobState in IMPORT_JOB_STATE)) {\n throw new ApiError('400', 'Invalid import job state');\n }\n\n const newJobState = operation === OPERATIONS.CREATE ? {'importJobState.CREATE': cleanImportJobState} : {'importJobState.UPDATE': cleanImportJobState};\n return db.collection(collection).findOneAndUpdate({\n correlationId: cleanCorrelationId\n }, {\n $set: {\n ...newJobState,\n modificationTime: moment().toDate()\n }\n }, {projection: {_id: 0}, returnNewDocument: true});\n }\n\n async function setOperation({correlationId, operation}) {\n const newOperation = operation;\n const {operation: oldOperation} = await db.collection(collection).findOne({correlationId});\n logger.info(`Setting queue-item operation from ${oldOperation} to ${newOperation} for ${correlationId} to ${collection}`);\n const cleanCorrelationId = sanitize(correlationId);\n const cleanNewOperation = sanitize(newOperation);\n\n const result = await db.collection(collection).findOneAndUpdate({\n correlationId: cleanCorrelationId\n }, {\n $set: {\n operation: cleanNewOperation,\n modificationTime: moment().toDate()\n }\n }, {projection: {_id: 0}, returnNewDocument: true});\n\n return result.ok;\n // logger.debug(JSON.stringify(result));\n }\n\n async function setOperations({correlationId, addOperation, removeOperation = undefined}) {\n const cleanCorrelationId = sanitize(correlationId);\n\n const queueItem = await db.collection(collection).findOne({correlationId: cleanCorrelationId});\n logger.silly(`We found a queueItem: ${JSON.stringify(queueItem)}`);\n\n const oldOperations = queueItem.operations;\n\n logger.info(`Setting queue-item operations from ${JSON.stringify(oldOperations)} by adding ${addOperation} and removing ${removeOperation} for ${correlationId} to ${collection}`);\n\n const operationsAfterRemove = oldOperations.filter(operation => operation !== removeOperation);\n const operationsAfterRemoveAndAdd = operationsAfterRemove.includes(addOperation) ? operationsAfterRemove : [...operationsAfterRemove, addOperation];\n\n logger.silly(`operationsAfterRemove: ${operationsAfterRemove}`);\n logger.silly(`operationAfterRemoveAndAdd: ${operationsAfterRemoveAndAdd}`);\n\n const result = await db.collection(collection).findOneAndUpdate({\n correlationId: cleanCorrelationId\n }, {\n $set: {\n operations: operationsAfterRemoveAndAdd,\n modificationTime: moment().toDate()\n }\n }, {projection: {_id: 0}, returnNewDocument: true});\n\n return result.ok;\n // logger.debug(JSON.stringify(result));\n }\n\n async function addBlobSize({correlationId}) {\n const cleanCorrelationId = sanitize(correlationId);\n\n const result = await db.collection(collection).findOneAndUpdate({\n correlationId: cleanCorrelationId,\n queueItemState: QUEUE_ITEM_STATE.VALIDATOR.WAITING_FOR_RECORDS\n }, {\n $inc: {\n blobSize: 1\n },\n $set: {\n modificationTime: moment().toDate()\n }\n }, {projection: {_id: 0}, returnNewDocument: true});\n\n logger.verbose(`AddBlobSizeResult in mongo: ${JSON.stringify(result)}`);\n return result;\n }\n\n async function setBlobSize({correlationId, blobSize}) {\n const cleanCorrelationId = sanitize(correlationId);\n const cleanBlobSize = sanitize(blobSize);\n\n const result = await db.collection(collection).findOneAndUpdate({\n correlationId: cleanCorrelationId\n }, {\n $set: {\n blobSize: cleanBlobSize,\n modificationTime: moment().toDate()\n }\n }, {projection: {_id: 0}, returnNewDocument: true});\n\n logger.verbose(`SetBlobSizeResult in mongo: ${JSON.stringify(result)}`);\n return result;\n }\n\n}\n"],"mappings":";;;;;;;AA4BA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;AAnCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAUA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEe,wBAAgBA,SAAhB,EAA2BC,UAA3B,EAAuC;EACpD,MAAMC,MAAM,GAAG,IAAAC,mCAAA,GAAf,CADoD,CAGpD;;EACA,MAAMC,MAAM,GAAG,MAAMC,oBAAA,CAAYC,OAAZ,CAAoBN,SAApB,EAA+B;IAACO,eAAe,EAAE,IAAlB;IAAwBC,kBAAkB,EAAE;EAA5C,CAA/B,CAArB;EACA,MAAMC,EAAE,GAAGL,MAAM,CAACK,EAAP,CAAU,UAAV,CAAX;EACA,MAAMC,YAAY,GAAG,IAAIC,qBAAJ,CAAiBF,EAAjB,EAAqB;IAACG,UAAU,EAAEX;EAAb,CAArB,CAArB;EAEA,OAAO;IAACY,UAAD;IAAaC,UAAb;IAAyBC,gBAAzB;IAA2CC,yBAA3C;IAAsEC,KAAtE;IAA6EC,SAA7E;IAAwFC,MAAxF;IAAgGC,WAAhG;IAA6GC,aAA7G;IAA4HC,MAA5H;IAAoIC,SAApI;IAA+IC,QAA/I;IAAyJC,iBAAzJ;IAA4KC,OAA5K;IAAqLC,YAArL;IAAmMC,YAAnM;IAAiNC,aAAjN;IAAgOC,WAAhO;IAA6OC;EAA7O,CAAP;;EAEA,eAAelB,UAAf,CAA0B;IAACmB,aAAD;IAAgBC,SAAhB;IAA2BC,YAA3B;IAAyCC,SAAzC;IAAoDC;EAApD,CAA1B,EAAkG;IAChG,MAAMC,IAAI,GAAG,IAAAC,eAAA,IAASC,MAAT,EAAb;IACA,MAAMC,YAAY,GAAG;MACnBR,aADmB;MAEnBC,SAFmB;MAGnBE,SAHmB;MAInBM,UAAU,EAAE,CAACN,SAAD,CAJO;MAKnBD,YALmB;MAMnBE,iBAAiB,EAAE;QACjBM,IAAI,EAAE,IADW;QAEjB,GAAGN;MAFc,CANA;MAUnBO,cAAc,EAAEC,2BAAA,CAAiBC,SAAjB,CAA2BC,kBAVxB;MAWnBC,QAAQ,EAAE,CAXS;MAYnBC,cAAc,EAAE;QACdC,MAAM,EAAEC,2BAAA,CAAiBC,KADX;QAEdC,MAAM,EAAEF,2BAAA,CAAiBC;MAFX,CAZG;MAgBnBE,OAAO,EAAE,EAhBU;MAiBnBC,YAAY,EAAE,EAjBK;MAkBnBC,WAAW,EAAE,EAlBM;MAmBnBC,YAAY,EAAEnB,IAnBK;MAoBnBoB,gBAAgB,EAAEpB;IApBC,CAArB;;IAsBA,IAAI;MACF,MAAMqB,MAAM,GAAG,MAAMjD,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0B0D,SAA1B,CAAoCnB,YAApC,CAArB;;MACA,IAAIkB,MAAM,CAACE,YAAX,EAAyB;QACvB1D,MAAM,CAAC2D,IAAP,CAAa,2BAA0B1B,SAAU,IAAGH,aAAc,qBAAoB/B,UAAW,EAAjG;QACA;MACD;;MACD,MAAM,IAAI6D,qBAAJ,CAAaC,mBAAA,CAAWC,qBAAxB,CAAN;IACD,CAPD,CAOE,OAAOC,KAAP,EAAc;MACd,IAAAC,eAAA,EAASD,KAAT;MACA,MAAM,IAAIH,qBAAJ,CAAaC,mBAAA,CAAWC,qBAAxB,CAAN;IACD;EACF;;EAED,eAAelD,UAAf,CAA0B;IAACkB,aAAD;IAAgBC,SAAhB;IAA2BC,YAA3B;IAAyCC,SAAzC;IAAoDgC,WAApD;IAAiEC,gBAAjE;IAAmFC,MAAnF;IAA2FjC;EAA3F,CAA1B,EAAyI;IACvI,MAAMC,IAAI,GAAG,IAAAC,eAAA,IAASC,MAAT,EAAb;IACA,MAAMC,YAAY,GAAG;MACnBR,aADmB;MAEnBC,SAFmB;MAGnBC,YAHmB;MAInBC,SAJmB;MAKnBM,UAAU,EAAE,CAACN,SAAD,CALO;MAMnBC,iBAAiB,EAAE;QACjBM,IAAI,EAAE,KADW;QAEjB,GAAGN;MAFc,CANA;MAUnB+B,WAVmB;MAWnBC,gBAXmB;MAYnBzB,cAAc,EAAE0B,MAAM,GAAGzB,2BAAA,CAAiBC,SAAjB,CAA2ByB,SAA9B,GAA0C1B,2BAAA,CAAiBC,SAAjB,CAA2B0B,mBAZxE;MAanBxB,QAAQ,EAAE,CAbS;MAcnBC,cAAc,EAAE;QACdC,MAAM,EAAEC,2BAAA,CAAiBC,KADX;QAEdC,MAAM,EAAEF,2BAAA,CAAiBC;MAFX,CAdG;MAkBnBE,OAAO,EAAE,EAlBU;MAmBnBC,YAAY,EAAE,EAnBK;MAoBnBC,WAAW,EAAE,EApBM;MAqBnBC,YAAY,EAAEnB,IArBK;MAsBnBoB,gBAAgB,EAAEpB;IAtBC,CAArB,CAFuI,CA2BvI;;IACA,IAAIgC,MAAJ,EAAY;MACV,IAAI;QACF;QACA5D,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0B0D,SAA1B,CAAoCnB,YAApC;QACAtC,MAAM,CAAC2D,IAAP,CAAa,2BAA0B1B,SAAU,IAAGH,aAAc,qBAAoB/B,UAAW,GAAjG;QACA,OAAO,IAAIuE,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;UACtC,MAAMC,YAAY,GAAGjE,YAAY,CAACkE,gBAAb,CAA8B5C,aAA9B,CAArB;UAEAqC,MAAM,CACHQ,EADH,CACM,OADN,EACeH,MADf,EAEGG,EAFH,CAEM,MAFN,EAEcC,KAAK,IAAIH,YAAY,CAACI,KAAb,CAAmBD,KAAnB,CAFvB,EAGGD,EAHH,CAGM,KAHN,EAGa,MAAMF,YAAY,CAACK,GAAb,CAAiBC,SAAjB,EAA4BA,SAA5B,EAAuC,MAAM;YAC5DR,OAAO,CAACzC,aAAD,CAAP;UACD,CAFgB,CAHnB;QAMD,CATM,CAAP;MAUD,CAdD,CAcE,OAAOiC,KAAP,EAAc;QACd,IAAAC,eAAA,EAASD,KAAT;QACA,MAAM,IAAIH,qBAAJ,CAAaC,mBAAA,CAAWC,qBAAxB,CAAN;MACD;IACF;;IAED9D,MAAM,CAACgF,KAAP,CAAc,WAAd,EAjDuI,CAkDvI;;IACA,IAAI,CAACb,MAAL,EAAa;MACX,IAAI;QACF,MAAMX,MAAM,GAAG,MAAMjD,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0B0D,SAA1B,CAAoCnB,YAApC,CAArB;;QACA,IAAIkB,MAAM,CAACE,YAAX,EAAyB;UACvB1D,MAAM,CAAC2D,IAAP,CAAa,oCAAmC1B,SAAU,IAAGH,aAAc,qBAAoB/B,UAAW,EAA1G;UACA,OAAO;YAAC+B,aAAD;YAAgBW,cAAc,EAAEC,2BAAA,CAAiBC,SAAjB,CAA2B0B;UAA3D,CAAP;QACD;;QACD,MAAM,IAAIT,qBAAJ,CAAaC,mBAAA,CAAWC,qBAAxB,CAAN;MACD,CAPD,CAOE,OAAOC,KAAP,EAAc;QACd,IAAAC,eAAA,EAASD,KAAT;QACA,MAAM,IAAIH,qBAAJ,CAAaC,mBAAA,CAAWC,qBAAxB,CAAN;MACD;IACF;EACF,CA/GmD,CAiHpD;;;EACA,eAAejD,gBAAf,CAAgC;IAACiB,aAAD;IAAgBmD,KAAhB;IAAuB7B,YAAY,GAAG2B,SAAtC;IAAiD1B,WAAW,GAAG0B;EAA/D,CAAhC,EAA2G;IACzG;IACA;IACA,MAAMG,OAAO,GAAG,MAAMC,YAAY,CAAC;MAACrD;IAAD,CAAD,CAAlC;;IACA,IAAIoD,OAAJ,EAAa;MACX,OAAO5D,QAAQ,CAAC;QAACQ,aAAD;QAAgBmD,KAAhB;QAAuB7B,YAAvB;QAAqCC;MAArC,CAAD,CAAf;IACD;;IACD,OAAO,KAAP;EACD,CA1HmD,CA4HpD;;;EACA,eAAevC,yBAAf,CAAyC;IAACgB,aAAD;IAAgBG,SAAhB;IAA2Ba,cAA3B;IAA2CM,YAAY,GAAG,EAA1D;IAA8DC,WAAW,GAAG;EAA5E,CAAzC,EAA0H;IACxH;IACA;IACArD,MAAM,CAACgF,KAAP,CAAc,GAAElD,aAAc,KAAIgB,cAAe,KAAIb,SAAU,EAA/D;IACA,MAAMiD,OAAO,GAAG,MAAMC,YAAY,CAAC;MAACrD,aAAD;MAAgBG,SAAhB;MAA2Ba;IAA3B,CAAD,CAAlC;;IACA,IAAIoC,OAAJ,EAAa;MACX,OAAO3D,iBAAiB,CAAC;QAACO,aAAD;QAAgBG,SAAhB;QAA2Ba,cAA3B;QAA2CM,YAA3C;QAAyDC;MAAzD,CAAD,CAAxB;IACD;;IACD,OAAO,KAAP;EACD;;EAED,eAAetC,KAAf,CAAqBqE,MAArB,EAA6BC,UAAU,GAAG,EAA1C,EAA8C;IAC5C,MAAM;MAACC,cAAc,GAAG,CAAlB;MAAqBC,qBAAqB,GAAG,CAA7C;MAAgDC,oBAAoB,GAAG,CAAvE;MAA0EC,kBAAkB,GAAG;IAA/F,IAAoGJ,UAA1G;IACA,MAAM;MAACK,KAAK,GAAG,IAAT;MAAeC,IAAI,GAAG,CAAtB;MAAyB,GAAGC;IAA5B,IAAoCR,MAA1C;IACA,MAAM5B,MAAM,GAAG,MAAMjD,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0B8F,IAA1B,CAA+BD,IAA/B,EAAqC;MAACE,UAAU,EAAE;QACrEC,GAAG,EAAE,CADgE;QAErExD,UAAU,EAAE+C,cAFyD;QAGrEpD,iBAAiB,EAAEqD,qBAHkD;QAIrErB,gBAAgB,EAAEsB,oBAJmD;QAKrE1C,cAAc,EAAE2C;MALqD;IAAb,CAArC,EAOlBC,KAPkB,CAOZM,QAAQ,CAACN,KAAD,EAAQ,EAAR,CAPI,EAQlBC,IARkB,CAQbK,QAAQ,CAACL,IAAD,EAAO,EAAP,CARK,EASlBM,OATkB,EAArB;IAUAjG,MAAM,CAACgF,KAAP,CAAc,iBAAgBxB,MAAM,CAAC0C,MAAP,GAAgB,CAAhB,GAAoB,QAApB,GAA+B,YAAa,EAA1E;IACA,OAAO1C,MAAP;EACD;;EAED,eAAexC,SAAf,CAAyB;IAACc,aAAD;IAAgBqE,YAAY,GAAG;EAA/B,CAAzB,EAAgE;IAC9D,MAAM3C,MAAM,GAAG,MAAMjD,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BqG,OAA1B,CAAkC;MAACtE;IAAD,CAAlC,CAArB;;IACA,IAAIqE,YAAJ,EAAkB;MAChB,MAAMjB,OAAO,GAAG,MAAMC,YAAY,CAAC;QAACrD;MAAD,CAAD,CAAlC;;MACA,IAAIoD,OAAJ,EAAa;QACX,OAAOlE,SAAS,CAAC;UAACc;QAAD,CAAD,CAAhB;MACD;;MACD,OAAO0B,MAAP;IACD;;IAED,OAAOA,MAAP;EACD,CApKmD,CAsKpD;EACA;EACA;EACA;;;EAEA,eAAe2B,YAAf,CAA4B;IAACrD;EAAD,CAA5B,EAA6C;IAC3C,MAAM;MAACyB,gBAAD;MAAmB8C,cAAc,EAAEC,QAAnC;MAA6CxD;IAA7C,IAA+D,MAAMvC,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BqG,OAA1B,CAAkC;MAACtE;IAAD,CAAlC,CAA3E,CAD2C,CAG3C;;IACA,IAAI,CAACY,2BAAA,CAAiB6D,KAAlB,EAAyB7D,2BAAA,CAAiB8D,KAA1C,EAAiD9D,2BAAA,CAAiB+D,IAAlE,EAAwEC,QAAxE,CAAiFJ,QAAjF,CAAJ,EAAgG;MAC9FtG,MAAM,CAAC2G,KAAP,CAAc,GAAE7E,aAAc,uBAAsBwE,QAAS,EAA7D;MACA,OAAO,KAAP;IACD;;IAED,MAAMM,WAAW,GAAG,IAAAxE,eAAA,EAAOmB,gBAAP,EAAyBsD,GAAzB,CAA6B,CAA7B,EAAgC,GAAhC,CAApB;IACA7G,MAAM,CAAC2G,KAAP,CAAc,aAAYC,WAAY,EAAtC;;IAEA,IAAIA,WAAW,CAACE,QAAZ,EAAJ,EAA4B;MAC1B,MAAMC,oBAAoB,GAAG,CAAC/D,2BAAA,CAAiBuD,KAAlB,EAAyBvD,2BAAA,CAAiByD,IAA1C,EAAgDzD,2BAAA,CAAiBC,KAAjE,EAAwED,2BAAA,CAAiBwD,KAAzF,CAA7B;;MACA,IAAI,CAACO,oBAAoB,CAACL,QAArB,CAA8B5D,cAAc,CAACC,MAA7C,CAAL,EAA2D;QAAE;QAC3D,MAAMxB,iBAAiB,CAAC;UAACO,aAAD;UAAgBG,SAAS,EAAE,QAA3B;UAAqCa,cAAc,EAAEE,2BAAA,CAAiBuD;QAAtE,CAAD,CAAvB;MACD;;MAED,IAAI,CAACQ,oBAAoB,CAACL,QAArB,CAA8B5D,cAAc,CAACI,MAA7C,CAAL,EAA2D;QAAE;QAC3D,MAAM3B,iBAAiB,CAAC;UAACO,aAAD;UAAgBG,SAAS,EAAE,QAA3B;UAAqCa,cAAc,EAAEE,2BAAA,CAAiBuD;QAAtE,CAAD,CAAvB;MACD;;MAED,MAAMjF,QAAQ,CAAC;QAACQ,aAAD;QAAgBmD,KAAK,EAAEvC,2BAAA,CAAiB6D,KAAxC;QAA+ClD,WAAW,EAAEQ,mBAAA,CAAWmD,eAAvE;QAAwF5D,YAAY,EAAG,cAAakD,QAAS;MAA7H,CAAD,CAAd;MAEA,OAAO,KAAP;IACD;;IAED,OAAO,IAAP;EACD;;EAED,eAAerF,MAAf,CAAsBmE,MAAtB,EAA8B;IAC5BpF,MAAM,CAAC2G,KAAP,CAAc,GAAEM,IAAI,CAACC,SAAL,CAAe9B,MAAf,CAAuB,EAAvC;IACApF,MAAM,CAAC2D,IAAP,CAAa,wBAAuB5D,UAAW,SAAQqF,MAAM,CAACtD,aAAc,EAA5E;IACA,MAAMqF,KAAK,GAAG,IAAAC,sBAAA,EAAShC,MAAM,CAACtD,aAAhB,CAAd;IACA9B,MAAM,CAAC2G,KAAP,CAAc,wBAAuBM,IAAI,CAACC,SAAL,CAAeC,KAAf,CAAsB,EAA3D;;IAEA,IAAI;MACF;MACA;MACA,MAAME,SAAS,GAAG,MAAMlG,aAAa,CAACiE,MAAD,CAArC;;MACA,IAAIiC,SAAJ,EAAe;QACb,MAAM9G,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BuH,SAA1B,CAAoC;UAACxF,aAAa,EAAEqF;QAAhB,CAApC,CAAN;QACA,OAAO,IAAP;MACD;IACF,CARD,CAQE,OAAOI,GAAP,EAAY;MACZ,IAAIA,GAAG,YAAYC,yBAAnB,EAAqC;QACnC,IAAID,GAAG,CAACE,OAAJ,CAAYC,OAAZ,CAAoB,uBAApB,MAAiD,CAAC,CAAtD,EAAyD;UACvD1H,MAAM,CAAC2G,KAAP,CAAc,oDAAmDM,IAAI,CAACC,SAAL,CAAeC,KAAf,CAAsB,SAAQpH,UAAW,EAA1G;UACA,MAAMQ,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BuH,SAA1B,CAAoC;YAACxF,aAAa,EAAEqF;UAAhB,CAApC,CAAN;UACA,OAAO,IAAP;QACD;;QACDnH,MAAM,CAAC+D,KAAP,CAAawD,GAAG,CAACE,OAAjB;QACA,MAAM,IAAI7D,qBAAJ,CAAaC,mBAAA,CAAWC,qBAAxB,EAA+CyD,GAAG,CAACE,OAAnD,CAAN;MACD;;MACD,MAAM,IAAI7D,qBAAJ,CAAaC,mBAAA,CAAWC,qBAAxB,EAA+CyD,GAAG,CAACE,OAAnD,CAAN;IACD;EACF;;EAED,eAAevG,WAAf,CAA2BY,aAA3B,EAA0C;IACxC9B,MAAM,CAAC2D,IAAP,CAAa,sCAAqC7B,aAAc,OAAM/B,UAAW,EAAjF;IACA,MAAMoH,KAAK,GAAG,IAAAC,sBAAA,EAAStF,aAAT,CAAd;IACA,MAAM0B,MAAM,GAAG,MAAMjD,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BqG,OAA1B,CAAkC;MAACtE,aAAa,EAAEqF;IAAhB,CAAlC,CAArB,CAHwC,CAGwC;;IAEhF,IAAI3D,MAAJ,EAAY;MACV,MAAM;QAACtB;MAAD,IAAsBsB,MAA5B;;MACA,IAAItB,iBAAiB,CAACM,IAAlB,KAA2B,KAA3B,IAAoCN,iBAAiB,CAACyF,QAAlB,KAA+B,KAAvE,EAA8E;QAC5E,OAAO;UACL1D,WAAW,EAAET,MAAM,CAACS,WADf;UAEL2D,UAAU,EAAEpH,YAAY,CAACqH,wBAAb,CAAsCV,KAAtC;QAFP,CAAP;MAID;;MACDnH,MAAM,CAACgF,KAAP,CAAc,wBAAuBlD,aAAc,KAAImF,IAAI,CAACC,SAAL,CAAehF,iBAAf,CAAkC,EAAzF;MACA,MAAM,IAAI0B,qBAAJ,CAAaC,mBAAA,CAAWiE,WAAxB,EAAqC;QAACL,OAAO,EAAG,kDAAiD3F,aAAc;MAA1E,CAArC,CAAN;IACD;;IAED,MAAM,IAAI8B,qBAAJ,CAAaC,mBAAA,CAAWkE,SAAxB,EAAmC;MAACN,OAAO,EAAG,OAAM3F,aAAc;IAA/B,CAAnC,CAAN;EACD;;EAED,eAAeX,aAAf,CAA6BiE,MAA7B,EAAqC;IACnCpF,MAAM,CAAC2D,IAAP,CAAa,uCAAsCyB,MAAM,CAACtD,aAAc,OAAM/B,UAAW,EAAzF;IACA,MAAMoH,KAAK,GAAG,IAAAC,sBAAA,EAAShC,MAAM,CAACtD,aAAhB,CAAd;IAEA,MAAM0B,MAAM,GAAG,MAAMjD,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BqG,OAA1B,CAAkC;MAACtE,aAAa,EAAEqF;IAAhB,CAAlC,CAArB,CAJmC,CAI6C;;IAChFnH,MAAM,CAAC2G,KAAP,CAAc,+BAA8BM,IAAI,CAACC,SAAL,CAAe1D,MAAf,CAAuB,EAAnE;;IAEA,IAAIA,MAAJ,EAAY;MACV,MAAMhD,YAAY,CAACwH,MAAb,CAAoBb,KAApB,CAAN;MACA,OAAO,IAAP;IACD;;IAED,OAAO,IAAP;EACD,CAtQmD,CAwQpD;;;EACA,SAAS/F,MAAT,CAAgB;IAACqB,cAAD;IAAiBK,cAAc,GAAGiC;EAAlC,CAAhB,EAA8D;IAE5D/E,MAAM,CAAC2G,KAAP,CAAc,mBAAkBlE,cAAe,qBAAoBwE,IAAI,CAACC,SAAL,CAAepE,cAAf,CAA+B,EAAlG;IACA,MAAMmF,mBAAmB,GAAGxF,cAAc,GAAG;MAACA,cAAc,EAAE,IAAA2E,sBAAA,EAAS3E,cAAT;IAAjB,CAAH,GAAgDsC,SAA1F;;IAEA,IAAI;MAEF;MACA,IAAItC,cAAc,IAAIK,cAAc,KAAKiC,SAAzC,EAAoD;QAClD/E,MAAM,CAAC2G,KAAP,CAAc,eAAc5G,UAAW,aAAYkH,IAAI,CAACC,SAAL,CAAee,mBAAmB,CAACxF,cAAnC,CAAmD,EAAtG;QACA,OAAOlC,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BqG,OAA1B,CAAkC,EAAC,GAAG6B;QAAJ,CAAlC,CAAP;MACD,CANC,CAQF;;;MACA,IAAInF,cAAc,IAAIL,cAAc,KAAKsC,SAAzC,EAAoD;QAClD/E,MAAM,CAAC2G,KAAP,CAAc,eAAc5G,UAAW,QAAOkH,IAAI,CAACC,SAAL,CAAepE,cAAf,CAA+B,EAA7E;QACA,OAAOvC,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BqG,OAA1B,CAAkC,EAAC,GAAGtD;QAAJ,CAAlC,CAAP;MACD,CAZC,CAcF;;;MACA,IAAIA,cAAc,IAAIL,cAAtB,EAAsC;QACpCzC,MAAM,CAAC2G,KAAP,CAAc,eAAc5G,UAAW,QAAO0C,cAAe,QAAOwE,IAAI,CAACC,SAAL,CAAepE,cAAf,CAA+B,EAAnG;QACA,OAAOvC,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BqG,OAA1B,CAAkC,EAAC,GAAG6B,mBAAJ;UAAyB,GAAGnF;QAA5B,CAAlC,CAAP;MACD;;MAED9C,MAAM,CAACgF,KAAP,CAAc,qBAAd;MACA,MAAM,IAAIpB,qBAAJ,CAAaC,mBAAA,CAAWC,qBAAxB,EAA+C,0CAA/C,CAAN;IAED,CAvBD,CAuBE,OAAOC,KAAP,EAAc;MACd,IAAAC,eAAA,EAASD,KAAT;IACD;EACF;;EAED,SAAS1C,SAAT,CAAmBS,aAAnB,EAAkC;IAChC9B,MAAM,CAAC2D,IAAP,CAAa,iCAAgC7B,aAAc,OAAM/B,UAAW,EAA5E;IACA,MAAMoH,KAAK,GAAG,IAAAC,sBAAA,EAAStF,aAAT,CAAd;;IACA,IAAI;MACF;MACA,OAAOtB,YAAY,CAACqH,wBAAb,CAAsCV,KAAtC,CAAP;IACD,CAHD,CAGE,OAAOpD,KAAP,EAAc;MACd,IAAAC,eAAA,EAASD,KAAT;IACD;EACF;;EAED,eAAevC,OAAf,CAAuB;IAACM,aAAD;IAAgBoG,UAAhB;IAA4BC;EAA5B,CAAvB,EAAiE;IAC/DnI,MAAM,CAACoI,OAAP,CAAgB,aAAYF,UAAU,CAAChC,MAAO,sBAAqBiC,WAAW,CAACjC,MAAO,KAAIpE,aAAc,OAAM/B,UAAW,EAAzH;IACAC,MAAM,CAACgF,KAAP,CAAc,QAAOkD,UAAU,CAAChC,MAAO,MAAKe,IAAI,CAACC,SAAL,CAAegB,UAAf,CAA2B,iBAAgBC,WAAW,CAACjC,MAAO,KAAIe,IAAI,CAACC,SAAL,CAAeiB,WAAf,CAA4B,EAA1I;IACA,MAAMhB,KAAK,GAAG,IAAAC,sBAAA,EAAStF,aAAT,CAAd;IACA,MAAMvB,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BsI,SAA1B,CAAoC;MACxCvG,aAAa,EAAEqF;IADyB,CAApC,EAEH;MACDmB,IAAI,EAAE;QACJ/E,gBAAgB,EAAE,IAAAnB,eAAA,IAASC,MAAT;MADd,CADL;MAIDkG,KAAK,EAAE;QACLL,UAAU,EAAE;UAACM,KAAK,EAAEN;QAAR,CADP;QAELC,WAAW,EAAE;UAACK,KAAK,EAAEL;QAAR;MAFR;IAJN,CAFG,CAAN;EAWD;;EAED,eAAe1G,YAAf,CAA4B;IAACK,aAAD;IAAgB2G,QAAhB;IAA0BC,YAAY,GAAG;EAAzC,CAA5B,EAAkF;IAChF1I,MAAM,CAACoI,OAAP,CAAgB,kBAAiBK,QAAQ,CAACvC,MAAO,QAAOwC,YAAa,IAAG5G,aAAc,OAAM/B,UAAW,EAAvG;IACAC,MAAM,CAAC2G,KAAP,CAAc,aAAY8B,QAAQ,CAACvC,MAAO,MAAKe,IAAI,CAACC,SAAL,CAAeuB,QAAf,CAAyB,GAAxE;IACA,MAAMtB,KAAK,GAAG,IAAAC,sBAAA,EAAStF,aAAT,CAAd;IACA,MAAM6G,iBAAiB,GAAG,IAAAvB,sBAAA,EAASsB,YAAT,CAA1B;IACA,MAAMnI,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BsI,SAA1B,CAAoC;MACxCvG,aAAa,EAAEqF;IADyB,CAApC,EAEH;MACDmB,IAAI,EAAE;QACJ/E,gBAAgB,EAAE,IAAAnB,eAAA,IAASC,MAAT;MADd,CADL;MAIDkG,KAAK,EAAE;QACL,CAACI,iBAAD,GAAqB;UAACH,KAAK,EAAEC;QAAR;MADhB;IAJN,CAFG,CAAN;EAUD;;EAED,SAASnH,QAAT,CAAkB;IAACQ,aAAD;IAAgBmD,KAAhB;IAAuB7B,YAAY,GAAG2B,SAAtC;IAAiD1B,WAAW,GAAG0B;EAA/D,CAAlB,EAA6F;IAC3F,MAAM6D,WAAW,GAAGxF,YAAY,IAAIC,WAAhB,GAA+B,qBAAoB4D,IAAI,CAACC,SAAL,CAAe9D,YAAf,KAAgC,EAAG,qBAAoBC,WAAW,IAAI,EAAG,GAA5H,GAAiI,EAArJ;IACArD,MAAM,CAAC2D,IAAP,CAAa,4BAA2BsB,KAAM,QAAOnD,aAAc,GAAE8G,WAAY,OAAM7I,UAAW,EAAlG;IAEA,MAAM8I,sBAAsB,GAAGC,MAAM,CAACC,MAAP,CAAcrG,2BAAd,EAAgCgF,OAAhC,CAAwCzC,KAAxC,IAAiD,CAAC,CAAjF;IACA,MAAM+D,+BAA+B,GAAGF,MAAM,CAACC,MAAP,CAAcrG,2BAAA,CAAiBC,SAA/B,EAA0C+E,OAA1C,CAAkDzC,KAAlD,IAA2D,CAAC,CAApG;IACA,MAAMgE,8BAA8B,GAAGH,MAAM,CAACC,MAAP,CAAcrG,2BAAA,CAAiBwG,QAA/B,EAAyCxB,OAAzC,CAAiDzC,KAAjD,IAA0D,CAAC,CAAlG;;IACA,IAAI,CAAC4D,sBAAD,IAA2B,CAACG,+BAA5B,IAA+D,CAACC,8BAApE,EAAoG;MAClG,MAAM,IAAIrF,qBAAJ,CAAaC,mBAAA,CAAWiE,WAAxB,EAAqC,6BAArC,CAAN;IACD;;IAED,MAAMX,KAAK,GAAG,IAAAC,sBAAA,EAAStF,aAAT,CAAd;IACA,MAAMqH,YAAY,GAAG;MACnB1G,cAAc,EAAEwC,KADG;MAEnB1B,gBAAgB,EAAE,IAAAnB,eAAA,IAASC,MAAT,EAFC;MAGnBe,YAHmB;MAInBC;IAJmB,CAArB,CAZ2F,CAmB3F;IACA;;IACAyF,MAAM,CAACM,IAAP,CAAYD,YAAZ,EAA0BE,OAA1B,CAAkCC,GAAG,IAAIH,YAAY,CAACG,GAAD,CAAZ,KAAsBvE,SAAtB,IAAmC,OAAOoE,YAAY,CAACG,GAAD,CAA/F;IAEA,OAAO/I,EAAE,CAACR,UAAH,CAAcA,UAAd,EACJwJ,gBADI,CAEH;MAACzH,aAAa,EAAEqF;IAAhB,CAFG,EAGH;MAACmB,IAAI,EAAEa;IAAP,CAHG,EAIH;MAACrD,UAAU,EAAE;QAACC,GAAG,EAAE;MAAN,CAAb;MAAuByD,iBAAiB,EAAE;IAA1C,CAJG,CAAP;EAMD;;EAED,SAASjI,iBAAT,CAA2B;IAACO,aAAD;IAAgBG,SAAhB;IAA2Ba;EAA3B,CAA3B,EAAuE;IAErE;IACA9C,MAAM,CAAC2D,IAAP,CAAa,uCAAsC1B,SAAU,KAAIa,cAAe,SAAQhB,aAAc,EAAtG;IACA,MAAM2H,kBAAkB,GAAG,IAAArC,sBAAA,EAAStF,aAAT,CAA3B;IACA,MAAM4H,mBAAmB,GAAG,IAAAtC,sBAAA,EAAStE,cAAT,CAA5B;;IAEA,IAAI,EAAEb,SAAS,IAAI0H,qBAAf,CAAJ,EAAgC;MAC9B,MAAM,IAAI/F,qBAAJ,CAAa,KAAb,EAAoB,wCAApB,CAAN;IACD;;IAED,IAAI,EAAE8F,mBAAmB,IAAI1G,2BAAzB,CAAJ,EAAgD;MAC9C,MAAM,IAAIY,qBAAJ,CAAa,KAAb,EAAoB,0BAApB,CAAN;IACD;;IAED,MAAMgG,WAAW,GAAG3H,SAAS,KAAK0H,qBAAA,CAAW5G,MAAzB,GAAkC;MAAC,yBAAyB2G;IAA1B,CAAlC,GAAmF;MAAC,yBAAyBA;IAA1B,CAAvG;IACA,OAAOnJ,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BwJ,gBAA1B,CAA2C;MAChDzH,aAAa,EAAE2H;IADiC,CAA3C,EAEJ;MACDnB,IAAI,EAAE,EACJ,GAAGsB,WADC;QAEJrG,gBAAgB,EAAE,IAAAnB,eAAA,IAASC,MAAT;MAFd;IADL,CAFI,EAOJ;MAACyD,UAAU,EAAE;QAACC,GAAG,EAAE;MAAN,CAAb;MAAuByD,iBAAiB,EAAE;IAA1C,CAPI,CAAP;EAQD;;EAED,eAAe9H,YAAf,CAA4B;IAACI,aAAD;IAAgBG;EAAhB,CAA5B,EAAwD;IACtD,MAAM4H,YAAY,GAAG5H,SAArB;IACA,MAAM;MAACA,SAAS,EAAE6H;IAAZ,IAA4B,MAAMvJ,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BqG,OAA1B,CAAkC;MAACtE;IAAD,CAAlC,CAAxC;IACA9B,MAAM,CAAC2D,IAAP,CAAa,qCAAoCmG,YAAa,OAAMD,YAAa,QAAO/H,aAAc,OAAM/B,UAAW,EAAvH;IACA,MAAM0J,kBAAkB,GAAG,IAAArC,sBAAA,EAAStF,aAAT,CAA3B;IACA,MAAMiI,iBAAiB,GAAG,IAAA3C,sBAAA,EAASyC,YAAT,CAA1B;IAEA,MAAMrG,MAAM,GAAG,MAAMjD,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BwJ,gBAA1B,CAA2C;MAC9DzH,aAAa,EAAE2H;IAD+C,CAA3C,EAElB;MACDnB,IAAI,EAAE;QACJrG,SAAS,EAAE8H,iBADP;QAEJxG,gBAAgB,EAAE,IAAAnB,eAAA,IAASC,MAAT;MAFd;IADL,CAFkB,EAOlB;MAACyD,UAAU,EAAE;QAACC,GAAG,EAAE;MAAN,CAAb;MAAuByD,iBAAiB,EAAE;IAA1C,CAPkB,CAArB;IASA,OAAOhG,MAAM,CAACwG,EAAd,CAhBsD,CAiBtD;EACD;;EAED,eAAerI,aAAf,CAA6B;IAACG,aAAD;IAAgBmI,YAAhB;IAA8BC,eAAe,GAAGnF;EAAhD,CAA7B,EAAyF;IACvF,MAAM0E,kBAAkB,GAAG,IAAArC,sBAAA,EAAStF,aAAT,CAA3B;IAEA,MAAMqI,SAAS,GAAG,MAAM5J,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BqG,OAA1B,CAAkC;MAACtE,aAAa,EAAE2H;IAAhB,CAAlC,CAAxB;IACAzJ,MAAM,CAAC2G,KAAP,CAAc,yBAAwBM,IAAI,CAACC,SAAL,CAAeiD,SAAf,CAA0B,EAAhE;IAEA,MAAMC,aAAa,GAAGD,SAAS,CAAC5H,UAAhC;IAEAvC,MAAM,CAAC2D,IAAP,CAAa,sCAAqCsD,IAAI,CAACC,SAAL,CAAekD,aAAf,CAA8B,cAAaH,YAAa,iBAAgBC,eAAgB,QAAOpI,aAAc,OAAM/B,UAAW,EAAhL;IAEA,MAAMsK,qBAAqB,GAAGD,aAAa,CAACE,MAAd,CAAqBrI,SAAS,IAAIA,SAAS,KAAKiI,eAAhD,CAA9B;IACA,MAAMK,2BAA2B,GAAGF,qBAAqB,CAAC3D,QAAtB,CAA+BuD,YAA/B,IAA+CI,qBAA/C,GAAuE,CAAC,GAAGA,qBAAJ,EAA2BJ,YAA3B,CAA3G;IAEAjK,MAAM,CAAC2G,KAAP,CAAc,0BAAyB0D,qBAAsB,EAA7D;IACArK,MAAM,CAAC2G,KAAP,CAAc,+BAA8B4D,2BAA4B,EAAxE;IAEA,MAAM/G,MAAM,GAAG,MAAMjD,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BwJ,gBAA1B,CAA2C;MAC9DzH,aAAa,EAAE2H;IAD+C,CAA3C,EAElB;MACDnB,IAAI,EAAE;QACJ/F,UAAU,EAAEgI,2BADR;QAEJhH,gBAAgB,EAAE,IAAAnB,eAAA,IAASC,MAAT;MAFd;IADL,CAFkB,EAOlB;MAACyD,UAAU,EAAE;QAACC,GAAG,EAAE;MAAN,CAAb;MAAuByD,iBAAiB,EAAE;IAA1C,CAPkB,CAArB;IASA,OAAOhG,MAAM,CAACwG,EAAd,CAzBuF,CA0BvF;EACD;;EAED,eAAepI,WAAf,CAA2B;IAACE;EAAD,CAA3B,EAA4C;IAC1C,MAAM2H,kBAAkB,GAAG,IAAArC,sBAAA,EAAStF,aAAT,CAA3B;IAEA,MAAM0B,MAAM,GAAG,MAAMjD,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BwJ,gBAA1B,CAA2C;MAC9DzH,aAAa,EAAE2H,kBAD+C;MAE9DhH,cAAc,EAAEC,2BAAA,CAAiBC,SAAjB,CAA2B0B;IAFmB,CAA3C,EAGlB;MACDmG,IAAI,EAAE;QACJ3H,QAAQ,EAAE;MADN,CADL;MAIDyF,IAAI,EAAE;QACJ/E,gBAAgB,EAAE,IAAAnB,eAAA,IAASC,MAAT;MADd;IAJL,CAHkB,EAUlB;MAACyD,UAAU,EAAE;QAACC,GAAG,EAAE;MAAN,CAAb;MAAuByD,iBAAiB,EAAE;IAA1C,CAVkB,CAArB;IAYAxJ,MAAM,CAACoI,OAAP,CAAgB,+BAA8BnB,IAAI,CAACC,SAAL,CAAe1D,MAAf,CAAuB,EAArE;IACA,OAAOA,MAAP;EACD;;EAED,eAAe3B,WAAf,CAA2B;IAACC,aAAD;IAAgBe;EAAhB,CAA3B,EAAsD;IACpD,MAAM4G,kBAAkB,GAAG,IAAArC,sBAAA,EAAStF,aAAT,CAA3B;IACA,MAAM2I,aAAa,GAAG,IAAArD,sBAAA,EAASvE,QAAT,CAAtB;IAEA,MAAMW,MAAM,GAAG,MAAMjD,EAAE,CAACR,UAAH,CAAcA,UAAd,EAA0BwJ,gBAA1B,CAA2C;MAC9DzH,aAAa,EAAE2H;IAD+C,CAA3C,EAElB;MACDnB,IAAI,EAAE;QACJzF,QAAQ,EAAE4H,aADN;QAEJlH,gBAAgB,EAAE,IAAAnB,eAAA,IAASC,MAAT;MAFd;IADL,CAFkB,EAOlB;MAACyD,UAAU,EAAE;QAACC,GAAG,EAAE;MAAN,CAAb;MAAuByD,iBAAiB,EAAE;IAA1C,CAPkB,CAArB;IASAxJ,MAAM,CAACoI,OAAP,CAAgB,+BAA8BnB,IAAI,CAACC,SAAL,CAAe1D,MAAf,CAAuB,EAArE;IACA,OAAOA,MAAP;EACD;AAEF"}
|
package/dist/mongoLog.js
ADDED
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.default = _default;
|
|
7
|
+
|
|
8
|
+
var _mongodb = require("mongodb");
|
|
9
|
+
|
|
10
|
+
var _melindaBackendCommons = require("@natlibfi/melinda-backend-commons");
|
|
11
|
+
|
|
12
|
+
var _melindaCommons = require("@natlibfi/melinda-commons");
|
|
13
|
+
|
|
14
|
+
var _utils = require("./utils.js");
|
|
15
|
+
|
|
16
|
+
var _moment = _interopRequireDefault(require("moment"));
|
|
17
|
+
|
|
18
|
+
var _httpStatus = _interopRequireDefault(require("http-status"));
|
|
19
|
+
|
|
20
|
+
var _mongoSanitize = _interopRequireDefault(require("mongo-sanitize"));
|
|
21
|
+
|
|
22
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
*
|
|
26
|
+
* @licstart The following is the entire license notice for the JavaScript code in this file.
|
|
27
|
+
*
|
|
28
|
+
* Shared modules for microservices of Melinda rest api batch import system
|
|
29
|
+
*
|
|
30
|
+
* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)
|
|
31
|
+
*
|
|
32
|
+
* This file is part of melinda-rest-api-commons
|
|
33
|
+
*
|
|
34
|
+
* melinda-rest-api-commons program is free software: you can redistribute it and/or modify
|
|
35
|
+
* it under the terms of the GNU Affero General Public License as
|
|
36
|
+
* published by the Free Software Foundation, either version 3 of the
|
|
37
|
+
* License, or (at your option) any later version.
|
|
38
|
+
*
|
|
39
|
+
* melinda-rest-api-commons is distributed in the hope that it will be useful,
|
|
40
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
41
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
42
|
+
* GNU Affero General Public License for more details.
|
|
43
|
+
*
|
|
44
|
+
* You should have received a copy of the GNU Affero General Public License
|
|
45
|
+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
46
|
+
*
|
|
47
|
+
* @licend The above is the entire license notice
|
|
48
|
+
* for the JavaScript code in this file.
|
|
49
|
+
*
|
|
50
|
+
*/
|
|
51
|
+
async function _default(MONGO_URI) {
|
|
52
|
+
const logger = (0, _melindaBackendCommons.createLogger)(); // Connect to mongo (MONGO)
|
|
53
|
+
|
|
54
|
+
const client = await _mongodb.MongoClient.connect(MONGO_URI, {
|
|
55
|
+
useNewUrlParser: true,
|
|
56
|
+
useUnifiedTopology: true
|
|
57
|
+
});
|
|
58
|
+
const db = client.db('rest-api');
|
|
59
|
+
const collection = 'logs';
|
|
60
|
+
return {
|
|
61
|
+
addLogItem,
|
|
62
|
+
query,
|
|
63
|
+
queryById,
|
|
64
|
+
remove
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
async function addLogItem(logItem) {
|
|
68
|
+
const time = (0, _moment.default)().toDate();
|
|
69
|
+
const newLogItem = { ...logItem,
|
|
70
|
+
creationTime: time
|
|
71
|
+
};
|
|
72
|
+
|
|
73
|
+
try {
|
|
74
|
+
const result = await db.collection(collection).insertOne(newLogItem);
|
|
75
|
+
|
|
76
|
+
if (result.acknowledged) {
|
|
77
|
+
logger.info(`*** New ${logItem.logItemType} added for ${logItem.correlationId} items ${logItem.blobSequenceStart}-${logItem.blobSequenceEnd}. ***`);
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR);
|
|
82
|
+
} catch (error) {
|
|
83
|
+
(0, _utils.logError)(error);
|
|
84
|
+
throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
async function query(params) {
|
|
89
|
+
logger.debug(`Query params: ${JSON.stringify(params)}`);
|
|
90
|
+
const result = await db.collection(collection).find(params).toArray();
|
|
91
|
+
logger.debug(result);
|
|
92
|
+
logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items!` : 'Not found!'}`);
|
|
93
|
+
return result;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
async function queryById(correlationIdString) {
|
|
97
|
+
logger.debug(`QueryById: ${correlationIdString}`);
|
|
98
|
+
const result = await db.collection(collection).find({
|
|
99
|
+
correlationId: correlationIdString
|
|
100
|
+
}).toArray();
|
|
101
|
+
logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items!` : 'Not found!'}`);
|
|
102
|
+
return result;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
async function remove(params) {
|
|
106
|
+
logger.silly(`${JSON.stringify(params)}`);
|
|
107
|
+
logger.info(`Removing from Mongo (${collection}) correlationId: ${params.correlationId}`);
|
|
108
|
+
const clean = (0, _mongoSanitize.default)(params.correlationId);
|
|
109
|
+
logger.silly(`mongo/remove: clean: ${JSON.stringify(clean)}`);
|
|
110
|
+
|
|
111
|
+
try {
|
|
112
|
+
await db.collection(collection).deleteMany({
|
|
113
|
+
correlationId: clean
|
|
114
|
+
});
|
|
115
|
+
return true;
|
|
116
|
+
} catch (err) {
|
|
117
|
+
throw new _melindaCommons.Error(_httpStatus.default.INTERNAL_SERVER_ERROR, err.message);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
//# sourceMappingURL=mongoLog.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mongoLog.js","names":["MONGO_URI","logger","createLogger","client","MongoClient","connect","useNewUrlParser","useUnifiedTopology","db","collection","addLogItem","query","queryById","remove","logItem","time","moment","toDate","newLogItem","creationTime","result","insertOne","acknowledged","info","logItemType","correlationId","blobSequenceStart","blobSequenceEnd","ApiError","httpStatus","INTERNAL_SERVER_ERROR","error","logError","params","debug","JSON","stringify","find","toArray","length","correlationIdString","silly","clean","sanitize","deleteMany","err","message"],"sources":["../src/mongoLog.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 {MongoClient} from 'mongodb';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {logError} from './utils.js';\nimport moment from 'moment';\nimport httpStatus from 'http-status';\nimport sanitize from 'mongo-sanitize';\n\nexport default async function (MONGO_URI) {\n const logger = createLogger();\n\n // Connect to mongo (MONGO)\n const client = await MongoClient.connect(MONGO_URI, {useNewUrlParser: true, useUnifiedTopology: true});\n const db = client.db('rest-api');\n const collection = 'logs';\n return {addLogItem, query, queryById, remove};\n\n async function addLogItem(logItem) {\n const time = moment().toDate();\n const newLogItem = {\n ...logItem,\n creationTime: time\n };\n try {\n const result = await db.collection(collection).insertOne(newLogItem);\n if (result.acknowledged) {\n logger.info(`*** New ${logItem.logItemType} added for ${logItem.correlationId} items ${logItem.blobSequenceStart}-${logItem.blobSequenceEnd}. ***`);\n return;\n }\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n } catch (error) {\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n }\n }\n\n\n async function query(params) {\n logger.debug(`Query params: ${JSON.stringify(params)}`);\n const result = await db.collection(collection).find(params).toArray();\n logger.debug(result);\n logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items!` : 'Not found!'}`);\n return result;\n }\n\n async function queryById(correlationIdString) {\n logger.debug(`QueryById: ${correlationIdString}`);\n const result = await db.collection(collection).find({correlationId: correlationIdString}).toArray();\n logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items!` : 'Not found!'}`);\n return result;\n }\n\n async function remove(params) {\n logger.silly(`${JSON.stringify(params)}`);\n logger.info(`Removing from Mongo (${collection}) correlationId: ${params.correlationId}`);\n const clean = sanitize(params.correlationId);\n logger.silly(`mongo/remove: clean: ${JSON.stringify(clean)}`);\n\n try {\n await db.collection(collection).deleteMany({correlationId: clean});\n return true;\n } catch (err) {\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, err.message);\n }\n }\n}\n"],"mappings":"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"}
|
package/dist/utils.js
CHANGED
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.addRecordResponseItem = addRecordResponseItem;
|
|
7
7
|
exports.createImportJobState = createImportJobState;
|
|
8
8
|
exports.createRecordResponseItem = createRecordResponseItem;
|
|
9
|
-
exports.getRecordResponseStatus = getRecordResponseStatus;
|
|
10
9
|
exports.logError = logError;
|
|
11
10
|
|
|
12
11
|
var _melindaBackendCommons = require("@natlibfi/melinda-backend-commons");
|
|
@@ -90,63 +89,114 @@ function createRecordResponseItem({
|
|
|
90
89
|
recordMetadata,
|
|
91
90
|
id
|
|
92
91
|
}) {
|
|
93
|
-
const
|
|
92
|
+
const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload);
|
|
94
93
|
const recordResponseItem = {
|
|
95
|
-
|
|
96
|
-
recordMetadata: recordMetadata || undefined,
|
|
97
|
-
...
|
|
94
|
+
databaseId: id || '000000000',
|
|
95
|
+
recordMetadata: responsePayload.recordMetadata || recordMetadata || undefined,
|
|
96
|
+
...recordResponseStatusAndMessage
|
|
98
97
|
};
|
|
99
98
|
return recordResponseItem;
|
|
100
|
-
}
|
|
99
|
+
} // eslint-disable-next-line max-statements
|
|
100
|
+
|
|
101
101
|
|
|
102
|
-
function
|
|
103
|
-
logger.
|
|
102
|
+
function getRecordResponseStatusAndMessage(responseStatus, responsePayload) {
|
|
103
|
+
logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);
|
|
104
104
|
const responseStatusName = _httpStatus.default[`${responseStatus}_NAME`];
|
|
105
|
-
logger.
|
|
105
|
+
logger.debug(`Response status name: ${responseStatusName}`);
|
|
106
|
+
const message = getMessageFromResponsePayload(responsePayload);
|
|
107
|
+
logger.debug(`Response message: ${message}`); // Non-http statuses
|
|
108
|
+
|
|
109
|
+
if (['UPDATED', 'CREATED', 'INVALID', 'ERROR'].includes(responseStatus)) {
|
|
110
|
+
return {
|
|
111
|
+
status: responseStatus,
|
|
112
|
+
message
|
|
113
|
+
};
|
|
114
|
+
}
|
|
106
115
|
|
|
107
|
-
if (['
|
|
116
|
+
if (['UNKNOWN'].includes(responseStatus)) {
|
|
117
|
+
const possibleIds = responsePayload.ids || [];
|
|
108
118
|
return {
|
|
109
119
|
status: responseStatus,
|
|
110
|
-
message
|
|
120
|
+
message,
|
|
121
|
+
possibleIds
|
|
111
122
|
};
|
|
112
|
-
} // Duplicates and other
|
|
123
|
+
} // Duplicates and other CONFLICT statuses
|
|
113
124
|
|
|
114
125
|
|
|
115
126
|
if ([_httpStatus.default.CONFLICT, 'CONFLICT'].includes(responseStatus)) {
|
|
116
|
-
if (/^Duplicates in database/u.test(
|
|
127
|
+
if (/^Duplicates in database/u.test(message)) {
|
|
128
|
+
const duplicateIds = responsePayload.ids || [];
|
|
117
129
|
return {
|
|
118
130
|
status: 'DUPLICATE',
|
|
119
|
-
message
|
|
120
|
-
duplicateIds
|
|
131
|
+
message,
|
|
132
|
+
duplicateIds
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
if (/^MatchValidation for all/u.test(message)) {
|
|
137
|
+
const duplicateIds = responsePayload.ids || [];
|
|
138
|
+
return {
|
|
139
|
+
status: 'CONFLICT',
|
|
140
|
+
message,
|
|
141
|
+
duplicateIds
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
const conflictIds = responsePayload.ids || [];
|
|
146
|
+
|
|
147
|
+
if (conflictIds.length > 0) {
|
|
148
|
+
return {
|
|
149
|
+
status: 'CONFLICT',
|
|
150
|
+
message,
|
|
151
|
+
conflictIds
|
|
121
152
|
};
|
|
122
153
|
}
|
|
123
154
|
|
|
124
155
|
return {
|
|
125
156
|
status: 'CONFLICT',
|
|
126
|
-
message
|
|
157
|
+
message
|
|
127
158
|
};
|
|
128
159
|
}
|
|
129
160
|
|
|
130
161
|
if ([_httpStatus.default.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {
|
|
131
|
-
|
|
162
|
+
const unprocessableIds = responsePayload.ids || [];
|
|
163
|
+
const response = unprocessableIds.length > 0 ? {
|
|
132
164
|
status: 'UNPROCESSABLE_ENTITY',
|
|
133
|
-
message
|
|
165
|
+
message,
|
|
166
|
+
unprocessableIds
|
|
167
|
+
} : {
|
|
168
|
+
status: 'UNPROCESSABLE_ENTITY',
|
|
169
|
+
message
|
|
134
170
|
};
|
|
171
|
+
return response;
|
|
135
172
|
}
|
|
136
173
|
|
|
137
174
|
if ([_httpStatus.default.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {
|
|
138
175
|
return {
|
|
139
176
|
status: 'NOT_FOUND',
|
|
140
|
-
message
|
|
177
|
+
message
|
|
141
178
|
};
|
|
142
|
-
}
|
|
179
|
+
} // Otherwise
|
|
180
|
+
|
|
143
181
|
|
|
144
182
|
return {
|
|
145
183
|
status: 'ERROR',
|
|
146
|
-
message
|
|
184
|
+
message
|
|
147
185
|
};
|
|
148
186
|
}
|
|
149
187
|
|
|
188
|
+
function getMessageFromResponsePayload(responsePayload) {
|
|
189
|
+
if (responsePayload.message) {
|
|
190
|
+
return responsePayload.message;
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
if (typeof responsePayload === 'string' || responsePayload instanceof String) {
|
|
194
|
+
return responsePayload;
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
return '';
|
|
198
|
+
}
|
|
199
|
+
|
|
150
200
|
async function addRecordResponseItem({
|
|
151
201
|
recordResponseItem,
|
|
152
202
|
correlationId,
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"utils.js","names":["logger","createLogger","logError","err","ApiError","error","JSON","stringify","stack","undefined","createImportJobState","operation","state","queryImportJobState","IMPORT_JOB_STATE","Error","OPERATIONS","importJobStateWithOperation","importJobStateForQuery","createRecordResponseItem","responsePayload","responseStatus","recordMetadata","id","recordResponseStatusAndMessage","getRecordResponseStatusAndMessage","recordResponseItem","databaseId","debug","responseStatusName","httpStatus","message","getMessageFromResponsePayload","includes","status","possibleIds","ids","CONFLICT","test","duplicateIds","conflictIds","length","UNPROCESSABLE_ENTITY","unprocessableIds","response","NOT_FOUND","String","addRecordResponseItem","correlationId","mongoOperator","pushMessages","messages","messageField"],"sources":["../src/utils.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 {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {IMPORT_JOB_STATE, OPERATIONS} from './constants';\nimport httpStatus from 'http-status';\n\nconst logger = createLogger();\n\nexport function logError(err) {\n if (err instanceof ApiError) {\n logger.error(JSON.stringify(err));\n return;\n }\n\n if (err === 'SIGINT') {\n logger.error(err);\n return;\n }\n\n logger.error(err.stack === undefined ? err : err.stack);\n}\n\nexport function createImportJobState(operation, state, queryImportJobState = false) {\n if (!(state in IMPORT_JOB_STATE)) {\n throw new Error('Invalid IMPORT_JOB_STATE');\n }\n\n if (!(operation in OPERATIONS)) {\n throw new Error('Invalid operation');\n }\n\n if (queryImportJobState) {\n const importJobStateWithOperation = `importJobState.${operation}`;\n const importJobStateForQuery = {[importJobStateWithOperation]: state};\n\n return importJobStateForQuery;\n }\n\n return {[operation]: state};\n}\n\nexport function createRecordResponseItem({responsePayload, responseStatus, recordMetadata, id}) {\n const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload);\n const recordResponseItem = {\n databaseId: id || '000000000',\n recordMetadata: responsePayload.recordMetadata || recordMetadata || undefined,\n ...recordResponseStatusAndMessage\n };\n return recordResponseItem;\n}\n\n// eslint-disable-next-line max-statements\nfunction getRecordResponseStatusAndMessage(responseStatus, responsePayload) {\n\n logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);\n const responseStatusName = httpStatus[`${responseStatus}_NAME`];\n logger.debug(`Response status name: ${responseStatusName}`);\n\n const message = getMessageFromResponsePayload(responsePayload);\n\n logger.debug(`Response message: ${message}`);\n\n // Non-http statuses\n if (['UPDATED', 'CREATED', 'INVALID', 'ERROR'].includes(responseStatus)) {\n return {status: responseStatus, message};\n }\n\n if (['UNKNOWN'].includes(responseStatus)) {\n const possibleIds = responsePayload.ids || [];\n return {status: responseStatus, message, possibleIds};\n }\n\n // Duplicates and other CONFLICT statuses\n if ([httpStatus.CONFLICT, 'CONFLICT'].includes(responseStatus)) {\n if ((/^Duplicates in database/u).test(message)) {\n const duplicateIds = responsePayload.ids || [];\n return {status: 'DUPLICATE', message, duplicateIds};\n }\n if ((/^MatchValidation for all/u).test(message)) {\n const duplicateIds = responsePayload.ids || [];\n return {status: 'CONFLICT', message, duplicateIds};\n }\n const conflictIds = responsePayload.ids || [];\n if (conflictIds.length > 0) {\n return {status: 'CONFLICT', message, conflictIds};\n }\n return {status: 'CONFLICT', message};\n }\n\n if ([httpStatus.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {\n const unprocessableIds = responsePayload.ids || [];\n const response = unprocessableIds.length > 0 ? {status: 'UNPROCESSABLE_ENTITY', message, unprocessableIds} : {status: 'UNPROCESSABLE_ENTITY', message};\n return response;\n }\n\n if ([httpStatus.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {\n return {status: 'NOT_FOUND', message};\n }\n\n // Otherwise\n return {status: 'ERROR', message};\n}\n\nfunction getMessageFromResponsePayload(responsePayload) {\n if (responsePayload.message) {\n return responsePayload.message;\n }\n if (typeof responsePayload === 'string' || responsePayload instanceof String) {\n return responsePayload;\n }\n return '';\n}\n\nexport async function addRecordResponseItem({recordResponseItem, correlationId, mongoOperator}) {\n await mongoOperator.pushMessages({correlationId, messages: [recordResponseItem], messageField: 'records'});\n return true;\n}\n\n"],"mappings":";;;;;;;;;;AA4BA;;AACA;;AACA;;AACA;;;;AA/BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAOA,MAAMA,MAAM,GAAG,IAAAC,mCAAA,GAAf;;AAEO,SAASC,QAAT,CAAkBC,GAAlB,EAAuB;EAC5B,IAAIA,GAAG,YAAYC,qBAAnB,EAA6B;IAC3BJ,MAAM,CAACK,KAAP,CAAaC,IAAI,CAACC,SAAL,CAAeJ,GAAf,CAAb;IACA;EACD;;EAED,IAAIA,GAAG,KAAK,QAAZ,EAAsB;IACpBH,MAAM,CAACK,KAAP,CAAaF,GAAb;IACA;EACD;;EAEDH,MAAM,CAACK,KAAP,CAAaF,GAAG,CAACK,KAAJ,KAAcC,SAAd,GAA0BN,GAA1B,GAAgCA,GAAG,CAACK,KAAjD;AACD;;AAEM,SAASE,oBAAT,CAA8BC,SAA9B,EAAyCC,KAAzC,EAAgDC,mBAAmB,GAAG,KAAtE,EAA6E;EAClF,IAAI,EAAED,KAAK,IAAIE,2BAAX,CAAJ,EAAkC;IAChC,MAAM,IAAIC,KAAJ,CAAU,0BAAV,CAAN;EACD;;EAED,IAAI,EAAEJ,SAAS,IAAIK,qBAAf,CAAJ,EAAgC;IAC9B,MAAM,IAAID,KAAJ,CAAU,mBAAV,CAAN;EACD;;EAED,IAAIF,mBAAJ,EAAyB;IACvB,MAAMI,2BAA2B,GAAI,kBAAiBN,SAAU,EAAhE;IACA,MAAMO,sBAAsB,GAAG;MAAC,CAACD,2BAAD,GAA+BL;IAAhC,CAA/B;IAEA,OAAOM,sBAAP;EACD;;EAED,OAAO;IAAC,CAACP,SAAD,GAAaC;EAAd,CAAP;AACD;;AAEM,SAASO,wBAAT,CAAkC;EAACC,eAAD;EAAkBC,cAAlB;EAAkCC,cAAlC;EAAkDC;AAAlD,CAAlC,EAAyF;EAC9F,MAAMC,8BAA8B,GAAGC,iCAAiC,CAACJ,cAAD,EAAiBD,eAAjB,CAAxE;EACA,MAAMM,kBAAkB,GAAG;IACzBC,UAAU,EAAEJ,EAAE,IAAI,WADO;IAEzBD,cAAc,EAAEF,eAAe,CAACE,cAAhB,IAAkCA,cAAlC,IAAoDb,SAF3C;IAGzB,GAAGe;EAHsB,CAA3B;EAKA,OAAOE,kBAAP;AACD,C,CAED;;;AACA,SAASD,iCAAT,CAA2CJ,cAA3C,EAA2DD,eAA3D,EAA4E;EAE1EpB,MAAM,CAAC4B,KAAP,CAAc,oBAAmBP,cAAe,qBAAoBf,IAAI,CAACC,SAAL,CAAea,eAAf,CAAgC,EAApG;EACA,MAAMS,kBAAkB,GAAGC,mBAAA,CAAY,GAAET,cAAe,OAA7B,CAA3B;EACArB,MAAM,CAAC4B,KAAP,CAAc,yBAAwBC,kBAAmB,EAAzD;EAEA,MAAME,OAAO,GAAGC,6BAA6B,CAACZ,eAAD,CAA7C;EAEApB,MAAM,CAAC4B,KAAP,CAAc,qBAAoBG,OAAQ,EAA1C,EAR0E,CAU1E;;EACA,IAAI,CAAC,SAAD,EAAY,SAAZ,EAAuB,SAAvB,EAAkC,OAAlC,EAA2CE,QAA3C,CAAoDZ,cAApD,CAAJ,EAAyE;IACvE,OAAO;MAACa,MAAM,EAAEb,cAAT;MAAyBU;IAAzB,CAAP;EACD;;EAED,IAAI,CAAC,SAAD,EAAYE,QAAZ,CAAqBZ,cAArB,CAAJ,EAA0C;IACxC,MAAMc,WAAW,GAAGf,eAAe,CAACgB,GAAhB,IAAuB,EAA3C;IACA,OAAO;MAACF,MAAM,EAAEb,cAAT;MAAyBU,OAAzB;MAAkCI;IAAlC,CAAP;EACD,CAlByE,CAoB1E;;;EACA,IAAI,CAACL,mBAAA,CAAWO,QAAZ,EAAsB,UAAtB,EAAkCJ,QAAlC,CAA2CZ,cAA3C,CAAJ,EAAgE;IAC9D,IAAK,0BAAD,CAA6BiB,IAA7B,CAAkCP,OAAlC,CAAJ,EAAgD;MAC9C,MAAMQ,YAAY,GAAGnB,eAAe,CAACgB,GAAhB,IAAuB,EAA5C;MACA,OAAO;QAACF,MAAM,EAAE,WAAT;QAAsBH,OAAtB;QAA+BQ;MAA/B,CAAP;IACD;;IACD,IAAK,2BAAD,CAA8BD,IAA9B,CAAmCP,OAAnC,CAAJ,EAAiD;MAC/C,MAAMQ,YAAY,GAAGnB,eAAe,CAACgB,GAAhB,IAAuB,EAA5C;MACA,OAAO;QAACF,MAAM,EAAE,UAAT;QAAqBH,OAArB;QAA8BQ;MAA9B,CAAP;IACD;;IACD,MAAMC,WAAW,GAAGpB,eAAe,CAACgB,GAAhB,IAAuB,EAA3C;;IACA,IAAII,WAAW,CAACC,MAAZ,GAAqB,CAAzB,EAA4B;MAC1B,OAAO;QAACP,MAAM,EAAE,UAAT;QAAqBH,OAArB;QAA8BS;MAA9B,CAAP;IACD;;IACD,OAAO;MAACN,MAAM,EAAE,UAAT;MAAqBH;IAArB,CAAP;EACD;;EAED,IAAI,CAACD,mBAAA,CAAWY,oBAAZ,EAAkC,sBAAlC,EAA0DT,QAA1D,CAAmEZ,cAAnE,CAAJ,EAAwF;IACtF,MAAMsB,gBAAgB,GAAGvB,eAAe,CAACgB,GAAhB,IAAuB,EAAhD;IACA,MAAMQ,QAAQ,GAAGD,gBAAgB,CAACF,MAAjB,GAA0B,CAA1B,GAA8B;MAACP,MAAM,EAAE,sBAAT;MAAiCH,OAAjC;MAA0CY;IAA1C,CAA9B,GAA4F;MAACT,MAAM,EAAE,sBAAT;MAAiCH;IAAjC,CAA7G;IACA,OAAOa,QAAP;EACD;;EAED,IAAI,CAACd,mBAAA,CAAWe,SAAZ,EAAuB,WAAvB,EAAoCZ,QAApC,CAA6CZ,cAA7C,CAAJ,EAAkE;IAChE,OAAO;MAACa,MAAM,EAAE,WAAT;MAAsBH;IAAtB,CAAP;EACD,CA7CyE,CA+C1E;;;EACA,OAAO;IAACG,MAAM,EAAE,OAAT;IAAkBH;EAAlB,CAAP;AACD;;AAED,SAASC,6BAAT,CAAuCZ,eAAvC,EAAwD;EACtD,IAAIA,eAAe,CAACW,OAApB,EAA6B;IAC3B,OAAOX,eAAe,CAACW,OAAvB;EACD;;EACD,IAAI,OAAOX,eAAP,KAA2B,QAA3B,IAAuCA,eAAe,YAAY0B,MAAtE,EAA8E;IAC5E,OAAO1B,eAAP;EACD;;EACD,OAAO,EAAP;AACD;;AAEM,eAAe2B,qBAAf,CAAqC;EAACrB,kBAAD;EAAqBsB,aAArB;EAAoCC;AAApC,CAArC,EAAyF;EAC9F,MAAMA,aAAa,CAACC,YAAd,CAA2B;IAACF,aAAD;IAAgBG,QAAQ,EAAE,CAACzB,kBAAD,CAA1B;IAAgD0B,YAAY,EAAE;EAA9D,CAA3B,CAAN;EACA,OAAO,IAAP;AACD"}
|
package/package.json
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"url": "git@github.com:natlibfi/melinda-rest-api-commons.git"
|
|
15
15
|
},
|
|
16
16
|
"license": "AGPL-3.0+",
|
|
17
|
-
"version": "2.
|
|
17
|
+
"version": "2.3.0-alpha.1",
|
|
18
18
|
"main": "./dist/index.js",
|
|
19
19
|
"engines": {
|
|
20
20
|
"node": ">=14"
|
|
@@ -36,21 +36,21 @@
|
|
|
36
36
|
"@natlibfi/marc-record": "^7.0.0",
|
|
37
37
|
"@natlibfi/marc-record-serializers": "^8.1.0",
|
|
38
38
|
"@natlibfi/marc-record-validate": "^7.0.1",
|
|
39
|
-
"@natlibfi/marc-record-validators-melinda": "^9.0.
|
|
39
|
+
"@natlibfi/marc-record-validators-melinda": "^9.0.9",
|
|
40
40
|
"@natlibfi/melinda-backend-commons": "^2.0.5",
|
|
41
41
|
"@natlibfi/melinda-commons": "^12.0.3",
|
|
42
42
|
"amqplib": ">=0.8.0 <1.0.0",
|
|
43
|
-
"http-status": "^1.5.
|
|
44
|
-
"moment": "^2.29.
|
|
43
|
+
"http-status": "^1.5.2",
|
|
44
|
+
"moment": "^2.29.3",
|
|
45
45
|
"mongo-sanitize": "^1.1.0",
|
|
46
|
-
"mongodb": "^4.
|
|
46
|
+
"mongodb": "^4.6.0"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
|
-
"@babel/cli": "^7.17.
|
|
50
|
-
"@babel/core": "^7.17.
|
|
49
|
+
"@babel/cli": "^7.17.10",
|
|
50
|
+
"@babel/core": "^7.17.12",
|
|
51
51
|
"@babel/eslint-parser": "^7.17.0",
|
|
52
52
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
|
53
|
-
"@babel/preset-env": "^7.
|
|
53
|
+
"@babel/preset-env": "^7.17.12",
|
|
54
54
|
"@natlibfi/eslint-config-melinda-backend": "^2.0.0",
|
|
55
55
|
"@natlibfi/fixura": "^2.2.1",
|
|
56
56
|
"babel-plugin-dynamic-import-node": "^2.3.3",
|
|
@@ -58,9 +58,9 @@
|
|
|
58
58
|
"babel-plugin-rewire": "^1.2.0",
|
|
59
59
|
"chai": "^4.3.6",
|
|
60
60
|
"cross-env": "^7.0.3",
|
|
61
|
-
"eslint": "^8.
|
|
62
|
-
"mocha": "^
|
|
63
|
-
"nodemon": "^2.0.
|
|
61
|
+
"eslint": "^8.15.0",
|
|
62
|
+
"mocha": "^10.0.0",
|
|
63
|
+
"nodemon": "^2.0.16",
|
|
64
64
|
"nyc": "^15.1.0"
|
|
65
65
|
},
|
|
66
66
|
"eslintConfig": {
|