Skip to content

fix(font): avoid serializing full p5.Font data in previewEntry and IDE hook #3461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion client/modules/IDE/hooks/useHandleMessageEvent.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,37 @@ import { Decode } from 'console-feed';
import { dispatchConsoleEvent } from '../actions/console';
import { stopSketch, expandConsole } from '../actions/ide';

// Helper function to restore p5.Font objects
function restoreP5Font(obj) {
if (obj && obj._isP5Font) {
// Return a simplified font-like object for console display
return {
_isP5Font: true,
name: obj.name,
path: obj.path,
face: {
family: obj.face?.family,
style: obj.face?.style,
weight: obj.face?.weight
}
};
}
return obj;
}

export default function useHandleMessageEvent() {
const dispatch = useDispatch();

const handleMessageEvent = (data) => {
const { source, messages } = data;
if (source === 'sketch' && Array.isArray(messages)) {
const decodedMessages = messages.map((message) => Decode(message.log));
const decodedMessages = messages.map((message) => {
const decoded = Decode(message.log);
if (decoded.data) {
decoded.data = decoded.data.map(restoreP5Font);
}
return decoded;
});
decodedMessages.every((message, index, arr) => {
const { data: args } = message;
let hasInfiniteLoop = false;
Expand Down
26 changes: 25 additions & 1 deletion client/utils/previewEntry.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,30 @@ setInterval(() => {
}
}, LOGWAIT);

// Helper function to handle p5.Font objects
function handleP5Font(obj) {
// Check for p5.Font instances in multiple ways
if (
(obj &&
obj.constructor &&
(obj.constructor.name === 'Font' ||
obj.constructor.name === 'p5.Font')) ||
(window.p5 && obj instanceof window.p5.Font)
) {
return {
_isP5Font: true,
name: obj.name,
path: obj.path,
face: {
family: obj.face?.family,
style: obj.face?.style,
weight: obj.face?.weight
}
};
}
return obj;
}

function handleMessageEvent(e) {
// maybe don't need this?? idk!
if (window.origin !== e.origin) return;
Expand All @@ -44,7 +68,7 @@ function handleMessageEvent(e) {
const decodedMessages = messages.map((message) => Decode(message.log));
decodedMessages.forEach((message) => {
const { data: args } = message;
const { result, error } = evaluateExpression(args);
const { result, error } = evaluateExpression(args.map(handleP5Font));
const resultMessages = [
{ log: Encode({ method: error ? 'error' : 'result', data: [result] }) }
];
Expand Down