profoundjs-swagger-stats 1.1.4 → 2.0.1

package/examples/authtest/authtest.js

@@ -16,17 +16,10 @@ var server = null;
 // Express and middlewares
 var express = require('express');
 var expressBodyParser = require('body-parser');
-var expressFavicon = require('serve-favicon');
-var expressStatic = require('serve-static');
-
-var swaggerParser = require('swagger-parser');
 
 var swStats = require('../../lib');    // require('swagger-stats');
 
 var app = module.exports = express();
-app.use(expressFavicon(path.join(__dirname, '../../ui/favicon.png')));
-app.use('/ui',expressStatic(path.join(__dirname, '../../ui')));
-app.use('/node_modules',expressStatic(path.join(__dirname, '../../node_modules')));
 app.use(expressBodyParser.json());
 app.use(expressBodyParser.urlencoded({ extended: true }));
 
@@ -41,13 +34,15 @@ app.set('port', process.env.PORT || 3050);
 app.disable('etag');
 
 app.get('/', function(req,res) {
-    res.redirect('/swagger-stats/ui');
+    res.redirect('/swagger-stats/');
 });
 
 // Return Prometheus metrics from prom-client
 app.get('/metrics', function(req,res) {
     res.status(200).set('Content-Type', 'text/plain');
-    res.end(promClient.register.metrics());
+    Promise.resolve(promClient.register.metrics()).then( (x) => {
+        res.end(x);
+    });
 });
 
 var specLocation = path.join(__dirname, 'petstore.json');
@@ -64,7 +59,7 @@ var swaggerSpec = require( specLocation );
 // Use swagger-stats middleware with authentication enabled
 app.use(swStats.getMiddleware({
     name: 'swagger-stats-authtest',
-    version: '0.95.17',
+    version: '0.99.7',
     hostname: "hostname",
     ip: "127.0.0.1",
     swaggerSpec:swaggerSpec,

package/examples/fastify/fasifytest.js

@@ -12,7 +12,8 @@ const swaggerSpec = require('../spectest/petstore3.json');
 let server = null;
 
 fastify.get('/', function (request, reply) {
-    reply.send({ hello: 'world' })
+    //reply.send({ hello: 'world' })
+    reply.redirect('/swagger-stats/');
 });
 
 fastify.get('/v2/paramstest/:code/and/:value', function (request, reply) {
@@ -46,15 +47,33 @@ fastify.route({
 
 let swsOptions = {
     name: 'swagger-stats-fastify',
-    version: '0.95.17',
+    version: '0.99.7',
     timelineBucketDuration: 1000,
     swaggerSpec:swaggerSpec,
-    elasticsearch: 'http://127.0.0.1:9200',
-    elasticsearchIndexPrefix: 'swaggerstats-'
+    authentication: true,
+    sessionMaxAge: process.env.SWS_AUTHTEST_MAXAGE || 900,
+    onAuthenticate: function(req,username,password){
+        // simple check for username and password
+        if(username==='swagger-stats') {
+            return ((username === 'swagger-stats') && (password === 'swagger-stats'));
+        } else if(username==='swagger-promise'){
+            return new Promise(function(resolve) {
+                setTimeout(function(){
+                    resolve((username === 'swagger-promise') && (password === 'swagger-promise'));
+                }, 1000);
+            });
+        }
+        return false;
+    }
+    //elasticsearch: 'http://127.0.0.1:9200',
+    //elasticsearchIndexPrefix: 'swaggerstats-'
 };
 
 // Enable swagger-stats
-fastify.register(swStats.getFastifyPlugin, swsOptions);
+fastify.register(require('fastify-express')).then(()=>{
+    fastify.register(swStats.getFastifyPlugin, swsOptions);
+});
+
 
 // Run the server!
 fastify.listen(3040, function (err, address) {

package/examples/hapijstest/hapijstest.js

@@ -67,7 +67,7 @@ const init = async () => {
 
     let swsOptions = {
         name: 'swagger-stats-hapitest',
-        version: '0.95.17',
+        version: '0.99.7',
         hostname: "hostname",
         ip: "127.0.0.1",
         uriPath: '/swagger-stats',
@@ -76,7 +76,22 @@ const init = async () => {
         durationBuckets: [10,100,1000],
         metricsPrefix: 'hapitest_',
         elasticsearch: 'http://127.0.0.1:9200',
-        elasticsearchIndexPrefix: 'swaggerstats-'
+        elasticsearchIndexPrefix: 'swaggerstats-',
+        authentication: true,
+        sessionMaxAge: process.env.SWS_AUTHTEST_MAXAGE || 900,
+        onAuthenticate: function(req,username,password){
+            // simple check for username and password
+            if(username==='swagger-stats') {
+                return ((username === 'swagger-stats') && (password === 'swagger-stats'));
+            } else if(username==='swagger-promise'){
+                return new Promise(function(resolve) {
+                    setTimeout(function(){
+                        resolve((username === 'swagger-promise') && (password === 'swagger-promise'));
+                    }, 1000);
+                });
+            }
+            return false;
+        }
     };
 
     // Enable Elasticsearch if specified

package/examples/restify/restifytest.js

@@ -15,7 +15,7 @@ server.use(restify.plugins.queryParser());
 // Use swagger-stats middleware
 server.pre(swStats.getMiddleware({
     name: 'restifytest',
-    version: '0.95.17',
+    version: '0.99.7',
     hostname: "hostname",
     ip: "127.0.0.1",
     timelineBucketDuration:1000,
@@ -30,6 +30,21 @@ server.pre(swStats.getMiddleware({
     elasticsearchIndexPrefix: 'swaggerstats-',
     onResponseFinish: function(req,res,rrr){
         debug('onResponseFinish: %s', JSON.stringify(rrr));
+    },
+    authentication: true,
+    sessionMaxAge: process.env.SWS_AUTHTEST_MAXAGE || 900,
+    onAuthenticate: function(req,username,password){
+        // simple check for username and password
+        if(username==='swagger-stats') {
+            return ((username === 'swagger-stats') && (password === 'swagger-stats'));
+        } else if(username==='swagger-promise'){
+            return new Promise(function(resolve) {
+                setTimeout(function(){
+                    resolve((username === 'swagger-promise') && (password === 'swagger-promise'));
+                }, 1000);
+            });
+        }
+        return false;
     }
 }));
 

package/examples/spectest/spectest.js

@@ -18,17 +18,12 @@ var server = null;
 // Express and middlewares
 var express = require('express');
 var expressBodyParser = require('body-parser');
-var expressFavicon = require('serve-favicon');
-var expressStatic = require('serve-static');
 
 var swaggerParser = require('swagger-parser');
 
 var swStats = require('../../lib');    // require('swagger-stats');
 
 var app = module.exports = express();
-app.use(expressFavicon(path.join(__dirname, '../../ui/favicon.png')));
-app.use('/ui',expressStatic(path.join(__dirname, '../../ui')));
-app.use('/node_modules',expressStatic(path.join(__dirname, '../../node_modules')));
 app.use(expressBodyParser.json());
 app.use(expressBodyParser.urlencoded({ extended: true }));
 
@@ -43,13 +38,15 @@ app.set('port', process.env.PORT || 3040);
 app.disable('etag');
 
 app.get('/', function(req,res) {
-    res.redirect('/swagger-stats/ui');
+    res.redirect('/swagger-stats/');
 });
 
 // Return Prometheus metrics from prom-client
 app.get('/metrics', function(req,res) {
     res.status(200).set('Content-Type', 'text/plain');
-    res.end(promClient.register.metrics());
+    Promise.resolve(promClient.register.metrics()).then( (x) => {
+        res.end(x);
+    });
 });
 
 
@@ -57,7 +54,8 @@ app.get('/metrics', function(req,res) {
 var swaggerSpec = null;
 var parser = new swaggerParser();
 
-var specLocation = 'petstore3.yaml';
+//var specLocation = 'petstore3.yaml';
+var specLocation = 'petstore.yaml';
 
 if( process.env.SWS_SPECTEST_URL ){
     specLocation = process.env.SWS_SPECTEST_URL;
@@ -78,7 +76,7 @@ parser.validate(specLocation,function(err, api) {
 
         var swsOptions = {
             name: 'swagger-stats-spectest',
-            version: '0.95.17',
+            version: '0.99.7',
             hostname: "hostname",
             ip: "127.0.0.1",
             timelineBucketDuration: tlBucket,