Merge pull request #179 from permafrost-dev/fix-stackframes-1

Fix stack frames

Author: patinthehat

package.json

@@ -115,6 +115,7 @@
         "find-up": "^5.0",
         "md5": "^2.3.0",
         "stacktrace-gps": "^3.1.2",
+        "stacktrace-js": "^2.0.2",
         "tslib": "^2.5.0",
         "uuid": "^9.0.0",
         "xml-formatter": "^3.3.2"

src/Concerns/RemovesRayFrames.ts

@@ -1,12 +1,8 @@
-import StackFrame from '@/lib/stackframe';
+import { StackFrame } from 'stacktrace-js';
 
 export class RemovesRayFrames {
     public static removeRayFrames(frames: StackFrame[]): StackFrame[] {
-        const result = frames
-            .filter(frame => !RemovesRayFrames.isRayFrame(frame) && !RemovesRayFrames.isNodeFrame(frame))
-            .filter(frame => {
-                return !(!frame.fileName || !frame.functionName || !frame.source);
-            });
+        const result = frames.filter(frame => !RemovesRayFrames.isRayFrame(frame) && !RemovesRayFrames.isNodeFrame(frame));
 
         return result;
     }
@@ -22,10 +18,10 @@ export class RemovesRayFrames {
     }
 
     protected static isNodeFrame(frame: StackFrame): boolean {
-        return frame.fileName?.indexOf('node:') === 0;
+        return frame.fileName?.includes('node:') || frame.fileName?.includes('node_modules') || false;
     }
 
     protected static rayNamespaces(): string[] {
-        return ['ray-node/dist', 'node-ray/dist', 'vue-ray/dist'];
+        return ['ray-node/dist', 'node-ray/dist', 'vue-ray/dist', '-ray'];
     }
 }

src/Payloads/CallerPayload.ts

@@ -1,6 +1,6 @@
 import { Payload } from '../Payloads/Payload';
 import { RemovesRayFrames } from '../Concerns/RemovesRayFrames';
-import StackFrame from '@/lib/stackframe';
+import { StackFrame } from 'stacktrace-js';
 
 export class CallerPayload extends Payload {
     protected frames;

src/Payloads/ExceptionPayload.ts

@@ -1,15 +1,13 @@
 import { Payload } from '../Payloads/Payload';
-//import * as StackTrace from 'stacktrace-js/dist/stacktrace-with-promises-and-json-polyfills';
-import { StackTrace } from '@/lib/stacktrace';
-import StackFrame from 'stackframe';
+import * as StackTrace from 'stacktrace-js';
 
 export class ExceptionPayload extends Payload {
     protected exception: Error;
 
     protected meta = {};
 
     // eslint-disable-next-line no-undef
-    protected stack: StackFrame[];
+    protected stack: StackTrace.StackFrame[];
 
     public constructor(exception: Error, meta: Record<string, unknown> = {}) {
         super();

src/Payloads/TracePayload.ts

@@ -1,6 +1,6 @@
 import { Payload } from './Payload';
 import { RemovesRayFrames } from '../Concerns/RemovesRayFrames';
-import StackFrame from '@/lib/stackframe';
+import { StackFrame } from 'stacktrace-js';
 
 export class TracePayload extends Payload {
     /** @var array */

src/Ray.ts

@@ -8,7 +8,7 @@ const BUILDING_STANDALONE_LIB = typeof __BUILDING_STANDALONE_LIB__ !== 'undefine
 
 import * as md5lib from 'md5';
 import { RayScreenColors } from '@/Concerns/RayScreenColors';
-import { StackTrace } from '@/lib/stacktrace';
+import * as StackTrace from 'stacktrace-js';
 import { Mixin } from 'ts-mixer';
 import { RayColors } from './Concerns/RayColors';
 import { RaySizes } from './Concerns/RaySizes';
@@ -720,9 +720,7 @@ export class Ray extends Mixin(RayColors, RaySizes, RayScreenColors) {
             startFrameIndex = 0;
         }
 
-        const callerFrames = RemovesRayFrames.removeRayFrames(
-            st.slice(startFrameIndex).filter(frame => !frame.functionName?.includes('Ray.')),
-        );
+        const callerFrames = RemovesRayFrames.removeRayFrames(st.slice(startFrameIndex));
 
         return callerFrames.slice(0).shift();
     }