soajs.controller 4.2.15 → 4.2.17

package/.travis.yml

@@ -20,18 +20,18 @@ jobs:
     - if [ "$TRAVIS_BRANCH" != "master" ]; then grunt test; fi
     - if [ "$TRAVIS_BRANCH" = "master" ]; then grunt coverage; fi
 
-  - stage: Publish to npm
-    if: branch =~ /(release)/
-    script:
-    - echo "PUBLISH npm"
-    deploy:
-      skip_cleanup: true
-      provider: npm
-      email: $NPM_EMAIL
-      api_key: $NPM_TOKEN
-      on:
-        all_branches: true
-        condition: $TRAVIS_BRANCH =~ ^(release)*
+  # - stage: Publish to npm
+  #   if: branch =~ /(release)/
+  #   script:
+  #   - echo "PUBLISH npm"
+  #   deploy:
+  #     skip_cleanup: true
+  #     provider: npm
+  #     email: $NPM_EMAIL
+  #     api_key: $NPM_TOKEN
+  #     on:
+  #       all_branches: true
+  #       condition: $TRAVIS_BRANCH =~ ^(release)*
 
   - stage: Publish to docker registry
     if: branch =~ /(release)/

package/mw/lastSeen/index.js

@@ -0,0 +1,81 @@
+'use strict';
+
+/**
+ * @license
+ * Copyright SOAJS All Rights Reserved.
+ *
+ * Use of this source code is governed by an Apache license that can be
+ * found in the LICENSE file at the root of this repository
+ */
+
+const request = require("request");
+const get = (p, o) => p.reduce((xs, x) => (xs && xs[x]) ? xs[x] : null, o);
+
+/**
+ *
+ * @param configuration
+ * @returns {Function}
+ */
+module.exports = () => {
+
+    return (req, res, next) => {
+        next();
+
+        let lastSeen = get(["soajs", "registry", "custom", "gateway", "value", "lastSeen"], req);
+        if (lastSeen && lastSeen.active) {
+
+            const item = {
+                "name": lastSeen.serviceName || "urac",
+                "version": lastSeen.serviceVersion || "3",
+                "api": lastSeen.api || "/user/last/seen"
+            };
+
+            let userId = null;
+            if (req.soajs.uracDriver) {
+                let uracObj = req.soajs.uracDriver.getProfile();
+                userId = uracObj._id;
+            }
+
+            if (userId) {
+                req.soajs.awareness.getHost(item.name, item.version, (host) => {
+                    if (host) {
+                        item.host = host;
+                        item.port = req.soajs.registry.services[item.name].port;
+
+                        let options = {
+                            method: "post",
+                            uri: "http://" + item.host + ":" + item.port + item.api,
+                            json: true
+                        };
+                        if (req.headers && req.headers.soajsinjectobj) {
+                            options.headers = { "soajsinjectobj": req.headers.soajsinjectobj };
+                        }
+                        request(options, (error, response, body) => {
+                            if (error) {
+                                req.soajs.log.debug("lastSeen failed for [" + item.name + "@" + item.version + " " + item.api + "]");
+                                req.soajs.log.error("lastSeen " + error.message);
+                            } else if (!body.result) {
+                                let errorMsg = "";
+                                if (body.errors && body.errors && body.errors.details && body.errors.details.length > 0) {
+                                    body.errors.details.forEach((detail) => {
+                                        if (errorMsg === "") {
+                                            errorMsg += detail.message;
+                                        }
+                                        else {
+                                            errorMsg += " - " + detail.message;
+                                        }
+                                    });
+                                }
+                                req.soajs.log.error("lastSeen", errorMsg);
+                            }
+                        });
+                    } else {
+                        req.soajs.log.debug("lastSeen failed with no host for [" + item.name + "@" + item.version + " " + item.api + "]");
+                    }
+                });
+            } else {
+                req.soajs.log.debug("lastSeen failed with no userId for [" + item.name + "@" + item.version + " " + item.api + "]");
+            }
+        }
+    };
+};

package/mw/traffic/model/mongo.js

@@ -22,6 +22,9 @@ let model = {
         model.log = log;
         if (!model.mongo) {
             model.mongo = new Mongo(dbConfiguration);
+            model.mongo.createIndex(throttling_monitor, { 'l1': 1, 'l2': 1 }, {}, (err, index) => {
+                log.debug("Index: " + index + " created with error: " + err);
+            });
         }
     },
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.2.15",
+  "version": "4.2.17",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -18,7 +18,7 @@
     "test": "grunt test"
   },
   "dependencies": {
-    "async": "3.2.5",
+    "async": "3.2.6",
     "connect": "3.7.0",
     "http-proxy": "1.18.1",
     "jsonwebtoken": "9.0.2",
@@ -30,15 +30,15 @@
     "path-to-regexp": "6.2.2",
     "request": "2.88.2",
     "soajs.core.libs": "1.2.0",
-    "soajs.core.modules": "5.2.11",
-    "soajs.urac.driver": "3.2.8",
+    "soajs.core.modules": "5.2.12",
+    "soajs.urac.driver": "3.2.9",
     "useragent": "2.3.0"
   },
   "devDependencies": {
-    "@babel/core": "7.25.2",
-    "@babel/plugin-transform-runtime": "7.24.7",
-    "@babel/preset-env": "7.25.3",
-    "express": "4.18.2",
+    "@babel/core": "7.26.0",
+    "@babel/plugin-transform-runtime": "7.25.9",
+    "@babel/preset-env": "7.26.0",
+    "express": "4.21.1",
     "grunt": "1.6.1",
     "grunt-babel": "8.0.0",
     "grunt-contrib-clean": "2.0.1",
@@ -50,6 +50,7 @@
     "grunt-jsdoc": "2.4.1",
     "grunt-mocha-test": "0.13.3",
     "mocha": "10.7.3",
-    "sinon": "18.0.0"
+    "nock": "13.5.6",
+    "sinon": "19.0.2"
   }
 }

package/server/controller.js

@@ -37,6 +37,7 @@ const keyACL_mw = require("../mw/keyACL/index");
 const gotoService_mw = require("../mw/gotoService/index");
 const mt_mw = require("../mw/mt/index");
 const traffic_mw = require("../mw/traffic/index");
+const lastSeen_mw = require("../mw/lastSeen/index");
 
 const utils = require("../utilities/utils");
 
@@ -172,6 +173,8 @@ Controller.prototype.init = function (callback) {
 						"gatewayDB": registry.coreDB.gateway || registry.coreDB.provision
 					}));
 
+					app.use(lastSeen_mw());
+
 					app.use((req, res, next) => {
 						setImmediate(() => {
 							req.soajs.controller.gotoservice(req, res, next);

package/test/unit/index.js

@@ -34,6 +34,7 @@ describe("Starting Gateway Unit test", () => {
         require("./mw/response/index.js");
         require("./mw/soajs/index.js");
         require("./mw/traffic/index.js");
+        require("./mw/lastSeen/index.js");
 
         require("./utilities/utils.js");
 

package/test/unit/mw/lastSeen/index.js

@@ -0,0 +1,67 @@
+"use strict";
+
+const helper = require("../../../helper.js");
+const mw = helper.requireModule('./mw/lastSeen/index');
+const assert = require('assert');
+const nock = require('nock')
+
+describe("Unit test for: mw - lastSeen", () => {
+
+    it("success - default from environment", (done) => {
+        let res = {};
+        let req = {
+            getClientIP: () => {
+                return "127.0.0.1"
+            },
+            soajs: {
+                log: {
+                    debug: (a) => {
+                        console.log(a);
+                    },
+                    error: (a) => {
+                        console.log(a);
+                    }
+                },
+                uracDriver: {
+                    getProfile: (name, version, cb) => {
+                        return { _id: "1111111111" };
+                    }
+                },
+                awareness: {
+                    getHost: (name, version, cb) => {
+                        return cb("urac.fake");
+                    }
+                },
+                registry: {
+                    services: {
+                        urac: {
+                            port: 4001
+                        }
+                    },
+                    custom: {
+                        gateway: {
+                            value: {
+                                lastSeen: {
+                                    active: true
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        const scope = nock('http://urac.fake:4001')
+            .post('/user/last/seen')
+            .reply(200, {
+                result: true,
+                data: true
+            })
+        let functionMw = mw({});
+        functionMw(req, res, (error) => {
+            assert.ifError(error);
+            // nock.cleanAll()
+            done();
+        });
+    });
+
+});