Komodo / komodo-sdk

Compare View

switch
from
...
to
 
Commits (7)

Changes

Showing 9 changed files Side-by-side Diff

1 1 /node_modules/
2 2 /logs/
  3 +/tmp
1   -"use strict";
  1 +'use strict';
2 2  
3 3 const fs = require('fs');
4 4 const configFiller = require('./config-filler');
5 5  
6   -let configFile = process.cwd() + "/config.json";
  6 +let configFile = process.cwd() + '/config.json';
7 7  
8 8 if (!fs.existsSync(configFile)) {
9   - console.trace('Config file not found. Terminating');
10   - //setImmediate(function() {
11   - process.exit(1);
12   - //});
  9 + configFile = process.cwd() + '/config.js';
  10 + if (!fs.existsSync(configFile)) {
  11 + throw new Error("Config file not found");
  12 + }
13 13 }
14 14  
15 15 const config = require(configFile);
control-panel/index.js
Diff comments   View file @ d63dce7
1 1 "use strict";
2 2  
3   -const init = require('./lib/express-init');
  3 +require('./lib/express-init');
control-panel/lib/express-init.js
Diff comments   View file @ d63dce7
1 1 "use strict";
2 2  
3 3 const path = require('path');
4   -const module_name = path.basename(__filename);
5 4  
6 5 const express = require('express');
7 6 const session = require('express-session');
control-panel/lib/router-main.js
Diff comments   View file @ d63dce7
1 1 "use strict";
2 2  
3   -const module_name = 'CONTROL_PANEL_' + require('path').basename(__filename);
4   -
5 3 const os = require('os');
6 4  
7 5 const express = require('express');
... ... @@ -14,12 +12,12 @@ const matrix = require('komodo-sdk/matrix');
14 12  
15 13 const misc = require('./misc');
16 14  
17   -function pageMain(req, res, next) {
  15 +function pageMain(req, res) {
18 16 res.redirect('/runtime');
19 17 }
20 18  
21   -function pageLog(req, res, next) {
22   - logger.query({json: true, order: 'desc'}, function(err, results) {
  19 +function pageLog(req, res) {
  20 + logger.query({json: true, order: 'desc'}, function(err) {
23 21 if (err) {
24 22 return res.end('INVALID LOGGER');
25 23 }
... ... @@ -27,13 +25,14 @@ function pageLog(req, res, next) {
27 25 res.render(
28 26 req.app.locals.cp_views_dir + '/log.html',
29 27 {
30   - log: JSON.stringify(results.logs, null, 4)
  28 + // log: JSON.stringify(results.logs, null, 4)
  29 + log: '[]'
31 30 }
32 31 );
33 32  
34 33 });
35 34 }
36   -function pageRuntime(req, res, next) {
  35 +function pageRuntime(req, res) {
37 36  
38 37 res.render(
39 38 req.app.locals.cp_views_dir + '/runtime.html',
logger-circular-buffer-web.js
Diff comments   View file @ d63dce7
... ... @@ -3,7 +3,6 @@
3 3 const http = require('http');
4 4 const auth = require('basic-auth');
5 5  
6   -const config = require('./config');
7 6 const logger = require('./logger');
8 7  
9 8 function listen(options) {
... ... @@ -19,6 +18,8 @@ function listen(options) {
19 18 }
20 19 else {
21 20  
  21 + res.json([]);
  22 + /*
22 23 logger.query({json: true, order: desc}, function(err, results) {
23 24 if (err) {
24 25 res.end('INVALID LOGGER');
... ... @@ -28,6 +29,7 @@ function listen(options) {
28 29 res.end(JSON.stringify(results));
29 30 }
30 31 });
  32 + */
31 33 }
32 34 }).listen(options.port);
33 35  
1 1 "use strict";
2 2  
3   -const fs = require('fs');
4   -const strftime = require('strftime');
  3 +const PID = process.pid;
  4 +
5 5 const winston = require('winston');
6 6  
7 7 require('winston-daily-rotate-file');
8 8 require('winston-circular-buffer');
9 9  
10   -const config = require('./config');
11   -
12   -const loggerTimestamp = function() {
13   - return strftime('%F %T', new Date());
14   -}
15   -
16 10 const logDirectory = process.cwd() + '/logs';
17   -const filenamePrefix = logDirectory + "/" + (process.env.KOMODO_LOG_FILENAME || "/log");
  11 +const filenamePrefix = (process.env.KOMODO_LOG_FILENAME || "log.");
18 12  
19   -fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory);
  13 +// const processTitle = process.title;
20 14  
21   -const logger = new winston.Logger({
  15 +const logger = winston.createLogger({
  16 + // levels: winston.config.syslog.levels,
22 17 transports: [
  18 + /*
23 19 new (winston.transports.Console)({
24   - timestamp: process.stdout.isTTY ? loggerTimestamp : null,
  20 + timestamp: process.stdout.isTTY ? moment() : null,
25 21 level: 'verbose',
26 22 }),
  23 + */
  24 +
  25 + new (winston.transports.Console) ({
  26 + format: winston.format.combine(
  27 + winston.format.metadata(),
  28 + winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss.SSS' }),
  29 + winston.format.label({ label: `${process.title}[${PID}]`, message: false }),
  30 + winston.format.printf((info) => `${process.stdout.isTTY ? info.timestamp : ''} ${info.label}: ${info.level}: ${info.message} ${info.metadata && Object.keys(info.metadata).length ? JSON.stringify(info.metadata) : ''}`.trim()),
  31 + )
  32 + }),
27 33  
28 34 new (winston.transports.DailyRotateFile) ({
29   - name: 'log-file-txt',
30   - filename: filenamePrefix,
31   - timestamp: loggerTimestamp,
32   - formatter: function(options) {
33   - return options.timestamp()
34   - +' ' + options.level.toUpperCase()
35   - +' ' + (undefined !== options.message ? options.message : '')
36   - + (options.meta && Object.keys(options.meta).length ? '\n\t' + JSON.stringify(options.meta) : '' );
37   - },
38   - level: 'debug',
  35 + filename: `${filenamePrefix}%DATE%`,
  36 + dirname: logDirectory,
  37 + datePattern: 'YYYY-MM-DD',
  38 +
  39 + format: winston.format.combine(
  40 + winston.format.metadata(),
  41 + winston.format.label({ label: `${process.title}[${PID}]`, message: false }),
  42 + winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss.SSS' }),
  43 + winston.format.json(),
  44 + )
  45 +
39 46 }),
40 47  
  48 + /*
41 49 new (winston.transports.CircularBuffer) ({
42 50 name: 'logs',
43 51 level: "verbose",
44 52 json: true,
45 53 size: 500
46   - })
  54 + }),
  55 + */
47 56 ]
48 57 });
49 58  
50   -logger.verbose(__filename + ': initialized');
51   -
  59 +logger.info('Logger initialized');
52 60 require('./logger-circular-buffer-web');
53 61  
54 62 module.exports = logger;
1 1 {
2 2 "name": "komodo-sdk",
3   - "version": "1.37.1",
  3 + "version": "1.37.2",
4 4 "lockfileVersion": 1,
5 5 "requires": true,
6 6 "dependencies": {
... ... @@ -176,9 +176,12 @@
176 176 "dev": true
177 177 },
178 178 "async": {
179   - "version": "1.0.0",
180   - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
181   - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k="
  179 + "version": "2.6.3",
  180 + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
  181 + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
  182 + "requires": {
  183 + "lodash": "^4.17.14"
  184 + }
182 185 },
183 186 "async-each": {
184 187 "version": "1.0.1",
... ... @@ -398,11 +401,19 @@
398 401 "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
399 402 "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
400 403 },
  404 + "color": {
  405 + "version": "3.0.0",
  406 + "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
  407 + "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
  408 + "requires": {
  409 + "color-convert": "^1.9.1",
  410 + "color-string": "^1.5.2"
  411 + }
  412 + },
401 413 "color-convert": {
402 414 "version": "1.9.3",
403 415 "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
404 416 "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
405   - "dev": true,
406 417 "requires": {
407 418 "color-name": "1.1.3"
408 419 }
... ... @@ -410,13 +421,35 @@
410 421 "color-name": {
411 422 "version": "1.1.3",
412 423 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
413   - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
414   - "dev": true
  424 + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
  425 + },
  426 + "color-string": {
  427 + "version": "1.5.3",
  428 + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
  429 + "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
  430 + "requires": {
  431 + "color-name": "^1.0.0",
  432 + "simple-swizzle": "^0.2.2"
  433 + }
  434 + },
  435 + "colornames": {
  436 + "version": "1.1.1",
  437 + "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
  438 + "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y="
415 439 },
416 440 "colors": {
417   - "version": "1.0.3",
418   - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
419   - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
  441 + "version": "1.3.3",
  442 + "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
  443 + "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="
  444 + },
  445 + "colorspace": {
  446 + "version": "1.1.2",
  447 + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
  448 + "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
  449 + "requires": {
  450 + "color": "3.0.x",
  451 + "text-hex": "1.0.x"
  452 + }
420 453 },
421 454 "combined-stream": {
422 455 "version": "1.0.5",
... ... @@ -559,6 +592,16 @@
559 592 "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
560 593 "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
561 594 },
  595 + "diagnostics": {
  596 + "version": "1.1.1",
  597 + "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
  598 + "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==",
  599 + "requires": {
  600 + "colorspace": "1.1.x",
  601 + "enabled": "1.0.x",
  602 + "kuler": "1.0.x"
  603 + }
  604 + },
562 605 "doctrine": {
563 606 "version": "3.0.0",
564 607 "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
... ... @@ -602,11 +645,24 @@
602 645 "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
603 646 "dev": true
604 647 },
  648 + "enabled": {
  649 + "version": "1.0.2",
  650 + "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
  651 + "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
  652 + "requires": {
  653 + "env-variable": "0.0.x"
  654 + }
  655 + },
605 656 "encodeurl": {
606 657 "version": "1.0.2",
607 658 "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
608 659 "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
609 660 },
  661 + "env-variable": {
  662 + "version": "0.0.5",
  663 + "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz",
  664 + "integrity": "sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA=="
  665 + },
610 666 "es6-promisify": {
611 667 "version": "6.0.0",
612 668 "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.0.tgz",
... ... @@ -972,11 +1028,6 @@
972 1028 "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
973 1029 "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
974 1030 },
975   - "eyes": {
976   - "version": "0.1.8",
977   - "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
978   - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A="
979   - },
980 1031 "fast-deep-equal": {
981 1032 "version": "2.0.1",
982 1033 "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
... ... @@ -995,6 +1046,16 @@
995 1046 "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
996 1047 "dev": true
997 1048 },
  1049 + "fast-safe-stringify": {
  1050 + "version": "2.0.6",
  1051 + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz",
  1052 + "integrity": "sha512-q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg=="
  1053 + },
  1054 + "fecha": {
  1055 + "version": "2.3.3",
  1056 + "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
  1057 + "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
  1058 + },
998 1059 "figures": {
999 1060 "version": "2.0.0",
1000 1061 "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
... ... @@ -1013,6 +1074,14 @@
1013 1074 "flat-cache": "^2.0.1"
1014 1075 }
1015 1076 },
  1077 + "file-stream-rotator": {
  1078 + "version": "0.4.1",
  1079 + "resolved": "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.4.1.tgz",
  1080 + "integrity": "sha512-W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ==",
  1081 + "requires": {
  1082 + "moment": "^2.11.2"
  1083 + }
  1084 + },
1016 1085 "filename-regex": {
1017 1086 "version": "2.0.1",
1018 1087 "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
... ... @@ -1153,8 +1222,8 @@
1153 1222 "bundled": true,
1154 1223 "optional": true,
1155 1224 "requires": {
1156   - "delegates": "1.0.0",
1157   - "readable-stream": "2.3.6"
  1225 + "delegates": "^1.0.0",
  1226 + "readable-stream": "^2.0.6"
1158 1227 }
1159 1228 },
1160 1229 "balanced-match": {
... ... @@ -1237,14 +1306,14 @@
1237 1306 "bundled": true,
1238 1307 "optional": true,
1239 1308 "requires": {
1240   - "aproba": "1.2.0",
1241   - "console-control-strings": "1.1.0",
1242   - "has-unicode": "2.0.1",
1243   - "object-assign": "4.1.1",
1244   - "signal-exit": "3.0.2",
1245   - "string-width": "1.0.2",
1246   - "strip-ansi": "3.0.1",
1247   - "wide-align": "1.1.2"
  1309 + "aproba": "^1.0.3",
  1310 + "console-control-strings": "^1.0.0",
  1311 + "has-unicode": "^2.0.0",
  1312 + "object-assign": "^4.1.0",
  1313 + "signal-exit": "^3.0.0",
  1314 + "string-width": "^1.0.1",
  1315 + "strip-ansi": "^3.0.1",
  1316 + "wide-align": "^1.1.0"
1248 1317 }
1249 1318 },
1250 1319 "glob": {
... ... @@ -1270,7 +1339,7 @@
1270 1339 "bundled": true,
1271 1340 "optional": true,
1272 1341 "requires": {
1273   - "safer-buffer": "2.1.2"
  1342 + "safer-buffer": "^2.1.0"
1274 1343 }
1275 1344 },
1276 1345 "ignore-walk": {
... ... @@ -1305,7 +1374,7 @@
1305 1374 "bundled": true,
1306 1375 "optional": true,
1307 1376 "requires": {
1308   - "number-is-nan": "1.0.1"
  1377 + "number-is-nan": "^1.0.0"
1309 1378 }
1310 1379 },
1311 1380 "isarray": {
... ... @@ -1361,9 +1430,9 @@
1361 1430 "bundled": true,
1362 1431 "optional": true,
1363 1432 "requires": {
1364   - "debug": "2.6.9",
1365   - "iconv-lite": "0.4.21",
1366   - "sax": "1.2.4"
  1433 + "debug": "^2.1.2",
  1434 + "iconv-lite": "^0.4.4",
  1435 + "sax": "^1.2.4"
1367 1436 }
1368 1437 },
1369 1438 "node-pre-gyp": {
... ... @@ -1388,8 +1457,8 @@
1388 1457 "bundled": true,
1389 1458 "optional": true,
1390 1459 "requires": {
1391   - "abbrev": "1.1.1",
1392   - "osenv": "0.1.5"
  1460 + "abbrev": "1",
  1461 + "osenv": "^0.1.4"
1393 1462 }
1394 1463 },
1395 1464 "npm-bundled": {
... ... @@ -1402,8 +1471,8 @@
1402 1471 "bundled": true,
1403 1472 "optional": true,
1404 1473 "requires": {
1405   - "ignore-walk": "3.0.1",
1406   - "npm-bundled": "1.0.3"
  1474 + "ignore-walk": "^3.0.1",
  1475 + "npm-bundled": "^1.0.1"
1407 1476 }
1408 1477 },
1409 1478 "npmlog": {
... ... @@ -1411,10 +1480,10 @@
1411 1480 "bundled": true,
1412 1481 "optional": true,
1413 1482 "requires": {
1414   - "are-we-there-yet": "1.1.4",
1415   - "console-control-strings": "1.1.0",
1416   - "gauge": "2.7.4",
1417   - "set-blocking": "2.0.0"
  1483 + "are-we-there-yet": "~1.1.2",
  1484 + "console-control-strings": "~1.1.0",
  1485 + "gauge": "~2.7.3",
  1486 + "set-blocking": "~2.0.0"
1418 1487 }
1419 1488 },
1420 1489 "number-is-nan": {
... ... @@ -1432,7 +1501,7 @@
1432 1501 "bundled": true,
1433 1502 "optional": true,
1434 1503 "requires": {
1435   - "wrappy": "1.0.2"
  1504 + "wrappy": "1"
1436 1505 }
1437 1506 },
1438 1507 "os-homedir": {
... ... @@ -1450,8 +1519,8 @@
1450 1519 "bundled": true,
1451 1520 "optional": true,
1452 1521 "requires": {
1453   - "os-homedir": "1.0.2",
1454   - "os-tmpdir": "1.0.2"
  1522 + "os-homedir": "^1.0.0",
  1523 + "os-tmpdir": "^1.0.0"
1455 1524 }
1456 1525 },
1457 1526 "path-is-absolute": {
... ... @@ -1469,10 +1538,10 @@
1469 1538 "bundled": true,
1470 1539 "optional": true,
1471 1540 "requires": {
1472   - "deep-extend": "0.5.1",
1473   - "ini": "1.3.5",
1474   - "minimist": "1.2.0",
1475   - "strip-json-comments": "2.0.1"
  1541 + "deep-extend": "^0.5.1",
  1542 + "ini": "~1.3.0",
  1543 + "minimist": "^1.2.0",
  1544 + "strip-json-comments": "~2.0.1"
1476 1545 },
1477 1546 "dependencies": {
1478 1547 "minimist": {
... ... @@ -1487,13 +1556,13 @@
1487 1556 "bundled": true,
1488 1557 "optional": true,
1489 1558 "requires": {
1490   - "core-util-is": "1.0.2",
1491   - "inherits": "2.0.3",
1492   - "isarray": "1.0.0",
1493   - "process-nextick-args": "2.0.0",
1494   - "safe-buffer": "5.1.1",
1495   - "string_decoder": "1.1.1",
1496   - "util-deprecate": "1.0.2"
  1559 + "core-util-is": "~1.0.0",
  1560 + "inherits": "~2.0.3",
  1561 + "isarray": "~1.0.0",
  1562 + "process-nextick-args": "~2.0.0",
  1563 + "safe-buffer": "~5.1.1",
  1564 + "string_decoder": "~1.1.1",
  1565 + "util-deprecate": "~1.0.1"
1497 1566 }
1498 1567 },
1499 1568 "rimraf": {
... ... @@ -1539,9 +1608,9 @@
1539 1608 "bundled": true,
1540 1609 "optional": true,
1541 1610 "requires": {
1542   - "code-point-at": "1.1.0",
1543   - "is-fullwidth-code-point": "1.0.0",
1544   - "strip-ansi": "3.0.1"
  1611 + "code-point-at": "^1.0.0",
  1612 + "is-fullwidth-code-point": "^1.0.0",
  1613 + "strip-ansi": "^3.0.0"
1545 1614 }
1546 1615 },
1547 1616 "string_decoder": {
... ... @@ -1549,7 +1618,7 @@
1549 1618 "bundled": true,
1550 1619 "optional": true,
1551 1620 "requires": {
1552   - "safe-buffer": "5.1.1"
  1621 + "safe-buffer": "~5.1.0"
1553 1622 }
1554 1623 },
1555 1624 "strip-ansi": {
... ... @@ -1557,7 +1626,7 @@
1557 1626 "bundled": true,
1558 1627 "optional": true,
1559 1628 "requires": {
1560   - "ansi-regex": "2.1.1"
  1629 + "ansi-regex": "^2.0.0"
1561 1630 }
1562 1631 },
1563 1632 "strip-json-comments": {
... ... @@ -1589,7 +1658,7 @@
1589 1658 "bundled": true,
1590 1659 "optional": true,
1591 1660 "requires": {
1592   - "string-width": "1.0.2"
  1661 + "string-width": "^1.0.2"
1593 1662 }
1594 1663 },
1595 1664 "wrappy": {
... ... @@ -1862,6 +1931,11 @@
1862 1931 "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
1863 1932 "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs="
1864 1933 },
  1934 + "is-arrayish": {
  1935 + "version": "0.3.2",
  1936 + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
  1937 + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
  1938 + },
1865 1939 "is-binary-path": {
1866 1940 "version": "1.0.1",
1867 1941 "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
... ... @@ -1961,6 +2035,11 @@
1961 2035 "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
1962 2036 "dev": true
1963 2037 },
  2038 + "is-stream": {
  2039 + "version": "1.1.0",
  2040 + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
  2041 + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
  2042 + },
1964 2043 "is-typedarray": {
1965 2044 "version": "1.0.0",
1966 2045 "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
... ... @@ -1969,8 +2048,7 @@
1969 2048 "isarray": {
1970 2049 "version": "1.0.0",
1971 2050 "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
1972   - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
1973   - "optional": true
  2051 + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
1974 2052 },
1975 2053 "isexe": {
1976 2054 "version": "2.0.0",
... ... @@ -2080,6 +2158,14 @@
2080 2158 "is-buffer": "^1.1.5"
2081 2159 }
2082 2160 },
  2161 + "kuler": {
  2162 + "version": "1.0.1",
  2163 + "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
  2164 + "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==",
  2165 + "requires": {
  2166 + "colornames": "^1.1.1"
  2167 + }
  2168 + },
2083 2169 "lcid": {
2084 2170 "version": "1.0.0",
2085 2171 "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
... ... @@ -2101,8 +2187,26 @@
2101 2187 "lodash": {
2102 2188 "version": "4.17.15",
2103 2189 "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
2104   - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
2105   - "dev": true
  2190 + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
  2191 + },
  2192 + "logform": {
  2193 + "version": "2.1.2",
  2194 + "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz",
  2195 + "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==",
  2196 + "requires": {
  2197 + "colors": "^1.2.1",
  2198 + "fast-safe-stringify": "^2.0.4",
  2199 + "fecha": "^2.3.3",
  2200 + "ms": "^2.1.1",
  2201 + "triple-beam": "^1.3.0"
  2202 + },
  2203 + "dependencies": {
  2204 + "ms": {
  2205 + "version": "2.1.2",
  2206 + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
  2207 + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
  2208 + }
  2209 + }
2106 2210 },
2107 2211 "lru-cache": {
2108 2212 "version": "4.1.1",
... ... @@ -2293,6 +2397,11 @@
2293 2397 "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
2294 2398 "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
2295 2399 },
  2400 + "object-hash": {
  2401 + "version": "1.3.1",
  2402 + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
  2403 + "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="
  2404 + },
2296 2405 "object.omit": {
2297 2406 "version": "2.0.1",
2298 2407 "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
... ... @@ -2324,6 +2433,11 @@
2324 2433 "wrappy": "1"
2325 2434 }
2326 2435 },
  2436 + "one-time": {
  2437 + "version": "0.0.4",
  2438 + "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz",
  2439 + "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4="
  2440 + },
2327 2441 "onetime": {
2328 2442 "version": "2.0.1",
2329 2443 "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
... ... @@ -2710,8 +2824,7 @@
2710 2824 "semver": {
2711 2825 "version": "6.3.0",
2712 2826 "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
2713   - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
2714   - "dev": true
  2827 + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
2715 2828 },
2716 2829 "send": {
2717 2830 "version": "0.16.2",
... ... @@ -2816,6 +2929,14 @@
2816 2929 "debug": "^2.6.7"
2817 2930 }
2818 2931 },
  2932 + "simple-swizzle": {
  2933 + "version": "0.2.2",
  2934 + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
  2935 + "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
  2936 + "requires": {
  2937 + "is-arrayish": "^0.3.1"
  2938 + }
  2939 + },
2819 2940 "slice-ansi": {
2820 2941 "version": "2.1.0",
2821 2942 "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
... ... @@ -3019,6 +3140,11 @@
3019 3140 }
3020 3141 }
3021 3142 },
  3143 + "text-hex": {
  3144 + "version": "1.0.0",
  3145 + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
  3146 + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
  3147 + },
3022 3148 "text-table": {
3023 3149 "version": "0.2.0",
3024 3150 "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
... ... @@ -3056,6 +3182,11 @@
3056 3182 "punycode": "^1.4.1"
3057 3183 }
3058 3184 },
  3185 + "triple-beam": {
  3186 + "version": "1.3.0",
  3187 + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
  3188 + "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
  3189 + },
3059 3190 "tslib": {
3060 3191 "version": "1.10.0",
3061 3192 "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
... ... @@ -3174,8 +3305,7 @@
3174 3305 "util-deprecate": {
3175 3306 "version": "1.0.2",
3176 3307 "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
3177   - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
3178   - "optional": true
  3308 + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
3179 3309 },
3180 3310 "utils-merge": {
3181 3311 "version": "1.0.1",
... ... @@ -3230,16 +3360,44 @@
3230 3360 "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY="
3231 3361 },
3232 3362 "winston": {
3233   - "version": "2.3.1",
3234   - "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz",
3235   - "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=",
3236   - "requires": {
3237   - "async": "~1.0.0",
3238   - "colors": "1.0.x",
3239   - "cycle": "1.0.x",
3240   - "eyes": "0.1.x",
3241   - "isstream": "0.1.x",
3242   - "stack-trace": "0.0.x"
  3363 + "version": "3.2.1",
  3364 + "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz",
  3365 + "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==",
  3366 + "requires": {
  3367 + "async": "^2.6.1",
  3368 + "diagnostics": "^1.1.1",
  3369 + "is-stream": "^1.1.0",
  3370 + "logform": "^2.1.1",
  3371 + "one-time": "0.0.4",
  3372 + "readable-stream": "^3.1.1",
  3373 + "stack-trace": "0.0.x",
  3374 + "triple-beam": "^1.3.0",
  3375 + "winston-transport": "^4.3.0"
  3376 + },
  3377 + "dependencies": {
  3378 + "readable-stream": {
  3379 + "version": "3.4.0",
  3380 + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
  3381 + "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
  3382 + "requires": {
  3383 + "inherits": "^2.0.3",
  3384 + "string_decoder": "^1.1.1",
  3385 + "util-deprecate": "^1.0.1"
  3386 + }
  3387 + },
  3388 + "safe-buffer": {
  3389 + "version": "5.2.0",
  3390 + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
  3391 + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
  3392 + },
  3393 + "string_decoder": {
  3394 + "version": "1.3.0",
  3395 + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
  3396 + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
  3397 + "requires": {
  3398 + "safe-buffer": "~5.2.0"
  3399 + }
  3400 + }
3243 3401 }
3244 3402 },
3245 3403 "winston-circular-buffer": {
... ... @@ -3250,10 +3408,85 @@
3250 3408 "circular-buffer": "0.0.6"
3251 3409 }
3252 3410 },
  3411 + "winston-compat": {
  3412 + "version": "0.1.4",
  3413 + "resolved": "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.4.tgz",
  3414 + "integrity": "sha512-mMEfFsSm6GmkFF+f4/0UJtG4N1vSaczGmXLVJYmS/+u2zUaIPcw2ZRuwUg2TvVBjswgiraN+vNnAG8z4fRUZ4w==",
  3415 + "requires": {
  3416 + "cycle": "~1.0.3",
  3417 + "logform": "^1.6.0",
  3418 + "triple-beam": "^1.2.0"
  3419 + },
  3420 + "dependencies": {
  3421 + "logform": {
  3422 + "version": "1.10.0",
  3423 + "resolved": "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz",
  3424 + "integrity": "sha512-em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==",
  3425 + "requires": {
  3426 + "colors": "^1.2.1",
  3427 + "fast-safe-stringify": "^2.0.4",
  3428 + "fecha": "^2.3.3",
  3429 + "ms": "^2.1.1",
  3430 + "triple-beam": "^1.2.0"
  3431 + }
  3432 + },
  3433 + "ms": {
  3434 + "version": "2.1.2",
  3435 + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
  3436 + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
  3437 + }
  3438 + }
  3439 + },
3253 3440 "winston-daily-rotate-file": {
3254   - "version": "1.4.6",
3255   - "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-1.4.6.tgz",
3256   - "integrity": "sha1-8gS2raGaU4b99S/pl9jhDkP/d4g="
  3441 + "version": "3.10.0",
  3442 + "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.10.0.tgz",
  3443 + "integrity": "sha512-KO8CfbI2CvdR3PaFApEH02GPXiwJ+vbkF1mCkTlvRIoXFI8EFlf1ACcuaahXTEiDEKCii6cNe95gsL4ZkbnphA==",
  3444 + "requires": {
  3445 + "file-stream-rotator": "^0.4.1",
  3446 + "object-hash": "^1.3.0",
  3447 + "semver": "^6.2.0",
  3448 + "triple-beam": "^1.3.0",
  3449 + "winston-compat": "^0.1.4",
  3450 + "winston-transport": "^4.2.0"
  3451 + }
  3452 + },
  3453 + "winston-transport": {
  3454 + "version": "4.3.0",
  3455 + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz",
  3456 + "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==",
  3457 + "requires": {
  3458 + "readable-stream": "^2.3.6",
  3459 + "triple-beam": "^1.2.0"
  3460 + },
  3461 + "dependencies": {
  3462 + "process-nextick-args": {
  3463 + "version": "2.0.1",
  3464 + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
  3465 + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
  3466 + },
  3467 + "readable-stream": {
  3468 + "version": "2.3.6",
  3469 + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
  3470 + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
  3471 + "requires": {
  3472 + "core-util-is": "~1.0.0",
  3473 + "inherits": "~2.0.3",
  3474 + "isarray": "~1.0.0",
  3475 + "process-nextick-args": "~2.0.0",
  3476 + "safe-buffer": "~5.1.1",
  3477 + "string_decoder": "~1.1.1",
  3478 + "util-deprecate": "~1.0.1"
  3479 + }
  3480 + },
  3481 + "string_decoder": {
  3482 + "version": "1.1.1",
  3483 + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
  3484 + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
  3485 + "requires": {
  3486 + "safe-buffer": "~5.1.0"
  3487 + }
  3488 + }
  3489 + }
3257 3490 },
3258 3491 "wordwrap": {
3259 3492 "version": "1.0.0",
1 1 {
2 2 "name": "komodo-sdk",
3   - "version": "1.37.1",
  3 + "version": "1.37.2",
4 4 "description": "SDK for Komodo",
5 5 "main": "index.js",
6 6 "scripts": {
... ... @@ -44,9 +44,9 @@
44 44 "string-natural-compare": "^2.0.2",
45 45 "uniqid": "^4.1.1",
46 46 "uuid": "^3.1.0",
47   - "winston": "^2.3.1",
  47 + "winston": "^3.2.1",
48 48 "winston-circular-buffer": "^1.0.0",
49   - "winston-daily-rotate-file": "^1.4.6"
  49 + "winston-daily-rotate-file": "^3.10.0"
50 50 },
51 51 "devDependencies": {
52 52 "eslint": "^6.1.0"