@peculiar/acme-core - npm Package Compare versions

Comparing version 1.2.0 to 1.2.1

build/cjs/logger/console_logger.js

@@ -6,16 +6,28 @@ "use strict";
 class ConsoleLogger extends logger_1.Logger {
-    write(lvl, msg, ...obj) {
+    onWrite(lvl, msg, obj) {
         switch (lvl) {
-            case "debug":
-                console.debug(msg, ...obj);
+            case logger_1.LoggerLevel.debug:
+                if (obj) {
+                    console.debug(msg, obj);
+                }
+                console.debug(msg);
                 break;
-            case "warning":
-                console.warn(msg, ...obj);
+            case logger_1.LoggerLevel.warn:
+                if (obj) {
+                    console.warn(msg, obj);
+                }
+                console.warn(msg);
                 break;
-            case "error":
-                console.error(msg, ...obj);
+            case logger_1.LoggerLevel.error:
+                if (obj) {
+                    console.error(msg, obj);
+                }
+                console.error(msg);
                 break;
-            case "info":
+            case logger_1.LoggerLevel.info:
             default:
-                console.log(msg, ...obj);
+                if (obj) {
+                    console.info(msg, obj);
+                }
+                console.log(msg);
                 break;
@@ -22,0 +34,0 @@ }

build/cjs/logger/logger.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logger = exports.diLogger = void 0;
+exports.Logger = exports.diLogger = exports.LoggerLevel = void 0;
 const tslib_1 = require("tslib");
 const tsyringe_1 = require("tsyringe");
+var LoggerLevel;
+(function (LoggerLevel) {
+    LoggerLevel[LoggerLevel["error"] = 0] = "error";
+    LoggerLevel[LoggerLevel["warn"] = 1] = "warn";
+    LoggerLevel[LoggerLevel["info"] = 2] = "info";
+    LoggerLevel[LoggerLevel["debug"] = 3] = "debug";
+})(LoggerLevel = exports.LoggerLevel || (exports.LoggerLevel = {}));
 exports.diLogger = "ACME.Logger";
 let Logger = class Logger {
     constructor() {
-        this.level = "info";
+        this.level = LoggerLevel.info;
     }
-    error(msg, ...obj) {
-        if (this.checkLevel("error")) {
-            this.write("error", msg, ...obj);
-        }
+    error(msg, obj) {
+        this.write(LoggerLevel.debug, msg, obj);
     }
-    info(msg, ...obj) {
-        if (this.checkLevel("info")) {
-            this.write("info", msg, ...obj);
-        }
+    info(msg, obj) {
+        this.write(LoggerLevel.info, msg, obj);
     }
-    warn(msg, ...obj) {
-        if (this.checkLevel("warning")) {
-            this.write("warning", msg, ...obj);
-        }
+    warn(msg, obj) {
+        this.write(LoggerLevel.warn, msg, obj);
     }
-    debug(msg, ...obj) {
-        if (this.checkLevel("debug")) {
-            this.write("debug", msg, ...obj);
+    debug(msg, obj) {
+        this.write(LoggerLevel.debug, msg, obj);
+    }
+    write(lvl, msg, obj) {
+        if (this.level >= lvl) {
+            this.onWrite(lvl, msg, obj);
         }
     }
-    write(lvl, msg, ...obj) {
+    onWrite(lvl, msg, obj) {
     }
     checkLevel(lvl) {
-        switch (this.level) {
-            case "debug":
-                return lvl === "error" || lvl === "warning" || lvl === "info" || lvl === "debug";
-            case "info":
-                return lvl === "error" || lvl === "warning" || lvl === "info";
-            case "warning":
-                return lvl === "error" || lvl === "warning";
-            case "error":
-                return lvl === "error";
-            default:
-                return false;
-        }
+        return this.level >= lvl;
     }
@@ -47,0 +40,0 @@ };

build/cjs/web/content.js

@@ -11,5 +11,5 @@ "use strict";
     ContentType["problemJson"] = "application/problem+json";
-    ContentType["pkixCert"] = "application/pkix-cert";
-    ContentType["pemCertificateChain"] = "application/pem-certificate-chain";
-    ContentType["pkcs7Mime"] = "application/pkcs7-mime";
+    ContentType["pkix"] = "application/pkix-cert";
+    ContentType["pem"] = "application/pem-certificate-chain";
+    ContentType["pkcs7"] = "application/pkcs7-mime";
 })(ContentType = exports.ContentType || (exports.ContentType = {}));
@@ -22,3 +22,3 @@ class Content {
             this.content = pvtsutils_1.Convert.FromUtf8String(data);
-            this.type = ContentType.pemCertificateChain;
+            this.type = ContentType.pem;
         }
@@ -25,0 +25,0 @@ else if (data instanceof acme_error_1.AcmeError) {

build/es2015/logger/console_logger.js

@@ -1,17 +0,29 @@
-import { Logger } from "./logger";
+import { Logger, LoggerLevel } from "./logger";
 export class ConsoleLogger extends Logger {
-    write(lvl, msg, ...obj) {
+    onWrite(lvl, msg, obj) {
         switch (lvl) {
-            case "debug":
-                console.debug(msg, ...obj);
+            case LoggerLevel.debug:
+                if (obj) {
+                    console.debug(msg, obj);
+                }
+                console.debug(msg);
                 break;
-            case "warning":
-                console.warn(msg, ...obj);
+            case LoggerLevel.warn:
+                if (obj) {
+                    console.warn(msg, obj);
+                }
+                console.warn(msg);
                 break;
-            case "error":
-                console.error(msg, ...obj);
+            case LoggerLevel.error:
+                if (obj) {
+                    console.error(msg, obj);
+                }
+                console.error(msg);
                 break;
-            case "info":
+            case LoggerLevel.info:
             default:
-                console.log(msg, ...obj);
+                if (obj) {
+                    console.info(msg, obj);
+                }
+                console.log(msg);
                 break;
@@ -18,0 +30,0 @@ }

build/es2015/logger/logger.js

 import { __decorate } from "tslib";
 import { injectable, container } from "tsyringe";
+export var LoggerLevel;
+(function (LoggerLevel) {
+    LoggerLevel[LoggerLevel["error"] = 0] = "error";
+    LoggerLevel[LoggerLevel["warn"] = 1] = "warn";
+    LoggerLevel[LoggerLevel["info"] = 2] = "info";
+    LoggerLevel[LoggerLevel["debug"] = 3] = "debug";
+})(LoggerLevel || (LoggerLevel = {}));
 export const diLogger = "ACME.Logger";
 let Logger = class Logger {
     constructor() {
-        this.level = "info";
+        this.level = LoggerLevel.info;
     }
-    error(msg, ...obj) {
-        if (this.checkLevel("error")) {
-            this.write("error", msg, ...obj);
-        }
+    error(msg, obj) {
+        this.write(LoggerLevel.debug, msg, obj);
     }
-    info(msg, ...obj) {
-        if (this.checkLevel("info")) {
-            this.write("info", msg, ...obj);
-        }
+    info(msg, obj) {
+        this.write(LoggerLevel.info, msg, obj);
     }
-    warn(msg, ...obj) {
-        if (this.checkLevel("warning")) {
-            this.write("warning", msg, ...obj);
-        }
+    warn(msg, obj) {
+        this.write(LoggerLevel.warn, msg, obj);
     }
-    debug(msg, ...obj) {
-        if (this.checkLevel("debug")) {
-            this.write("debug", msg, ...obj);
+    debug(msg, obj) {
+        this.write(LoggerLevel.debug, msg, obj);
+    }
+    write(lvl, msg, obj) {
+        if (this.level >= lvl) {
+            this.onWrite(lvl, msg, obj);
         }
     }
-    write(lvl, msg, ...obj) {
+    onWrite(lvl, msg, obj) {
     }
     checkLevel(lvl) {
-        switch (this.level) {
-            case "debug":
-                return lvl === "error" || lvl === "warning" || lvl === "info" || lvl === "debug";
-            case "info":
-                return lvl === "error" || lvl === "warning" || lvl === "info";
-            case "warning":
-                return lvl === "error" || lvl === "warning";
-            case "error":
-                return lvl === "error";
-            default:
-                return false;
-        }
+        return this.level >= lvl;
     }
@@ -44,0 +37,0 @@ };

build/es2015/web/content.js

@@ -8,5 +8,5 @@ import { Convert, BufferSourceConverter } from "pvtsutils";
     ContentType["problemJson"] = "application/problem+json";
-    ContentType["pkixCert"] = "application/pkix-cert";
-    ContentType["pemCertificateChain"] = "application/pem-certificate-chain";
-    ContentType["pkcs7Mime"] = "application/pkcs7-mime";
+    ContentType["pkix"] = "application/pkix-cert";
+    ContentType["pem"] = "application/pem-certificate-chain";
+    ContentType["pkcs7"] = "application/pkcs7-mime";
 })(ContentType || (ContentType = {}));
@@ -19,3 +19,3 @@ export class Content {
             this.content = Convert.FromUtf8String(data);
-            this.type = ContentType.pemCertificateChain;
+            this.type = ContentType.pem;
         }
@@ -22,0 +22,0 @@ else if (data instanceof AcmeError) {

build/types/logger/console_logger.d.ts

@@ -1,4 +0,4 @@
-import { Logger, Level } from "./logger";
+import { Logger, LoggerData, LoggerLevel } from "./logger";
 export declare class ConsoleLogger extends Logger {
-    protected write(lvl: Level, msg: string, ...obj: any[]): void;
+    protected onWrite(lvl: LoggerLevel, msg: string, obj?: LoggerData): void;
 }

build/types/logger/logger.d.ts

 export interface ILogger {
-    level: Level;
-    error(msg: string, ...obj: any[]): void;
-    info(msg: string, ...obj: any[]): void;
-    warn(msg: string, ...obj: any[]): void;
-    debug(msg: string, ...obj: any[]): void;
+    level: LoggerLevel;
+    error(msg: string, obj?: LoggerData): void;
+    info(msg: string, obj?: LoggerData): void;
+    warn(msg: string, obj?: LoggerData): void;
+    debug(msg: string, obj?: LoggerData): void;
 }
-export declare type Level = 'debug' | 'info' | 'warning' | 'error' | undefined;
+export declare enum LoggerLevel {
+    error = 0,
+    warn = 1,
+    info = 2,
+    debug = 3
+}
+export interface LoggerData {
+    [key: string]: any;
+}
 export declare const diLogger = "ACME.Logger";
 export declare class Logger implements ILogger {
-    level: Level;
-    error(msg: string, ...obj: any[]): void;
-    info(msg: string, ...obj: any[]): void;
-    warn(msg: string, ...obj: any[]): void;
-    debug(msg: string, ...obj: any[]): void;
-    protected write(lvl: Level, msg: string, ...obj: any[]): void;
-    protected checkLevel(lvl: Level): boolean;
+    level: LoggerLevel;
+    error(msg: string, obj?: LoggerData): void;
+    info(msg: string, obj?: LoggerData): void;
+    warn(msg: string, obj?: LoggerData): void;
+    debug(msg: string, obj?: LoggerData): void;
+    write(lvl: LoggerLevel, msg: string, obj?: LoggerData): void;
+    protected onWrite(lvl: LoggerLevel, msg: string, obj?: LoggerData): void;
+    protected checkLevel(lvl: LoggerLevel): boolean;
 }

build/types/web/content.d.ts

@@ -6,5 +6,5 @@ import { AcmeError } from "../errors/acme_error";
     problemJson = "application/problem+json",
-    pkixCert = "application/pkix-cert",
-    pemCertificateChain = "application/pem-certificate-chain",
-    pkcs7Mime = "application/pkcs7-mime"
+    pkix = "application/pkix-cert",
+    pem = "application/pem-certificate-chain",
+    pkcs7 = "application/pkcs7-mime"
 }
@@ -11,0 +11,0 @@ export declare class Content {

CHANGELOG.md

@@ -6,2 +6,18 @@ # Change Log
 
+## [1.2.1](https://github.com/PeculiarVentures/acme-ts/compare/v1.2.0...v1.2.1) (2020-10-09)
+
+
+### Bug Fixes
+
+* **core:** Switch case to onWrite ([a223c37](https://github.com/PeculiarVentures/acme-ts/commit/a223c37fdbb1368be2d7cf4cd6e8350ca5430d5b))
+
+
+### Features
+
+* **core:** Added enum LoggerLevel and LoggerData ([256ad31](https://github.com/PeculiarVentures/acme-ts/commit/256ad3110a85168d235c50fe12c01f6440fd10a9))
+
+
+
+
+
 # [1.2.0](https://github.com/PeculiarVentures/acme-ts/compare/v1.1.0...v1.2.0) (2020-10-01)
@@ -8,0 +24,0 @@

package.json

 {
   "name": "@peculiar/acme-core",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Core module forAutomatic Certificate Management Environment (ACME) implementing RFC 8555",
@@ -45,9 +45,9 @@ "keywords": [
   "dependencies": {
-    "@peculiar/acme-protocol": "^1.2.0",
-    "@peculiar/asn1-cms": "^2.0.22",
-    "@peculiar/asn1-csr": "^2.0.22",
-    "@peculiar/asn1-ecc": "^2.0.1",
-    "@peculiar/asn1-pkcs9": "^2.0.22",
-    "@peculiar/asn1-rsa": "^2.0.22",
-    "@peculiar/asn1-schema": "2.0.17",
+    "@peculiar/acme-protocol": "^1.2.1",
+    "@peculiar/asn1-cms": "^2.0.23",
+    "@peculiar/asn1-csr": "^2.0.23",
+    "@peculiar/asn1-ecc": "^2.0.23",
+    "@peculiar/asn1-pkcs9": "^2.0.23",
+    "@peculiar/asn1-rsa": "^2.0.23",
+    "@peculiar/asn1-schema": "2.0.23",
     "@peculiar/jose": "^1.2.0",
@@ -58,3 +58,3 @@ "pvtsutils": "1.0.14",
   },
-  "gitHead": "96bc092472f0c0f0aca790dcf0f1c6a6cbb4b262"
+  "gitHead": "f43c83432e6063ef961c825edb9dca2e1998a073"
 }

No alert changes

Improved metrics

Total package byte prevSize

102339

increased by0.9%

Lines of code

1558

increased by1.23%

Dependency changes

• + Added@peculiar/asn1-schema@2.0.23(transitive)

• + Added@types/asn1js@0.0.2(transitive)

• - Removed@peculiar/asn1-schema@2.0.17(transitive)

• - Removed@types/asn1js@0.0.1(transitive)

• Updated@peculiar/acme-protocol@^1.2.1

• Updated@peculiar/asn1-cms@^2.0.23

• Updated@peculiar/asn1-csr@^2.0.23

• Updated@peculiar/asn1-ecc@^2.0.23

• Updated@peculiar/asn1-pkcs9@^2.0.23

• Updated@peculiar/asn1-rsa@^2.0.23

• Updated@peculiar/asn1-schema@2.0.23