Merge branch 'ondev-gcs' into 'dev'

Ondev gcs

See merge request !36

.env

-BIGSTREAM_TAG=test
+BIGSTREAM_IMG=bigstream:test
 BS_SECRET=bigstream-server
 REDIS_TAG=4
 PREFIX_NO=19

Changelog

 #Changelog
-## [1.2.4 Dev] - 2021-05-31
+## [1.2.4 Dev] - 2021-06-11
 ### Added
 - STORAGE :: Object Cache
-### Update
+### Changed
 - SS :: Direct Idxstore
 ## [1.2.3] - 2021-05-05
 ### Update

docker-compose.yml

 version: '3'
 services:
   bigstream:
-    image: "bigstream:${BIGSTREAM_TAG}"
-    build: ./
+    image: "${BIGSTREAM_IMG}"
     container_name: bs_bigstream
     restart: always
     networks:

jobworker/lib/jobtask.js

@@ -217,11 +217,13 @@ JobTask.prototype.run = function ()
     if(!err){
       self.stop(resp)
       // console.log('***** JOB SUCCESSFULLY DONE *****\n');
-      console.log('[JOB DONE] id=' + job_id + ' ,tr=' + transaction_id + '\tsuccess');
+      console.log('[JOB DONE] id=' + job_id + ' ,tr=' + transaction_id + '\tSUCCESS');
     }else{
       self.stop(err)
       // console.log('***** JOB UNSUCCESSFULLY DONE *****\n');
-      console.log('[JOB DONE] id=' + job_id + ' ,tr=' + transaction_id + '\tunsuccess');
+      var st = 'unsuccess';
+      if(err.status){st=String(err.status).toUpperCase()}
+      console.log('[JOB DONE] id=' + job_id + ' ,tr=' + transaction_id + '\t' + st);
     }
   });
 

lib/amqp/rpccaller.js

@@ -61,43 +61,4 @@ RPCCaller.prototype.call = function(req,cb){
   }
 }
 
-
-/*
-function RPCCaller(config)
-{
-  this.config = config;
-  this.url = config.url;
-  this.name = config.name || "rpc_queue";
-}
-
-RPCCaller.prototype.call = function(req,cb){
-  var self = this;
-  amqp.connect(self.url, function(err, conn) {
-    conn.createChannel(function(err, ch) {
-      ch.assertQueue('', {exclusive: true}, function(err, q) {
-        var corr = generateUuid();
-
-        ch.consume(q.queue, function(msg) {
-          if (msg.properties.correlationId == corr) {
-            var resp = JSON.parse(msg.content.toString());
-            conn.close();
-            cb(null,resp);
-          }
-        }, {noAck: true});
-
-        ch.sendToQueue(self.name,
-        new Buffer(JSON.stringify(req)),
-        { correlationId: corr, replyTo: q.queue });
-      });
-    });
-  });
-
-  function generateUuid() {
-    return Math.random().toString() +
-           Math.random().toString() +
-           Math.random().toString();
-  }
-}
-*/
-
 module.exports = RPCCaller;

lib/bss/file-access-buffer.js

@@ -46,7 +46,8 @@ FileAccessBuffer.prototype.bufferedRead = function (offset, length, cb) {
     var self=this;
     var readStart = offset;
     var readEnd = (offset + length) - 1;
-    var ret_buffer = new Buffer(length);
+    //var ret_buffer = new Buffer(length);
+    var ret_buffer = Buffer.alloc(length);
 
     if(!self.filesize){
       fs.stat(self.filename,function(err,stats){

lib/bss/oat.js

@@ -164,7 +164,8 @@ Oat.prototype.readMeta = function(cb){
 }
 
 Oat.prototype.writeMeta = function(cb){
-  var buffer = new Buffer(OATMETASIZE);
+  //var buffer = new Buffer(OATMETASIZE);
+  var buffer = Buffer.alloc(OATMETASIZE);
   BSON.serialize(this.oatmeta,buffer);
   this.file.write(this.address,buffer,cb);
 }
@@ -174,7 +175,8 @@ Oat.prototype.writeSlot = function(index,data,cb){
     return cb(new Error("Index out of bound"));
   }
   var slotAddr = this.address + OATMETASIZE + (index*OBJHEADERSIZE);
-  var buffer = new Buffer(OBJHEADERSIZE);
+  //var buffer = new Buffer(OBJHEADERSIZE);
+  var buffer = Buffer.alloc(OBJHEADERSIZE);
   BSON.serialize(data,buffer);
   this.file.write(slotAddr,buffer,cb);
 }

lib/bss/objectdata.js

@@ -10,14 +10,22 @@ const OBJECT_TYPE = 3;
 
 //Header structure
 var header_struct = function(){
-  return {
+  // return {
+  //   "ID" : null,
+  //   "TY" : 1,
+  //   "FG" : null,
+  //   "MZ" : 0,
+  //   "DZ" : 0,
+  //   "AD" : 0
+  // }
+  return JSON.parse(JSON.stringify({
     "ID" : null,
     "TY" : 1,
     "FG" : null,
     "MZ" : 0,
     "DZ" : 0,
     "AD" : 0
-  }
+  }));
 }
 
 
@@ -151,7 +159,8 @@ ObjectData.prototype.write = function(addr,cb){
   }
   var fd=this.file;
 
-  var objBuffer = new Buffer(this.header.MZ + this.header.DZ)
+  //var objBuffer = new Buffer(this.header.MZ + this.header.DZ)
+  var objBuffer = Buffer.alloc(this.header.MZ + this.header.DZ)
   if(this.header.MZ>0){
     this.metaBuffer.copy(objBuffer);
   }
@@ -183,7 +192,8 @@ module.exports.createByData = function(fd,prm){
       case 'string':
           header.TY = STRING_TYPE;
           header.DZ = Buffer.byteLength(data, 'utf8');
-          dataBuffer = new Buffer(data);
+          //dataBuffer = new Buffer(data);
+          dataBuffer = Buffer.from(data,'utf8');
           break;
       case 'object':
           if(data instanceof Buffer){

lib/bss/objid.js

@@ -7,26 +7,41 @@ function ObjId(prm){
         }
         this.bytes = prm
     }else if(typeof prm == 'object'){
-      var fhn = (Buffer.isBuffer(prm.fhn) )?prm.fhn:new Buffer(4);
+      //var fhn = (Buffer.isBuffer(prm.fhn) )?prm.fhn:new Buffer(4);
+      var fhn = (Buffer.isBuffer(prm.fhn) )?prm.fhn:Buffer.alloc(4);
       var seq = prm.seq || 1;
       var ts = (prm.ts)?prm.ts:(Date.now() / 1000) & 0xFFFFFFFF;
 
       seq = seq & 0xFFFFFFFF;
 
-      this.bytes = new Buffer([
-            fhn[0],
-            fhn[1],
-            fhn[2],
-            fhn[3],
-            seq>>24,
-            seq>>16,
-            seq>>8,
-            seq,
-            ts>>24,
-            ts>>16,
-            ts>>8,
-            ts
-        ]);
+    //   this.bytes = new Buffer([
+    //         fhn[0],
+    //         fhn[1],
+    //         fhn[2],
+    //         fhn[3],
+    //         seq>>24,
+    //         seq>>16,
+    //         seq>>8,
+    //         seq,
+    //         ts>>24,
+    //         ts>>16,
+    //         ts>>8,
+    //         ts
+    //     ]);
+    this.bytes = Buffer.from([
+        fhn[0],
+        fhn[1],
+        fhn[2],
+        fhn[3],
+        seq>>24,
+        seq>>16,
+        seq>>8,
+        seq,
+        ts>>24,
+        ts>>16,
+        ts>>8,
+        ts
+    ]);
 
     }else if (typeof prm == 'string') {
         if (prm.length != 24) throw new Error("String-based ObjectId must be 24 bytes")
@@ -52,5 +67,6 @@ var toHex = function(buffer) {
 }
 
 var fromHex = function(string) {
-    return new Buffer(string, 'hex')
+    //return new Buffer(string, 'hex')
+    return Buffer.from(string, 'hex')
 }

lib/bss/root.js

@@ -5,14 +5,22 @@ const VERSION = "1.0";
 const OATSIZE = 10000;
 
 var root_struct = function (){
-    return {
-       "VER":VERSION,
-       "FHN":new Buffer(4),
-       "SEQ":0,
-       "OATA":0,
-       "OATZ":OATSIZE,
-       "AOF":ROOTSIZE
-   };
+  //   return {
+  //      "VER":VERSION,
+  //      "FHN":new Buffer(4),
+  //      "SEQ":0,
+  //      "OATA":0,
+  //      "OATZ":OATSIZE,
+  //      "AOF":ROOTSIZE
+  //  };
+   return JSON.parse(JSON.stringify({
+    "VER":VERSION,
+    "FHN":Buffer.alloc(4),
+    "SEQ":0,
+    "OATA":0,
+    "OATZ":OATSIZE,
+    "AOF":ROOTSIZE
+  }));
 }
 
 module.exports = Root;
@@ -55,7 +63,8 @@ Root.prototype.load = function(cb){
 }
 
 Root.prototype.write = function(cb){
-  var buffer = new Buffer(ROOTSIZE);
+  //var buffer = new Buffer(ROOTSIZE);
+  var buffer = Buffer.alloc(ROOTSIZE);
   BSON.serialize(this.data,buffer);
   this.file.write(0,buffer,cb);
 }

lib/model/bsdata.js

@@ -8,7 +8,8 @@ module.exports.parse = function(obj)
       var bsobj = JSON.parse(obj);
       var data = bsobj.data;
       if(bsobj.data_type=='binary' && bsobj.encoding=='base64'){
-        data = new Buffer(bsobj.data,'base64');
+        //data = new Buffer(bsobj.data,'base64');
+        data = Buffer.from(bsobj.data,'base64');
       }
       return new BSData(data,bsobj.data_type);
 
@@ -21,7 +22,8 @@ module.exports.parse = function(obj)
       }else if( ((obj.object_type && obj.object_type == 'bsdata')||(obj.type && obj.type == 'bsdata'))  && obj.data_type && obj.data){
         var oData = obj.data;
         if(obj.encoding == 'base64'){
-          oData = new Buffer(obj.data,'base64');
+          //oData = new Buffer(obj.data,'base64');
+          oData = Buffer.from(obj.data,'base64');
         }
         return new BSData(oData,obj.data_type);
       }else{

plugins/di/di-http-request/perform.js

@@ -41,7 +41,7 @@ function execute_function(context,response){
   var http_headers = {};
   if(param.auth){
     if(param.auth.type == 'basic'){
-      var auth_header  = "Basic " + new Buffer(param.auth.username + ":" + param.auth.password).toString("base64");
+      var auth_header  = "Basic " + Buffer.from(param.auth.username + ":" + param.auth.password).toString("base64");
       http_headers.Authorization = auth_header;
     }
   }

plugins/di/di-sftp-filesync/perform.js

@@ -22,7 +22,8 @@ function perform_function(context,response){
   var meta = {};
   var last_mod = {'fname':'','tts':0};
   var fs_continue = false;
-  var buff_out = new Buffer(0);
+  //var buff_out = new Buffer(0);
+  var buff_out = Buffer.alloc(0);
 
   if(param.last_modify_ts)
   {

plugins/dt/dt-agritronics/parser/image_parser.js

@@ -75,7 +75,7 @@ function getImage(url) {
 	return new Promise((resolve, reject) => {
 		request(url, function (error, resp, body) {
 			if (!error && resp.statusCode == 200) {
-				resolve("data:" + resp.headers["content-type"] + ";base64," + new Buffer(body).toString('base64'));
+				resolve("data:" + resp.headers["content-type"] + ";base64," + Buffer.from(body).toString('base64'));
 			}else{
 				return reject(error);
 			}

plugins/dt/dt-gistda-air/perform.js

@@ -138,7 +138,7 @@ function perform_image(_result, filecontent) {
 
 function getImage(filecontent) {
   return  new Promise((resolve, reject) => {
-      resolve("data:image/jpeg;base64," + new Buffer(filecontent).toString('base64'));
+      resolve("data:image/jpeg;base64," + Buffer.from(filecontent).toString('base64'));
   });    
 }
 

plugins/dt/dt-tanpibut/parser/image_parser.js

@@ -75,7 +75,7 @@ function getImage(url) {
 	return new Promise((resolve, reject) => {
 		request(url, function (error, resp, body) {
 			if (!error && resp.statusCode == 200) {
-				resolve("data:" + resp.headers["content-type"] + ";base64," + new Buffer(body).toString('base64'));
+				resolve("data:" + resp.headers["content-type"] + ";base64," + Buffer.from(body).toString('base64'));
 			}else{
 				return reject(error);
 			}

plugins/dt/dt-window-event/perform.js

@@ -29,7 +29,7 @@ function perform_function(context,request,response){
       val.forEach(function(v){
         if(typeof v.data == 'object' && v.data.type == 'Buffer' && Array.isArray(v.data.data))
         {
-          v.data = new Buffer(v.data.data);
+          v.data = Buffer.from(v.data.data);
         }
         ret.push(v);
       });

version.json

 {
-    "version":"1.2.4",
-    "build":"202105310000"
+    "version":"1.2.4-ur",
+    "build":"202106111500"
 }
\ No newline at end of file