@flareapp/js 1.1.0 → 1.2.1

package/.release-it.json

@@ -0,0 +1,17 @@
+{
+    "git": {
+        "commitMessage": "Release @flareapp/js v${version}",
+        "tagName": "@flareapp/js@${version}",
+        "tagAnnotation": "Release @flareapp/js v${version}"
+    },
+    "github": {
+        "release": false
+    },
+    "npm": {
+        "publish": true
+    },
+    "hooks": {
+        "before:init": ["npm run test", "npm run typescript"],
+        "after:bump": "npm run build"
+    }
+}

package/CHANGELOG.md

@@ -0,0 +1,30 @@
+# @flareapp/js
+
+## 1.2.0
+
+This is the **final v1 release**. Subsequent work ships under v2.
+
+### Added
+- Reports are now mapped to the Flare v2 wire format on egress. The mapper sits at the `Api.report()` boundary; the public API and the `beforeSubmit` hook still see the v1 `Report` shape.
+
+### Changed
+- Default `reportingUrl` now points to the new ingestion endpoint: `https://ingress.flareapp.io/v1/errors`. Consumers with allowlist firewall rules on outbound HTTP must add this host to their allowlist. Consumers passing a custom `reportingUrl` to `flare.configure({...})` are unaffected.
+- HTTP response is now treated as success on status `200`, `201`, or `204` (previously only `204`).
+- Headers updated: `Accept: application/json` and `X-Flare-Client-Version: 1` added; `X-Requested-With` removed. `X-Api-Token` and `X-Report-Browser-Extension-Errors` retained.
+- Stack frames omit the `class` field when empty (previously emitted as `""`). The field is still emitted when populated.
+
+### Fixed
+- `cookie` context collector preserves `=` characters inside cookie values (previously truncated base64-padded values at the first `=`).
+- Global error and unhandled-rejection handlers attach via `addEventListener`, so user code reassigning `window.onerror` no longer detaches Flare's handlers.
+- Non-Error rejection reasons (strings, plain objects, Symbols) now produce reports instead of being silently dropped.
+- `flatJsonStringify` decycles via a `WeakSet` of ancestor objects: real cycles become the literal `'[Circular]'`; non-cyclic shared sub-objects are preserved without recursion blowup.
+- `createStackTrace` wraps `ErrorStackParser.parse` in `try/catch`. Parser failures resolve to a single fallback frame instead of dropping the report.
+
+### Internal
+- New `mapToV2Wire(report, config)` pure function in `src/api/mapToV2Wire.ts`.
+- New `glowsToEvents(glows)` helper in `src/util/glowsToEvents.ts`.
+- `Api.report()` signature changed from `(report, url, key, reportBrowserExtensionErrors)` to `(report, config)`. This is internal — it is not part of the package's public exports.
+
+## 1.1.0
+
+Prior history is in git.

package/dist/index.d.mts

@@ -77,7 +77,7 @@ type Glow = {
 type MessageLevel = 'info' | 'debug' | 'warning' | 'error' | 'critical';
 
 declare class Api {
-    report(report: Report, url: string, key: string | null, reportBrowserExtensionErrors: boolean): Promise<void>;
+    report(report: Report, config: Config): Promise<void>;
 }
 
 declare class Flare {

package/dist/index.d.ts

@@ -77,7 +77,7 @@ type Glow = {
 type MessageLevel = 'info' | 'debug' | 'warning' | 'error' | 'critical';
 
 declare class Api {
-    report(report: Report, url: string, key: string | null, reportBrowserExtensionErrors: boolean): Promise<void>;
+    report(report: Report, config: Config): Promise<void>;
 }
 
 declare class Flare {

package/dist/index.js

@@ -28,15 +28,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   Flare: () => Flare,
   flare: () => flare
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/env/index.ts
-var CLIENT_VERSION = false ? "?" : '"1.1.0"';
+var CLIENT_VERSION = false ? "?" : "1.2.1";
 var KEY = typeof FLARE_JS_KEY === "undefined" ? "" : FLARE_JS_KEY;
 var SOURCEMAP_VERSION = typeof FLARE_SOURCEMAP_VERSION === "undefined" ? "" : FLARE_SOURCEMAP_VERSION;
 
@@ -68,22 +68,23 @@ function assertSolutionProvider(solutionProvider, debug) {
 
 // src/util/flatJsonStringify.ts
 function flatJsonStringify(json) {
-  let cache = [];
-  const flattenedStringifiedJson = JSON.stringify(json, function(_, value) {
-    if (typeof value === "object" && value !== null) {
-      if (cache.indexOf(value) !== -1) {
-        try {
-          return JSON.parse(JSON.stringify(value));
-        } catch (error) {
-          return;
-        }
-      }
-      cache.push(value);
+  const ancestors = /* @__PURE__ */ new WeakSet();
+  const path = [];
+  return JSON.stringify(json, function(_key, value) {
+    if (typeof value !== "object" || value === null) {
+      return value;
+    }
+    while (path.length > 0 && path[path.length - 1] !== this) {
+      const popped = path.pop();
+      ancestors.delete(popped);
+    }
+    if (ancestors.has(value)) {
+      return "[Circular]";
     }
+    ancestors.add(value);
+    path.push(value);
     return value;
   });
-  cache = null;
-  return flattenedStringifiedJson;
 }
 
 // src/util/flattenOnce.ts
@@ -93,29 +94,131 @@ function flattenOnce(array) {
   }, []);
 }
 
+// src/util/glowsToEvents.ts
+function glowsToEvents(glows) {
+  return glows.map((glow) => ({
+    type: "php_glow",
+    startTimeUnixNano: Math.round(glow.microtime * 1e9),
+    endTimeUnixNano: null,
+    attributes: {
+      "glow.name": String(glow.name),
+      "glow.level": glow.message_level,
+      "glow.context": glow.meta_data ?? {}
+    }
+  }));
+}
+
 // src/util/now.ts
 function now() {
   return Math.round(Date.now() / 1e3);
 }
 
+// src/api/mapToV2Wire.ts
+var KNOWN_CONTEXT_BUCKETS = /* @__PURE__ */ new Set(["request", "request_data", "cookies", "context"]);
+var NON_APPLICATION_FRAME_PATTERN = /node_modules|vendor|chunk-/;
+function mapToV2Wire(report, config) {
+  const wire = {
+    seenAtUnixNano: Math.round(report.seen_at * 1e9),
+    stacktrace: report.stacktrace.map(mapStackFrame),
+    events: glowsToEvents(report.glows),
+    attributes: buildAttributes(report, config)
+  };
+  if (report.exception_class) {
+    wire.exceptionClass = report.exception_class;
+  }
+  if (report.message != null) {
+    wire.message = report.message;
+  }
+  if (report.sourcemap_version_id) {
+    wire.sourcemapVersionId = report.sourcemap_version_id;
+  }
+  return wire;
+}
+function mapStackFrame(frame) {
+  const out = {
+    file: frame.file,
+    lineNumber: frame.line_number,
+    isApplicationFrame: !NON_APPLICATION_FRAME_PATTERN.test(frame.file)
+  };
+  if (frame.column_number != null) {
+    out.columnNumber = frame.column_number;
+  }
+  if (frame.method) {
+    out.method = frame.method;
+  }
+  if (frame.class) {
+    out.class = frame.class;
+  }
+  if (frame.code_snippet) {
+    out.codeSnippet = frame.code_snippet;
+  }
+  return out;
+}
+function buildAttributes(report, config) {
+  const attrs = {
+    "telemetry.sdk.language": "javascript",
+    "telemetry.sdk.name": "@flareapp/js",
+    "telemetry.sdk.version": CLIENT_VERSION,
+    "flare.language.name": "javascript",
+    "flare.entry_point.type": "web"
+  };
+  if (typeof window !== "undefined" && window.location && window.location.href) {
+    attrs["flare.entry_point.value"] = window.location.href;
+  }
+  if (config.stage) {
+    attrs["service.stage"] = config.stage;
+  }
+  if (config.version) {
+    attrs["service.version"] = config.version;
+  }
+  const context = report.context ?? {};
+  if (context.request?.url) attrs["url.full"] = String(context.request.url);
+  if (context.request?.useragent) attrs["user_agent.original"] = String(context.request.useragent);
+  if (context.request?.referrer) attrs["http.request.referrer"] = String(context.request.referrer);
+  if (context.request?.readyState) attrs["document.ready_state"] = String(context.request.readyState);
+  if (context.request_data?.queryString) {
+    attrs["url.query"] = context.request_data.queryString;
+  }
+  if (context.cookies) {
+    attrs["http.request.cookies"] = context.cookies;
+  }
+  const custom = buildCustomContext(context);
+  if (Object.keys(custom).length > 0) {
+    attrs["context.custom"] = custom;
+  }
+  return attrs;
+}
+function buildCustomContext(context) {
+  const custom = {};
+  for (const key of Object.keys(context)) {
+    if (KNOWN_CONTEXT_BUCKETS.has(key)) continue;
+    custom[key] = context[key];
+  }
+  const added = context.context;
+  if (added && typeof added === "object") {
+    for (const key of Object.keys(added)) {
+      custom[key] = added[key];
+    }
+  }
+  return custom;
+}
+
 // src/api/Api.ts
 var Api = class {
-  report(report, url, key, reportBrowserExtensionErrors) {
-    return fetch(url, {
+  report(report, config) {
+    return fetch(config.reportingUrl, {
       method: "POST",
       headers: {
+        "Accept": "application/json",
         "Content-Type": "application/json",
-        "X-Api-Token": key ?? "",
-        "X-Requested-With": "XMLHttpRequest",
-        "X-Report-Browser-Extension-Errors": JSON.stringify(reportBrowserExtensionErrors)
+        "X-Api-Token": config.key ?? "",
+        "X-Report-Browser-Extension-Errors": JSON.stringify(config.reportBrowserExtensionErrors),
+        "X-Flare-Client-Version": "1"
       },
-      body: flatJsonStringify({
-        ...report,
-        key
-      })
+      body: flatJsonStringify(mapToV2Wire(report, config))
     }).then(
       (response) => {
-        if (response.status !== 204) {
+        if (response.status !== 200 && response.status !== 201 && response.status !== 204) {
           console.error(`Received response with status ${response.status} from Flare`);
         }
       },
@@ -129,16 +232,20 @@ function cookie() {
   if (!window.document.cookie) {
     return {};
   }
-  return {
-    cookies: window.document.cookie.split("; ").reduce(
-      (cookies, cookie2) => {
-        const [cookieName, cookieValue] = cookie2.split(/=/);
-        cookies[cookieName] = cookieValue;
-        return cookies;
-      },
-      {}
-    )
-  };
+  const cookies = {};
+  for (const raw of window.document.cookie.split("; ")) {
+    const eq = raw.indexOf("=");
+    if (eq === -1) {
+      continue;
+    }
+    const name = raw.slice(0, eq);
+    const value = raw.slice(eq + 1);
+    cookies[name] = value;
+  }
+  if (Object.keys(cookies).length === 0) {
+    return {};
+  }
+  return { cookies };
 }
 
 // src/context/request.ts
@@ -279,22 +386,19 @@ function createStackTrace(error, debug) {
       if (debug) {
         console.error(error);
       }
-      return resolve([
-        {
-          line_number: 0,
-          column_number: 0,
-          method: "unknown",
-          file: "unknown",
-          code_snippet: {
-            0: "Could not read from file: stacktrace missing"
-          },
-          trimmed_column_number: null,
-          class: "unknown"
-        }
-      ]);
+      return resolve([fallbackFrame("stacktrace missing")]);
+    }
+    let parsed;
+    try {
+      parsed = import_error_stack_parser.default.parse(error);
+    } catch (parseError) {
+      if (debug) {
+        console.error("Flare: failed to parse stacktrace", parseError);
+      }
+      return resolve([fallbackFrame("Could not parse stacktrace")]);
     }
     Promise.all(
-      import_error_stack_parser.default.parse(error).map((frame) => {
+      parsed.map((frame) => {
         return new Promise((resolve2) => {
           getCodeSnippet(frame.fileName, frame.lineNumber, frame.columnNumber).then((snippet) => {
             resolve2({
@@ -312,6 +416,17 @@ function createStackTrace(error, debug) {
     ).then(resolve);
   });
 }
+function fallbackFrame(message) {
+  return {
+    line_number: 0,
+    column_number: 0,
+    method: "unknown",
+    file: "unknown",
+    code_snippet: { 0: message },
+    trimmed_column_number: null,
+    class: "unknown"
+  };
+}
 function hasStack(err) {
   return !!err && (!!err.stack || !!err.stacktrace || !!err["opera#sourceloc"]) && typeof (err.stack || err.stacktrace || err["opera#sourceloc"]) === "string" && err.stack !== `${err.name}: ${err.message}`;
 }
@@ -326,7 +441,7 @@ var Flare = class {
       sourcemapVersion: SOURCEMAP_VERSION,
       stage: "",
       maxGlowsPerReport: 30,
-      reportingUrl: "https://reporting.flareapp.io/api/reports",
+      reportingUrl: "https://ingress.flareapp.io/v1/errors",
       reportBrowserExtensionErrors: false,
       debug: false,
       beforeEvaluate: (error) => error,
@@ -443,12 +558,7 @@ var Flare = class {
     if (!reportToSubmit) {
       return;
     }
-    return this.api.report(
-      reportToSubmit,
-      this.config.reportingUrl,
-      this.config.key,
-      this.config.reportBrowserExtensionErrors
-    );
+    return this.api.report(reportToSubmit, this.config);
   }
   // Deprecated, the following methods exist for backwards compatibility.
   set beforeEvaluate(beforeEvaluate) {
@@ -471,24 +581,50 @@ function catchWindowErrors() {
   if (!window || !flare2) {
     return;
   }
-  const originalOnerrorHandler = window.onerror;
-  const originalOnunhandledrejectionHandler = window.onunhandledrejection;
-  window.onerror = (_1, _2, _3, _4, error) => {
-    if (error) {
-      flare2.report(error);
+  window.addEventListener("error", (event) => {
+    if (event.error) {
+      flare2.report(event.error);
     }
-    if (typeof originalOnerrorHandler === "function") {
-      originalOnerrorHandler(_1, _2, _3, _4, error);
+  });
+  window.addEventListener("unhandledrejection", (event) => {
+    const reason = event.reason;
+    if (reason instanceof Error) {
+      flare2.report(reason);
+      return;
     }
-  };
-  window.onunhandledrejection = (error) => {
-    if (error.reason instanceof Error) {
-      flare2.report(error.reason);
+    if (hasStack2(reason)) {
+      const error = new Error(rejectionReasonToMessage(reason));
+      error.stack = reason.stack;
+      flare2.report(error);
+      return;
     }
-    if (typeof originalOnunhandledrejectionHandler === "function") {
-      originalOnunhandledrejectionHandler(error);
+    flare2.reportMessage(rejectionReasonToMessage(reason), {}, "UnhandledPromiseRejection");
+  });
+}
+function rejectionReasonToMessage(reason) {
+  if (typeof reason === "string") {
+    return reason;
+  }
+  if (reason == null) {
+    return `Unhandled promise rejection (${reason})`;
+  }
+  if (typeof reason === "object") {
+    if ("message" in reason && typeof reason.message === "string") {
+      return reason.message;
     }
-  };
+    try {
+      const json = JSON.stringify(reason);
+      if (json && json !== "{}") {
+        return `Unhandled promise rejection: ${json}`;
+      }
+    } catch {
+    }
+    return "Unhandled promise rejection with non-serializable object";
+  }
+  return `Unhandled promise rejection: ${String(reason)}`;
+}
+function hasStack2(value) {
+  return typeof value === "object" && value !== null && "stack" in value && typeof value.stack === "string";
 }
 
 // src/index.ts

package/dist/index.mjs

@@ -1,5 +1,5 @@
 // src/env/index.ts
-var CLIENT_VERSION = false ? "?" : '"1.1.0"';
+var CLIENT_VERSION = false ? "?" : "1.2.1";
 var KEY = typeof FLARE_JS_KEY === "undefined" ? "" : FLARE_JS_KEY;
 var SOURCEMAP_VERSION = typeof FLARE_SOURCEMAP_VERSION === "undefined" ? "" : FLARE_SOURCEMAP_VERSION;
 
@@ -31,22 +31,23 @@ function assertSolutionProvider(solutionProvider, debug) {
 
 // src/util/flatJsonStringify.ts
 function flatJsonStringify(json) {
-  let cache = [];
-  const flattenedStringifiedJson = JSON.stringify(json, function(_, value) {
-    if (typeof value === "object" && value !== null) {
-      if (cache.indexOf(value) !== -1) {
-        try {
-          return JSON.parse(JSON.stringify(value));
-        } catch (error) {
-          return;
-        }
-      }
-      cache.push(value);
+  const ancestors = /* @__PURE__ */ new WeakSet();
+  const path = [];
+  return JSON.stringify(json, function(_key, value) {
+    if (typeof value !== "object" || value === null) {
+      return value;
+    }
+    while (path.length > 0 && path[path.length - 1] !== this) {
+      const popped = path.pop();
+      ancestors.delete(popped);
+    }
+    if (ancestors.has(value)) {
+      return "[Circular]";
     }
+    ancestors.add(value);
+    path.push(value);
     return value;
   });
-  cache = null;
-  return flattenedStringifiedJson;
 }
 
 // src/util/flattenOnce.ts
@@ -56,29 +57,131 @@ function flattenOnce(array) {
   }, []);
 }
 
+// src/util/glowsToEvents.ts
+function glowsToEvents(glows) {
+  return glows.map((glow) => ({
+    type: "php_glow",
+    startTimeUnixNano: Math.round(glow.microtime * 1e9),
+    endTimeUnixNano: null,
+    attributes: {
+      "glow.name": String(glow.name),
+      "glow.level": glow.message_level,
+      "glow.context": glow.meta_data ?? {}
+    }
+  }));
+}
+
 // src/util/now.ts
 function now() {
   return Math.round(Date.now() / 1e3);
 }
 
+// src/api/mapToV2Wire.ts
+var KNOWN_CONTEXT_BUCKETS = /* @__PURE__ */ new Set(["request", "request_data", "cookies", "context"]);
+var NON_APPLICATION_FRAME_PATTERN = /node_modules|vendor|chunk-/;
+function mapToV2Wire(report, config) {
+  const wire = {
+    seenAtUnixNano: Math.round(report.seen_at * 1e9),
+    stacktrace: report.stacktrace.map(mapStackFrame),
+    events: glowsToEvents(report.glows),
+    attributes: buildAttributes(report, config)
+  };
+  if (report.exception_class) {
+    wire.exceptionClass = report.exception_class;
+  }
+  if (report.message != null) {
+    wire.message = report.message;
+  }
+  if (report.sourcemap_version_id) {
+    wire.sourcemapVersionId = report.sourcemap_version_id;
+  }
+  return wire;
+}
+function mapStackFrame(frame) {
+  const out = {
+    file: frame.file,
+    lineNumber: frame.line_number,
+    isApplicationFrame: !NON_APPLICATION_FRAME_PATTERN.test(frame.file)
+  };
+  if (frame.column_number != null) {
+    out.columnNumber = frame.column_number;
+  }
+  if (frame.method) {
+    out.method = frame.method;
+  }
+  if (frame.class) {
+    out.class = frame.class;
+  }
+  if (frame.code_snippet) {
+    out.codeSnippet = frame.code_snippet;
+  }
+  return out;
+}
+function buildAttributes(report, config) {
+  const attrs = {
+    "telemetry.sdk.language": "javascript",
+    "telemetry.sdk.name": "@flareapp/js",
+    "telemetry.sdk.version": CLIENT_VERSION,
+    "flare.language.name": "javascript",
+    "flare.entry_point.type": "web"
+  };
+  if (typeof window !== "undefined" && window.location && window.location.href) {
+    attrs["flare.entry_point.value"] = window.location.href;
+  }
+  if (config.stage) {
+    attrs["service.stage"] = config.stage;
+  }
+  if (config.version) {
+    attrs["service.version"] = config.version;
+  }
+  const context = report.context ?? {};
+  if (context.request?.url) attrs["url.full"] = String(context.request.url);
+  if (context.request?.useragent) attrs["user_agent.original"] = String(context.request.useragent);
+  if (context.request?.referrer) attrs["http.request.referrer"] = String(context.request.referrer);
+  if (context.request?.readyState) attrs["document.ready_state"] = String(context.request.readyState);
+  if (context.request_data?.queryString) {
+    attrs["url.query"] = context.request_data.queryString;
+  }
+  if (context.cookies) {
+    attrs["http.request.cookies"] = context.cookies;
+  }
+  const custom = buildCustomContext(context);
+  if (Object.keys(custom).length > 0) {
+    attrs["context.custom"] = custom;
+  }
+  return attrs;
+}
+function buildCustomContext(context) {
+  const custom = {};
+  for (const key of Object.keys(context)) {
+    if (KNOWN_CONTEXT_BUCKETS.has(key)) continue;
+    custom[key] = context[key];
+  }
+  const added = context.context;
+  if (added && typeof added === "object") {
+    for (const key of Object.keys(added)) {
+      custom[key] = added[key];
+    }
+  }
+  return custom;
+}
+
 // src/api/Api.ts
 var Api = class {
-  report(report, url, key, reportBrowserExtensionErrors) {
-    return fetch(url, {
+  report(report, config) {
+    return fetch(config.reportingUrl, {
       method: "POST",
       headers: {
+        "Accept": "application/json",
         "Content-Type": "application/json",
-        "X-Api-Token": key ?? "",
-        "X-Requested-With": "XMLHttpRequest",
-        "X-Report-Browser-Extension-Errors": JSON.stringify(reportBrowserExtensionErrors)
+        "X-Api-Token": config.key ?? "",
+        "X-Report-Browser-Extension-Errors": JSON.stringify(config.reportBrowserExtensionErrors),
+        "X-Flare-Client-Version": "1"
       },
-      body: flatJsonStringify({
-        ...report,
-        key
-      })
+      body: flatJsonStringify(mapToV2Wire(report, config))
     }).then(
       (response) => {
-        if (response.status !== 204) {
+        if (response.status !== 200 && response.status !== 201 && response.status !== 204) {
           console.error(`Received response with status ${response.status} from Flare`);
         }
       },
@@ -92,16 +195,20 @@ function cookie() {
   if (!window.document.cookie) {
     return {};
   }
-  return {
-    cookies: window.document.cookie.split("; ").reduce(
-      (cookies, cookie2) => {
-        const [cookieName, cookieValue] = cookie2.split(/=/);
-        cookies[cookieName] = cookieValue;
-        return cookies;
-      },
-      {}
-    )
-  };
+  const cookies = {};
+  for (const raw of window.document.cookie.split("; ")) {
+    const eq = raw.indexOf("=");
+    if (eq === -1) {
+      continue;
+    }
+    const name = raw.slice(0, eq);
+    const value = raw.slice(eq + 1);
+    cookies[name] = value;
+  }
+  if (Object.keys(cookies).length === 0) {
+    return {};
+  }
+  return { cookies };
 }
 
 // src/context/request.ts
@@ -242,22 +349,19 @@ function createStackTrace(error, debug) {
       if (debug) {
         console.error(error);
       }
-      return resolve([
-        {
-          line_number: 0,
-          column_number: 0,
-          method: "unknown",
-          file: "unknown",
-          code_snippet: {
-            0: "Could not read from file: stacktrace missing"
-          },
-          trimmed_column_number: null,
-          class: "unknown"
-        }
-      ]);
+      return resolve([fallbackFrame("stacktrace missing")]);
+    }
+    let parsed;
+    try {
+      parsed = ErrorStackParser.parse(error);
+    } catch (parseError) {
+      if (debug) {
+        console.error("Flare: failed to parse stacktrace", parseError);
+      }
+      return resolve([fallbackFrame("Could not parse stacktrace")]);
     }
     Promise.all(
-      ErrorStackParser.parse(error).map((frame) => {
+      parsed.map((frame) => {
         return new Promise((resolve2) => {
           getCodeSnippet(frame.fileName, frame.lineNumber, frame.columnNumber).then((snippet) => {
             resolve2({
@@ -275,6 +379,17 @@ function createStackTrace(error, debug) {
     ).then(resolve);
   });
 }
+function fallbackFrame(message) {
+  return {
+    line_number: 0,
+    column_number: 0,
+    method: "unknown",
+    file: "unknown",
+    code_snippet: { 0: message },
+    trimmed_column_number: null,
+    class: "unknown"
+  };
+}
 function hasStack(err) {
   return !!err && (!!err.stack || !!err.stacktrace || !!err["opera#sourceloc"]) && typeof (err.stack || err.stacktrace || err["opera#sourceloc"]) === "string" && err.stack !== `${err.name}: ${err.message}`;
 }
@@ -289,7 +404,7 @@ var Flare = class {
       sourcemapVersion: SOURCEMAP_VERSION,
       stage: "",
       maxGlowsPerReport: 30,
-      reportingUrl: "https://reporting.flareapp.io/api/reports",
+      reportingUrl: "https://ingress.flareapp.io/v1/errors",
       reportBrowserExtensionErrors: false,
       debug: false,
       beforeEvaluate: (error) => error,
@@ -406,12 +521,7 @@ var Flare = class {
     if (!reportToSubmit) {
       return;
     }
-    return this.api.report(
-      reportToSubmit,
-      this.config.reportingUrl,
-      this.config.key,
-      this.config.reportBrowserExtensionErrors
-    );
+    return this.api.report(reportToSubmit, this.config);
   }
   // Deprecated, the following methods exist for backwards compatibility.
   set beforeEvaluate(beforeEvaluate) {
@@ -434,24 +544,50 @@ function catchWindowErrors() {
   if (!window || !flare2) {
     return;
   }
-  const originalOnerrorHandler = window.onerror;
-  const originalOnunhandledrejectionHandler = window.onunhandledrejection;
-  window.onerror = (_1, _2, _3, _4, error) => {
-    if (error) {
-      flare2.report(error);
+  window.addEventListener("error", (event) => {
+    if (event.error) {
+      flare2.report(event.error);
     }
-    if (typeof originalOnerrorHandler === "function") {
-      originalOnerrorHandler(_1, _2, _3, _4, error);
+  });
+  window.addEventListener("unhandledrejection", (event) => {
+    const reason = event.reason;
+    if (reason instanceof Error) {
+      flare2.report(reason);
+      return;
     }
-  };
-  window.onunhandledrejection = (error) => {
-    if (error.reason instanceof Error) {
-      flare2.report(error.reason);
+    if (hasStack2(reason)) {
+      const error = new Error(rejectionReasonToMessage(reason));
+      error.stack = reason.stack;
+      flare2.report(error);
+      return;
     }
-    if (typeof originalOnunhandledrejectionHandler === "function") {
-      originalOnunhandledrejectionHandler(error);
+    flare2.reportMessage(rejectionReasonToMessage(reason), {}, "UnhandledPromiseRejection");
+  });
+}
+function rejectionReasonToMessage(reason) {
+  if (typeof reason === "string") {
+    return reason;
+  }
+  if (reason == null) {
+    return `Unhandled promise rejection (${reason})`;
+  }
+  if (typeof reason === "object") {
+    if ("message" in reason && typeof reason.message === "string") {
+      return reason.message;
     }
-  };
+    try {
+      const json = JSON.stringify(reason);
+      if (json && json !== "{}") {
+        return `Unhandled promise rejection: ${json}`;
+      }
+    } catch {
+    }
+    return "Unhandled promise rejection with non-serializable object";
+  }
+  return `Unhandled promise rejection: ${String(reason)}`;
+}
+function hasStack2(value) {
+  return typeof value === "object" && value !== null && "stack" in value && typeof value.stack === "string";
 }
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flareapp/js",
-    "version": "1.1.0",
+    "version": "1.2.1",
     "description": "JavaScript client for flareapp.io",
     "homepage": "https://flareapp.io",
     "bugs": {
@@ -23,14 +23,16 @@
     },
     "scripts": {
         "prepublishOnly": "npm run build",
-        "build": "tsup src/index.ts --format cjs,esm --dts --env.FLARE_JS_CLIENT_VERSION=\\\"$(node -p \"require('./package.json').version\")\\\" --clean",
+        "build": "tsup src/index.ts --format cjs,esm --dts --env.FLARE_JS_CLIENT_VERSION=$(node -p \"require('./package.json').version\") --clean",
         "test": "vitest run",
-        "typescript": "tsc"
+        "typescript": "tsc",
+        "release": "npx release-it"
     },
     "dependencies": {
         "error-stack-parser": "^2.0.2"
     },
     "devDependencies": {
+        "jsdom": "^25.0.0",
         "tsup": "^8.0.1",
         "typescript": "^5.3.3",
         "vitest": "^1.0.4"

package/src/Flare.ts

@@ -21,7 +21,7 @@ export class Flare {
         sourcemapVersion: SOURCEMAP_VERSION,
         stage: '',
         maxGlowsPerReport: 30,
-        reportingUrl: 'https://reporting.flareapp.io/api/reports',
+        reportingUrl: 'https://ingress.flareapp.io/v1/errors',
         reportBrowserExtensionErrors: false,
         debug: false,
         beforeEvaluate: (error) => error,
@@ -184,12 +184,7 @@ export class Flare {
             return;
         }
 
-        return this.api.report(
-            reportToSubmit,
-            this.config.reportingUrl,
-            this.config.key,
-            this.config.reportBrowserExtensionErrors
-        );
+        return this.api.report(reportToSubmit, this.config);
     }
 
     // Deprecated, the following methods exist for backwards compatibility.

package/src/api/Api.ts

@@ -1,23 +1,23 @@
-import { Report } from '../types';
+import { Config, Report } from '../types';
 import { flatJsonStringify } from '../util';
 
+import { mapToV2Wire } from './mapToV2Wire';
+
 export class Api {
-    report(report: Report, url: string, key: string | null, reportBrowserExtensionErrors: boolean): Promise<void> {
-        return fetch(url, {
+    report(report: Report, config: Config): Promise<void> {
+        return fetch(config.reportingUrl, {
             method: 'POST',
             headers: {
+                'Accept': 'application/json',
                 'Content-Type': 'application/json',
-                'X-Api-Token': key ?? '',
-                'X-Requested-With': 'XMLHttpRequest',
-                'X-Report-Browser-Extension-Errors': JSON.stringify(reportBrowserExtensionErrors),
+                'X-Api-Token': config.key ?? '',
+                'X-Report-Browser-Extension-Errors': JSON.stringify(config.reportBrowserExtensionErrors),
+                'X-Flare-Client-Version': '1',
             },
-            body: flatJsonStringify({
-                ...report,
-                key: key,
-            }),
+            body: flatJsonStringify(mapToV2Wire(report, config)),
         }).then(
             (response) => {
-                if (response.status !== 204) {
+                if (response.status !== 200 && response.status !== 201 && response.status !== 204) {
                     console.error(`Received response with status ${response.status} from Flare`);
                 }
             },

package/src/api/index.ts

@@ -1 +1,2 @@
 export * from './Api';
+export * from './mapToV2Wire';

package/src/api/mapToV2Wire.ts

@@ -0,0 +1,120 @@
+import { CLIENT_VERSION } from '../env';
+import { Config, Context, Report, StackFrame } from '../types';
+import { glowsToEvents } from '../util/glowsToEvents';
+
+import { V2AttributeValue, V2Attributes, V2StackFrame, V2WirePayload } from './v2WireTypes';
+
+const KNOWN_CONTEXT_BUCKETS = new Set(['request', 'request_data', 'cookies', 'context']);
+
+const NON_APPLICATION_FRAME_PATTERN = /node_modules|vendor|chunk-/;
+
+export function mapToV2Wire(report: Report, config: Config): V2WirePayload {
+    const wire: V2WirePayload = {
+        seenAtUnixNano: Math.round(report.seen_at * 1_000_000_000),
+        stacktrace: report.stacktrace.map(mapStackFrame),
+        events: glowsToEvents(report.glows),
+        attributes: buildAttributes(report, config),
+    };
+
+    if (report.exception_class) {
+        wire.exceptionClass = report.exception_class;
+    }
+    if (report.message != null) {
+        wire.message = report.message;
+    }
+    if (report.sourcemap_version_id) {
+        wire.sourcemapVersionId = report.sourcemap_version_id;
+    }
+
+    return wire;
+}
+
+function mapStackFrame(frame: StackFrame): V2StackFrame {
+    const out: V2StackFrame = {
+        file: frame.file,
+        lineNumber: frame.line_number,
+        isApplicationFrame: !NON_APPLICATION_FRAME_PATTERN.test(frame.file),
+    };
+
+    if (frame.column_number != null) {
+        out.columnNumber = frame.column_number;
+    }
+    if (frame.method) {
+        out.method = frame.method;
+    }
+    if (frame.class) {
+        out.class = frame.class;
+    }
+    if (frame.code_snippet) {
+        out.codeSnippet = frame.code_snippet;
+    }
+
+    return out;
+}
+
+function buildAttributes(report: Report, config: Config): V2Attributes {
+    const attrs: V2Attributes = {
+        'telemetry.sdk.language': 'javascript',
+        'telemetry.sdk.name': '@flareapp/js',
+        'telemetry.sdk.version': CLIENT_VERSION,
+        'flare.language.name': 'javascript',
+        'flare.entry_point.type': 'web',
+    };
+
+    if (typeof window !== 'undefined' && window.location && window.location.href) {
+        attrs['flare.entry_point.value'] = window.location.href;
+    }
+
+    if (config.stage) {
+        attrs['service.stage'] = config.stage;
+    }
+    if (config.version) {
+        attrs['service.version'] = config.version;
+    }
+
+    const context: Context = report.context ?? {};
+
+    if (context.request?.url) attrs['url.full'] = String(context.request.url);
+    if (context.request?.useragent) attrs['user_agent.original'] = String(context.request.useragent);
+    if (context.request?.referrer) attrs['http.request.referrer'] = String(context.request.referrer);
+    if (context.request?.readyState) attrs['document.ready_state'] = String(context.request.readyState);
+
+    if (context.request_data?.queryString) {
+        attrs['url.query'] = context.request_data.queryString as V2AttributeValue;
+    }
+    if (context.cookies) {
+        attrs['http.request.cookies'] = context.cookies as V2AttributeValue;
+    }
+
+    const custom = buildCustomContext(context);
+    if (Object.keys(custom).length > 0) {
+        attrs['context.custom'] = custom;
+    }
+
+    return attrs;
+}
+
+function buildCustomContext(context: Context): { [k: string]: V2AttributeValue } {
+    const custom: { [k: string]: V2AttributeValue } = {};
+
+    // Passed-context: any top-level key not in known buckets.
+    for (const key of Object.keys(context)) {
+        if (KNOWN_CONTEXT_BUCKETS.has(key)) continue;
+        custom[key] = context[key] as V2AttributeValue;
+    }
+
+    // addContext('foo', value) populates context.context.foo. Flatten its
+    // children into siblings under context.custom. We process this AFTER the
+    // passed-context loop above so that on a collision (e.g. user calls both
+    // addContext('vue', X) and flare.report(err, {vue: Y})), the addContext
+    // value wins — same outcome as the {...passed, ...this.context} merge in
+    // Flare.report's createReportFromError.
+    const added = (context as any).context;
+    if (added && typeof added === 'object') {
+        for (const key of Object.keys(added)) {
+            custom[key] = added[key] as V2AttributeValue;
+        }
+    }
+
+    return custom;
+}

package/src/api/v2WireTypes.ts

@@ -0,0 +1,39 @@
+// Internal types — NOT re-exported from packages/js/src/index.ts.
+// These describe the v2 wire shape posted to https://ingress.flareapp.io/v1/errors.
+
+export type V2AttributeValue =
+    | string
+    | number
+    | boolean
+    | null
+    | V2AttributeValue[]
+    | { [key: string]: V2AttributeValue };
+
+export type V2Attributes = Record<string, V2AttributeValue>;
+
+export type V2StackFrame = {
+    file: string;
+    lineNumber: number;
+    columnNumber?: number;
+    method?: string;
+    class?: string;
+    codeSnippet?: { [line: number]: string };
+    isApplicationFrame?: boolean;
+};
+
+export type V2SpanEvent = {
+    type: string;
+    startTimeUnixNano: number;
+    endTimeUnixNano: number | null;
+    attributes: V2Attributes;
+};
+
+export type V2WirePayload = {
+    exceptionClass?: string;
+    message?: string;
+    seenAtUnixNano: number;
+    sourcemapVersionId?: string;
+    stacktrace: V2StackFrame[];
+    events: V2SpanEvent[];
+    attributes: V2Attributes;
+};

package/src/browser/catchWindowErrors.ts

@@ -10,27 +10,63 @@ export function catchWindowErrors() {
         return;
     }
 
-    const originalOnerrorHandler = window.onerror;
-    const originalOnunhandledrejectionHandler = window.onunhandledrejection;
-
-    window.onerror = (_1, _2, _3, _4, error) => {
-        if (error) {
-            flare.report(error);
+    window.addEventListener('error', (event: ErrorEvent) => {
+        if (event.error) {
+            flare.report(event.error);
         }
+    });
 
-        if (typeof originalOnerrorHandler === 'function') {
-            originalOnerrorHandler(_1, _2, _3, _4, error);
+    window.addEventListener('unhandledrejection', (event: PromiseRejectionEvent) => {
+        const reason = event.reason;
+
+        if (reason instanceof Error) {
+            flare.report(reason);
+            return;
         }
-    };
 
-    window.onunhandledrejection = (error: PromiseRejectionEvent) => {
-        if (error.reason instanceof Error) {
-            flare.report(error.reason);
+        if (hasStack(reason)) {
+            const error = new Error(rejectionReasonToMessage(reason));
+            error.stack = (reason as { stack: string }).stack;
+            flare.report(error);
+            return;
         }
 
-        if (typeof originalOnunhandledrejectionHandler === 'function') {
-            // @ts-ignore
-            originalOnunhandledrejectionHandler(error);
+        flare.reportMessage(rejectionReasonToMessage(reason), {}, 'UnhandledPromiseRejection');
+    });
+}
+
+function rejectionReasonToMessage(reason: unknown): string {
+    if (typeof reason === 'string') {
+        return reason;
+    }
+
+    if (reason == null) {
+        return `Unhandled promise rejection (${reason})`;
+    }
+
+    if (typeof reason === 'object') {
+        if ('message' in reason && typeof (reason as Record<string, unknown>).message === 'string') {
+            return (reason as Record<string, unknown>).message as string;
         }
-    };
+
+        try {
+            const json = JSON.stringify(reason);
+            if (json && json !== '{}') {
+                return `Unhandled promise rejection: ${json}`;
+            }
+        } catch {}
+
+        return 'Unhandled promise rejection with non-serializable object';
+    }
+
+    return `Unhandled promise rejection: ${String(reason)}`;
+}
+
+function hasStack(value: unknown): boolean {
+    return (
+        typeof value === 'object' &&
+        value !== null &&
+        'stack' in value &&
+        typeof (value as Record<string, unknown>).stack === 'string'
+    );
 }

package/src/context/cookie.ts

@@ -3,15 +3,22 @@ export default function cookie() {
         return {};
     }
 
-    return {
-        cookies: window.document.cookie.split('; ').reduce(
-            (cookies, cookie) => {
-                const [cookieName, cookieValue] = cookie.split(/=/);
-                cookies[cookieName] = cookieValue;
+    const cookies: { [key: string]: string } = {};
 
-                return cookies;
-            },
-            {} as { [key: string]: string }
-        ),
-    };
+    for (const raw of window.document.cookie.split('; ')) {
+        const eq = raw.indexOf('=');
+        if (eq === -1) {
+            continue;
+        }
+
+        const name = raw.slice(0, eq);
+        const value = raw.slice(eq + 1);
+        cookies[name] = value;
+    }
+
+    if (Object.keys(cookies).length === 0) {
+        return {};
+    }
+
+    return { cookies };
 }

package/src/stacktrace/createStackTrace.ts

@@ -14,23 +14,21 @@ export function createStackTrace(error: Error, debug: boolean): Promise<Array<St
                 console.error(error);
             }
 
-            return resolve([
-                {
-                    line_number: 0,
-                    column_number: 0,
-                    method: 'unknown',
-                    file: 'unknown',
-                    code_snippet: {
-                        0: 'Could not read from file: stacktrace missing',
-                    },
-                    trimmed_column_number: null,
-                    class: 'unknown',
-                },
-            ]);
+            return resolve([fallbackFrame('stacktrace missing')]);
+        }
+
+        let parsed: ReturnType<typeof ErrorStackParser.parse>;
+        try {
+            parsed = ErrorStackParser.parse(error);
+        } catch (parseError) {
+            if (debug) {
+                console.error('Flare: failed to parse stacktrace', parseError);
+            }
+            return resolve([fallbackFrame('Could not parse stacktrace')]);
         }
 
         Promise.all(
-            ErrorStackParser.parse(error).map((frame) => {
+            parsed.map((frame) => {
                 return new Promise<StackFrame>((resolve) => {
                     getCodeSnippet(frame.fileName, frame.lineNumber, frame.columnNumber).then((snippet) => {
                         resolve({
@@ -49,6 +47,18 @@ export function createStackTrace(error: Error, debug: boolean): Promise<Array<St
     });
 }
 
+function fallbackFrame(message: string): StackFrame {
+    return {
+        line_number: 0,
+        column_number: 0,
+        method: 'unknown',
+        file: 'unknown',
+        code_snippet: { 0: message },
+        trimmed_column_number: null,
+        class: 'unknown',
+    };
+}
+
 function hasStack(err: any): boolean {
     return (
         !!err &&

package/src/util/flatJsonStringify.ts

@@ -1,22 +1,25 @@
-// https://stackoverflow.com/a/11616993/6374824
-export function flatJsonStringify(json: Object): string {
-    let cache: any = [];
+export function flatJsonStringify(json: object): string {
+    const ancestors = new WeakSet<object>();
+    const path: object[] = [];
 
-    const flattenedStringifiedJson = JSON.stringify(json, function (_, value) {
-        if (typeof value === 'object' && value !== null) {
-            if (cache.indexOf(value) !== -1) {
-                try {
-                    return JSON.parse(JSON.stringify(value));
-                } catch (error) {
-                    return;
-                }
-            }
-            cache.push(value);
+    return JSON.stringify(json, function (this: object, _key, value) {
+        if (typeof value !== 'object' || value === null) {
+            return value;
+        }
+
+        // Pop ancestors that are no longer on the path to `this`.
+        while (path.length > 0 && path[path.length - 1] !== this) {
+            const popped = path.pop()!;
+            ancestors.delete(popped);
         }
-        return value;
-    });
 
-    cache = null;
+        if (ancestors.has(value)) {
+            return '[Circular]';
+        }
+
+        ancestors.add(value);
+        path.push(value);
 
-    return flattenedStringifiedJson;
+        return value;
+    });
 }

package/src/util/glowsToEvents.ts

@@ -0,0 +1,17 @@
+import { V2AttributeValue, V2SpanEvent } from '../api/v2WireTypes';
+import { Glow } from '../types';
+
+// glow.microtime is seconds since epoch with sub-second fraction (see util/now.ts).
+// V2SpanEvent.startTimeUnixNano is unix nanoseconds.
+export function glowsToEvents(glows: Glow[]): V2SpanEvent[] {
+    return glows.map((glow) => ({
+        type: 'php_glow',
+        startTimeUnixNano: Math.round(glow.microtime * 1_000_000_000),
+        endTimeUnixNano: null,
+        attributes: {
+            'glow.name': String(glow.name),
+            'glow.level': glow.message_level,
+            'glow.context': (glow.meta_data ?? {}) as V2AttributeValue,
+        },
+    }));
+}

package/src/util/index.ts

@@ -3,4 +3,5 @@ export * from './assertKey';
 export * from './assertSolutionProvider';
 export * from './flatJsonStringify';
 export * from './flattenOnce';
+export * from './glowsToEvents';
 export * from './now';