@flareapp/js 2.0.0 → 2.1.0

package/dist/index.cjs

@@ -35,20 +35,20 @@ function catchWindowErrors() {
 	window.addEventListener("error", (event) => {
 		const flare = window.flare;
 		if (!flare) return;
-		if (event.error instanceof Error) Promise.resolve(flare.report(event.error)).catch(() => {});
+		if (event.error instanceof Error) flare.reportSilently(event.error);
 	});
 	window.addEventListener("unhandledrejection", (event) => {
 		const flare = window.flare;
 		if (!flare) return;
 		const reason = event.reason;
 		if (reason instanceof Error) {
-			Promise.resolve(flare.report(reason)).catch(() => {});
+			flare.reportSilently(reason);
 			return;
 		}
 		if (hasStack$1(reason)) {
 			const error = new Error(describeRejectionReason(reason));
 			error.stack = reason.stack;
-			Promise.resolve(flare.report(error)).catch(() => {});
+			flare.reportSilently(error);
 			return;
 		}
 		Promise.resolve(flare.reportUnhandledRejection(describeRejectionReason(reason))).catch(() => {});
@@ -73,7 +73,7 @@ function hasStack$1(value) {
 
 //#endregion
 //#region src/env/index.ts
-const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.0.0" : "?";
+const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.1.0" : "?";
 const KEY = typeof FLARE_JS_KEY === "undefined" ? "" : FLARE_JS_KEY;
 const SOURCEMAP_VERSION = typeof FLARE_SOURCEMAP_VERSION === "undefined" ? "" : FLARE_SOURCEMAP_VERSION;
 
@@ -84,6 +84,22 @@ function assert(value, message, debug) {
 	return !!value;
 }
 
+//#endregion
+//#region src/util/convertToError.ts
+function convertToError(error) {
+	if (error instanceof Error) return error;
+	if (typeof error === "string") return new Error(error);
+	if (typeof error === "object" && error !== null) {
+		const obj = error;
+		const message = typeof obj.message === "string" ? obj.message : String(error);
+		const converted = new Error(message);
+		if (typeof obj.stack === "string") converted.stack = obj.stack;
+		if (typeof obj.name === "string") converted.name = obj.name;
+		return converted;
+	}
+	return new Error(String(error));
+}
+
 //#endregion
 //#region src/util/assertKey.ts
 function assertKey(key, debug) {
@@ -266,6 +282,14 @@ function collectAttributes(urlDenylist) {
 	};
 }
 
+//#endregion
+//#region src/stacktrace/nativeImport.ts
+let cached = null;
+function nativeImport(specifier) {
+	if (!cached) cached = new Function("specifier", "return import(specifier)");
+	return cached(specifier);
+}
+
 //#endregion
 //#region src/stacktrace/fileReader.ts
 const cachedFiles = {};
@@ -275,7 +299,7 @@ function getCodeSnippet(url, lineNumber, columnNumber) {
 			codeSnippet: { 0: `Could not read from file: missing file URL or line number. URL: ${url} lineNumber: ${lineNumber}` },
 			trimmedColumnNumber: null
 		});
-		if (!isFetchableUrl(url)) return resolve({
+		if (!isFetchableUrl(url) && !(isNode() && isLocalFileUrl(url))) return resolve({
 			codeSnippet: { 0: `Could not read from file: unsupported URL scheme. URL: ${url}` },
 			trimmedColumnNumber: null
 		});
@@ -291,14 +315,29 @@ function getCodeSnippet(url, lineNumber, columnNumber) {
 function isFetchableUrl(url) {
 	return /^https?:\/\//i.test(url);
 }
+function isNode() {
+	return typeof process !== "undefined" && process.release?.name === "node";
+}
+function isLocalFileUrl(url) {
+	return /^file:\/\//i.test(url) || url.startsWith("/") || /^[a-z]:[\\/]/i.test(url) || url.startsWith("\\\\");
+}
 function readFile(url) {
 	if (cachedFiles[url] !== void 0) return Promise.resolve(cachedFiles[url]);
+	return (isNode() && isLocalFileUrl(url) ? readFileFromDisk(url) : readFileWithFetch(url)).then((text) => {
+		if (text !== null) cachedFiles[url] = text;
+		return text;
+	});
+}
+function readFileWithFetch(url) {
 	return fetch(url).then((response) => {
 		if (response.status !== 200) return null;
 		return response.text();
-	}).then((text) => {
-		if (text !== null) cachedFiles[url] = text;
-		return text;
+	}).catch(() => null);
+}
+function readFileFromDisk(url) {
+	return nativeImport("node:url").then(({ fileURLToPath }) => {
+		const path = /^file:\/\//i.test(url) ? fileURLToPath(url) : url;
+		return nativeImport("node:fs/promises").then(({ readFile: readFileAsync }) => readFileAsync(path, "utf-8"));
 	}).catch(() => null);
 }
 function readLinesFromFile(fileText, lineNumber, columnNumber, maxSnippetLineLength = 1e3, maxSnippetLines = 40) {
@@ -475,6 +514,7 @@ var Flare = class {
 	}
 	setFramework(framework) {
 		this.framework = framework;
+		this.addContext("framework", framework.name.toLowerCase());
 		return this;
 	}
 	async report(error, attributes = {}) {
@@ -487,6 +527,9 @@ var Flare = class {
 		if (!report) return;
 		return this.sendReport(report);
 	}
+	reportSilently(error, attributes = {}) {
+		Promise.resolve(this.report(error, attributes)).catch(() => {});
+	}
 	async reportUnhandledRejection(message, attributes = {}) {
 		if (Math.random() >= this._config.sampleRate) return;
 		const seenAtUnixNano = Date.now() * 1e6;
@@ -598,6 +641,7 @@ if (typeof window !== "undefined" && window) {
 //#endregion
 exports.DEFAULT_URL_DENYLIST = DEFAULT_URL_DENYLIST;
 exports.Flare = Flare;
+exports.convertToError = convertToError;
 exports.flare = flare;
 exports.redactFullPath = redactFullPath;
 exports.resolveDenylist = resolveDenylist;

package/dist/index.d.cts

@@ -104,6 +104,7 @@ declare class Flare {
   setSdkInfo(info: SdkInfo): Flare;
   setFramework(framework: Framework): Flare;
   report(error: Error, attributes?: Attributes): Promise<void>;
+  reportSilently(error: Error, attributes?: Attributes): void;
   reportUnhandledRejection(message: string, attributes?: Attributes): Promise<void>;
   reportMessage(message: string, level?: MessageLevel, attributes?: Attributes): Promise<void>;
   createReportFromError(error: Error, attributes?: Attributes, seenAtUnixNano?: number): Promise<Report | false>;
@@ -111,6 +112,9 @@ declare class Flare {
   sendReport(report: Report): Promise<void>;
 }
 //#endregion
+//#region src/util/convertToError.d.ts
+declare function convertToError(error: unknown): Error;
+//#endregion
 //#region src/util/redactUrl.d.ts
 declare const DEFAULT_URL_DENYLIST: RegExp;
 declare function resolveDenylist(custom?: RegExp, replaceDefault?: boolean, defaultDenylist?: RegExp): RegExp;
@@ -119,4 +123,4 @@ declare function redactFullPath(fullPath: string, denylist?: RegExp): string;
 //#region src/index.d.ts
 declare const flare: Flare;
 //#endregion
-export { type AttributeValue, type Attributes, type Config, DEFAULT_URL_DENYLIST, type EntryPointHandler, Flare, type Framework, type Glow, type MessageLevel, type OverriddenGrouping, type Report, type SdkInfo, type SpanEvent, type StackFrame, flare, redactFullPath, resolveDenylist };
+export { type AttributeValue, type Attributes, type Config, DEFAULT_URL_DENYLIST, type EntryPointHandler, Flare, type Framework, type Glow, type MessageLevel, type OverriddenGrouping, type Report, type SdkInfo, type SpanEvent, type StackFrame, convertToError, flare, redactFullPath, resolveDenylist };

package/dist/index.d.mts

@@ -104,6 +104,7 @@ declare class Flare {
   setSdkInfo(info: SdkInfo): Flare;
   setFramework(framework: Framework): Flare;
   report(error: Error, attributes?: Attributes): Promise<void>;
+  reportSilently(error: Error, attributes?: Attributes): void;
   reportUnhandledRejection(message: string, attributes?: Attributes): Promise<void>;
   reportMessage(message: string, level?: MessageLevel, attributes?: Attributes): Promise<void>;
   createReportFromError(error: Error, attributes?: Attributes, seenAtUnixNano?: number): Promise<Report | false>;
@@ -111,6 +112,9 @@ declare class Flare {
   sendReport(report: Report): Promise<void>;
 }
 //#endregion
+//#region src/util/convertToError.d.ts
+declare function convertToError(error: unknown): Error;
+//#endregion
 //#region src/util/redactUrl.d.ts
 declare const DEFAULT_URL_DENYLIST: RegExp;
 declare function resolveDenylist(custom?: RegExp, replaceDefault?: boolean, defaultDenylist?: RegExp): RegExp;
@@ -119,4 +123,4 @@ declare function redactFullPath(fullPath: string, denylist?: RegExp): string;
 //#region src/index.d.ts
 declare const flare: Flare;
 //#endregion
-export { type AttributeValue, type Attributes, type Config, DEFAULT_URL_DENYLIST, type EntryPointHandler, Flare, type Framework, type Glow, type MessageLevel, type OverriddenGrouping, type Report, type SdkInfo, type SpanEvent, type StackFrame, flare, redactFullPath, resolveDenylist };
+export { type AttributeValue, type Attributes, type Config, DEFAULT_URL_DENYLIST, type EntryPointHandler, Flare, type Framework, type Glow, type MessageLevel, type OverriddenGrouping, type Report, type SdkInfo, type SpanEvent, type StackFrame, convertToError, flare, redactFullPath, resolveDenylist };

package/dist/index.mjs

@@ -6,20 +6,20 @@ function catchWindowErrors() {
 	window.addEventListener("error", (event) => {
 		const flare = window.flare;
 		if (!flare) return;
-		if (event.error instanceof Error) Promise.resolve(flare.report(event.error)).catch(() => {});
+		if (event.error instanceof Error) flare.reportSilently(event.error);
 	});
 	window.addEventListener("unhandledrejection", (event) => {
 		const flare = window.flare;
 		if (!flare) return;
 		const reason = event.reason;
 		if (reason instanceof Error) {
-			Promise.resolve(flare.report(reason)).catch(() => {});
+			flare.reportSilently(reason);
 			return;
 		}
 		if (hasStack$1(reason)) {
 			const error = new Error(describeRejectionReason(reason));
 			error.stack = reason.stack;
-			Promise.resolve(flare.report(error)).catch(() => {});
+			flare.reportSilently(error);
 			return;
 		}
 		Promise.resolve(flare.reportUnhandledRejection(describeRejectionReason(reason))).catch(() => {});
@@ -44,7 +44,7 @@ function hasStack$1(value) {
 
 //#endregion
 //#region src/env/index.ts
-const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.0.0" : "?";
+const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.1.0" : "?";
 const KEY = typeof FLARE_JS_KEY === "undefined" ? "" : FLARE_JS_KEY;
 const SOURCEMAP_VERSION = typeof FLARE_SOURCEMAP_VERSION === "undefined" ? "" : FLARE_SOURCEMAP_VERSION;
 
@@ -55,6 +55,22 @@ function assert(value, message, debug) {
 	return !!value;
 }
 
+//#endregion
+//#region src/util/convertToError.ts
+function convertToError(error) {
+	if (error instanceof Error) return error;
+	if (typeof error === "string") return new Error(error);
+	if (typeof error === "object" && error !== null) {
+		const obj = error;
+		const message = typeof obj.message === "string" ? obj.message : String(error);
+		const converted = new Error(message);
+		if (typeof obj.stack === "string") converted.stack = obj.stack;
+		if (typeof obj.name === "string") converted.name = obj.name;
+		return converted;
+	}
+	return new Error(String(error));
+}
+
 //#endregion
 //#region src/util/assertKey.ts
 function assertKey(key, debug) {
@@ -237,6 +253,14 @@ function collectAttributes(urlDenylist) {
 	};
 }
 
+//#endregion
+//#region src/stacktrace/nativeImport.ts
+let cached = null;
+function nativeImport(specifier) {
+	if (!cached) cached = new Function("specifier", "return import(specifier)");
+	return cached(specifier);
+}
+
 //#endregion
 //#region src/stacktrace/fileReader.ts
 const cachedFiles = {};
@@ -246,7 +270,7 @@ function getCodeSnippet(url, lineNumber, columnNumber) {
 			codeSnippet: { 0: `Could not read from file: missing file URL or line number. URL: ${url} lineNumber: ${lineNumber}` },
 			trimmedColumnNumber: null
 		});
-		if (!isFetchableUrl(url)) return resolve({
+		if (!isFetchableUrl(url) && !(isNode() && isLocalFileUrl(url))) return resolve({
 			codeSnippet: { 0: `Could not read from file: unsupported URL scheme. URL: ${url}` },
 			trimmedColumnNumber: null
 		});
@@ -262,14 +286,29 @@ function getCodeSnippet(url, lineNumber, columnNumber) {
 function isFetchableUrl(url) {
 	return /^https?:\/\//i.test(url);
 }
+function isNode() {
+	return typeof process !== "undefined" && process.release?.name === "node";
+}
+function isLocalFileUrl(url) {
+	return /^file:\/\//i.test(url) || url.startsWith("/") || /^[a-z]:[\\/]/i.test(url) || url.startsWith("\\\\");
+}
 function readFile(url) {
 	if (cachedFiles[url] !== void 0) return Promise.resolve(cachedFiles[url]);
+	return (isNode() && isLocalFileUrl(url) ? readFileFromDisk(url) : readFileWithFetch(url)).then((text) => {
+		if (text !== null) cachedFiles[url] = text;
+		return text;
+	});
+}
+function readFileWithFetch(url) {
 	return fetch(url).then((response) => {
 		if (response.status !== 200) return null;
 		return response.text();
-	}).then((text) => {
-		if (text !== null) cachedFiles[url] = text;
-		return text;
+	}).catch(() => null);
+}
+function readFileFromDisk(url) {
+	return nativeImport("node:url").then(({ fileURLToPath }) => {
+		const path = /^file:\/\//i.test(url) ? fileURLToPath(url) : url;
+		return nativeImport("node:fs/promises").then(({ readFile: readFileAsync }) => readFileAsync(path, "utf-8"));
 	}).catch(() => null);
 }
 function readLinesFromFile(fileText, lineNumber, columnNumber, maxSnippetLineLength = 1e3, maxSnippetLines = 40) {
@@ -446,6 +485,7 @@ var Flare = class {
 	}
 	setFramework(framework) {
 		this.framework = framework;
+		this.addContext("framework", framework.name.toLowerCase());
 		return this;
 	}
 	async report(error, attributes = {}) {
@@ -458,6 +498,9 @@ var Flare = class {
 		if (!report) return;
 		return this.sendReport(report);
 	}
+	reportSilently(error, attributes = {}) {
+		Promise.resolve(this.report(error, attributes)).catch(() => {});
+	}
 	async reportUnhandledRejection(message, attributes = {}) {
 		if (Math.random() >= this._config.sampleRate) return;
 		const seenAtUnixNano = Date.now() * 1e6;
@@ -567,4 +610,4 @@ if (typeof window !== "undefined" && window) {
 }
 
 //#endregion
-export { DEFAULT_URL_DENYLIST, Flare, flare, redactFullPath, resolveDenylist };
+export { DEFAULT_URL_DENYLIST, Flare, convertToError, flare, redactFullPath, resolveDenylist };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flareapp/js",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "description": "JavaScript client for flareapp.io",
     "homepage": "https://flareapp.io",
     "bugs": {