@optimiser/common 1.0.246 → 1.0.250

package/dist/aws/awsservices.js

@@ -158,7 +158,7 @@ var AwsServices = /** @class */ (function () {
                     case 2:
                         err_1 = _a.sent();
                         console.error("Error While Creating Signed Url:", err_1);
-                        throw new err_1;
+                        return [3 /*break*/, 3];
                     case 3: return [2 /*return*/];
                 }
             });
@@ -264,6 +264,11 @@ var AwsServices = /** @class */ (function () {
     };
     AwsServices.prototype.GeneratePreSignedUrlNotAccelerated = function (params) {
         var region = params.region, bucket = params.bucket, path = params.path, _a = params.expires, expires = _a === void 0 ? 60 : _a, _b = params.acl, acl = _b === void 0 ? 'private' : _b, _c = params.contentType, contentType = _c === void 0 ? 'application/octet-stream' : _c, _d = params.accessKeyId, accessKeyId = _d === void 0 ? this.accessKeyId : _d, _e = params.secretAccessKey, secretAccessKey = _e === void 0 ? this.secretAccessKey : _e;
+        // added by Mohan ason 28-01-2022. To overwrite acl variable.
+        // acl variable will have public-read OR private value. default is private
+        if (params.accessType != '' && params.accessType != undefined && params.accessType != null) {
+            acl = params.accessType;
+        }
         var S3 = new aws_sdk_1.default.S3({
             accessKeyId: accessKeyId,
             secretAccessKey: secretAccessKey,

package/dist/lib/memoryserverclient.d.ts

@@ -7,6 +7,7 @@ declare class MemoryDBConnect {
     private host;
     private isConnected;
     private messages;
+    private memBuffObj;
     /**
      * @param masterConfig Master Connectivity Object
      * @param redisClient Redisclient

package/dist/lib/memoryserverclient.js

@@ -59,6 +59,42 @@ exports.MemoryDBConnect = void 0;
 //var net = require('net');
 var net = __importStar(require("net"));
 var crypto = __importStar(require("crypto"));
+var MessageBuffer = /** @class */ (function () {
+    function MessageBuffer(delimiter) {
+        this.delimiter = delimiter;
+        this.buffer = "";
+    }
+    MessageBuffer.prototype.isFinished = function () {
+        if (this.buffer.length === 0 ||
+            this.buffer.indexOf(this.delimiter) === -1) {
+            return true;
+        }
+        return false;
+    };
+    MessageBuffer.prototype.push = function (data) {
+        this.buffer += data;
+    };
+    MessageBuffer.prototype.getMessage = function () {
+        var delimiterIndex = this.buffer.indexOf(this.delimiter);
+        if (delimiterIndex !== -1) {
+            var message = this.buffer.slice(0, delimiterIndex);
+            this.buffer = this.buffer.replace(message + this.delimiter, "");
+            return message;
+        }
+        return null;
+    };
+    MessageBuffer.prototype.handleData = function () {
+        /**
+         * Try to accumulate the buffer with messages
+         *
+         * If the server isnt sending delimiters for some reason
+         * then nothing will ever come back for these requests
+         */
+        var message = this.getMessage();
+        return message;
+    };
+    return MessageBuffer;
+}());
 var MemoryDBConnect = /** @class */ (function () {
     /**
      * @param masterConfig Master Connectivity Object
@@ -71,6 +107,7 @@ var MemoryDBConnect = /** @class */ (function () {
         this.host = "";
         this.isConnected = false;
         this.messages = {};
+        this.memBuffObj = new MessageBuffer("##message_response##");
         this.portNo = portNumber;
         this.host = hostName;
         // this.Initialize().then(([error, result]) => {
@@ -97,12 +134,31 @@ var MemoryDBConnect = /** @class */ (function () {
                 }
             });
             _this.client.on('data', function (data) {
+                console.log("Data from MemServer", (data || "").toString());
                 //console.log("")
-                data = JSON.parse(data);
-                var message = _this.messages[data.id];
-                if (message) {
-                    delete _this.messages[data.id];
-                    message(data);
+                // let message = null;
+                try {
+                    // data = JSON.parse(data);
+                    // message = this.messages[data.id];
+                    // if (message) {
+                    //     delete this.messages[data.id];
+                    //     message(data);
+                    // }
+                    _this.memBuffObj.push(data);
+                    while (!_this.memBuffObj.isFinished()) {
+                        var message = _this.memBuffObj.handleData();
+                        // console.log(message);
+                        // console.log(JSON.parse(message))                      
+                        if (message) {
+                            message = JSON.parse(message);
+                            var messageCallbackFn = _this.messages[message.id];
+                            delete _this.messages[message.id];
+                            messageCallbackFn(message);
+                        }
+                    }
+                }
+                catch (error) {
+                    console.log("Error in parsing MemServer data", error);
                 }
             });
             _this.client.on('close', function () {
@@ -150,9 +206,9 @@ var MemoryDBConnect = /** @class */ (function () {
                         resolve([new Error("REQUEST_TIMEDOUT"), undefined]);
                         message_1.status = "-1";
                     }
-                }, 30000);
+                }, 60000);
                 if (_this.client && _this.isConnected) {
-                    _this.client.write(JSON.stringify(message_1));
+                    _this.client.write(JSON.stringify(message_1) + "##message##");
                 }
                 else {
                     //to avoid again resolve by set timeout

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.246",
+  "version": "1.0.250",
   "description": "",
   "main": "dist/index.js",
   "scripts": {