not-node 6.5.58 → 6.5.60

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.5.58",
+	"version": "6.5.60",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {

package/src/common.js

@@ -342,14 +342,17 @@ module.exports.generatePaths = (content = [], relative = "src") => {
  **/
 module.exports.getIP = (req) => {
     if (req) {
-        return (
+        const ip =
             (req.headers && req.headers["x-forwarded-for"]) ||
             (req.connection && req.connection.remoteAddress) ||
             (req.socket && req.socket.remoteAddress) ||
             (req.connection &&
                 req.connection.socket &&
-                req.connection.socket.remoteAddress)
-        );
+                req.connection.socket.remoteAddress);
+        if (ip && ip.indexOf(",") > -1) {
+            return ip.split(",")[0];
+        }
+        return ip;
     } else {
         return undefined;
     }

package/src/model/routine.js

@@ -100,9 +100,17 @@ class ModelRoutine {
             filter.__latest = true;
             filter.__closed = false;
             if (ModelConstructor.findOneAndUpdate) {
+                const setData = {}, unsetData = {};
+                Object.keys(data).forEach((key)=>{
+                    if(typeof data[key] === 'undefined'){
+                        unsetData[key] = 1;
+                    }else{
+                        setData[key] = data[key];
+                    }
+                });
                 const updateResult = await ModelConstructor.findOneAndUpdate(
                     filter,
-                    { $set: data },
+                    { $set: setData, $unset: unsetData },
                     {                        
                         returnDocument: "after"
                     }