whatap 0.4.78 → 0.4.80

package/lib/net/security-master.js

@@ -1,174 +1,183 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-var DataInputX  = require('./../io/data-inputx'),
-    License     = require('./../conf/license'),
-    Cypher      = require('./../util/cypher'),
-    IPUtil      = require('./../util/iputil'),
-    OidUtil     = require('./../util/oidutil'),
-    ProcessSeq  = require('./../util/process-seq'),
-    HashUtil    = require('./../util/hashutil');
-
-var cluster = require('cluster');
-
-var lastOid = 0;
-
-var SecurityMaster = {
-    ONAME: '',
-    IP: 0,
-    PCODE: 0,
-    OKIND : 0,
-    OKIND_NAME : null,
-    ONODE : 0,
-    ONODE_NAME : null,
-    OID: 0 ,
-    run : function(cb){
-        var conf = require('./../conf/configure');
-        if( this.resetLicense( conf.license )) {
-            require('../logger').print('WHATAP-110', "[pcode=" + this.PCODE
-                + ",SECURE_KEY=" + this.SECURE_KEY.toString('hex')
-                + "]", false);
-            this.getClusterId(cb);
-        } else {
-            if(cb) cb(new Error('Invalid license'));
-        }
-    },
-    resetLicense: function(lic /* String */){
-        try {
-            var key = License.getKey(lic);
-            if(key.pcode == null || key.security_key == null) {
-                throw new Error('Invalid license');
-            }
-            this.PCODE = key.pcode;
-            this.SECURE_KEY = key.security_key;
-            this.cypher = new Cypher(this.SECURE_KEY, 0);
-            return true;
-        } catch(e) {
-            require('../logger').printError('WHATAP-606', 'LicenseKey is invalid ' + lic, e, true);
-        }
-        return false;
-    },
-    updateLocalIp: function(myIp){
-        process.env["whatap.ip"] = myIp;
-        this.IP = 0;
-    },
-    decideAgentOnameOid: function(myIp) {
-        var Configuration = require('./../conf/configure');
-        Configuration.setProperty('whatap.ip', myIp);
-
-        this.IP = IPUtil.stringToInt(myIp);
-        var port = Configuration.getProperty("whatap.port");
-        OidUtil.setIp(IPUtil.intToString(this.IP));
-        OidUtil.setPort(port);
-        OidUtil.setPid(process.pid);
-        OidUtil.setHostName(require('os').hostname());
-        //OidUtil.setType(Configuration.getProperty("whatap.type", "NODE"));
-        OidUtil.setType(process.env.name || Configuration.getProperty("whatap.type", "NODE"));
-
-        var name_pattern;
-        if(require('cluster').isMaster){
-            name_pattern=process.env.WHATAP_NAME || "{type}-{ip2}-{ip3}";
-        }else{
-            name_pattern=process.env.WHATAP_NAME || "{type}{cluster}-{ip2}-{ip3}";
-            var cid = Configuration.getProperty('node.clusterId');
-            OidUtil.setCluster(cid);
-        }
-
-        var okindStr= process.env.WHATAP_OKIND ||  Configuration.getProperty('whatap.okind');
-        if(okindStr && okindStr.length>0){
-            this.OKIND = HashUtil.hashFromString(okindStr);
-            this.OKIND_NAME=okindStr;
-        }else{
-            this.OKIND = 0;
-            this.OKIND_NAME=null;
-        }
-
-        var onodeStr= process.env.WHATAP_ONODE ||  Configuration.getProperty('whatap.onode');
-        if(onodeStr && onodeStr.length>0){
-            this.ONODE = HashUtil.hashFromString(onodeStr);
-            this.ONODE_NAME=onodeStr;
-        }else{
-            this.ONODE = 0;
-            this.ONODE_NAME=null;
-        }
-
-        //OidUtil.setCmd(Configuration.getProperty("sun.java.command"));
-        this.ONAME = OidUtil.mkOname(Configuration.getProperty("whatap.name", name_pattern));
-        this.OID = OidUtil.mkOid(this.ONAME);
-
-        if (lastOid != this.OID) {
-            lastOid = this.OID;
-           require('../logger').print('WHATAP-968', "OID: " + this.OID + " ONAME: " + this.ONAME + " IP: " + IPUtil.intToString(this.IP), false);
-        }
-    },
-    setAgentOnameOid :function (oname, myIp) {
-        var Configuration = require('./../conf/configure');
-        Configuration.setProperty('whatap.ip', myIp);
-
-        this.IP = IPUtil.stringToInt(myIp);//DataInputX.toInt(IPUtil.toBytes(myIp), 0);
-        var port = Configuration.getProperty("whatap.port");
-        OidUtil.setIp(IPUtil.intToString(this.IP));
-        OidUtil.setPort(port);
-        OidUtil.setPid(process.pid);
-        OidUtil.setHostName(require('os').hostname());
-        if(require('cluster').isMaster){
-            OidUtil.setType(Configuration.getProperty("whatap.type", "NODE"));
-        }else{
-            OidUtil.setType(Configuration.getProperty("whatap.type", "NODE"+ Configuration.getProperty('node.clusterId') ) );
-        }
-
-        OidUtil.setCmd(Configuration.getProperty("sun.java.command"));
-        this.ONAME = oname;
-        this.OID = OidUtil.mkOid(this.ONAME);
-
-        var okindStr= process.env.WHATAP_OKIND ||  Configuration.getProperty('whatap.okind');
-        if(okindStr && okindStr.length>0){
-            this.OKIND = HashUtil.hashFromString(okindStr);
-            this.OKIND_NAME=okindStr;
-        }else{
-            this.OKIND = 0;
-            this.OKIND_NAME=null;
-        }
-        var onodeStr= process.env.WHATAP_ONODE ||  Configuration.getProperty('whatap.onode');
-        if(onodeStr && onodeStr.length>0){
-            this.ONODE = HashUtil.hashFromString(onodeStr);
-            this.ONODE_NAME=onodeStr;
-        }else{
-            this.ONODE = 0;
-            this.ONODE_NAME=null;
-        }
-        
-        if (lastOid != this.OID) {
-            lastOid = this.OID;
-            require('../logger').print('WHATAP-168', "OID: " + this.OID + " ONAME: " + this.ONAME + " IP: " + IPUtil.intToString(this.IP), false);
-        }
-    },
-    getClusterId: function(cb){
-        var conf = require('./../conf/configure');
-        if(cluster.isMaster){
-            //console.log('현재 프로젝트는 MASTER 입니다!!!!');
-            conf.setProperty('node.clusterId', '');
-            if(cb) cb();
-        }else{
-            conf.setProperty('node.clusterId', cluster.worker.id);
-            if(cb) cb();
-            //console.log('현재 프로젝트는 ' + cluster.worker.id + ' 입니다!!!!');
-            /*
-            ProcessSeq('whatap').accessAuth(function(pseq){
-                if(!pseq){
-                    return;
-                } 
-                var conf = require('./../conf/configure');
-                conf.setProperty('node.clusterId', pseq);
-                if(cb) cb();
-            });
-            */
-        }
-        
-    }
-};
-
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+var DataInputX  = require('./../io/data-inputx'),
+    License     = require('./../conf/license'),
+    Cypher      = require('./../util/cypher'),
+    IPUtil      = require('./../util/iputil'),
+    OidUtil     = require('./../util/oidutil'),
+    ProcessSeq  = require('./../util/process-seq'),
+    HashUtil    = require('./../util/hashutil');
+
+var cluster = require('cluster');
+const Configuration = require("../conf/configure");
+
+var lastOid = 0;
+
+var SecurityMaster = {
+    ONAME: '',
+    IP: 0,
+    PCODE: 0,
+    OKIND : 0,
+    OKIND_NAME : null,
+    ONODE : 0,
+    ONODE_NAME : null,
+    OID: 0 ,
+    run : function(cb){
+        var conf = require('./../conf/configure');
+        if( this.resetLicense( conf.license )) {
+            require('../logger').print('WHATAP-110', "[pcode=" + this.PCODE
+                + ",SECURE_KEY=" + this.SECURE_KEY.toString('hex')
+                + "]", false);
+            this.getClusterId(cb);
+        } else {
+            if(cb) cb(new Error('Invalid license'));
+        }
+    },
+    resetLicense: function(lic /* String */){
+        try {
+            var key = License.getKey(lic);
+            if(key.pcode == null || key.security_key == null) {
+                throw new Error('Invalid license');
+            }
+            this.PCODE = key.pcode;
+            this.SECURE_KEY = key.security_key;
+            this.cypher = new Cypher(this.SECURE_KEY, 0);
+            return true;
+        } catch(e) {
+            require('../logger').printError('WHATAP-606', 'LicenseKey is invalid ' + lic, e, true);
+        }
+        return false;
+    },
+    updateLocalIp: function(myIp){
+        process.env["whatap.ip"] = myIp;
+        this.IP = 0;
+    },
+    decideAgentOnameOid: function(myIp) {
+        var Configuration = require('./../conf/configure');
+        Configuration.setProperty('whatap.ip', myIp);
+
+        this.IP = IPUtil.stringToInt(myIp);
+        var port = Configuration.getProperty("whatap.port");
+        OidUtil.setIp(IPUtil.intToString(this.IP));
+        OidUtil.setPort(port);
+        OidUtil.setPid(process.pid);
+        OidUtil.setHostName(require('os').hostname());
+        //OidUtil.setType(Configuration.getProperty("whatap.type", "NODE"));
+        OidUtil.setType(process.env.name || Configuration.getProperty("whatap.type", "NODE"));
+
+        var name_pattern;
+        if(Configuration.getProperty('whatap_micro_enabled') === true){
+            name_pattern = process.env.WHATAP_NAME || "{okind}-{ip2}-{ip3}";
+        }else if(require('cluster').isMaster){
+            name_pattern=process.env.WHATAP_NAME || "{type}-{ip2}-{ip3}";
+        }else{
+            name_pattern=process.env.WHATAP_NAME || "{type}{cluster}-{ip2}-{ip3}";
+            var cid = Configuration.getProperty('node.clusterId');
+            OidUtil.setCluster(cid);
+        }
+
+        var okindStr= process.env.WHATAP_OKIND ||  Configuration.getProperty('whatap.okind');
+        if(okindStr && okindStr.length>0){
+            this.OKIND = HashUtil.hashFromString(okindStr);
+            this.OKIND_NAME=okindStr;
+            OidUtil.setOkind(okindStr);
+        }else{
+            this.OKIND = 0;
+            this.OKIND_NAME=null;
+        }
+
+        if(Configuration.getProperty('whatap_micro_enabled') === false) {
+            var onodeStr= process.env.WHATAP_ONODE ||  Configuration.getProperty('whatap.onode');
+            if(onodeStr && onodeStr.length>0){
+                this.ONODE = HashUtil.hashFromString(onodeStr);
+                this.ONODE_NAME=onodeStr;
+            }else{
+                this.ONODE = 0;
+                this.ONODE_NAME=null;
+            }
+        }
+
+        //OidUtil.setCmd(Configuration.getProperty("sun.java.command"));
+        this.ONAME = OidUtil.mkOname(Configuration.getProperty("whatap.name", name_pattern));
+        this.OID = OidUtil.mkOid(this.ONAME);
+
+        if (lastOid != this.OID) {
+            lastOid = this.OID;
+           require('../logger').print('WHATAP-968', "OID: " + this.OID + " ONAME: " + this.ONAME + " IP: " + IPUtil.intToString(this.IP), false);
+        }
+    },
+    setAgentOnameOid :function (oname, myIp) {
+        var Configuration = require('./../conf/configure');
+        Configuration.setProperty('whatap.ip', myIp);
+
+        this.IP = IPUtil.stringToInt(myIp);//DataInputX.toInt(IPUtil.toBytes(myIp), 0);
+        var port = Configuration.getProperty("whatap.port");
+        OidUtil.setIp(IPUtil.intToString(this.IP));
+        OidUtil.setPort(port);
+        OidUtil.setPid(process.pid);
+        OidUtil.setHostName(require('os').hostname());
+        if(require('cluster').isMaster){
+            OidUtil.setType(Configuration.getProperty("whatap.type", "NODE"));
+        }else{
+            OidUtil.setType(Configuration.getProperty("whatap.type", "NODE"+ Configuration.getProperty('node.clusterId') ) );
+        }
+
+        OidUtil.setCmd(Configuration.getProperty("sun.java.command"));
+        this.ONAME = oname;
+        this.OID = OidUtil.mkOid(this.ONAME);
+
+        var okindStr= process.env.WHATAP_OKIND ||  Configuration.getProperty('whatap.okind');
+        if(okindStr && okindStr.length>0){
+            this.OKIND = HashUtil.hashFromString(okindStr);
+            this.OKIND_NAME=okindStr;
+        }else{
+            this.OKIND = 0;
+            this.OKIND_NAME=null;
+        }
+
+        if(Configuration.getProperty('whatap_micro_enabled') === false) {
+            var onodeStr= process.env.WHATAP_ONODE ||  Configuration.getProperty('whatap.onode');
+            if(onodeStr && onodeStr.length>0){
+                this.ONODE = HashUtil.hashFromString(onodeStr);
+                this.ONODE_NAME=onodeStr;
+            }else{
+                this.ONODE = 0;
+                this.ONODE_NAME=null;
+            }
+        }
+        
+        if (lastOid != this.OID) {
+            lastOid = this.OID;
+            require('../logger').print('WHATAP-168', "OID: " + this.OID + " ONAME: " + this.ONAME + " IP: " + IPUtil.intToString(this.IP), false);
+        }
+    },
+    getClusterId: function(cb){
+        var conf = require('./../conf/configure');
+        if(cluster.isMaster){
+            //console.log('현재 프로젝트는 MASTER 입니다!!!!');
+            conf.setProperty('node.clusterId', '');
+            if(cb) cb();
+        }else{
+            conf.setProperty('node.clusterId', cluster.worker.id);
+            if(cb) cb();
+            //console.log('현재 프로젝트는 ' + cluster.worker.id + ' 입니다!!!!');
+            /*
+            ProcessSeq('whatap').accessAuth(function(pseq){
+                if(!pseq){
+                    return;
+                } 
+                var conf = require('./../conf/configure');
+                conf.setProperty('node.clusterId', pseq);
+                if(cb) cb();
+            });
+            */
+        }
+        
+    }
+};
+
 module.exports = SecurityMaster;

package/lib/net/sender.js

@@ -1,141 +1,141 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-var conf        = require('./../conf/configure'),
-    DataOutputX = require('./../io/data-outputx'),
-    EventPack   = require('./../pack/event-pack'),
-    PackEnum    = require('./../pack/packenum'),
-    EventLevel  = require('./../data/event-level'),
-    NetFlag     = require('./netflag').NetFlag,
-    TcpSession  = require('./tcp-session'),
-    Logger      = require('../logger'),
-    Long        = require('long');
-
-var Sender = function(agent, requestMgr){
-    this._agent = agent;
-    this._mgr = requestMgr;
-    this.next_time_sync = Date.now() + conf.getProperty('time_sync_interval_ms', 300000);
-    this.isProcessing = false;
-    this.ddd=Date.now()%100000;
-};
-
-Sender.prototype.startCheckQueue = function(){
-    var self = this;
-    if(this._interval) return;
-    this.cypher_level = conf.cypher_level;
-    this._interval = setInterval(function(){
-        self.start();
-    }, 100, 'whatap');
-};
-Sender.prototype.stopCheckQueue = function(){
-    if(this._interval){
-        clearInterval(this._interval);
-        delete this._interval;
-    }
-};
-Sender.prototype.start = function(){
-    var self = this;
-    this.isProcessing = true;
-    var hasNext = self._mgr.pool.hasNext();
-
-    if(!hasNext) {
-        if(this._interval){
-            return ;
-        }else{
-            this.startCheckQueue();
-        }
-    }
-    this.stopCheckQueue();
-    self.send();
-
-};
-
-Sender.prototype.send = function(){
-    var self = this;
-    var w = TcpSession;
-    var p = self._mgr.pool.get();
-    if(p == null) {return this.startCheckQueue();}
-    if(w.out == null) {return this.startCheckQueue();}
-
-    if(this.cypher_level != conf.cypher_level) {
-        this.cypher_level = conf.cypher_level;
-        w.close();
-        return;
-    }
-    var len = 0;
-    try{
-        var now = Date.now();
-        if( now > self.next_time_sync ){
-            self.next_time_sync = now + conf.getProperty('time_sync_interval_ms', 300000);
-            w.send(NetFlag.TIME_SYNC, DataOutputX.toBytesLong(Long.fromValue(now)));
-        }
-        if(conf.debug_tcpsend){
-            try{
-                var qsize=JSON.stringify(self._mgr.pool.size());
-                var packName= PackEnum.PACK_NAME[p.pack.getPackType()]  ;
-                var m = packName + "\t" +qsize;
-                Logger.printAll("TCPSEND", m);
-            }catch(e){
-                Logger.printError('WHATAP-251', 'Sender(send)', e);
-            }
-        }
-
-        p.pack.apType = 2;
-        
-        if(conf.cypher_level == 0){
-            var b = DataOutputX.toBytesPack(p.pack);
-            w.send(p.flag, b);
-            len = b.length;
-        } else {
-            switch( NetFlag.getSecureMask(p.flag) ) {
-                case NetFlag.SECURE_HIDE:
-                    if(conf.cypher != null){
-                        var b = DataOutputX.toBytesPack(p.pack);
-                        b = conf.cypher.hide(b);
-                        len = b.length;
-                        w.send(p.flag, b);
-                    }
-                    break;
-                case NetFlag.SECURE_CYPHER:
-                    if(conf.cypher !== null){
-                        var b = DataOutputX.toBytesPack(p.pack, conf.cypher_level / 8);
-                        b = conf.cypher.encryptBlock(b);
-                        len = b.length;
-                        w.send(p.flag, b);
-                    }
-                    break;
-                default:
-                    var b = DataOutputX.toBytesPack(p.pack);
-                    w.send(p.flag, b);
-                    len = b.length;
-                    break;
-            }
-        }
-
-        if(len > conf.net_send_max_bytes){
-            var e = new EventPack();
-            e.level = EventLevel.FATAL;
-            errorOverflow(p.pack.constructor + '('+ p.pack.getPackType() + ')');
-            return;
-        }
-
-        self._mgr.sendBytes += len;
-        self._mgr.sendPack++;
-    } catch(e) {
-        Logger.printError('WHATAP-121', 'Sender error', e);
-    }
-
-    process.nextTick(function(){
-        self.start();
-    });
-};
-var errorOverflow = function(packName){
-    var e = new EventPack();
-    e.title = "NEW_OVERFLOW";
-    e.message = "Too big data: " + packName;
-};
-//PackEnum.PACK_NAME[p.pack.getPackType()]
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+var conf        = require('./../conf/configure'),
+    DataOutputX = require('./../io/data-outputx'),
+    EventPack   = require('./../pack/event-pack'),
+    PackEnum    = require('./../pack/packenum'),
+    EventLevel  = require('./../data/event-level'),
+    NetFlag     = require('./netflag').NetFlag,
+    TcpSession  = require('./tcp-session'),
+    Logger      = require('../logger'),
+    Long        = require('long');
+
+var Sender = function(agent, requestMgr){
+    this._agent = agent;
+    this._mgr = requestMgr;
+    this.next_time_sync = Date.now() + conf.getProperty('time_sync_interval_ms', 300000);
+    this.isProcessing = false;
+    this.ddd=Date.now()%100000;
+};
+
+Sender.prototype.startCheckQueue = function(){
+    var self = this;
+    if(this._interval) return;
+    this.cypher_level = conf.cypher_level;
+    this._interval = setInterval(function(){
+        self.start();
+    }, 100, 'whatap');
+};
+Sender.prototype.stopCheckQueue = function(){
+    if(this._interval){
+        clearInterval(this._interval);
+        delete this._interval;
+    }
+};
+Sender.prototype.start = function(){
+    var self = this;
+    this.isProcessing = true;
+    var hasNext = self._mgr.pool.hasNext();
+
+    if(!hasNext) {
+        if(this._interval){
+            return ;
+        }else{
+            this.startCheckQueue();
+        }
+    }
+    this.stopCheckQueue();
+    self.send();
+
+};
+
+Sender.prototype.send = function(){
+    var self = this;
+    var w = TcpSession;
+    var p = self._mgr.pool.get();
+    if(p == null) {return this.startCheckQueue();}
+    if(w.out == null) {return this.startCheckQueue();}
+
+    if(this.cypher_level != conf.cypher_level) {
+        this.cypher_level = conf.cypher_level;
+        w.close();
+        return;
+    }
+    var len = 0;
+    try{
+        var now = Date.now();
+        if( now > self.next_time_sync ){
+            self.next_time_sync = now + conf.getProperty('time_sync_interval_ms', 300000);
+            w.send(NetFlag.TIME_SYNC, DataOutputX.toBytesLong(Long.fromValue(now)));
+        }
+        if(conf.debug_tcpsend){
+            try{
+                var qsize=JSON.stringify(self._mgr.pool.size());
+                var packName= PackEnum.PACK_NAME[p.pack.getPackType()]  ;
+                var m = packName + "\t" +qsize;
+                Logger.printAll("TCPSEND", m);
+            }catch(e){
+                Logger.printError('WHATAP-251', 'Sender(send)', e);
+            }
+        }
+
+        p.pack.apType = 2;
+        
+        if(conf.cypher_level == 0){
+            var b = DataOutputX.toBytesPack(p.pack);
+            w.send(p.flag, b);
+            len = b.length;
+        } else {
+            switch( NetFlag.getSecureMask(p.flag) ) {
+                case NetFlag.SECURE_HIDE:
+                    if(conf.cypher != null){
+                        var b = DataOutputX.toBytesPack(p.pack);
+                        b = conf.cypher.hide(b);
+                        len = b.length;
+                        w.send(p.flag, b);
+                    }
+                    break;
+                case NetFlag.SECURE_CYPHER:
+                    if(conf.cypher !== null){
+                        var b = DataOutputX.toBytesPack(p.pack, conf.cypher_level / 8);
+                        b = conf.cypher.encryptBlock(b);
+                        len = b.length;
+                        w.send(p.flag, b);
+                    }
+                    break;
+                default:
+                    var b = DataOutputX.toBytesPack(p.pack);
+                    w.send(p.flag, b);
+                    len = b.length;
+                    break;
+            }
+        }
+
+        if(len > conf.net_send_max_bytes){
+            var e = new EventPack();
+            e.level = EventLevel.FATAL;
+            errorOverflow(p.pack.constructor + '('+ p.pack.getPackType() + ')');
+            return;
+        }
+
+        self._mgr.sendBytes += len;
+        self._mgr.sendPack++;
+    } catch(e) {
+        Logger.printError('WHATAP-121', 'Sender error', e);
+    }
+
+    process.nextTick(function(){
+        self.start();
+    });
+};
+var errorOverflow = function(packName){
+    var e = new EventPack();
+    e.title = "NEW_OVERFLOW";
+    e.message = "Too big data: " + packName;
+};
+//PackEnum.PACK_NAME[p.pack.getPackType()]
 module.exports = Sender;