@compas/stdlib - npm Package Compare versions

Comparing version 0.0.150 to 0.0.151

package.json

 {
   "name": "@compas/stdlib",
-  "version": "0.0.150",
+  "version": "0.0.151",
   "description": "All kinds of utility functions",
@@ -17,3 +17,3 @@ "main": "./index.js",
   "dependencies": {
-    "@types/node": "15.12.5",
+    "@types/node": "16.0.1",
     "dotenv": "10.0.0",
@@ -41,5 +41,5 @@ "lodash.merge": "4.6.2"
   "engines": {
-    "node": ">=15"
+    "node": ">=16"
   },
-  "gitHead": "6bbe148c5e4f643ed7db0bc22fc439091f0fc34a"
+  "gitHead": "04f772827440bd9c8a782cf109c8b147f728d204"
 }

src/events.js

 import { inspect } from "util";
+import { AppError } from "./error.js";
 import { isNil } from "./lodash.js";
@@ -34,2 +35,4 @@
 
+  const _this = this;
+
   /**  @type {Logger} */
@@ -51,12 +54,12 @@ this.log = logger;
   function calculateDuration() {
-    if (this.callStack[0]?.type !== "start") {
+    if (_this.callStack[0]?.type !== "start") {
       return;
     }
 
-    const lastIdx = this.callStack.length - 1;
-    const lastType = this.callStack[lastIdx]?.type;
+    const lastIdx = _this.callStack.length - 1;
+    const lastType = _this.callStack[lastIdx]?.type;
 
     if (lastType === "stop" || lastType === "aborted") {
-      this.callStack[0].duration =
-        this.callStack[lastIdx].time - this.callStack[0].time;
+      _this.callStack[0].duration =
+        _this.callStack[lastIdx].time - _this.callStack[0].time;
     }
@@ -66,7 +69,7 @@ }
   function print() {
-    this.log.info({
+    return {
       type: "event_callstack",
-      aborted: !!this.signal?.aborted,
-      callStack: this.callStack,
-    });
+      aborted: !!_this.signal?.aborted,
+      callStack: _this.callStack,
+    };
   }
@@ -106,3 +109,6 @@
     event.calculateDuration();
-    throw new TimeoutError(event);
+    throw AppError.serverError({
+      message: "Operation aborted",
+      event: getEventRoot(event).toJSON(),
+    });
   }
@@ -138,3 +144,6 @@
     });
-    throw new TimeoutError(event);
+    throw AppError.serverError({
+      message: "Operation aborted",
+      event: getEventRoot(event).toJSON(),
+    });
   }
@@ -174,3 +183,6 @@
     event.calculateDuration();
-    throw new TimeoutError(event);
+    throw AppError.serverError({
+      message: "Operation aborted",
+      event: getEventRoot(event).toJSON(),
+    });
   }
@@ -196,6 +208,3 @@ }
   if (isNil(event.root)) {
-    event.log.info({
-      type: "event_callstack",
-      callStack: event.callStack,
-    });
+    event.log.info(event);
   }
@@ -205,52 +214,8 @@ }
 /**
- * Timeout error, shaped like an @compas/stdlib AppError
- *
- * @since 0.1.0
- * @class
+ * Get the root event from the provided event
+ * @param {InsightEvent} event
+ * @returns {InsightEvent}
  */
-export class TimeoutError extends Error {
-  /**
-   *
-   * @param {InsightEvent} event
-   */
-  constructor(event) {
-    super();
-
-    const getEventRoot = (event) =>
-      isNil(event.parent) ? event : getEventRoot(event.parent);
-
-    this.key = "error.server.internal";
-    this.status = 500;
-    this.info = {
-      message: "Operation aborted",
-      rootEvent: getEventRoot(event),
-    };
-
-    Object.setPrototypeOf(this, TimeoutError.prototype);
-  }
-
-  /**
-   * Format as object when the TimeoutError is passed to console.log / console.error.
-   * This works because it uses `util.inspect` under the hood.
-   * Util#inspect checks if the Symbol `util.inspect.custom` is available.
-   */
-  [inspect.custom]() {
-    return {
-      key: this.key,
-      status: this.status,
-      info: this.info,
-    };
-  }
-
-  /**
-   * Format as object when the TimeoutError is passed to JSON.stringify().
-   * This is used in the compas insight logger in production mode.
-   */
-  toJSON() {
-    return {
-      key: this.key,
-      status: this.status,
-      info: this.info,
-    };
-  }
+function getEventRoot(event) {
+  return isNil(event.parent) ? event : getEventRoot(event.parent);
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

53040

decreased by-1.32%

Lines of code

1802

decreased by-1.69%

Dependency changes

• + Added@types/node@16.0.1(transitive)

• - Removed@types/node@15.12.5(transitive)

• Updated@types/node@16.0.1