@ohbug/browser 2.4.1 → 2.5.0

package/dist/index.d.mts

@@ -0,0 +1,81 @@
+import { OhbugClient, OhbugConfig, OhbugBaseDetail } from '@ohbug/types';
+
+interface OhbugBrowserClient {
+    __client: OhbugClient | null;
+    setup: (config: OhbugConfig) => OhbugClient;
+}
+declare const BrowserClient: OhbugBrowserClient;
+
+interface UncaughtErrorDetail extends OhbugBaseDetail {
+    name: string;
+    filename?: string;
+    lineno?: number;
+    colno?: number;
+    stack: string;
+}
+
+interface ResourceErrorDetail extends OhbugBaseDetail {
+    src: string;
+    tagName: string;
+    id: string;
+    className: string;
+    name: string;
+    nodeType: number;
+    selector: string;
+}
+
+interface UnhandledrejectionErrorDetail extends OhbugBaseDetail {
+    name: string;
+    filename?: string;
+    lineno?: number;
+    colno?: number;
+    stack: string;
+}
+
+interface UnknownErrorDetail extends OhbugBaseDetail {
+    name: string;
+    filename?: string;
+    lineno?: number;
+    colno?: number;
+    stack: string;
+}
+
+interface AjaxErrorDetail extends OhbugBaseDetail {
+    req: {
+        url: string;
+        method: string;
+        data?: string;
+        params?: string;
+    };
+    res: {
+        response: string;
+        status: number;
+        statusText?: string;
+    };
+}
+
+interface FetchErrorDetail extends OhbugBaseDetail {
+    req: {
+        url: string;
+        method: string;
+        data?: string;
+        params?: string;
+    };
+    res: {
+        status: number;
+        statusText?: string;
+    };
+}
+
+interface WebsocketErrorDetail extends OhbugBaseDetail {
+    url: string;
+    params?: string;
+    timeStamp: number;
+    readyState: number;
+    protocol: string;
+    extensions: string;
+    binaryType: string;
+    bufferedAmount: number;
+}
+
+export { AjaxErrorDetail, FetchErrorDetail, ResourceErrorDetail, UncaughtErrorDetail, UnhandledrejectionErrorDetail, UnknownErrorDetail, WebsocketErrorDetail, BrowserClient as default };

package/dist/index.js

@@ -35,6 +35,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -58,6 +62,7 @@ var device = () => {
     const {
       language,
       userAgent,
+      // @ts-expect-error Chromium only
       connection
     } = navigator;
     ohbugDevice.language = language;
@@ -83,7 +88,7 @@ var device = () => {
 };
 
 // src/version.ts
-var version = "2.4.1";
+var version = "2.5.0";
 
 // src/extension.ts
 var import_core12 = require("@ohbug/core");
@@ -245,6 +250,7 @@ var import_utils4 = require("@ohbug/utils");
 var levels = ["log", "info", "warn", "error"];
 var consoleOriginal = Object.keys(levels).reduce(
   (acc, cur) => __spreadProps(__spreadValues({}, acc), {
+    // @ts-expect-error 修改了原生的console
     [cur]: console[cur]
   }),
   {
@@ -328,6 +334,7 @@ function resourceErrorHandler(e) {
     id: target && target.id,
     className: target && target.className,
     name: target && target.name,
+    // https://developer.mozilla.org/zh-CN/docs/Web/API/Node/nodeType
     nodeType: target && target.nodeType,
     selector
   };
@@ -490,28 +497,43 @@ function networkDispatcher(type, detail) {
 }
 
 // src/capture/network/getParams.ts
-var groupParamsByKey = (params) => [...params.entries()].reduce((acc, tuple) => {
-  const [key, val] = tuple;
-  if (acc.hasOwnProperty(key)) {
-    if (Array.isArray(acc[key])) {
-      acc[key] = [...acc[key], val];
+var groupParamsByKey = (params) => (
+  // @ts-expect-error worked
+  [...params.entries()].reduce((acc, tuple) => {
+    const [key, val] = tuple;
+    if (acc.hasOwnProperty(key)) {
+      if (Array.isArray(acc[key])) {
+        acc[key] = [...acc[key], val];
+      } else {
+        acc[key] = [acc[key], val];
+      }
     } else {
-      acc[key] = [acc[key], val];
+      acc[key] = val;
     }
-  } else {
-    acc[key] = val;
-  }
-  return acc;
-}, {});
+    return acc;
+  }, {})
+);
 function getParams(data) {
-  const location = new URL(data);
-  const url = location.origin + location.pathname;
-  const searchParams = location.search ? new URLSearchParams(location.search) : void 0;
-  const params = searchParams ? JSON.stringify(groupParamsByKey(searchParams)) : void 0;
-  return {
-    url,
-    params
-  };
+  try {
+    const location = new URL(data);
+    const url = location.origin + location.pathname;
+    const searchParams = location.search ? location.searchParams : void 0;
+    const params = searchParams ? JSON.stringify(groupParamsByKey(searchParams)) : void 0;
+    return {
+      url,
+      params
+    };
+  } catch (_) {
+    const location = data.split("?");
+    const url = location == null ? void 0 : location[0];
+    const search = location == null ? void 0 : location[1];
+    const searchParams = search ? new URLSearchParams(search) : void 0;
+    const params = searchParams ? JSON.stringify(groupParamsByKey(searchParams)) : void 0;
+    return {
+      url,
+      params
+    };
+  }
 }
 
 // src/capture/network/captureAjaxError.ts
@@ -755,17 +777,20 @@ function handleCapture() {
 // src/destroy.ts
 var import_utils18 = require("@ohbug/utils");
 var global9 = (0, import_utils18.getGlobal)();
+function destroy() {
+  removeReplaceAddEventListener();
+  removeCaptureScript();
+  removeCaptureNetwork();
+  removeCaptureAction();
+  removeCaptureConsole();
+}
 function handleDestroy() {
   var _a2;
   (_a2 = global9 == null ? void 0 : global9.addEventListener) == null ? void 0 : _a2.call(
     global9,
     "unload",
     () => {
-      removeReplaceAddEventListener();
-      removeCaptureScript();
-      removeCaptureNetwork();
-      removeCaptureAction();
-      removeCaptureConsole();
+      destroy();
     },
     true
   );
@@ -820,13 +845,13 @@ function notifier(event) {
 }
 
 // src/client.ts
-function createClient(config) {
+function createClient(config, handleDestroy2) {
   const global10 = (0, import_utils20.getGlobal)();
   const sdk = {
     platform: "ohbug-browser",
     version
   };
-  const client = new import_core13.Client({ sdk, config, device, notifier });
+  const client = new import_core13.Client({ sdk, config, device, notifier, destroy: handleDestroy2 });
   global10.__OHBUG__ = { client };
   client.use(extension);
   client.__logger.info(
@@ -841,16 +866,20 @@ var BrowserClient = {
   __client: null,
   setup(config) {
     var _a2;
+    function destroyClient() {
+      const global10 = (0, import_utils20.getGlobal)();
+      destroy();
+      BrowserClient.__client = null;
+      global10.__OHBUG__ = void 0;
+    }
     if (BrowserClient.__client) {
-      (_a2 = BrowserClient.__client.__logger) == null ? void 0 : _a2.warn("init() has been called. Ignored.");
+      (_a2 = BrowserClient.__client.__logger) == null ? void 0 : _a2.warn("setup() has been called. Ignored.");
       return BrowserClient.__client;
     }
-    BrowserClient.__client = createClient(config);
+    BrowserClient.__client = createClient(config, destroyClient);
     return BrowserClient.__client;
   }
 };
 
 // src/index.ts
 var src_default = BrowserClient;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/index.mjs

@@ -29,6 +29,7 @@ var device = () => {
     const {
       language,
       userAgent,
+      // @ts-expect-error Chromium only
       connection
     } = navigator;
     ohbugDevice.language = language;
@@ -54,7 +55,7 @@ var device = () => {
 };
 
 // src/version.ts
-var version = "2.4.1";
+var version = "2.5.0";
 
 // src/extension.ts
 import { defineExtension } from "@ohbug/core";
@@ -216,6 +217,7 @@ import { getOhbugObject as getOhbugObject3, replace as replace3 } from "@ohbug/u
 var levels = ["log", "info", "warn", "error"];
 var consoleOriginal = Object.keys(levels).reduce(
   (acc, cur) => __spreadProps(__spreadValues({}, acc), {
+    // @ts-expect-error 修改了原生的console
     [cur]: console[cur]
   }),
   {
@@ -299,6 +301,7 @@ function resourceErrorHandler(e) {
     id: target && target.id,
     className: target && target.className,
     name: target && target.name,
+    // https://developer.mozilla.org/zh-CN/docs/Web/API/Node/nodeType
     nodeType: target && target.nodeType,
     selector
   };
@@ -461,28 +464,43 @@ function networkDispatcher(type, detail) {
 }
 
 // src/capture/network/getParams.ts
-var groupParamsByKey = (params) => [...params.entries()].reduce((acc, tuple) => {
-  const [key, val] = tuple;
-  if (acc.hasOwnProperty(key)) {
-    if (Array.isArray(acc[key])) {
-      acc[key] = [...acc[key], val];
+var groupParamsByKey = (params) => (
+  // @ts-expect-error worked
+  [...params.entries()].reduce((acc, tuple) => {
+    const [key, val] = tuple;
+    if (acc.hasOwnProperty(key)) {
+      if (Array.isArray(acc[key])) {
+        acc[key] = [...acc[key], val];
+      } else {
+        acc[key] = [acc[key], val];
+      }
     } else {
-      acc[key] = [acc[key], val];
+      acc[key] = val;
     }
-  } else {
-    acc[key] = val;
-  }
-  return acc;
-}, {});
+    return acc;
+  }, {})
+);
 function getParams(data) {
-  const location = new URL(data);
-  const url = location.origin + location.pathname;
-  const searchParams = location.search ? new URLSearchParams(location.search) : void 0;
-  const params = searchParams ? JSON.stringify(groupParamsByKey(searchParams)) : void 0;
-  return {
-    url,
-    params
-  };
+  try {
+    const location = new URL(data);
+    const url = location.origin + location.pathname;
+    const searchParams = location.search ? location.searchParams : void 0;
+    const params = searchParams ? JSON.stringify(groupParamsByKey(searchParams)) : void 0;
+    return {
+      url,
+      params
+    };
+  } catch (_) {
+    const location = data.split("?");
+    const url = location == null ? void 0 : location[0];
+    const search = location == null ? void 0 : location[1];
+    const searchParams = search ? new URLSearchParams(search) : void 0;
+    const params = searchParams ? JSON.stringify(groupParamsByKey(searchParams)) : void 0;
+    return {
+      url,
+      params
+    };
+  }
 }
 
 // src/capture/network/captureAjaxError.ts
@@ -726,17 +744,20 @@ function handleCapture() {
 // src/destroy.ts
 import { getGlobal as getGlobal10 } from "@ohbug/utils";
 var global9 = getGlobal10();
+function destroy() {
+  removeReplaceAddEventListener();
+  removeCaptureScript();
+  removeCaptureNetwork();
+  removeCaptureAction();
+  removeCaptureConsole();
+}
 function handleDestroy() {
   var _a2;
   (_a2 = global9 == null ? void 0 : global9.addEventListener) == null ? void 0 : _a2.call(
     global9,
     "unload",
     () => {
-      removeReplaceAddEventListener();
-      removeCaptureScript();
-      removeCaptureNetwork();
-      removeCaptureAction();
-      removeCaptureConsole();
+      destroy();
     },
     true
   );
@@ -791,13 +812,13 @@ function notifier(event) {
 }
 
 // src/client.ts
-function createClient(config) {
+function createClient(config, handleDestroy2) {
   const global10 = getGlobal11();
   const sdk = {
     platform: "ohbug-browser",
     version
   };
-  const client = new Client({ sdk, config, device, notifier });
+  const client = new Client({ sdk, config, device, notifier, destroy: handleDestroy2 });
   global10.__OHBUG__ = { client };
   client.use(extension);
   client.__logger.info(
@@ -812,11 +833,17 @@ var BrowserClient = {
   __client: null,
   setup(config) {
     var _a2;
+    function destroyClient() {
+      const global10 = getGlobal11();
+      destroy();
+      BrowserClient.__client = null;
+      global10.__OHBUG__ = void 0;
+    }
     if (BrowserClient.__client) {
-      (_a2 = BrowserClient.__client.__logger) == null ? void 0 : _a2.warn("init() has been called. Ignored.");
+      (_a2 = BrowserClient.__client.__logger) == null ? void 0 : _a2.warn("setup() has been called. Ignored.");
       return BrowserClient.__client;
     }
-    BrowserClient.__client = createClient(config);
+    BrowserClient.__client = createClient(config, destroyClient);
     return BrowserClient.__client;
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohbug/browser",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "Ohbug SDK for browsers",
   "license": "Apache-2.0",
   "author": "chenyueban <jasonchan0527@gmail.com>",
@@ -30,10 +30,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@ohbug/core": "2.1.1",
-    "@ohbug/types": "2.1.1",
-    "@ohbug/utils": "2.0.6",
-    "error-stack-parser": "^2.1.4"
+    "error-stack-parser": "^2.1.4",
+    "@ohbug/core": "2.2.0",
+    "@ohbug/utils": "2.0.7",
+    "@ohbug/types": "2.2.0"
   },
   "scripts": {
     "build": "tsup",