express-status-monitor
Advanced tools
Comparing version 0.1.7 to 0.1.9
{ | ||
"extends": "airbnb", | ||
"globals": { | ||
"describe": false, | ||
"it": false, | ||
"beforeEach": false, | ||
"before": false, | ||
"after": false | ||
}, | ||
"rules": { | ||
"import/no-extraneous-dependencies": [ | ||
"error", { | ||
"peerDependencies": true | ||
} | ||
], | ||
"no-param-reassign": "off" | ||
} | ||
} | ||
"env": { | ||
"node": true, | ||
"es6": true | ||
}, | ||
"extends": "eslint:recommended", | ||
"rules": { | ||
"accessor-pairs": "error", | ||
"array-bracket-spacing": "error", | ||
"array-callback-return": "error", | ||
"arrow-body-style": "error", | ||
"arrow-parens": [ | ||
"error", | ||
"as-needed" | ||
], | ||
"arrow-spacing": [ | ||
"error", | ||
{ | ||
"after": true, | ||
"before": true | ||
} | ||
], | ||
"block-scoped-var": "error", | ||
"block-spacing": "error", | ||
"brace-style": "error", | ||
"callback-return": "off", | ||
"camelcase": "error", | ||
"class-methods-use-this": "error", | ||
"comma-dangle": "off", | ||
"comma-spacing": [ | ||
"error", | ||
{ | ||
"after": true, | ||
"before": false | ||
} | ||
], | ||
"comma-style": [ | ||
"error", | ||
"last" | ||
], | ||
"complexity": "error", | ||
"computed-property-spacing": [ | ||
"error", | ||
"never" | ||
], | ||
"consistent-return": "error", | ||
"consistent-this": "error", | ||
"default-case": "error", | ||
"dot-location": [ | ||
"error", | ||
"property" | ||
], | ||
"dot-notation": [ | ||
"error", | ||
{ | ||
"allowKeywords": true | ||
} | ||
], | ||
"eol-last": "error", | ||
"eqeqeq": "error", | ||
"func-call-spacing": "error", | ||
"func-name-matching": "error", | ||
"func-names": "error", | ||
"func-style": [ | ||
"error", | ||
"expression" | ||
], | ||
"generator-star-spacing": "error", | ||
"global-require": "error", | ||
"guard-for-in": "error", | ||
"handle-callback-err": "error", | ||
"id-blacklist": "error", | ||
"id-match": "error", | ||
"indent": "off", | ||
"init-declarations": "error", | ||
"jsx-quotes": "error", | ||
"key-spacing": "error", | ||
"keyword-spacing": "error", | ||
"line-comment-position": "error", | ||
"linebreak-style": [ | ||
"error", | ||
"unix" | ||
], | ||
"lines-around-comment": "error", | ||
"lines-around-directive": "error", | ||
"max-depth": "error", | ||
"max-len": "off", | ||
"max-lines": "error", | ||
"max-nested-callbacks": "error", | ||
"max-params": "error", | ||
"max-statements": "off", | ||
"max-statements-per-line": "error", | ||
"multiline-ternary": "off", | ||
"new-cap": "error", | ||
"new-parens": "error", | ||
"newline-after-var": [ | ||
"error", | ||
"always" | ||
], | ||
"newline-before-return": "off", | ||
"newline-per-chained-call": "off", | ||
"no-alert": "error", | ||
"no-array-constructor": "error", | ||
"no-bitwise": "error", | ||
"no-caller": "error", | ||
"no-catch-shadow": "error", | ||
"no-confusing-arrow": "error", | ||
"no-continue": "error", | ||
"no-div-regex": "error", | ||
"no-duplicate-imports": "error", | ||
"no-else-return": "error", | ||
"no-empty-function": "error", | ||
"no-eq-null": "error", | ||
"no-eval": "error", | ||
"no-extend-native": "error", | ||
"no-extra-bind": "error", | ||
"no-extra-label": "error", | ||
"no-extra-parens": "off", | ||
"no-floating-decimal": "error", | ||
"no-implicit-coercion": "error", | ||
"no-implicit-globals": "error", | ||
"no-implied-eval": "error", | ||
"no-inline-comments": "error", | ||
"no-invalid-this": "error", | ||
"no-iterator": "error", | ||
"no-label-var": "error", | ||
"no-labels": "error", | ||
"no-lone-blocks": "error", | ||
"no-lonely-if": "error", | ||
"no-loop-func": "error", | ||
"no-mixed-operators": "error", | ||
"no-mixed-requires": "error", | ||
"no-multi-spaces": "error", | ||
"no-multi-str": "error", | ||
"no-multiple-empty-lines": "error", | ||
"no-native-reassign": "error", | ||
"no-negated-condition": "off", | ||
"no-negated-in-lhs": "error", | ||
"no-nested-ternary": "error", | ||
"no-new": "error", | ||
"no-new-func": "error", | ||
"no-new-object": "error", | ||
"no-new-require": "error", | ||
"no-new-wrappers": "error", | ||
"no-octal-escape": "error", | ||
"no-param-reassign": "error", | ||
"no-path-concat": "error", | ||
"no-plusplus": "error", | ||
"no-process-env": "off", | ||
"no-process-exit": "error", | ||
"no-proto": "error", | ||
"no-prototype-builtins": "error", | ||
"no-redeclare": [ | ||
"error", | ||
{ | ||
"builtinGlobals": false | ||
} | ||
], | ||
"no-restricted-globals": "error", | ||
"no-restricted-imports": "error", | ||
"no-restricted-modules": "error", | ||
"no-restricted-properties": "error", | ||
"no-restricted-syntax": "error", | ||
"no-return-assign": "error", | ||
"no-script-url": "error", | ||
"no-self-compare": "error", | ||
"no-sequences": "error", | ||
"no-shadow": "error", | ||
"no-shadow-restricted-names": "error", | ||
"no-spaced-func": "error", | ||
"no-sync": "off", | ||
"no-tabs": "error", | ||
"no-template-curly-in-string": "error", | ||
"no-ternary": "off", | ||
"no-throw-literal": "error", | ||
"no-trailing-spaces": "error", | ||
"no-undef-init": "error", | ||
"no-undefined": "off", | ||
"no-underscore-dangle": "error", | ||
"no-unmodified-loop-condition": "error", | ||
"no-unneeded-ternary": "error", | ||
"no-unused-expressions": "error", | ||
"no-use-before-define": "error", | ||
"no-useless-call": "error", | ||
"no-useless-computed-key": "error", | ||
"no-useless-concat": "error", | ||
"no-useless-constructor": "error", | ||
"no-useless-escape": "error", | ||
"no-useless-rename": "error", | ||
"no-useless-return": "error", | ||
"no-var": "error", | ||
"no-void": "error", | ||
"no-warning-comments": "off", | ||
"no-whitespace-before-property": "error", | ||
"no-with": "error", | ||
"object-curly-spacing": [ | ||
"error", | ||
"always" | ||
], | ||
"object-property-newline": [ | ||
"error", | ||
{ | ||
"allowMultiplePropertiesPerLine": true | ||
} | ||
], | ||
"object-shorthand": "error", | ||
"one-var": "off", | ||
"one-var-declaration-per-line": "error", | ||
"operator-assignment": "error", | ||
"operator-linebreak": "error", | ||
"padded-blocks": "off", | ||
"prefer-arrow-callback": "error", | ||
"prefer-const": "error", | ||
"prefer-numeric-literals": "error", | ||
"prefer-reflect": "error", | ||
"prefer-rest-params": "error", | ||
"prefer-spread": "error", | ||
"prefer-template": "error", | ||
"quote-props": "off", | ||
"quotes": [ | ||
"error", | ||
"single" | ||
], | ||
"radix": "error", | ||
"require-jsdoc": "off", | ||
"rest-spread-spacing": "error", | ||
"semi": "off", | ||
"semi-spacing": "error", | ||
"sort-imports": "error", | ||
"sort-keys": "off", | ||
"sort-vars": "error", | ||
"space-before-blocks": "error", | ||
"space-before-function-paren": "error", | ||
"space-in-parens": [ | ||
"error", | ||
"never" | ||
], | ||
"space-infix-ops": "error", | ||
"space-unary-ops": "error", | ||
"spaced-comment": "error", | ||
"strict": "off", | ||
"symbol-description": "error", | ||
"template-curly-spacing": [ | ||
"error", | ||
"never" | ||
], | ||
"unicode-bom": [ | ||
"error", | ||
"never" | ||
], | ||
"valid-jsdoc": "error", | ||
"vars-on-top": "error", | ||
"wrap-iife": "error", | ||
"wrap-regex": "error", | ||
"yield-star-spacing": "error", | ||
"yoda": [ | ||
"error", | ||
"never" | ||
] | ||
} | ||
} |
{ | ||
"name": "express-status-monitor", | ||
"version": "0.1.7", | ||
"version": "0.1.9", | ||
"description": "Realtime Monitoring for Express-based Node applications", | ||
@@ -60,7 +60,3 @@ "main": "index.js", | ||
"chai": "^3.5.0", | ||
"eslint": "^3.9.1", | ||
"eslint-config-airbnb": "^12.0.0", | ||
"eslint-plugin-import": "^1.16.0", | ||
"eslint-plugin-jsx-a11y": "^2.2.3", | ||
"eslint-plugin-react": "^6.5.0", | ||
"eslint": "^3.12.2", | ||
"istanbul": "^0.4.5", | ||
@@ -67,0 +63,0 @@ "mocha": "^3.0.2", |
@@ -20,2 +20,3 @@ module.exports = { | ||
websocket: null, | ||
iframe: false, | ||
}; |
@@ -25,2 +25,3 @@ /* eslint no-console: "off" */ | ||
const last = span.responses[span.responses.length - 1]; | ||
// Convert from B to MB | ||
@@ -27,0 +28,0 @@ stat.memory = stat.memory / 1024 / 1024; |
@@ -6,8 +6,9 @@ module.exports = (statusCode, startTime, spans) => { | ||
spans.forEach((span) => { | ||
spans.forEach(span => { | ||
const last = span.responses[span.responses.length - 1]; | ||
if (last !== undefined && (last.timestamp / 1000) + span.interval > Date.now() / 1000) { | ||
last[category] += 1; | ||
last.count += 1; | ||
last.mean += ((responseTime - last.mean) / last.count); | ||
last.mean += (responseTime - last.mean) / last.count; | ||
} else { | ||
@@ -14,0 +15,0 @@ span.responses.push({ |
@@ -1,2 +0,2 @@ | ||
/* eslint strict: "off" */ | ||
/* eslint strict: "off", init-declarations: "off" */ | ||
@@ -10,3 +10,3 @@ 'use strict'; | ||
function addSocketEvents(socket, config) { | ||
const addSocketEvents = (socket, config) => { | ||
socket.emit('esm_start', config.spans); | ||
@@ -26,6 +26,6 @@ socket.on('esm_change', () => { | ||
io.on('connection', (socket) => { | ||
io.on('connection', socket => { | ||
if (config.authorize) { | ||
config.authorize(socket) | ||
.then((authorized) => { | ||
.then(authorized => { | ||
if (!authorized) socket.disconnect('unauthorized'); | ||
@@ -40,9 +40,11 @@ else addSocketEvents(socket, config); | ||
config.spans.forEach((span) => { | ||
config.spans.forEach(span => { | ||
span.os = []; | ||
span.responses = []; | ||
const interval = setInterval(() => gatherOsMetrics(io, span), span.interval * 1000); | ||
interval.unref(); // don't keep node.js process up | ||
// Don't keep node.js process up | ||
interval.unref(); | ||
}); | ||
} | ||
}; |
const defaultConfig = require('./default-config'); | ||
module.exports = (config) => { | ||
module.exports = config => { | ||
if (!config) { | ||
@@ -18,3 +18,5 @@ return defaultConfig; | ||
config.iframe = (typeof config.iframe === 'boolean') ? config.iframe : defaultConfig.iframe; | ||
return config; | ||
}; |
@@ -0,1 +1,3 @@ | ||
/* eslint no-param-reassign: "off" */ | ||
const fs = require('fs'); | ||
@@ -8,3 +10,3 @@ const path = require('path'); | ||
const middlewareWrapper = (config) => { | ||
const middlewareWrapper = config => { | ||
config = validate(config); | ||
@@ -24,6 +26,19 @@ | ||
const startTime = process.hrtime(); | ||
if (req.path === config.path) { | ||
if (config.iframe) { | ||
if (res.removeHeader) { | ||
res.removeHeader('X-Frame-Options'); | ||
} | ||
if (res.remove) { | ||
res.remove('X-Frame-Options'); | ||
} | ||
} | ||
res.send(renderedHtml); | ||
} else { | ||
onHeaders(res, () => { onHeadersListener(res.statusCode, startTime, config.spans); }); | ||
onHeaders(res, () => { | ||
onHeadersListener(res.statusCode, startTime, config.spans); | ||
}); | ||
next(); | ||
@@ -44,3 +59,5 @@ } | ||
middleware.middleware = middleware; | ||
middleware.pageRoute = (req, res) => { res.send(renderedHtml); }; | ||
middleware.pageRoute = (req, res) => { | ||
res.send(renderedHtml); | ||
}; | ||
return middleware; | ||
@@ -47,0 +64,0 @@ }; |
@@ -117,2 +117,3 @@ /* | ||
var otherSpans = document.getElementsByTagName('span'); | ||
for (var i = 0; i < otherSpans.length; i++) { | ||
@@ -185,2 +186,3 @@ if (otherSpans[i] !== e.target) otherSpans[i].classList.remove('active'); | ||
data[defaultSpan].responses[data[defaultSpan].responses.length - 2].timestamp; | ||
if (deltaTime < 1) deltaTime = 1000; | ||
@@ -199,2 +201,3 @@ rpsStat.textContent = ((lastResponseMetric.count / deltaTime) * 1000).toFixed(2); | ||
var spanControls = document.getElementById('span-controls'); | ||
if (data.length !== spans.length) { | ||
@@ -209,2 +212,3 @@ data.forEach(function (span, index) { | ||
var textNode = document.createTextNode(((span.retention * span.interval) / 60) + 'M'); | ||
spanNode.appendChild(textNode); | ||
@@ -255,2 +259,3 @@ spanNode.setAttribute('id', index); | ||
var deltaTime = responses.timestamp - rpsChart.data.labels[rpsChart.data.labels.length - 1]; | ||
if (deltaTime < 1) deltaTime = 1000; | ||
@@ -257,0 +262,0 @@ rpsStat.textContent = ((responses.count / deltaTime) * 1000).toFixed(2); |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
42133
7
992