@openfin/core 46.100.64 → 46.100.65

package/out/mock-alpha.d.ts

@@ -2166,6 +2166,15 @@ declare type ByType_8<Type extends EventType_8> = Payload_10<Type>;
  */
 declare type ByType_9<Type extends EventType_9> = Payload_11<Type>;
 
+/** Minimal V8 CallSite shape — js-adapter does not include @types/node. */
+declare interface CallSite {
+    getFileName(): string | null;
+    toString(): string;
+}
+
+/** V8 CallSite objects, or native stack-frame strings from browsers that ignore Error.prepareStackTrace. */
+declare type CapturedStack = CallSite[] | string[];
+
 /**
  * Configuration for page capture.
  *
@@ -17567,7 +17576,7 @@ declare class Transport<MeType extends EntityType = EntityType> extends EventEmi
     connectByPort(config: ExistingConnectConfig): Promise<void>;
     private authorize;
     sendAction<T extends keyof ProtocolMap>(action: T, payload?: ProtocolMap[T]['request'], uncorrelated?: boolean): SentMessage<SendActionResponse<T>>;
-    protected nackHandler(payloadOrMessage: RuntimeErrorPayload | string, reject: Function, callSites?: NodeJS.CallSite[]): void;
+    protected nackHandler(payloadOrMessage: RuntimeErrorPayload | string, reject: Function, callSites?: CapturedStack): void;
     ferryAction(origData: any): Promise<Message<any>>;
     registerMessageHandler(handler: MessageHandler): void;
     protected addWireListener(id: number, resolve: Function, handleNack: NackHandler, uncorrelated: boolean): void;

package/out/mock-beta.d.ts

@@ -2166,6 +2166,15 @@ declare type ByType_8<Type extends EventType_8> = Payload_10<Type>;
  */
 declare type ByType_9<Type extends EventType_9> = Payload_11<Type>;
 
+/** Minimal V8 CallSite shape — js-adapter does not include @types/node. */
+declare interface CallSite {
+    getFileName(): string | null;
+    toString(): string;
+}
+
+/** V8 CallSite objects, or native stack-frame strings from browsers that ignore Error.prepareStackTrace. */
+declare type CapturedStack = CallSite[] | string[];
+
 /**
  * Configuration for page capture.
  *
@@ -17567,7 +17576,7 @@ declare class Transport<MeType extends EntityType = EntityType> extends EventEmi
     connectByPort(config: ExistingConnectConfig): Promise<void>;
     private authorize;
     sendAction<T extends keyof ProtocolMap>(action: T, payload?: ProtocolMap[T]['request'], uncorrelated?: boolean): SentMessage<SendActionResponse<T>>;
-    protected nackHandler(payloadOrMessage: RuntimeErrorPayload | string, reject: Function, callSites?: NodeJS.CallSite[]): void;
+    protected nackHandler(payloadOrMessage: RuntimeErrorPayload | string, reject: Function, callSites?: CapturedStack): void;
     ferryAction(origData: any): Promise<Message<any>>;
     registerMessageHandler(handler: MessageHandler): void;
     protected addWireListener(id: number, resolve: Function, handleNack: NackHandler, uncorrelated: boolean): void;

package/out/mock-public.d.ts

@@ -2166,6 +2166,15 @@ declare type ByType_8<Type extends EventType_8> = Payload_10<Type>;
  */
 declare type ByType_9<Type extends EventType_9> = Payload_11<Type>;
 
+/** Minimal V8 CallSite shape — js-adapter does not include @types/node. */
+declare interface CallSite {
+    getFileName(): string | null;
+    toString(): string;
+}
+
+/** V8 CallSite objects, or native stack-frame strings from browsers that ignore Error.prepareStackTrace. */
+declare type CapturedStack = CallSite[] | string[];
+
 /**
  * Configuration for page capture.
  *
@@ -17567,7 +17576,7 @@ declare class Transport<MeType extends EntityType = EntityType> extends EventEmi
     connectByPort(config: ExistingConnectConfig): Promise<void>;
     private authorize;
     sendAction<T extends keyof ProtocolMap>(action: T, payload?: ProtocolMap[T]['request'], uncorrelated?: boolean): SentMessage<SendActionResponse<T>>;
-    protected nackHandler(payloadOrMessage: RuntimeErrorPayload | string, reject: Function, callSites?: NodeJS.CallSite[]): void;
+    protected nackHandler(payloadOrMessage: RuntimeErrorPayload | string, reject: Function, callSites?: CapturedStack): void;
     ferryAction(origData: any): Promise<Message<any>>;
     registerMessageHandler(handler: MessageHandler): void;
     protected addWireListener(id: number, resolve: Function, handleNack: NackHandler, uncorrelated: boolean): void;

package/out/stub.d.ts

@@ -2198,6 +2198,15 @@ declare type ByType_8<Type extends EventType_8> = Payload_10<Type>;
  */
 declare type ByType_9<Type extends EventType_9> = Payload_11<Type>;
 
+/** Minimal V8 CallSite shape — js-adapter does not include @types/node. */
+declare interface CallSite {
+    getFileName(): string | null;
+    toString(): string;
+}
+
+/** V8 CallSite objects, or native stack-frame strings from browsers that ignore Error.prepareStackTrace. */
+declare type CapturedStack = CallSite[] | string[];
+
 /**
  * Configuration for page capture.
  *
@@ -18072,7 +18081,7 @@ declare class Transport<MeType extends EntityType = EntityType> extends EventEmi
     connectByPort(config: ExistingConnectConfig): Promise<void>;
     private authorize;
     sendAction<T extends keyof ProtocolMap>(action: T, payload?: ProtocolMap[T]['request'], uncorrelated?: boolean): SentMessage<SendActionResponse<T>>;
-    protected nackHandler(payloadOrMessage: RuntimeErrorPayload | string, reject: Function, callSites?: NodeJS.CallSite[]): void;
+    protected nackHandler(payloadOrMessage: RuntimeErrorPayload | string, reject: Function, callSites?: CapturedStack): void;
     ferryAction(origData: any): Promise<Message<any>>;
     registerMessageHandler(handler: MessageHandler): void;
     protected addWireListener(id: number, resolve: Function, handleNack: NackHandler, uncorrelated: boolean): void;

package/out/stub.js

@@ -469,6 +469,26 @@ class EmitterBase extends Base {
 }
 _EmitterBase_emitterAccessor = new WeakMap(), _EmitterBase_deregisterOnceListeners = new WeakMap();
 
+const V8Error = Error;
+function isCallSiteArray(stack) {
+    if (!Array.isArray(stack) || stack.length === 0) {
+        return Array.isArray(stack);
+    }
+    const first = stack[0];
+    return typeof first === 'object' && first !== null && typeof first.getFileName === 'function';
+}
+function isStackFrameLine(line) {
+    return /^\s*at\s/.test(line) || line.includes('@');
+}
+/**
+ * Split a native `error.stack` string into frames and drop the dummy Error header plus `framesToRemove` frames.
+ * Safari/Firefox ignore V8's Error.prepareStackTrace, so `.stack` stays a string and `.slice(n)` would cut characters.
+ */
+function stackStringToFrames(stack, framesToRemove) {
+    const lines = stack.split('\n').filter((line) => line.length > 0);
+    const start = lines[0] !== undefined && !isStackFrameLine(lines[0]) ? 1 : 0;
+    return lines.slice(start + framesToRemove);
+}
 class UnexpectedActionError extends Error {
 }
 class DuplicateCorrelationError extends Error {
@@ -497,17 +517,17 @@ class DeserializedError extends Error {
 class RuntimeError extends Error {
     static trimEndCallSites(err, takeUntilRegex) {
         // save original props
-        const length = Error.stackTraceLimit;
+        const length = V8Error.stackTraceLimit;
         // eslint-disable-next-line no-underscore-dangle
-        const _prepareStackTrace = Error.prepareStackTrace;
+        const _prepareStackTrace = V8Error.prepareStackTrace;
         // This will be called when we access the `stack` property
-        Error.prepareStackTrace = (_, stack) => stack;
+        V8Error.prepareStackTrace = (_, stack) => stack;
         // in channel errors, the error was already serialized so we need to handle both string and CallSite[]
         const isString = typeof err.stack === 'string';
         const stack = (isString ? err.stack?.split('\n') : err.stack) ?? [];
         // restore original props
-        Error.prepareStackTrace = _prepareStackTrace;
-        Error.stackTraceLimit = length;
+        V8Error.prepareStackTrace = _prepareStackTrace;
+        V8Error.stackTraceLimit = length;
         // stack is optional in non chromium contexts
         if (stack.length) {
             const newStack = [];
@@ -529,31 +549,47 @@ class RuntimeError extends Error {
         }
     }
     static getCallSite(callsToRemove = 0) {
-        const length = Error.stackTraceLimit;
+        const length = V8Error.stackTraceLimit;
         const realCallsToRemove = callsToRemove + 1; // remove this call;
-        Error.stackTraceLimit = length + realCallsToRemove;
+        const limit = typeof length === 'number' && Number.isFinite(length) ? length : 10;
         // eslint-disable-next-line no-underscore-dangle
-        const _prepareStackTrace = Error.prepareStackTrace;
-        // This will be called when we access the `stack` property
-        Error.prepareStackTrace = (_, stack) => stack;
-        // stack is optional in non chromium contexts
-        const stack = new Error().stack?.slice(realCallsToRemove) ?? [];
-        Error.prepareStackTrace = _prepareStackTrace;
-        Error.stackTraceLimit = length;
-        return stack;
+        const _prepareStackTrace = V8Error.prepareStackTrace;
+        try {
+            V8Error.stackTraceLimit = limit + realCallsToRemove;
+            // V8 only: accessing `.stack` invokes this and returns CallSite[]. Safari/Firefox ignore it.
+            V8Error.prepareStackTrace = (_, stack) => stack;
+            const rawStack = new Error().stack;
+            if (Array.isArray(rawStack)) {
+                return rawStack.slice(realCallsToRemove);
+            }
+            if (typeof rawStack === 'string' && rawStack.length > 0) {
+                return stackStringToFrames(rawStack, realCallsToRemove);
+            }
+            return [];
+        }
+        finally {
+            V8Error.prepareStackTrace = _prepareStackTrace;
+            V8Error.stackTraceLimit = length;
+        }
     }
     static prepareStackTrace(err, callSites) {
-        if (typeof Error.prepareStackTrace === 'function') {
-            return Error.prepareStackTrace(err, callSites);
-        }
-        // TODO: this is just a first iteration, we can make this "nicer" at some point
-        // const EXCLUSIONS = ['IpcRenderer', 'Object.onMessage', 'Transport.onmessage', 'MessageReceiver.onmessage'];
-        let stackTrace = `${err.name || 'Error'}: ${err.message || ''}\n`;
-        stackTrace += callSites
-            .map((line) => `    at ${line}`)
-            // .filter((line) => !EXCLUSIONS.some((l) => line.includes(l)))
-            .join('\n');
-        return stackTrace;
+        const header = `${err.name || 'Error'}: ${err.message || ''}`;
+        const frames = typeof callSites === 'string' ? stackStringToFrames(callSites, 0) : callSites;
+        if (!Array.isArray(frames) || frames.length === 0) {
+            return header;
+        }
+        if (isCallSiteArray(frames)) {
+            const prepare = V8Error.prepareStackTrace;
+            // Only V8 CallSite[] may be passed to a user-supplied Error.prepareStackTrace.
+            if (typeof prepare === 'function') {
+                return prepare(err, frames);
+            }
+            // TODO: this is just a first iteration, we can make this "nicer" at some point
+            // const EXCLUSIONS = ['IpcRenderer', 'Object.onMessage', 'Transport.onmessage', 'MessageReceiver.onmessage'];
+            return `${header}\n${frames.map((line) => `    at ${line}`).join('\n')}`;
+        }
+        // Native Safari/Firefox frames already include their engine's format (`func@file:line:col`).
+        return `${header}\n${frames.join('\n')}`;
     }
     /*
 

package/out/stub.mjs

@@ -465,6 +465,26 @@ class EmitterBase extends Base {
 }
 _EmitterBase_emitterAccessor = new WeakMap(), _EmitterBase_deregisterOnceListeners = new WeakMap();
 
+const V8Error = Error;
+function isCallSiteArray(stack) {
+    if (!Array.isArray(stack) || stack.length === 0) {
+        return Array.isArray(stack);
+    }
+    const first = stack[0];
+    return typeof first === 'object' && first !== null && typeof first.getFileName === 'function';
+}
+function isStackFrameLine(line) {
+    return /^\s*at\s/.test(line) || line.includes('@');
+}
+/**
+ * Split a native `error.stack` string into frames and drop the dummy Error header plus `framesToRemove` frames.
+ * Safari/Firefox ignore V8's Error.prepareStackTrace, so `.stack` stays a string and `.slice(n)` would cut characters.
+ */
+function stackStringToFrames(stack, framesToRemove) {
+    const lines = stack.split('\n').filter((line) => line.length > 0);
+    const start = lines[0] !== undefined && !isStackFrameLine(lines[0]) ? 1 : 0;
+    return lines.slice(start + framesToRemove);
+}
 class UnexpectedActionError extends Error {
 }
 class DuplicateCorrelationError extends Error {
@@ -493,17 +513,17 @@ class DeserializedError extends Error {
 class RuntimeError extends Error {
     static trimEndCallSites(err, takeUntilRegex) {
         // save original props
-        const length = Error.stackTraceLimit;
+        const length = V8Error.stackTraceLimit;
         // eslint-disable-next-line no-underscore-dangle
-        const _prepareStackTrace = Error.prepareStackTrace;
+        const _prepareStackTrace = V8Error.prepareStackTrace;
         // This will be called when we access the `stack` property
-        Error.prepareStackTrace = (_, stack) => stack;
+        V8Error.prepareStackTrace = (_, stack) => stack;
         // in channel errors, the error was already serialized so we need to handle both string and CallSite[]
         const isString = typeof err.stack === 'string';
         const stack = (isString ? err.stack?.split('\n') : err.stack) ?? [];
         // restore original props
-        Error.prepareStackTrace = _prepareStackTrace;
-        Error.stackTraceLimit = length;
+        V8Error.prepareStackTrace = _prepareStackTrace;
+        V8Error.stackTraceLimit = length;
         // stack is optional in non chromium contexts
         if (stack.length) {
             const newStack = [];
@@ -525,31 +545,47 @@ class RuntimeError extends Error {
         }
     }
     static getCallSite(callsToRemove = 0) {
-        const length = Error.stackTraceLimit;
+        const length = V8Error.stackTraceLimit;
         const realCallsToRemove = callsToRemove + 1; // remove this call;
-        Error.stackTraceLimit = length + realCallsToRemove;
+        const limit = typeof length === 'number' && Number.isFinite(length) ? length : 10;
         // eslint-disable-next-line no-underscore-dangle
-        const _prepareStackTrace = Error.prepareStackTrace;
-        // This will be called when we access the `stack` property
-        Error.prepareStackTrace = (_, stack) => stack;
-        // stack is optional in non chromium contexts
-        const stack = new Error().stack?.slice(realCallsToRemove) ?? [];
-        Error.prepareStackTrace = _prepareStackTrace;
-        Error.stackTraceLimit = length;
-        return stack;
+        const _prepareStackTrace = V8Error.prepareStackTrace;
+        try {
+            V8Error.stackTraceLimit = limit + realCallsToRemove;
+            // V8 only: accessing `.stack` invokes this and returns CallSite[]. Safari/Firefox ignore it.
+            V8Error.prepareStackTrace = (_, stack) => stack;
+            const rawStack = new Error().stack;
+            if (Array.isArray(rawStack)) {
+                return rawStack.slice(realCallsToRemove);
+            }
+            if (typeof rawStack === 'string' && rawStack.length > 0) {
+                return stackStringToFrames(rawStack, realCallsToRemove);
+            }
+            return [];
+        }
+        finally {
+            V8Error.prepareStackTrace = _prepareStackTrace;
+            V8Error.stackTraceLimit = length;
+        }
     }
     static prepareStackTrace(err, callSites) {
-        if (typeof Error.prepareStackTrace === 'function') {
-            return Error.prepareStackTrace(err, callSites);
-        }
-        // TODO: this is just a first iteration, we can make this "nicer" at some point
-        // const EXCLUSIONS = ['IpcRenderer', 'Object.onMessage', 'Transport.onmessage', 'MessageReceiver.onmessage'];
-        let stackTrace = `${err.name || 'Error'}: ${err.message || ''}\n`;
-        stackTrace += callSites
-            .map((line) => `    at ${line}`)
-            // .filter((line) => !EXCLUSIONS.some((l) => line.includes(l)))
-            .join('\n');
-        return stackTrace;
+        const header = `${err.name || 'Error'}: ${err.message || ''}`;
+        const frames = typeof callSites === 'string' ? stackStringToFrames(callSites, 0) : callSites;
+        if (!Array.isArray(frames) || frames.length === 0) {
+            return header;
+        }
+        if (isCallSiteArray(frames)) {
+            const prepare = V8Error.prepareStackTrace;
+            // Only V8 CallSite[] may be passed to a user-supplied Error.prepareStackTrace.
+            if (typeof prepare === 'function') {
+                return prepare(err, frames);
+            }
+            // TODO: this is just a first iteration, we can make this "nicer" at some point
+            // const EXCLUSIONS = ['IpcRenderer', 'Object.onMessage', 'Transport.onmessage', 'MessageReceiver.onmessage'];
+            return `${header}\n${frames.map((line) => `    at ${line}`).join('\n')}`;
+        }
+        // Native Safari/Firefox frames already include their engine's format (`func@file:line:col`).
+        return `${header}\n${frames.join('\n')}`;
     }
     /*
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfin/core",
-  "version": "46.100.64",
+  "version": "46.100.65",
   "description": "The core renderer entry point of OpenFin",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "out/stub.js",