fix: save correct outputs

Author: skoshx

pnpm-lock.yaml

@@ -9,6 +9,7 @@ export const FLYTRAP_CIRCULAR = 'FLYTRAP_CIRCULAR'
 export const FLYTRAP_HEADERS = 'FLYTRAP_HEADERS'
 export const FLYTRAP_RESPONSE = 'FLYTRAP_RESPONSE'
 export const FLYTRAP_REQUEST = 'FLYTRAP_REQUEST'
+export const FLYTRAP_CLASS = 'FLYTRAP_CLASS'
 
 export const FLYTRAP_REPLACE_VALUES = [
 	FLYTRAP_UNSERIALIZABLE_VALUE,
@@ -17,5 +18,6 @@ export const FLYTRAP_REPLACE_VALUES = [
 	FLYTRAP_CIRCULAR,
 	FLYTRAP_HEADERS,
 	FLYTRAP_REQUEST,
-	FLYTRAP_RESPONSE
+	FLYTRAP_RESPONSE,
+	FLYTRAP_CLASS
 ]

src/core/constants.ts

@@ -15,13 +15,13 @@ import { FLYTRAP_UNSERIALIZABLE_VALUE, NO_SOURCE } from './constants'
 import { encrypt } from './encryption'
 import { log } from './logging'
 import { serializeError } from 'serialize-error'
-import { copy } from 'copy-anything'
 import {
 	addLinksToCaptures,
 	decryptCapture,
 	extractArgs,
 	extractOutputs,
 	parse,
+	processCaptures,
 	removeCircularDependencies,
 	stringify,
 	superJsonRegisterCustom
@@ -191,8 +191,14 @@ export const liveFlytrapStorage: FlytrapStorage = {
 			return
 		}
 
-		calls = removeIllegalValues(removeCircularDependencies(calls))
-		functions = removeIllegalValues(removeCircularDependencies(functions))
+		calls = removeIllegalValues(calls)
+		functions = removeIllegalValues(functions)
+
+		calls = processCaptures(calls)
+		functions = processCaptures(functions)
+
+		calls = removeCircularDependencies(calls)
+		functions = removeCircularDependencies(functions)
 
 		const args = [...extractArgs(calls), ...extractArgs(functions)]
 		const outputs = [...extractOutputs(calls), ...extractOutputs(functions)]
@@ -210,7 +216,7 @@ export const liveFlytrapStorage: FlytrapStorage = {
 			source: NO_SOURCE,
 			// args, outputs,
 			args: await encrypt(publicApiKey, stringify(args)),
-			outputs: await encrypt(publicApiKey, stringify(args)),
+			outputs: await encrypt(publicApiKey, stringify(outputs)),
 			calls: linkedCalls,
 			functions: linkedFunctions,
 			...(error && {
@@ -274,7 +280,7 @@ function isSerializable(input: any) {
 }
 
 export function removeIllegalValues(captures: (CapturedCall | CapturedFunction)[]) {
-	const capturesClone = copy(captures)
+	const capturesClone = captures
 
 	for (let i = 0; i < capturesClone.length; i++) {
 		for (let j = 0; j < capturesClone[i].invocations.length; j++) {

src/core/storage.ts

@@ -1,6 +1,7 @@
 import SuperJSON from 'superjson'
 import {
 	FLYTRAP_CIRCULAR,
+	FLYTRAP_CLASS,
 	FLYTRAP_DOM_EVENT,
 	FLYTRAP_FUNCTION,
 	FLYTRAP_HEADERS,
@@ -17,7 +18,7 @@ import {
 } from './types'
 import { deepEqual } from 'fast-equals'
 import { decrypt } from './encryption'
-import { copy } from 'copy-anything'
+// import { copy } from 'copy-anything'
 
 export function superJsonRegisterCustom(superJsonInstance: typeof SuperJSON) {
 	// Fetch API classes
@@ -46,17 +47,17 @@ export function superJsonRegisterCustom(superJsonInstance: typeof SuperJSON) {
 		'Request'
 	)
 
-	// handle functions
+	// Functions
 	superJsonInstance.registerCustom<any, string>(
 		{
 			isApplicable: (v): v is Function => typeof v === 'function',
 			serialize: () => FLYTRAP_FUNCTION,
 			deserialize: () => FLYTRAP_FUNCTION
 		},
-		'functions'
+		'Functions'
 	)
 
-	// handle DOM events
+	// DOM Events
 	superJsonInstance.registerCustom<any, string>(
 		{
 			isApplicable: (v): v is Event => {
@@ -65,7 +66,29 @@ export function superJsonRegisterCustom(superJsonInstance: typeof SuperJSON) {
 			serialize: () => FLYTRAP_DOM_EVENT,
 			deserialize: () => FLYTRAP_DOM_EVENT
 		},
-		'dom events'
+		'DOM Events'
+	)
+
+	// Classes
+	superJsonInstance.registerCustom<any, string>(
+		{
+			isApplicable: (v): v is Request => {
+				return isClassInstance(v)
+			},
+			serialize: () => FLYTRAP_CLASS,
+			deserialize: () => FLYTRAP_CLASS
+		},
+		'Classes'
+	)
+}
+
+export function isClassInstance<T>(obj: T): boolean {
+	return (
+		obj !== null &&
+		typeof obj === 'object' &&
+		!(obj instanceof Array) &&
+		obj.constructor &&
+		obj.constructor !== Object
 	)
 }
 
@@ -113,7 +136,6 @@ export function removeCircularDependencies<T>(obj: T, seenObjects = new Set()):
 		// It's a circular reference
 		// @ts-expect-error
 		return FLYTRAP_CIRCULAR
-		// return null; // Or replace with some placeholder if needed
 	}
 
 	// Keep track of this object so we don't process it again
@@ -137,16 +159,6 @@ export function removeCircularDependencies<T>(obj: T, seenObjects = new Set()):
 	return newObj as T
 }
 
-/*export function removeCircularDependencies<T>(obj: T): T {
-	superJsonRegisterCustom(SuperJSON)
-	const serialized = SuperJSON.serialize(obj)
-	if (serialized.meta?.referentialEqualities) {
-		delete serialized.meta.referentialEqualities
-	}
-
-	return SuperJSON.deserialize(serialized)
-}*/
-
 function _extract(captures: (CapturedCall | CapturedFunction)[], key: 'args' | 'output' = 'args') {
 	const values = captures.reduce(
 		(acc, curr) => [...acc, ...curr.invocations.map((i) => i[key])],
@@ -171,7 +183,7 @@ export function extractArgs(captures: (CapturedCall | CapturedFunction)[]): any[
 	return _extract(captures, 'args')
 }
 
-export function extractOutputs(captures: (CapturedCall | CapturedFunction)[]): any[][] {
+export function extractOutputs(captures: (CapturedCall | CapturedFunction)[]): any[] {
 	return _extract(captures, 'output')
 }
 
@@ -188,7 +200,8 @@ export function addLinks(
 	invocations: CaptureInvocation[],
 	{ args, outputs }: { args: any[][]; outputs: any[] }
 ) {
-	const invocationsCopy = copy(invocations)
+	// const invocationsCopy = copy(invocations)
+	const invocationsCopy = invocations
 
 	for (let i = 0; i < invocationsCopy.length; i++) {
 		// Args
@@ -210,7 +223,8 @@ export function addLinksToCaptures(
 	captures: (CapturedCall | CapturedFunction)[],
 	{ args, outputs }: { args: any[][]; outputs: any[] }
 ) {
-	const capturesCopy = copy(captures)
+	// const capturesCopy = copy(captures)
+	const capturesCopy = captures
 	for (let i = 0; i < capturesCopy.length; i++) {
 		// captures[i].invocations
 		const linkedInvocations = addLinks(capturesCopy[i].invocations, { args, outputs })
@@ -275,7 +289,8 @@ export function reviveLinks(
 	invocations: CaptureInvocationWithLinks[],
 	{ args, outputs }: { args: any[][]; outputs: any[] }
 ): CaptureInvocation[] {
-	const invocationsCopy = copy(invocations)
+	// const invocationsCopy = copy(invocations)
+	const invocationsCopy = invocations
 
 	for (let i = 0; i < invocationsCopy.length; i++) {
 		// Revive args
@@ -289,3 +304,11 @@ export function reviveLinks(
 
 	return invocationsCopy as unknown as CaptureInvocation[]
 }
+
+export function processCaptures(captures: (CapturedCall | CapturedFunction)[]) {
+	superJsonRegisterCustom(SuperJSON)
+	for (let i = 0; i < captures.length; i++) {
+		captures[i] = SuperJSON.deserialize(SuperJSON.serialize(captures[i]))
+	}
+	return captures
+}

src/core/stringify.ts

@@ -3,20 +3,23 @@ import {
 	addLinks,
 	extractArgs,
 	extractOutputs,
+	isClassInstance,
 	parse,
+	processCaptures,
 	reviveLinks,
 	stringify
 } from '../src/core/stringify'
 import SuperJSON from 'superjson'
 import {
+	FLYTRAP_CLASS,
 	FLYTRAP_DOM_EVENT,
 	FLYTRAP_FUNCTION,
 	FLYTRAP_HEADERS,
 	FLYTRAP_REQUEST,
 	FLYTRAP_RESPONSE
 } from '../src/core/constants'
 import { GlobalRegistrator } from '@happy-dom/global-registrator'
-import { CapturedCall } from '../src/exports'
+import { CapturedCall, type CapturedFunction } from '../src/exports'
 GlobalRegistrator.register()
 
 it('removes cyclical dependencies', () => {
@@ -163,6 +166,67 @@ describe('Deduplication', () => {
 	})
 })
 
+it('isClassInstance', () => {
+	class Foo {}
+	class Bar {}
+	abstract class Baz {}
+	const FooBar = class {}
+	class FooBarBaz extends Baz {}
+
+	const fixtures: any[] = [
+		[new Foo(), true],
+		[new Bar(), true],
+		[new FooBar(), true],
+		[new FooBarBaz(), true],
+		[{ foo: Foo }, false],
+		[{ foo: 'bar', bar: new Bar() }, false],
+		[[{ foo: Foo }, new Bar()], false]
+	]
+
+	for (let i = 0; i < fixtures.length; i++) {
+		expect(isClassInstance(fixtures[i][0]), `Fixture at index ${i}`).toEqual(fixtures[i][1])
+	}
+})
+
+it('processCaptures', () => {
+	// const mockClass
+	class HelloWorld {}
+	const outputArgs = {
+		user: { name: 'John Doe' },
+		hello: new HelloWorld(),
+		res: new Response('Hello World')
+	}
+	const mockCaptures: (CapturedCall | CapturedFunction)[] = [
+		{
+			id: 'mock-call',
+			invocations: [
+				{
+					args: [],
+					output: outputArgs,
+					timestamp: 0
+				}
+			]
+		}
+	]
+
+	expect(processCaptures(mockCaptures)).toEqual([
+		{
+			id: 'mock-call',
+			invocations: [
+				{
+					args: [],
+					output: {
+						user: { name: 'John Doe' },
+						hello: FLYTRAP_CLASS,
+						res: FLYTRAP_RESPONSE
+					},
+					timestamp: 0
+				}
+			]
+		}
+	])
+})
+
 /*describe.skip('Encrypting captures', async () => {
 	it('TODO', async () => {
 		expect(await encryptCaptures(mockCapturedCalls, '')).toEqual([])