@openfin/node-adapter 46.100.64 → 46.100.65

package/out/node-adapter.js

@@ -293,6 +293,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 DisconnectedError extends Error {
     constructor(readyState) {
         super(`Expected websocket state OPEN but found ${readyState}`);
@@ -329,17 +349,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 = [];
@@ -361,31 +381,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')}`;
     }
     /*
 
@@ -17459,7 +17495,7 @@ class NodeEnvironment extends BaseEnvironment {
         };
     }
     getAdapterVersionSync() {
-        return "46.100.64";
+        return "46.100.65";
     }
     observeBounds(element, onChange) {
         throw new Error('Method not implemented.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfin/node-adapter",
-  "version": "46.100.64",
+  "version": "46.100.65",
   "description": "See README.md",
   "main": "out/node-adapter.js",
   "types": "out/node-adapter.d.ts",
@@ -20,7 +20,7 @@
     "es-toolkit": "^1.39.3",
     "ws": "^7.5.11",
     "tslib": "2.8.1",
-    "@openfin/core": "46.100.64"
+    "@openfin/core": "46.100.65"
   },
   "scripts": {
     "prebuild": "rimraf ./out",