playov2-js-utilities 0.3.40 → 0.3.42

package/lib/index.js

@@ -11,8 +11,5 @@ module.exports = {
     httpRequest: require('./request'),
     Cron: require('./cron'),
     MessagePublisher: require('./message_publisher'),
-    middleware: require('./middleware'),
-    taskScheduler: require('./taskscheduler'),
-    Models: require('./models'),
-    Db_Connection : require('./db.connection')
+    middleware: require('./middleware')
 };

package/lib/message_publisher/index.js

@@ -115,6 +115,15 @@ const deleteHttpTask = async (queueId, taskId) => {
     try {
         await cloudtasks.projects.locations.queues.tasks.delete(requestData);
     } catch (err) {
+        /*
+         Error response schema - 
+         Naturally if GCP response is that task didn't exist while we were trying to delete it, then we should not 
+         pass back the error to calle function and resume operations as normal. As delete operation is atomic and idempotent.
+         */
+        if (err.response.data && err.response.data.error && err.response.data.error.message === 'Requested entity was not found.') {
+            return Promise.resolve('success!');
+        }
+
         throw err;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playov2-js-utilities",
-  "version": "0.3.40",
+  "version": "0.3.42",
   "description": "Private package for JS utility functions",
   "main": "index.js",
   "scripts": {
@@ -29,7 +29,6 @@
     "googleapis": "^109.0.1",
     "handlebars": "^4.7.7",
     "moment": "^2.29.4",
-    "mongoose": "^6.7.4",
     "uuid": "^8.3.2"
   }
 }

package/lib/db.connection.js

@@ -1,33 +0,0 @@
-const mongoose = require('mongoose');
-mongoose.Promise = global.Promise;
-const MONGO_CONNECTION = process.env.MONGO_URL || 'mongodb://localhost/playoV2DB'
-const Logger = require("./logger");
-const mongoOptions = {
-    reconnectInterval: 500, // Reconnect every 500ms
-    connectTimeoutMS: 10000, // Give up initial connection after 10 seconds
-    socketTimeoutMS: 45000, // Close sockets after 45 seconds of inactivity
-};
-
-var dbConnection;
-
-const connectToDB = () => {
-    mongoose.connect(MONGO_CONNECTION, mongoOptions, (err, db) => {
-        if (err)
-            Logger.prepareErrorLog("", err.stack, "Error in connecting to DB")
-        else {
-            Logger.prepareInfoLog("", {}, "connected to playoV2DB")
-
-            dbConnection = db;
-            return dbConnection;
-        }
-    })
-}
-
-const getDb = () => {
-    return dbConnection;
-}
-
-module.exports = {
-    connectToDB,
-    getDb
-}

package/lib/models/index.js

@@ -1,3 +0,0 @@
-module.exports = {
-    ScheduledTasks: require('./scheduled.tasks')
-}

package/lib/models/scheduled.tasks.js

@@ -1,40 +0,0 @@
-const mongoose = require('mongoose');
-const Schema = mongoose.Schema;
-
-// compound index on queuId and taskId and status, so that a task is saved only once per queue
-const scheduledTaskSchema = new Schema({
-    httpMethod: {
-        type: String,
-        enum: ["GET", "POST", "PUT", "DELETE"],
-        default: "POST",
-    },
-    taskId: { type: String, required: true },
-    queueId: { type: String, required: true },
-    url: {
-        type: String,
-        required: true,
-    },
-    ttl: {},
-    payload: {
-
-    },
-    activationTime: {
-        type: Date, required: true
-    },
-    cloudProvider: {
-        type: String,
-        enum: ['GCP', 'AWS'],
-        required: true
-    },
-    status: {
-        type: String,
-        enum: ['saved', 'executed', 'failed', 'cancelled'],
-        default: 'saved',
-        required: true
-    },
-    lastExecutionDetails: {
-
-    }
-});
-
-module.exports = mongoose.model('scheduledtasks', scheduledTaskSchema);

package/lib/taskscheduler/index.js

@@ -1,104 +0,0 @@
-
-// methods - save future task  - producers
-// push future task to queue  -- from cron service
-// cancel future task -- producers
-
-const SCHEDULED_TASK = require("../models/scheduled.tasks");
-const CloudTask = require("../message_publisher/index");
-const Moment = require("moment");
-const Logger = require('../logger');
-
-const MAX_RETRY_COUNT = 5;
-
-/**
- * 
- * @param {String} message 
- * @param {String} name - Optional - If "RetryableException", then function will be retried till MAX_RETRY_COUNT
- */
-function CTException(message, name) {
-    const error = new Error(message);
-    error.name = name;
-    return error;
-};
-
-/**
- * Currently, for cloudtask - 
- * Maximum schedule time for a task	 - 30 days, that means any task that is to be executed after 30 days
- * can't be scheduled by GCP cloudtask queues.
- * This function will provide a way for every microservices to save  a task to mongo scheduledtasks model,
- * from which tasks will be pushed via cron service to cloud task push queue on an every day basis.
- * RetryableException - Network exceptions
- */
-const saveFutureTask = async (queueId, taskId, payload, eta, count = MAX_RETRY_COUNT, requestId) => {
-    try {
-        if (!queueId || !taskId || !payload || !eta) {
-            throw CTException('Parameter validation failed!', 'ValidationException')
-        }
-
-        if (Moment(eta).isBefore(Moment().add(30, 'days'))) {
-            throw CTException('eta can not be before 30 days from now. Schedule directly!', 'ValidationException')
-        }
-
-        const { url, httpMethod } = payload;
-        const taskData = {
-            taskId,
-            url,
-            httpMethod,
-            payload,
-            queueId,
-            activationTime: eta,
-            status: 'saved',
-            cloudProvider: 'GCP'
-        }
-
-        const task = new SCHEDULED_TASK(taskData);
-
-        await task.save();
-
-    } catch (err) {
-        const errMessage = err && err.message ? err.message : 'Exception';
-        // in case there's an exception which shouldn't be retried, such as improper parameter, this throws the error to be 
-        // handled by the originating calling function
-        if (errMessage !== "RetryableException") {
-            throw err;
-        }
-
-        // This is a mechanism to handle unexpected network failure / disconnection to db.
-        // This seems lame though, probably should pair with set timeout for exponential back off.
-        if (count === 0) {
-            Logger.prepareAlertLog(requestId, { func: 'saveFutureTask', queueId, taskId, payload, eta, err }, 'saving future task failed!');
-            throw err;
-        }
-
-        return saveFutureTask(queueId, taskId, payload, eta, count--, requestId);
-    }
-};
-
-const deleteScheduledTask = async (queueId, taskId, count = MAX_RETRY_COUNT, requestId) => {
-    try {
-        if (!queueId || !taskId) {
-            throw CTException('Parameter validation failed!', 'ValidationException')
-        }
-
-        await Promise.all([
-            SCHEDULED_TASK.findOneAndUpdate({ queueId, taskId }, { $set: { status: 'cancelled' } }),
-            CloudTask.deleteHttpTask(queueId, taskId)
-        ]);
-
-    } catch (err) {
-        if (err.message !== "RetryableException") {
-            throw err;
-        }
-        if (count === 0) {
-            Logger.prepareAlertLog(requestId, { func: 'deleteScheduledTask', queueId, taskId, payload, eta, err }, 'saving future task failed!');
-            throw err;
-        }
-
-        return deleteScheduledTask(queueId, taskId, count--, requestId);
-    }
-}
-
-module.exports = {
-    saveFutureTask,
-    deleteScheduledTask
-}