whatap 1.0.5 → 1.0.6-canary.1

package/lib/observers/http-observer.js

@@ -19,6 +19,8 @@ const {Buffer} = require("buffer");
 const shimmer = require('../core/shimmer');
 const os = require('os');
 const Transfer = require('../util/transfer');
+const IPUtil = require('../util/iputil');
+const UserIdUtil = require('../util/userid-util');
 
 var _exts = new Set([".css", ".js", ".png", ".htm", ".html", ".gif", ".jpg", ".css", ".txt", ".ico"]);
 
@@ -216,19 +218,16 @@ function initCtx(req, res) {
         if(remote_addr.includes(',')) {
             remote_addr = remote_addr.split(',')[0].trim();
         }
-        remote_addr=IPUtil.checkIp4(remote_addr);
-        ctx.remoteIp = IPUtil.stringToInt(remote_addr);
+        ctx.remoteIp = IPUtil.checkIp4(remote_addr);
         switch (conf.trace_user_using_type || 3) {
             case 1:
                 ctx.userid = Long.fromNumber(ctx.remoteIp);
-                MeterUsers.add(ctx.userid);
                 break;
             case 2:
                 // MeterUsers.add(ctx.userid);
                 break;
             case 3:
                 ctx.userid = UserIdUtil.getUserId(req, res, 0);
-                MeterUsers.add(ctx.userid);
                 break;
         }
     } catch (e) {

package/lib/util/userid-util.js

@@ -0,0 +1,57 @@
+/**
+ * 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.
+ */
+
+const WHATAP_R = "WHATAP";
+
+var conf        = require('../conf/configure'),
+    HashUtil    = require('./hashutil'),
+    Hexa32      = require('./hexa32'),
+    KeyGen      = require('./keygen'),
+    Long        = require('long'),
+    Logger      = require('../logger');
+
+var getUserId = function (req, res, defValue) {
+    try {
+        if (conf.user_header_ticket_enabled === true) {
+            var ticket = req.headers[conf.user_header_ticket];
+            if (ticket != null && ticket.length > 0) {
+                return Long.fromNumber(HashUtil.hash(ticket));
+            }
+        }
+        var cookie = req.headers.cookie;
+        if (cookie != null) {
+            if (cookie.length >= conf.trace_user_cookie_limit) {
+                return defValue;
+            }
+            var x1 = cookie.indexOf(WHATAP_R);
+            if (x1 >= 0) {
+                var value = '';
+                var x2 = cookie.indexOf(';', x1);
+                if (x2 > 0) {
+                    value = cookie.substring(x1 + WHATAP_R.length + 1, x2);
+                } else {
+                    value = cookie.substring(x1 + WHATAP_R.length + 1);
+                }
+                try {
+                    return Hexa32.toLong32(value);
+                } catch (th) {
+                }
+            }
+        }
+        var expires= new Date(Date.now() + (86409000*365*5)).toUTCString();
+        var cookie_str = WHATAP_R + "=" + Hexa32.toString32(KeyGen.next()) + "; expires=" + expires +"; path=/";
+        res.setHeader("Set-Cookie", cookie_str);
+    } catch (e) {
+        Logger.printError('WHATAP-193', 'UserIdUtil Error', e);
+    }
+    return Long.ZERO;
+};
+
+var UserIdUtil = {
+    getUserId : getUserId
+};
+
+module.exports = UserIdUtil;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "1.0.5",
+  "version": "1.0.6-canary.1",
   "releaseDate": "20251030",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",