@contrast/agent 4.32.11 → 4.32.13

package/node_modules/winston-daily-rotate-file/README.md

@@ -1,11 +1,16 @@
 # winston-daily-rotate-file
 
-[![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][daviddm-image]][daviddm-url]
+[![NPM version][npm-image]][npm-url]
+
+[![NPM](https://nodei.co/npm/winston-daily-rotate-file.png)](https://nodei.co/npm/winston-daily-rotate-file/)
 
 A transport for [winston](https://github.com/winstonjs/winston) which logs to a rotating file. Logs can be rotated based on a date, size limit, and old logs can be removed based on count or elapsed days.
 
 Starting with version 2.0.0, the transport has been refactored to leverage the the [file-stream-rotator](https://github.com/rogerc/file-stream-rotator/) module. _Some of the options in the 1.x versions of the transport have changed._ Please review the options below to identify any changes needed.
 
+## Compatibility
+Please note that if you are using `winston@2`, you will need to use `winston-daily-rotate-file@3`. `winston-daily-rotate-file@4` removed support for `winston@2`.
+
 ## Install
 ```
 npm install winston-daily-rotate-file
@@ -15,22 +20,27 @@ npm install winston-daily-rotate-file
 The DailyRotateFile transport can rotate files by minute, hour, day, month, year or weekday. In addition to the options accepted by the logger, `winston-daily-rotate-file` also accepts the following options:
 
 * **frequency:** A string representing the frequency of rotation. This is useful if you want to have timed rotations, as opposed to rotations that happen at specific moments in time. Valid values are '#m' or '#h' (e.g., '5m' or '3h'). Leaving this null relies on `datePattern` for the rotation times. (default: null)
-* **datePattern:** A string representing the [moment.js date format](http://momentjs.com/docs/#/displaying/format/) to be used for rotating. The meta characters used in this string will dictate the frequency of the file rotation. For example, if your datePattern is simply 'HH' you will end up with 24 log files that are picked up and appended to every day. (default 'YYYY-MM-DD')
-* **zippedArchive:** A boolean to define whether or not to gzip archived log files. (default 'false')
-* **filename:** Filename to be used to log to. This filename can include the `%DATE%` placeholder which will include the formatted datePattern at that point in the filename. (default: 'winston.log.%DATE%)
+* **datePattern:** A string representing the [moment.js date format](http://momentjs.com/docs/#/displaying/format/) to be used for rotating. The meta characters used in this string will dictate the frequency of the file rotation. For example, if your datePattern is simply 'HH' you will end up with 24 log files that are picked up and appended to every day. (default: 'YYYY-MM-DD')
+* **zippedArchive:** A boolean to define whether or not to gzip archived log files. (default: 'false')
+* **filename:** Filename to be used to log to. This filename can include the `%DATE%` placeholder which will include the formatted datePattern at that point in the filename. (default: 'winston.log.%DATE%')
 * **dirname:** The directory name to save log files to. (default: '.')
 * **stream:** Write directly to a custom stream and bypass the rotation capabilities. (default: null)
 * **maxSize:** Maximum size of the file after which it will rotate. This can be a number of bytes, or units of kb, mb, and gb. If using the units, add 'k', 'm', or 'g' as the suffix. The units need to directly follow the number. (default: null)
-* **maxFiles:** Maximum number of logs to keep. If not set, no logs will be removed. This can be a number of files or number of days. If using days, add 'd' as the suffix. (default: null)
+* **maxFiles:** Maximum number of logs to keep. If not set, no logs will be removed. This can be a number of files or number of days. If using days, add 'd' as the suffix. It uses auditFile to keep track of the log files in a json format. It won't delete any file not contained in it. It can be a number of files or number of days (default: null)
 * **options:** An object resembling https://nodejs.org/api/fs.html#fs_fs_createwritestream_path_options indicating additional options that should be passed to the file stream. (default: `{ flags: 'a' }`)
-* **auditFile**: A string representing the name of the name of the audit file. This can be used to override the default filename which is generated by computing a hash of the options object. (default: '.<optionsHash>.json')
+* **auditFile**: A string representing the name of the audit file. This can be used to override the default filename which is generated by computing a hash of the options object. (default: '.<optionsHash>.json')
+* **utc**: Use UTC time for date in filename. (default: false)
+* **extension**: File extension to be appended to the filename. (default: '')
+* **createSymlink**: Create a tailable symlink to the current active log file. (default: false)
+* **symlinkName**: The name of the tailable symlink. (default: 'current.log')
+* **auditHashType**: Use specified hashing algorithm for audit. (default: 'sha256')
 
 ## Usage
 ``` js
   var winston = require('winston');
   require('winston-daily-rotate-file');
 
-  var transport = new (winston.transports.DailyRotateFile)({
+  var transport = new winston.transports.DailyRotateFile({
     filename: 'application-%DATE%.log',
     datePattern: 'YYYY-MM-DD-HH',
     zippedArchive: true,
@@ -49,9 +59,72 @@ The DailyRotateFile transport can rotate files by minute, hour, day, month, year
   });
 
   logger.info('Hello World!');
+
 ```
 
-This transport emits three custom events: *new*, *rotate*, and *archive*. You can listen for the *new* custom event, which is fired when a new log file is created. The new event will pass one parameter to the callback (*newFilename*). You can listen for the *rotate* custom event, which is fired when the log file is rotated. The rotate event will pass two parameters to the callback (*oldFilename*, *newFilename*). You can also listen for the *archive* custom event, which is fired when the log file is archived. The archive event will pass one parameter to the callback (*zipFilename*).
+### ES6
+
+``` js
+import  *  as  winston  from  'winston';
+import  'winston-daily-rotate-file';
+
+
+const transport = new winston.transports.DailyRotateFile({
+  filename: 'application-%DATE%.log',
+  datePattern: 'YYYY-MM-DD-HH',
+  zippedArchive: true,
+  maxSize: '20m',
+  maxFiles: '14d'
+});
+
+transport.on('rotate', function(oldFilename, newFilename) {
+  // do something fun
+});
+
+const logger = winston.createLogger({
+  transports: [
+    transport
+  ]
+});
+
+logger.info('Hello World!');
+```
+
+### Typescript
+
+``` typescript
+
+import  *  as  winston  from  'winston';
+import  DailyRotateFile from 'winston-daily-rotate-file';
+
+const transport: DailyRotateFile = new DailyRotateFile({
+    filename: 'application-%DATE%.log',
+    datePattern: 'YYYY-MM-DD-HH',
+    zippedArchive: true,
+    maxSize: '20m',
+    maxFiles: '14d'
+  });
+
+transport.on('rotate', function(oldFilename, newFilename) {
+      // do something fun
+    });
+
+const logger = winston.createLogger({
+transports: [
+  transport
+]});
+
+logger.info('Hello World!');
+
+```
+
+
+This transport emits the following custom events:
+
+* **new**: fired when a new log file is created. This event will pass one parameter to the callback (*newFilename*).
+* **rotate**: fired when the log file is rotated. This event will pass two parameters to the callback (*oldFilename*, *newFilename*).
+* **archive**: fired when the log file is archived. This event will pass one parameter to the callback (*zipFilename*).
+* **logRemoved**: fired when a log file is removed from the file system. This event will pass one parameter to the callback (*removedFilename*).
 
 ## LICENSE
 MIT
@@ -61,7 +134,3 @@ MIT
 
 [npm-image]: https://badge.fury.io/js/winston-daily-rotate-file.svg
 [npm-url]: https://npmjs.org/package/winston-daily-rotate-file
-[travis-image]: https://travis-ci.org/winstonjs/winston-daily-rotate-file.svg?branch=master
-[travis-url]: https://travis-ci.org/winstonjs/winston-daily-rotate-file
-[daviddm-image]: https://david-dm.org/winstonjs/winston-daily-rotate-file.svg?theme=shields.io
-[daviddm-url]: https://david-dm.org/winstonjs/winston-daily-rotate-file

package/node_modules/winston-daily-rotate-file/daily-rotate-file.js

@@ -4,14 +4,11 @@ var fs = require('fs');
 var os = require('os');
 var path = require('path');
 var util = require('util');
-var semver = require('semver');
 var zlib = require('zlib');
 var hash = require('object-hash');
-var winston = require('winston');
-var compat = require('winston-compat');
 var MESSAGE = require('triple-beam').MESSAGE;
 var PassThrough = require('stream').PassThrough;
-var Transport = semver.major(winston.version) === 2 ? compat.Transport : require('winston-transport');
+var Transport = require('winston-transport');
 
 var loggerDefaults = {
     json: false,
@@ -89,7 +86,13 @@ var DailyRotateFile = function (options) {
             max_logs: options.maxFiles,
             end_stream: true,
             audit_file: options.auditFile ? options.auditFile : path.join(self.dirname, '.' + hash(options) + '-audit.json'),
-            file_options: options.options ? options.options : {flags: 'a'}
+            file_options: options.options ? options.options : {flags: 'a'},
+            utc: options.utc ? options.utc : false,
+            extension: options.extension ? options.extension : '',
+            create_symlink: options.createSymlink ? options.createSymlink : false,
+            symlink_name: options.symlinkName ? options.symlinkName : 'current.log',
+            watch_log: options.watchLog ? options.watchLog : false,
+            audit_hash_type: options.auditHashType ? options.auditHashType  : 'sha256'
         });
 
         this.logStream.on('new', function (newFile) {
@@ -100,6 +103,27 @@ var DailyRotateFile = function (options) {
             self.emit('rotate', oldFile, newFile);
         });
 
+        this.logStream.on('logRemoved', function (params) {
+            if (options.zippedArchive) {
+                var gzName = params.name + '.gz';
+                if (fs.existsSync(gzName)) {
+                    try {
+                        fs.unlinkSync(gzName);
+                    }
+                    catch (_err) {
+                        // file is there but we got an error when trying to delete,
+                        // so permissions problem or concurrency issue and another
+                        // process already deleted it we could detect the concurrency
+                        // issue by checking err.type === ENOENT or EACCESS for
+                        // permissions ... but then?
+                    }
+                    self.emit('logRemoved', gzName);
+                    return;
+                }
+            }
+            self.emit('logRemoved', params.name);
+        });
+
         if (options.zippedArchive) {
             this.logStream.on('rotate', function (oldFile) {
                 var oldFileExist = fs.existsSync(oldFile);
@@ -112,11 +136,19 @@ var DailyRotateFile = function (options) {
                 var inp = fs.createReadStream(oldFile);
                 var out = fs.createWriteStream(oldFile + '.gz');
                 inp.pipe(gzip).pipe(out).on('finish', function () {
-                    fs.unlinkSync(oldFile);
+                    if (fs.existsSync(oldFile)) {
+                        fs.unlinkSync(oldFile);
+                    }
                     self.emit('archive', oldFile + '.gz');
                 });
             });
         }
+
+        if (options.watchLog) {
+            this.logStream.on('addWatcher', (newFile) => {
+                self.emit('addWatcher', newFile);
+            })
+        }
     }
 };
 
@@ -127,29 +159,13 @@ util.inherits(DailyRotateFile, Transport);
 DailyRotateFile.prototype.name = 'dailyRotateFile';
 
 var noop = function () {};
-if (semver.major(winston.version) === 2) {
-    DailyRotateFile.prototype.log = function (level, msg, meta, callback) {
-        callback = callback || noop;
-        var options = Object.assign({}, this.options, {
-            level: level,
-            message: msg,
-            meta: meta
-        });
+DailyRotateFile.prototype.log = function (info, callback) {
+    callback = callback || noop;
 
-        var output = compat.log(options) + options.eol;
-        this.logStream.write(output);
-        callback(null, true);
-    };
-} else {
-    DailyRotateFile.prototype.normalizeQuery = compat.Transport.prototype.normalizeQuery;
-    DailyRotateFile.prototype.log = function (info, callback) {
-        callback = callback || noop;
-
-        this.logStream.write(info[MESSAGE] + this.options.eol);
-        this.emit('logged', info);
-        callback(null, true);
-    };
-}
+    this.logStream.write(info[MESSAGE] + this.options.eol);
+    this.emit('logged', info);
+    callback(null, true);
+};
 
 DailyRotateFile.prototype.close = function () {
     var self = this;
@@ -176,7 +192,28 @@ DailyRotateFile.prototype.query = function (options, callback) {
 
     var self = this;
     var results = [];
-    options = self.normalizeQuery(options);
+    options = options || {};
+
+    // limit
+    options.rows = options.rows || options.limit || 10;
+
+    // starting row offset
+    options.start = options.start || 0;
+
+    // now
+    options.until = options.until || new Date;
+    if (typeof options.until !== 'object') {
+        options.until = new Date(options.until);
+    }
+
+    // now - 24
+    options.from = options.from || (options.until - (24 * 60 * 60 * 1000));
+    if (typeof options.from !== 'object') {
+        options.from = new Date(options.from);
+    }
+
+    // 'asc' or 'desc'
+    options.order = options.order || 'desc';
 
     var logFiles = (function () {
         var fileRegex = new RegExp(self.filename.replace('%DATE%', '.*'), 'i');
@@ -277,7 +314,9 @@ DailyRotateFile.prototype.query = function (options, callback) {
                 }
 
                 var time = new Date(log.timestamp);
-                if ((options.from && time < options.from) || (options.until && time > options.until)) {
+                if ((options.from && time < options.from) ||
+                    (options.until && time > options.until) ||
+                    (options.level && options.level !== log.level)) {
                     return;
                 }
 

package/node_modules/winston-daily-rotate-file/index.d.ts

@@ -1,73 +1,120 @@
-declare module "winston-daily-rotate-file" {
-  import * as Transport from "winston-transport";
-
-  namespace DailyRotateFile {
-      interface DailyRotateFileTransportOptions extends Transport.TransportStreamOptions {
-          json?: boolean;
-          eol?: string;
-
-          /**
-           * A string representing the moment.js date format to be used for rotating. The meta characters used in this string will dictate the frequency of the file rotation. For example, if your datePattern is simply 'HH' you will end up with 24 log files that are picked up and appended to every day. (default 'YYYY-MM-DD')
-           */
-          datePattern?: string;
-
-          /**
-           * A boolean to define whether or not to gzip archived log files. (default 'false')
-           */
-          zippedArchive?: boolean;
-
-          /**
-           * Filename to be used to log to. This filename can include the %DATE% placeholder which will include the formatted datePattern at that point in the filename. (default: 'winston.log.%DATE%)
-           */
-          filename?: string;
-
-          /**
-           * The directory name to save log files to. (default: '.')
-           */
-          dirname?: string;
-
-          /**
-           * Write directly to a custom stream and bypass the rotation capabilities. (default: null)
-           */
-          stream?: NodeJS.WritableStream;
-
-          /**
-           * Maximum size of the file after which it will rotate. This can be a number of bytes, or units of kb, mb, and gb. If using the units, add 'k', 'm', or 'g' as the suffix. The units need to directly follow the number. (default: null)
-           */
-          maxSize?: string | number;
-
-          /**
-           * Maximum number of logs to keep. If not set, no logs will be removed. This can be a number of files or number of days. If using days, add 'd' as the suffix. (default: null)
-           */
-          maxFiles?: string | number;
-
-          /**
-           * An object resembling https://nodejs.org/api/fs.html#fs_fs_createwritestream_path_options indicating additional options that should be passed to the file stream. (default: `{ flags: 'a' }`)
-           */
-          options?: string | object;
-
-          /**
-           * A string representing the name of the name of the audit file. (default: './hash-audit.json' )
-           */
-          auditFile?: string
-
-          /**
-           * A string representing the frequency of rotation. (default: 'custom')
-           */
-          frequency?: string
-      }
-  }
-
-  interface DailyRotateFileTransportInstance extends Transport {
-      filename: string;
-      dirname: string;
-      logStream: NodeJS.WritableStream;
-      options: DailyRotateFile.DailyRotateFileTransportOptions;
-
-      new (options?: DailyRotateFile.DailyRotateFileTransportOptions): DailyRotateFileTransportInstance;
-  }
-
-  const DailyRotateFile: DailyRotateFileTransportInstance;
-
-  export = DailyRotateFile;
+import TransportStream = require("winston-transport");
+
+// referenced from https://stackoverflow.com/questions/40510611/typescript-interface-require-one-of-two-properties-to-exist
+type RequireOnlyOne<T, Keys extends keyof T = keyof T> =
+    Pick<T, Exclude<keyof T, Keys>>
+    & {
+        [K in Keys]-?:
+            Pick<T, K>
+            & Partial<Record<Exclude<Keys, K>, undefined>>
+    }[Keys];
+
+// merging into winston.transports
+declare module 'winston/lib/winston/transports' {
+    interface Transports {
+        DailyRotateFile: typeof DailyRotateFile;
+        DailyRotateFileTransportOptions: DailyRotateFile.DailyRotateFileTransportOptions;
+    }
 }
+
+declare namespace DailyRotateFile {
+    type DailyRotateFileTransportOptions = RequireOnlyOne<GeneralDailyRotateFileTransportOptions, 'filename' | 'stream'>;
+
+    interface GeneralDailyRotateFileTransportOptions extends TransportStream.TransportStreamOptions {
+        json?: boolean;
+        eol?: string;
+
+        /**
+         * A string representing the moment.js date format to be used for rotating. The meta characters used in this string will dictate the frequency of the file rotation. For example, if your datePattern is simply 'HH' you will end up with 24 log files that are picked up and appended to every day. (default 'YYYY-MM-DD')
+         */
+        datePattern?: string;
+
+        /**
+         * A boolean to define whether or not to gzip archived log files. (default 'false')
+         */
+        zippedArchive?: boolean;
+
+        /**
+         * Filename to be used to log to. This filename can include the %DATE% placeholder which will include the formatted datePattern at that point in the filename. (default: 'winston.log.%DATE%)
+         */
+        filename?: string;
+
+        /**
+         * The directory name to save log files to. (default: '.')
+         */
+        dirname?: string;
+
+        /**
+         * Write directly to a custom stream and bypass the rotation capabilities. (default: null)
+         */
+        stream?: NodeJS.WritableStream;
+
+        /**
+         * Maximum size of the file after which it will rotate. This can be a number of bytes, or units of kb, mb, and gb. If using the units, add 'k', 'm', or 'g' as the suffix. The units need to directly follow the number. (default: null)
+         */
+        maxSize?: string | number;
+
+        /**
+         * Maximum number of logs to keep. If not set, no logs will be removed. This can be a number of files or number of days. If using days, add 'd' as the suffix. (default: null)
+         */
+        maxFiles?: string | number;
+
+        /**
+         * An object resembling https://nodejs.org/api/fs.html#fs_fs_createwritestream_path_options indicating additional options that should be passed to the file stream. (default: `{ flags: 'a' }`)
+         */
+        options?: string | object;
+
+        /**
+         * A string representing the name of the name of the audit file. (default: './hash-audit.json')
+         */
+        auditFile?: string;
+
+        /**
+         * A string representing the frequency of rotation. (default: 'custom')
+         */
+        frequency?: string;
+
+        /**
+         * A boolean whether or not to generate file name from "datePattern" in UTC format. (default: false)
+         */
+        utc?: boolean;
+
+        /**
+         * A string representing an extension to be added to the filename, if not included in the filename property. (default: '')
+         */
+        extension?: string;
+
+        /**
+         * Create a tailable symlink to the current active log file. (default: false)
+         */
+        createSymlink?: boolean;
+
+        /**
+         * The name of the tailable symlink. (default: 'current.log')
+         */
+        symlinkName?: string;
+
+        /**
+         * Watch the current file being written to and recreate it in case of accidental deletion. (default: FALSE)
+         */
+        watchLog?: boolean;
+        
+        handleRejections?: boolean;
+
+        /**
+         * Use specified hashing algorithm for audit. (default: 'sha256')
+         */
+        auditHashType?: string;
+    }
+}
+
+declare class DailyRotateFile extends TransportStream {
+    filename: string;
+    dirname: string;
+    logStream: NodeJS.WritableStream;
+    options: DailyRotateFile.DailyRotateFileTransportOptions;
+
+    constructor(options?: DailyRotateFile.DailyRotateFileTransportOptions);
+}
+
+export = DailyRotateFile;

package/node_modules/winston-daily-rotate-file/package.json

@@ -1,16 +1,14 @@
 {
   "name": "winston-daily-rotate-file",
-  "version": "3.10.0",
+  "version": "4.7.1",
   "description": "A transport for winston which logs to a rotating file each day.",
   "main": "index.js",
   "types": "index.d.ts",
   "engines": {
-    "node": ">=6"
+    "node": ">=8"
   },
   "scripts": {
-    "test": "mocha && eslint .",
-    "preversion": "npm test",
-    "postversion": "git push && git push --tags && npm publish"
+    "test": "mocha --ignore **/*.worker.js && eslint ."
   },
   "repository": {
     "type": "git",
@@ -27,28 +25,31 @@
   "bugs": {
     "url": "https://github.com/winstonjs/winston-daily-rotate-file/issues"
   },
+  "files": [
+    "daily-rotate-file.js",
+    "index.js",
+    "index.d.ts"
+  ],
   "homepage": "https://github.com/winstonjs/winston-daily-rotate-file#readme",
   "peerDependencies": {
-    "winston": "^2 || ^3"
+    "winston": "^3"
   },
   "devDependencies": {
     "chai": "4.2.0",
-    "eslint": "^6.0.1",
-    "eslint-config-xo": "^0.26.0",
-    "mocha": "^6.1.4",
-    "moment": "^2.24.0",
-    "rimraf": "2.6.3"
+    "eslint": "^6.8.0",
+    "eslint-plugin-node": "^11.1.0",
+    "mocha": "^7.2.0",
+    "rimraf": "^3.0.2",
+    "threads": "^1.7.0"
   },
   "dependencies": {
-    "file-stream-rotator": "^0.4.1",
-    "object-hash": "^1.3.0",
-    "semver": "^6.2.0",
+    "file-stream-rotator": "^0.6.1",
+    "object-hash": "^2.0.1",
     "triple-beam": "^1.3.0",
-    "winston-compat": "^0.1.4",
-    "winston-transport": "^4.2.0"
+    "winston-transport": "^4.4.0"
   }
 
-,"_resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.10.0.tgz"
-,"_integrity": "sha512-KO8CfbI2CvdR3PaFApEH02GPXiwJ+vbkF1mCkTlvRIoXFI8EFlf1ACcuaahXTEiDEKCii6cNe95gsL4ZkbnphA=="
-,"_from": "winston-daily-rotate-file@3.10.0"
+,"_resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.7.1.tgz"
+,"_integrity": "sha512-7LGPiYGBPNyGHLn9z33i96zx/bd71pjBn9tqQzO3I4Tayv94WPmBNwKC7CO1wPHdP9uvu+Md/1nr6VSH9h0iaA=="
+,"_from": "winston-daily-rotate-file@4.7.1"
 }

package/node_modules/winston-transport/.eslintrc

@@ -1,5 +1,5 @@
 {
-  "extends": "populist",
+  "extends": "@dabh/eslint-config-populist",
   "rules": {
     "one-var": ["error", { var: "never", let: "never", const: "never" }],
     "strict": 0