@devmoods/sentry 0.5.1 → 0.6.0

package/coverage/sorter.js

@@ -1,210 +1,205 @@
 /* eslint-disable */
-var addSorting = (function() {
-    'use strict';
-    var cols,
-        currentSort = {
-            index: 0,
-            desc: false
-        };
+var addSorting = (function () {
+  "use strict";
+  var cols,
+    currentSort = {
+      index: 0,
+      desc: false,
+    };
 
-    // returns the summary table element
-    function getTable() {
-        return document.querySelector('.coverage-summary');
-    }
-    // returns the thead element of the summary table
-    function getTableHeader() {
-        return getTable().querySelector('thead tr');
-    }
-    // returns the tbody element of the summary table
-    function getTableBody() {
-        return getTable().querySelector('tbody');
-    }
-    // returns the th element for nth column
-    function getNthColumn(n) {
-        return getTableHeader().querySelectorAll('th')[n];
+  // returns the summary table element
+  function getTable() {
+    return document.querySelector(".coverage-summary");
+  }
+  // returns the thead element of the summary table
+  function getTableHeader() {
+    return getTable().querySelector("thead tr");
+  }
+  // returns the tbody element of the summary table
+  function getTableBody() {
+    return getTable().querySelector("tbody");
+  }
+  // returns the th element for nth column
+  function getNthColumn(n) {
+    return getTableHeader().querySelectorAll("th")[n];
+  }
+
+  function onFilterInput() {
+    const searchValue = document.getElementById("fileSearch").value;
+    const rows = document.getElementsByTagName("tbody")[0].children;
+
+    // Try to create a RegExp from the searchValue. If it fails (invalid regex),
+    // it will be treated as a plain text search
+    let searchRegex;
+    try {
+      searchRegex = new RegExp(searchValue, "i"); // 'i' for case-insensitive
+    } catch (error) {
+      searchRegex = null;
     }
 
-    function onFilterInput() {
-        const searchValue = document.getElementById('fileSearch').value;
-        const rows = document.getElementsByTagName('tbody')[0].children;
-
-        // Try to create a RegExp from the searchValue. If it fails (invalid regex),
-        // it will be treated as a plain text search
-        let searchRegex;
-        try {
-            searchRegex = new RegExp(searchValue, 'i'); // 'i' for case-insensitive
-        } catch (error) {
-            searchRegex = null;
-        }
+    for (let i = 0; i < rows.length; i++) {
+      const row = rows[i];
+      let isMatch = false;
 
-        for (let i = 0; i < rows.length; i++) {
-            const row = rows[i];
-            let isMatch = false;
-
-            if (searchRegex) {
-                // If a valid regex was created, use it for matching
-                isMatch = searchRegex.test(row.textContent);
-            } else {
-                // Otherwise, fall back to the original plain text search
-                isMatch = row.textContent
-                    .toLowerCase()
-                    .includes(searchValue.toLowerCase());
-            }
-
-            row.style.display = isMatch ? '' : 'none';
-        }
-    }
+      if (searchRegex) {
+        // If a valid regex was created, use it for matching
+        isMatch = searchRegex.test(row.textContent);
+      } else {
+        // Otherwise, fall back to the original plain text search
+        isMatch = row.textContent.toLowerCase().includes(searchValue.toLowerCase());
+      }
 
-    // loads the search box
-    function addSearchBox() {
-        var template = document.getElementById('filterTemplate');
-        var templateClone = template.content.cloneNode(true);
-        templateClone.getElementById('fileSearch').oninput = onFilterInput;
-        template.parentElement.appendChild(templateClone);
+      row.style.display = isMatch ? "" : "none";
     }
-
-    // loads all columns
-    function loadColumns() {
-        var colNodes = getTableHeader().querySelectorAll('th'),
-            colNode,
-            cols = [],
-            col,
-            i;
-
-        for (i = 0; i < colNodes.length; i += 1) {
-            colNode = colNodes[i];
-            col = {
-                key: colNode.getAttribute('data-col'),
-                sortable: !colNode.getAttribute('data-nosort'),
-                type: colNode.getAttribute('data-type') || 'string'
-            };
-            cols.push(col);
-            if (col.sortable) {
-                col.defaultDescSort = col.type === 'number';
-                colNode.innerHTML =
-                    colNode.innerHTML + '<span class="sorter"></span>';
-            }
-        }
-        return cols;
+  }
+
+  // loads the search box
+  function addSearchBox() {
+    var template = document.getElementById("filterTemplate");
+    var templateClone = template.content.cloneNode(true);
+    templateClone.getElementById("fileSearch").oninput = onFilterInput;
+    template.parentElement.appendChild(templateClone);
+  }
+
+  // loads all columns
+  function loadColumns() {
+    var colNodes = getTableHeader().querySelectorAll("th"),
+      colNode,
+      cols = [],
+      col,
+      i;
+
+    for (i = 0; i < colNodes.length; i += 1) {
+      colNode = colNodes[i];
+      col = {
+        key: colNode.getAttribute("data-col"),
+        sortable: !colNode.getAttribute("data-nosort"),
+        type: colNode.getAttribute("data-type") || "string",
+      };
+      cols.push(col);
+      if (col.sortable) {
+        col.defaultDescSort = col.type === "number";
+        colNode.innerHTML = colNode.innerHTML + '<span class="sorter"></span>';
+      }
     }
-    // attaches a data attribute to every tr element with an object
-    // of data values keyed by column name
-    function loadRowData(tableRow) {
-        var tableCols = tableRow.querySelectorAll('td'),
-            colNode,
-            col,
-            data = {},
-            i,
-            val;
-        for (i = 0; i < tableCols.length; i += 1) {
-            colNode = tableCols[i];
-            col = cols[i];
-            val = colNode.getAttribute('data-value');
-            if (col.type === 'number') {
-                val = Number(val);
-            }
-            data[col.key] = val;
-        }
-        return data;
+    return cols;
+  }
+  // attaches a data attribute to every tr element with an object
+  // of data values keyed by column name
+  function loadRowData(tableRow) {
+    var tableCols = tableRow.querySelectorAll("td"),
+      colNode,
+      col,
+      data = {},
+      i,
+      val;
+    for (i = 0; i < tableCols.length; i += 1) {
+      colNode = tableCols[i];
+      col = cols[i];
+      val = colNode.getAttribute("data-value");
+      if (col.type === "number") {
+        val = Number(val);
+      }
+      data[col.key] = val;
     }
-    // loads all row data
-    function loadData() {
-        var rows = getTableBody().querySelectorAll('tr'),
-            i;
-
-        for (i = 0; i < rows.length; i += 1) {
-            rows[i].data = loadRowData(rows[i]);
-        }
+    return data;
+  }
+  // loads all row data
+  function loadData() {
+    var rows = getTableBody().querySelectorAll("tr"),
+      i;
+
+    for (i = 0; i < rows.length; i += 1) {
+      rows[i].data = loadRowData(rows[i]);
     }
-    // sorts the table using the data for the ith column
-    function sortByIndex(index, desc) {
-        var key = cols[index].key,
-            sorter = function(a, b) {
-                a = a.data[key];
-                b = b.data[key];
-                return a < b ? -1 : a > b ? 1 : 0;
-            },
-            finalSorter = sorter,
-            tableBody = document.querySelector('.coverage-summary tbody'),
-            rowNodes = tableBody.querySelectorAll('tr'),
-            rows = [],
-            i;
-
-        if (desc) {
-            finalSorter = function(a, b) {
-                return -1 * sorter(a, b);
-            };
-        }
-
-        for (i = 0; i < rowNodes.length; i += 1) {
-            rows.push(rowNodes[i]);
-            tableBody.removeChild(rowNodes[i]);
-        }
-
-        rows.sort(finalSorter);
-
-        for (i = 0; i < rows.length; i += 1) {
-            tableBody.appendChild(rows[i]);
-        }
+  }
+  // sorts the table using the data for the ith column
+  function sortByIndex(index, desc) {
+    var key = cols[index].key,
+      sorter = function (a, b) {
+        a = a.data[key];
+        b = b.data[key];
+        return a < b ? -1 : a > b ? 1 : 0;
+      },
+      finalSorter = sorter,
+      tableBody = document.querySelector(".coverage-summary tbody"),
+      rowNodes = tableBody.querySelectorAll("tr"),
+      rows = [],
+      i;
+
+    if (desc) {
+      finalSorter = function (a, b) {
+        return -1 * sorter(a, b);
+      };
     }
-    // removes sort indicators for current column being sorted
-    function removeSortIndicators() {
-        var col = getNthColumn(currentSort.index),
-            cls = col.className;
 
-        cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, '');
-        col.className = cls;
+    for (i = 0; i < rowNodes.length; i += 1) {
+      rows.push(rowNodes[i]);
+      tableBody.removeChild(rowNodes[i]);
     }
-    // adds sort indicators for current column being sorted
-    function addSortIndicators() {
-        getNthColumn(currentSort.index).className += currentSort.desc
-            ? ' sorted-desc'
-            : ' sorted';
+
+    rows.sort(finalSorter);
+
+    for (i = 0; i < rows.length; i += 1) {
+      tableBody.appendChild(rows[i]);
     }
-    // adds event listeners for all sorter widgets
-    function enableUI() {
-        var i,
-            el,
-            ithSorter = function ithSorter(i) {
-                var col = cols[i];
-
-                return function() {
-                    var desc = col.defaultDescSort;
-
-                    if (currentSort.index === i) {
-                        desc = !currentSort.desc;
-                    }
-                    sortByIndex(i, desc);
-                    removeSortIndicators();
-                    currentSort.index = i;
-                    currentSort.desc = desc;
-                    addSortIndicators();
-                };
-            };
-        for (i = 0; i < cols.length; i += 1) {
-            if (cols[i].sortable) {
-                // add the click event handler on the th so users
-                // dont have to click on those tiny arrows
-                el = getNthColumn(i).querySelector('.sorter').parentElement;
-                if (el.addEventListener) {
-                    el.addEventListener('click', ithSorter(i));
-                } else {
-                    el.attachEvent('onclick', ithSorter(i));
-                }
-            }
+  }
+  // removes sort indicators for current column being sorted
+  function removeSortIndicators() {
+    var col = getNthColumn(currentSort.index),
+      cls = col.className;
+
+    cls = cls.replace(/ sorted$/, "").replace(/ sorted-desc$/, "");
+    col.className = cls;
+  }
+  // adds sort indicators for current column being sorted
+  function addSortIndicators() {
+    getNthColumn(currentSort.index).className += currentSort.desc ? " sorted-desc" : " sorted";
+  }
+  // adds event listeners for all sorter widgets
+  function enableUI() {
+    var i,
+      el,
+      ithSorter = function ithSorter(i) {
+        var col = cols[i];
+
+        return function () {
+          var desc = col.defaultDescSort;
+
+          if (currentSort.index === i) {
+            desc = !currentSort.desc;
+          }
+          sortByIndex(i, desc);
+          removeSortIndicators();
+          currentSort.index = i;
+          currentSort.desc = desc;
+          addSortIndicators();
+        };
+      };
+    for (i = 0; i < cols.length; i += 1) {
+      if (cols[i].sortable) {
+        // add the click event handler on the th so users
+        // dont have to click on those tiny arrows
+        el = getNthColumn(i).querySelector(".sorter").parentElement;
+        if (el.addEventListener) {
+          el.addEventListener("click", ithSorter(i));
+        } else {
+          el.attachEvent("onclick", ithSorter(i));
         }
+      }
     }
-    // adds sorting functionality to the UI
-    return function() {
-        if (!getTable()) {
-            return;
-        }
-        cols = loadColumns();
-        loadData();
-        addSearchBox();
-        addSortIndicators();
-        enableUI();
-    };
+  }
+  // adds sorting functionality to the UI
+  return function () {
+    if (!getTable()) {
+      return;
+    }
+    cols = loadColumns();
+    loadData();
+    addSearchBox();
+    addSortIndicators();
+    enableUI();
+  };
 })();
 
-window.addEventListener('load', addSorting);
+window.addEventListener("load", addSorting);

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { type LoggerAdapter, type MetricAttributes, type MetricsAdapter } from '@devmoods/observability';
 import * as Sentry from '@sentry/node';
-import { type ErrorRequestHandler } from 'express';
 declare module '@devmoods/config' {
     interface Config extends ConfigFromDefs<typeof sentryConfig> {
     }
@@ -17,7 +16,6 @@ export interface SentryOptions extends Sentry.NodeOptions {
 export declare function initSentry(options?: SentryOptions): Promise<void>;
 export declare function closeSentry(): Promise<void>;
 export declare function sentryOptions(options?: SentryOptions): Promise<SentryOptions>;
-export declare function sentryErrorHandler(options?: Sentry.NodeOptions): ErrorRequestHandler;
 /**
  * MetricsAdapter backed by `Sentry.metrics` (available in @sentry/node >=10.25.0).
  * Requires `Sentry.init()` to have been called; calls are silently dropped when

package/dist/index.js

@@ -1,7 +1,6 @@
 import { config, define, t } from '@devmoods/config';
 import {} from '@devmoods/observability';
 import * as Sentry from '@sentry/node';
-import {} from 'express';
 export const sentryConfig = define({
     SENTRY_DSN: t.string(),
     SENTRY_TRACES_SAMPLE_RATE: t.number(0.3),
@@ -48,8 +47,16 @@ export async function sentryOptions(options = {}) {
         dsn: config.SENTRY_DSN,
         tracesSampleRate: config.SENTRY_TRACES_SAMPLE_RATE,
         profileSessionSampleRate: config.SENTRY_PROFILES_SAMPLE_RATE,
-        integrations: nativeIntegrations,
-        enableLogs: true,
+        integrations: [
+            ...nativeIntegrations,
+            Sentry.expressIntegration({
+                shouldHandleError(error) {
+                    const status = getHttpStatusCode(error);
+                    return (process.env.NODE_ENV === 'production' &&
+                        (status == null || status < 400 || status >= 500));
+                },
+            }),
+        ],
         ...options,
     };
 }
@@ -64,16 +71,6 @@ function getHttpStatusCode(error) {
         ? parsed
         : undefined;
 }
-export function sentryErrorHandler(options = {}) {
-    return Sentry.expressErrorHandler({
-        shouldHandleError(error) {
-            const status = getHttpStatusCode(error);
-            return (process.env.NODE_ENV === 'production' &&
-                (status == null || status < 400 || status >= 500));
-        },
-        ...options,
-    });
-}
 /**
  * MetricsAdapter backed by `Sentry.metrics` (available in @sentry/node >=10.25.0).
  * Requires `Sentry.init()` to have been called; calls are silently dropped when

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/sentry",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@devmoods/config": "0.3.0",
-    "@devmoods/observability": "0.4.0",
-    "@sentry/node": "^10.64.0",
-    "@sentry/node-native": "^10.64.0",
-    "@sentry/profiling-node": "^10.64.0",
+    "@devmoods/observability": "0.5.0",
+    "@sentry/node": "^11.5.0",
+    "@sentry/node-native": "^11.5.0",
+    "@sentry/profiling-node": "^11.5.0",
     "express": "^4.21.2"
   },
   "peerDependencies": {
     "express": ">=4.21.2 <5.0.0"
   },
-  "gitHead": "2981e0cfae881922af5b04af07c3d3e641dece37"
+  "gitHead": "60fe0c3459c81c7d71a4423cdc66d046d166de75"
 }

package/src/__tests__/index.spec.ts

@@ -9,7 +9,11 @@ async function loadModuleWithSentryMock(initialized = true) {
     init: vi.fn(),
     close: vi.fn(),
     isInitialized: vi.fn(() => initialized),
-    expressErrorHandler: vi.fn(() => vi.fn()),
+    expressIntegration: vi.fn<
+      (options: { shouldHandleError(error: unknown): boolean }) => {
+        name: string;
+      }
+    >(() => ({ name: 'Express' })),
     captureException: vi.fn(),
     logger: {
       trace: vi.fn(),
@@ -49,7 +53,6 @@ test('sentryOptions', async () => {
   expect(options).toEqual(
     expect.objectContaining({
       dsn: 'https://example.com/sentry',
-      enableLogs: true,
       integrations: expect.any(Array),
       profileSessionSampleRate: 0.3,
       tracesSampleRate: 0.3,
@@ -59,7 +62,7 @@ test('sentryOptions', async () => {
   reset();
 });
 
-describe('sentryErrorHandler', () => {
+describe('Express integration', () => {
   beforeEach(() => {
     vi.unstubAllEnvs();
   });
@@ -67,11 +70,16 @@ describe('sentryErrorHandler', () => {
   test('ignores HTTP 40x errors in production', async () => {
     vi.stubEnv('NODE_ENV', 'production');
 
-    const { Sentry, sentryErrorHandler } = await loadModuleWithSentryMock();
+    const { Sentry, sentryOptions: getSentryOptions } =
+      await loadModuleWithSentryMock();
 
-    sentryErrorHandler();
+    const sdkOptions = await getSentryOptions();
 
-    const options = Sentry.expressErrorHandler.mock.calls[0]![0];
+    expect(sdkOptions.integrations).toContain(
+      Sentry.expressIntegration.mock.results[0]!.value,
+    );
+
+    const options = Sentry.expressIntegration.mock.calls[0]![0];
     expect(options.shouldHandleError({ status: 400 })).toEqual(false);
     expect(options.shouldHandleError({ statusCode: 401 })).toEqual(false);
     expect(options.shouldHandleError({ status_code: '403' })).toEqual(false);
@@ -83,23 +91,28 @@ describe('sentryErrorHandler', () => {
   test('handles server and unknown errors in production', async () => {
     vi.stubEnv('NODE_ENV', 'production');
 
-    const { Sentry, sentryErrorHandler } = await loadModuleWithSentryMock();
+    const { Sentry, sentryOptions: getSentryOptions } =
+      await loadModuleWithSentryMock();
 
-    sentryErrorHandler();
+    await getSentryOptions();
 
-    const options = Sentry.expressErrorHandler.mock.calls[0]![0];
+    const options = Sentry.expressIntegration.mock.calls[0]![0];
     expect(options.shouldHandleError(new Error('boom'))).toEqual(true);
     expect(options.shouldHandleError({ status: 500 })).toEqual(true);
+    expect(options.shouldHandleError({ status: 399 })).toEqual(true);
+    expect(options.shouldHandleError({ status: 'invalid' })).toEqual(true);
+    expect(options.shouldHandleError(null)).toEqual(true);
   });
 
   test('does not handle errors outside production', async () => {
     vi.stubEnv('NODE_ENV', 'test');
 
-    const { Sentry, sentryErrorHandler } = await loadModuleWithSentryMock();
+    const { Sentry, sentryOptions: getSentryOptions } =
+      await loadModuleWithSentryMock();
 
-    sentryErrorHandler();
+    await getSentryOptions();
 
-    const options = Sentry.expressErrorHandler.mock.calls[0]![0];
+    const options = Sentry.expressIntegration.mock.calls[0]![0];
     expect(options.shouldHandleError({ status: 500 })).toEqual(false);
   });
 });

package/src/index.ts

@@ -5,7 +5,6 @@ import {
   type MetricsAdapter,
 } from '@devmoods/observability';
 import * as Sentry from '@sentry/node';
-import { type ErrorRequestHandler } from 'express';
 
 declare module '@devmoods/config' {
   interface Config extends ConfigFromDefs<typeof sentryConfig> {}
@@ -71,8 +70,19 @@ export async function sentryOptions(
     dsn: config.SENTRY_DSN,
     tracesSampleRate: config.SENTRY_TRACES_SAMPLE_RATE,
     profileSessionSampleRate: config.SENTRY_PROFILES_SAMPLE_RATE,
-    integrations: nativeIntegrations,
-    enableLogs: true,
+    integrations: [
+      ...nativeIntegrations,
+      Sentry.expressIntegration({
+        shouldHandleError(error) {
+          const status = getHttpStatusCode(error);
+
+          return (
+            process.env.NODE_ENV === 'production' &&
+            (status == null || status < 400 || status >= 500)
+          );
+        },
+      }),
+    ],
     ...options,
   };
 }
@@ -101,22 +111,6 @@ function getHttpStatusCode(error: unknown) {
     : undefined;
 }
 
-export function sentryErrorHandler(
-  options: Sentry.NodeOptions = {},
-): ErrorRequestHandler {
-  return Sentry.expressErrorHandler({
-    shouldHandleError(error) {
-      const status = getHttpStatusCode(error);
-
-      return (
-        process.env.NODE_ENV === 'production' &&
-        (status == null || status < 400 || status >= 500)
-      );
-    },
-    ...options,
-  }) as unknown as ErrorRequestHandler;
-}
-
 /**
  * MetricsAdapter backed by `Sentry.metrics` (available in @sentry/node >=10.25.0).
  * Requires `Sentry.init()` to have been called; calls are silently dropped when