TS conversion for plugin-network-instrumentation

Author: SB-priyankap

packages/plugin-network-instrumentation/package.json

@@ -37,5 +37,10 @@
   },
   "peerDependencies": {
     "@bugsnag/core": "^8.0.0"
+  },
+   "scripts": {
+    "clean": "rm -fr dist",
+    "prebuild": "npm run clean",
+    "build": "rollup --config rollup.config.mjs"
   }
 }

packages/plugin-network-instrumentation/src/lib/redact-values.ts

@@ -1,15 +1,21 @@
 /**
- * Redact values in an object based on a list of keys
+ * Redact values in an object based on a list of keys or patterns
  * @param obj - The object to redact
- * @param keys - The keys to redact
+ * @param keys - The keys or patterns to redact
  * @returns A new object with redacted values
  */
-export default function redactValues<T extends Record<string, any>>(obj: T, keys: Array<keyof T>): T {
-  const redacted: T = { ...obj }
-  for (const key of keys) {
-    if (Object.prototype.hasOwnProperty.call(redacted, key)) {
-      redacted[key] = '[REDACTED]' as any
+export default function redactValues<T extends Record<string, any>>(obj: T, keys: (string | RegExp)[]): T {
+  const redacted: Record<string, any> = { ...obj }
+  for (const key of Object.keys(redacted)) {
+    for (const pattern of keys) {
+      if (
+        (typeof pattern === 'string' && key === pattern) ||
+        (pattern instanceof RegExp && pattern.test(key))
+      ) {
+        redacted[key] = '[REDACTED]'
+        break
+      }
     }
   }
-  return redacted
+  return redacted as T
 }

packages/plugin-network-instrumentation/src/network-instrumentation.ts

@@ -34,8 +34,9 @@ const networkInstrumentation = (
     onHttpError
   } = config
 
-  // Normalize httpErrorCodes to an array
-  const normalizedStatusCodes = Array.isArray(httpErrorCodes) ? httpErrorCodes : [httpErrorCodes]
+  // Normalize httpErrorCodes to an array of {min, max} objects
+  const normalizedStatusCodes = (Array.isArray(httpErrorCodes) ? httpErrorCodes : [httpErrorCodes])
+    .map(code => typeof code === 'number' ? { min: code, max: code } : code)
 
   let restoreFunctions: Array<() => void> = []
   const plugin: Plugin = {
@@ -47,14 +48,12 @@ const networkInstrumentation = (
       // Auto-load request tracker if not present
       if (!requestTrackerPlugin) {
         try {
-          // @ts-ignore
           const { createRequestTrackerPlugin } = require('@bugsnag/request-tracker')
           const trackerPlugin = createRequestTrackerPlugin([], global)
-          // @ts-ignore
           client._loadPlugin(trackerPlugin)
           requestTrackerPlugin = client.getPlugin && client.getPlugin('requestTracker')
         } catch (error: any) {
-          client._logger?.warn?.('Failed to auto-load request tracker, using direct fetch patching:', error.message)
+          client._logger?.warn?.('Failed to auto-load request tracker, using direct fetch patching: '+ error.message)
         }
       }
 
@@ -104,12 +103,14 @@ const networkInstrumentation = (
             httpMethod: method,
             headers: startContext.headers,
             params: redactValues(requestParams, client._config.redactedKeys),
-            bodyLength: startContext.body ? startContext.body.length : undefined
+            bodyLength: startContext.body ? startContext.body.length : undefined,
+            body: undefined as string | undefined
           }
           const responseObj = {
             statusCode: endContext.status,
             headers: endContext.headers,
-            bodyLength: endContext.body ? endContext.body.length : undefined
+            bodyLength: endContext.body ? endContext.body.length : undefined,
+            body: undefined as string | undefined
           }
 
           // Call onHttpError callback if provided
@@ -142,7 +143,6 @@ const networkInstrumentation = (
             severityReason: { type: 'httpError' }
           }
 
-          // @ts-ignore
           const event: Event = client.Event.create(
             error,
             true,

packages/plugin-network-instrumentation/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "dist",
     "declarationDir": "dist/types"
   },
-  "include": ["src/**/*.ts", "src/lib/redact-values.ts"]
+  "include": ["src/**/*.ts"]
 }