Update Axios for security fixes.

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
+dist/
 *.sw?

dist/api-log-appender.d.ts

@@ -1,18 +0,0 @@
-import { LogMessage, LogLevel } from './log-message';
-import LogAppender from './log-appender';
-export declare class ApiLogAppender implements LogAppender {
-    readonly apiEndpoint: string;
-    authToken?: string | undefined;
-    batchSize: number;
-    minimumTimePassedInSec: number;
-    maximumTimePassedInSec: number;
-    threshold: LogLevel;
-    private http;
-    private msgBuffer;
-    private lastSent;
-    constructor(apiEndpoint: string, authToken?: string | undefined, threshold?: LogLevel);
-    appendMessage(msg: LogMessage): void;
-    private doPost;
-    private checkPost;
-}
-export default ApiLogAppender;

dist/api-log-appender.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiLogAppender = void 0;
-const axios_1 = require("axios");
-const log_message_1 = require("./log-message");
-class ApiLogAppender {
-    constructor(apiEndpoint, authToken, threshold) {
-        this.apiEndpoint = apiEndpoint;
-        this.authToken = authToken;
-        this.batchSize = 10;
-        this.minimumTimePassedInSec = 60;
-        this.maximumTimePassedInSec = 120;
-        this.threshold = log_message_1.LogLevel.ALL;
-        this.http = axios_1.default.create();
-        this.msgBuffer = [];
-        this.lastSent = 0;
-        this.checkPost = () => {
-            const now = Date.now();
-            const min = this.lastSent + this.minimumTimePassedInSec * 1000;
-            const max = this.lastSent + this.maximumTimePassedInSec * 1000;
-            if ((this.msgBuffer.length >= this.batchSize && min < now) ||
-                (this.msgBuffer.length > 0 && max < now)) {
-                this.doPost();
-            }
-            setTimeout(this.checkPost, Math.max(10000, this.minimumTimePassedInSec * 1000));
-        };
-        setTimeout(this.checkPost, 1000);
-        if (threshold) {
-            this.threshold = threshold;
-        }
-    }
-    appendMessage(msg) {
-        if (this.threshold && msg.level < this.threshold) {
-            return;
-        }
-        this.msgBuffer.push({
-            level: log_message_1.LogLevel[msg.level],
-            message: typeof msg.message === 'string'
-                ? msg.message
-                : JSON.stringify(msg.message),
-            scope: msg.scope,
-            stacktrace: msg.stacktrace,
-            timestamp: msg.timestamp.toISOString()
-        });
-    }
-    doPost() {
-        if (this.msgBuffer.length > 0 && this.authToken) {
-            this.http.post(this.apiEndpoint, this.msgBuffer, {
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${this.authToken}`
-                }
-            });
-            this.lastSent = Date.now();
-            this.msgBuffer = [];
-        }
-    }
-}
-exports.ApiLogAppender = ApiLogAppender;
-exports.default = ApiLogAppender;

dist/console-log-appender.d.ts

@@ -1,8 +0,0 @@
-import { LogMessage, LogLevel } from './log-message';
-import LogAppender from './log-appender';
-export declare class ConsoleLogAppender implements LogAppender {
-    threshold: LogLevel;
-    constructor(threshold?: LogLevel);
-    appendMessage(msg: LogMessage): void;
-}
-export default ConsoleLogAppender;

dist/console-log-appender.js

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConsoleLogAppender = void 0;
-/*tslint:disable:no-console*/
-const log_message_1 = require("./log-message");
-class ConsoleLogAppender {
-    constructor(threshold) {
-        this.threshold = log_message_1.LogLevel.ALL;
-        if (threshold) {
-            this.threshold = threshold;
-        }
-    }
-    appendMessage(msg) {
-        if (this.threshold && msg.level < this.threshold) {
-            return;
-        }
-        let logMethod = console.log;
-        switch (msg.level) {
-            case log_message_1.LogLevel.ALL:
-                logMethod = console.log;
-                break;
-            case log_message_1.LogLevel.TRACE:
-                logMethod = console.log;
-                break;
-            case log_message_1.LogLevel.DEBUG:
-                logMethod = console.debug;
-                break;
-            case log_message_1.LogLevel.LOG:
-                logMethod = console.log;
-                break;
-            case log_message_1.LogLevel.INFO:
-                logMethod = console.info;
-                break;
-            case log_message_1.LogLevel.WARN:
-                logMethod = console.warn;
-                break;
-            case log_message_1.LogLevel.ERROR:
-            case log_message_1.LogLevel.FATAL:
-                logMethod = console.trace;
-                break;
-        }
-        if (msg.error) {
-            logMethod(`[${msg.scope}]:`, msg.message, msg.error);
-        }
-        else if (msg.stacktrace) {
-            logMethod(`[${msg.scope}]:`, msg.message, msg.stacktrace);
-        }
-        else {
-            logMethod(`[${msg.scope}]:`, msg.message);
-        }
-    }
-}
-exports.ConsoleLogAppender = ConsoleLogAppender;
-exports.default = ConsoleLogAppender;

dist/index.d.ts

@@ -1,6 +0,0 @@
-export * from './log-message';
-export * from './log-appender';
-export * from './log-service';
-export * from './console-log-appender';
-export * from './api-log-appender';
-export * from './logger';

dist/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./log-message"), exports);
-__exportStar(require("./log-appender"), exports);
-__exportStar(require("./log-service"), exports);
-__exportStar(require("./console-log-appender"), exports);
-__exportStar(require("./api-log-appender"), exports);
-__exportStar(require("./logger"), exports);

dist/log-appender.d.ts

@@ -1,5 +0,0 @@
-import { LogLevel, LogMessage } from './log-message';
-export default interface LogAppender {
-    threshold: LogLevel;
-    appendMessage(message: LogMessage): void;
-}

dist/log-appender.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

dist/log-message.d.ts

@@ -1,19 +0,0 @@
-export declare enum LogLevel {
-    ALL = 0,
-    TRACE = 1,
-    DEBUG = 2,
-    LOG = 3,
-    INFO = 4,
-    WARN = 5,
-    ERROR = 6,
-    FATAL = 7
-}
-export interface LogMessage {
-    scope: string;
-    level: LogLevel;
-    message: string | object;
-    stacktrace: string;
-    error?: Error;
-    timestamp: Date;
-}
-export default LogMessage;

dist/log-message.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogLevel = void 0;
-var LogLevel;
-(function (LogLevel) {
-    LogLevel[LogLevel["ALL"] = 0] = "ALL";
-    LogLevel[LogLevel["TRACE"] = 1] = "TRACE";
-    LogLevel[LogLevel["DEBUG"] = 2] = "DEBUG";
-    LogLevel[LogLevel["LOG"] = 3] = "LOG";
-    LogLevel[LogLevel["INFO"] = 4] = "INFO";
-    LogLevel[LogLevel["WARN"] = 5] = "WARN";
-    LogLevel[LogLevel["ERROR"] = 6] = "ERROR";
-    LogLevel[LogLevel["FATAL"] = 7] = "FATAL";
-})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));

dist/log-service.d.ts

@@ -1,10 +0,0 @@
-import { LogLevel } from './log-message';
-import Logger from './logger';
-export declare class LogService {
-    private loggers;
-    get ROOT_LOGGER(): Logger;
-    constructor();
-    getLogger(name: string, threshold?: LogLevel): Logger;
-}
-export declare const logService: LogService;
-export default logService;

dist/log-service.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logService = exports.LogService = void 0;
-const log_message_1 = require("./log-message");
-const logger_1 = require("./logger");
-const ROOT_LOGGER_NAME = 'ROOT';
-class LogService {
-    constructor() {
-        this.loggers = {};
-        this.loggers[ROOT_LOGGER_NAME] = new logger_1.default(ROOT_LOGGER_NAME, undefined, log_message_1.LogLevel.ALL);
-    }
-    get ROOT_LOGGER() {
-        return this.loggers[ROOT_LOGGER_NAME];
-    }
-    getLogger(name, threshold) {
-        if (this.loggers[name]) {
-            return this.loggers[name];
-        }
-        let parentLogger;
-        const parentLoggerName = Object.keys(this.loggers)
-            .filter((n) => name.startsWith(n))
-            .reduce((acc, cur) => (acc.length > cur.length ? acc : cur), '');
-        if (parentLoggerName) {
-            parentLogger = this.loggers[parentLoggerName];
-        }
-        else {
-            parentLogger = this.ROOT_LOGGER;
-        }
-        this.loggers[name] = parentLogger.createChildLogger(name, threshold);
-        return this.loggers[name];
-    }
-}
-exports.LogService = LogService;
-exports.logService = new LogService();
-exports.default = exports.logService;

dist/logger.d.ts

@@ -1,23 +0,0 @@
-import { LogMessage, LogLevel } from './log-message';
-import LogAppender from './log-appender';
-export declare type DeferredMsg = () => string | object;
-export declare type MessageType = string | DeferredMsg | object;
-export declare class Logger {
-    readonly name: string;
-    private parentLogger?;
-    threshold?: LogLevel | undefined;
-    appenders: LogAppender[];
-    constructor(name: string, parentLogger?: Logger | undefined, threshold?: LogLevel | undefined);
-    createChildLogger(name: string, threshold?: LogLevel): Logger;
-    doLog(level: LogLevel, message: Error | MessageType, stacktrace?: string): void;
-    trace(message: Error | MessageType, stacktrace?: string): void;
-    debug(message: Error | MessageType, stacktrace?: string): void;
-    log(message: MessageType, stacktrace?: string): void;
-    info(message: MessageType, stacktrace?: string): void;
-    warn(message: MessageType, stacktrace?: string): void;
-    error(message: Error | MessageType, stacktrace?: string): void;
-    fatal(message: Error | MessageType, stacktrace?: string): void;
-    protected sendToAppenders(logMsg: LogMessage): void;
-    protected getEffectiveThreshold(): LogLevel;
-}
-export default Logger;

dist/logger.js

@@ -1,88 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logger = void 0;
-const log_message_1 = require("./log-message");
-class Logger {
-    constructor(name, parentLogger, threshold) {
-        this.name = name;
-        this.parentLogger = parentLogger;
-        this.threshold = threshold;
-        this.appenders = [];
-    }
-    createChildLogger(name, threshold) {
-        return new Logger(name, this, threshold);
-    }
-    doLog(level, message, stacktrace) {
-        if (level < this.getEffectiveThreshold()) {
-            return;
-        }
-        const logMsg = {
-            scope: this.name,
-            level,
-            message: '',
-            stacktrace: '',
-            timestamp: new Date()
-        };
-        if (message === undefined || message === null) {
-            logMsg.message = message;
-            logMsg.stacktrace = stacktrace == null ? '' : stacktrace;
-        }
-        else if (message.call !== undefined) {
-            logMsg.message = message();
-            logMsg.stacktrace = stacktrace == null ? '' : stacktrace;
-        }
-        else if (message instanceof Error) {
-            const error = message;
-            logMsg.error = error;
-            logMsg.message = `${error.name}: ${error.message}`;
-            logMsg.stacktrace = error.stack == null ? '' : error.stack;
-        }
-        else {
-            // string | object
-            logMsg.message = message;
-            logMsg.stacktrace = stacktrace == null ? '' : stacktrace;
-        }
-        this.sendToAppenders(logMsg);
-    }
-    trace(message, stacktrace) {
-        this.doLog(log_message_1.LogLevel.TRACE, message, stacktrace);
-    }
-    debug(message, stacktrace) {
-        this.doLog(log_message_1.LogLevel.DEBUG, message, stacktrace);
-    }
-    log(message, stacktrace) {
-        this.doLog(log_message_1.LogLevel.LOG, message, stacktrace);
-    }
-    info(message, stacktrace) {
-        this.doLog(log_message_1.LogLevel.INFO, message, stacktrace);
-    }
-    warn(message, stacktrace) {
-        this.doLog(log_message_1.LogLevel.WARN, message, stacktrace);
-    }
-    error(message, stacktrace) {
-        this.doLog(log_message_1.LogLevel.ERROR, message, stacktrace);
-    }
-    fatal(message, stacktrace) {
-        this.doLog(log_message_1.LogLevel.FATAL, message, stacktrace);
-    }
-    sendToAppenders(logMsg) {
-        this.appenders.forEach(app => {
-            app.appendMessage(logMsg);
-        });
-        if (this.parentLogger) {
-            this.parentLogger.sendToAppenders(logMsg);
-        }
-    }
-    getEffectiveThreshold() {
-        if (this.threshold) {
-            return this.threshold;
-        }
-        if (this.parentLogger) {
-            return this.parentLogger.getEffectiveThreshold();
-        }
-        // should never happen (root logger should always have a threshold
-        return log_message_1.LogLevel.ALL;
-    }
-}
-exports.Logger = Logger;
-exports.default = Logger;

package-lock.json

@@ -1,43 +1,122 @@
 {
-  "name": "js-log",
+  "name": "@jdbernard/logging",
-  "version": "1.0.0",
+  "version": "1.1.4",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
+  "packages": {
-    "axios": {
+    "": {
-      "version": "0.19.2",
+      "name": "@jdbernard/logging",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+      "version": "1.1.4",
-      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+      "license": "GPL-3.0",
-      "requires": {
+      "dependencies": {
-        "follow-redirects": "1.5.10"
+        "axios": "^1.4.0"
+      },
+      "devDependencies": {
+        "typescript": "^5.0.4"
       }
     },
-    "debug": {
+    "node_modules/asynckit": {
-      "version": "3.1.0",
+      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-      "requires": {
+    },
-        "ms": "2.0.0"
+    "node_modules/axios": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
+      "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
+      "dependencies": {
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
-    "follow-redirects": {
+    "node_modules/combined-stream": {
-      "version": "1.5.10",
+      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
+      "dependencies": {
-        "debug": "=3.1.0"
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "ms": {
+    "node_modules/delayed-stream": {
-      "version": "2.0.0",
+      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
     },
-    "typescript": {
+    "node_modules/follow-redirects": {
-      "version": "3.9.7",
+      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-      "dev": true
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "node_modules/typescript": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=12.20"
+      }
     }
   }
 }

package.json

@@ -1,10 +1,15 @@
 {
   "name": "@jdbernard/logging",
-  "version": "1.1.0",
+  "version": "1.1.4",
   "description": "Simple Javascript logging service.",
-  "main": "src/index.ts",
+  "main": "dist/index.js",
-  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "/dist"
+  ],
   "scripts": {
+    "build": "tsc",
+    "prepare": "npm run build",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -18,9 +23,9 @@
   "author": "Jonathan Bernard",
   "license": "GPL-3.0",
   "devDependencies": {
-    "typescript": "^3.9.7"
+    "typescript": "^5.0.4"
   },
   "dependencies": {
-    "axios": "^0.19.2"
+    "axios": "^1.4.0"
   }
 }

src/log-message.ts

@@ -9,9 +9,6 @@ export enum LogLevel {
   FATAL
 }
 
-const kv = 'WARN';
-const TEST = LogLevel[kv];
-
 export function parseLogLevel(str: string, defaultLevel = LogLevel.INFO): LogLevel {
   if (Object.prototype.hasOwnProperty.call(LogLevel, str)) {
     return LogLevel[<any>str] as unknown as LogLevel;

tsconfig.json

@@ -4,7 +4,8 @@
     "target": "es6",
     "declaration": true,
     "outDir": "./dist",
-    "strict": true
+    "strict": true,
+    "skipLibCheck": true
   },
   "include": [
     "src/**/*"