Merge branch 'develop' into refactor/menubar-a11y-keyboard-mouse

Author: tespin

client/modules/IDE/hooks/useHandleMessageEvent.js

@@ -6,30 +6,64 @@ import { stopSketch, expandConsole } from '../actions/ide';
 export default function useHandleMessageEvent() {
   const dispatch = useDispatch();
 
+  const safeStringify = (
+    obj,
+    depth = 0,
+    maxDepth = 10,
+    seen = new WeakMap()
+  ) => {
+    if (typeof obj !== 'object' || obj === null) return obj;
+
+    if (depth >= maxDepth) {
+      if (seen.has(obj)) return '[Circular Reference]';
+    }
+
+    seen.set(obj, true);
+
+    return Array.isArray(obj)
+      ? obj.map((item) => safeStringify(item, depth + 1, maxDepth, seen))
+      : Object.fromEntries(
+          Object.entries(obj).map(([key, value]) => [
+            key,
+            safeStringify(value, depth + 1, maxDepth, seen)
+          ])
+        );
+  };
+
   const handleMessageEvent = (data) => {
+    if (!data || typeof data !== 'object') return;
     const { source, messages } = data;
-    if (source === 'sketch' && Array.isArray(messages)) {
-      const decodedMessages = messages.map((message) => Decode(message.log));
-      decodedMessages.every((message, index, arr) => {
-        const { data: args } = message;
-        let hasInfiniteLoop = false;
-        Object.keys(args).forEach((key) => {
-          if (
-            typeof args[key] === 'string' &&
-            args[key].includes('Exiting potential infinite loop')
-          ) {
-            dispatch(stopSketch());
-            dispatch(expandConsole());
-            hasInfiniteLoop = true;
-          }
-        });
-        if (hasInfiniteLoop) {
-          return false;
-        }
-        return true;
-      });
-      dispatch(dispatchConsoleEvent(decodedMessages));
+    if (source !== 'sketch' || !Array.isArray(messages)) return;
+
+    const decodedMessages = messages.map((message) => {
+      try {
+        const decoded = Decode(message.log) ?? '[Unknown Message]'; // Ensure decoding works
+        return safeStringify(decoded);
+      } catch (error) {
+        console.error('Error decoding message:', error);
+        return { error: 'Failed to decode message' };
+      }
+    });
+
+    // Detect infinite loop warnings
+    const hasInfiniteLoop = decodedMessages.some(
+      (message) =>
+        message?.data &&
+        Object.values(message.data).some(
+          (arg) =>
+            typeof arg === 'string' &&
+            arg.includes('Exiting potential infinite loop')
+        )
+    );
+
+    if (hasInfiniteLoop) {
+      dispatch(stopSketch());
+      dispatch(expandConsole());
+      return;
     }
+
+    dispatch(dispatchConsoleEvent(decodedMessages));
   };
+
   return handleMessageEvent;
 }

client/utils/reduxFormUtils.js

@@ -62,8 +62,8 @@ export function validateSettings(formProps) {
 
 export function validateLogin(formProps) {
   const errors = {};
-  if (!formProps.email) {
-    errors.email = i18n.t('ReduxFormUtils.errorEmptyEmail');
+  if (!formProps.email && !formProps.username) {
+    errors.email = i18n.t('ReduxFormUtils.errorEmptyEmailorUserName');
   }
   if (!formProps.password) {
     errors.password = i18n.t('ReduxFormUtils.errorEmptyPassword');

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.16.2",
+  "version": "2.16.3",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",

package.json

@@ -54,6 +54,9 @@ passport.use(
         const isMatch = await user.comparePassword(password);
 
         if (isMatch) {
+          user.lastLoginTimestamp = Date.now();
+          await user.save();
+
           return done(null, user);
         } else { // eslint-disable-line
           return done(null, false, { msg: 'Invalid email or password' });
@@ -88,6 +91,8 @@ passport.use(
       }
 
       keyDocument.lastUsedAt = Date.now();
+      user.lastLoginTimestamp = Date.now();
+
       await user.save();
       return done(null, user);
     } catch (err) {
@@ -140,6 +145,9 @@ passport.use(
           } else if (existingUser.banned) {
             return done(null, false, { msg: accountSuspensionMessage });
           }
+          existingUser.lastLoginTimestamp = Date.now();
+          await existingUser.save();
+
           return done(null, existingUser);
         }
 
@@ -239,6 +247,9 @@ passport.use(
           } else if (existingUser.banned) {
             return done(null, false, { msg: accountSuspensionMessage });
           }
+          existingUser.lastLoginTimestamp = Date.now();
+          await existingUser.save();
+
           return done(null, existingUser);
         }
 

server/config/passport.js

@@ -82,7 +82,8 @@ const userSchema = new Schema(
       enum: ['none', 'essential', 'all'],
       default: 'none'
     },
-    banned: { type: Boolean, default: false }
+    banned: { type: Boolean, default: false },
+    lastLoginTimestamp: { type: Date }
   },
   { timestamps: true, usePushEach: true }
 );

server/models/user.js

@@ -94,7 +94,8 @@ app.use(
     name: 'sessionId',
     cookie: {
       httpOnly: true,
-      secure: false
+      secure: false,
+      maxAge: 1000 * 60 * 60 * 24 * 28 // 4 weeks in milliseconds
     },
     store: new MongoStore({
       clientPromise,

server/server.js

@@ -334,6 +334,7 @@
   "ReduxFormUtils": {
     "errorInvalidEmail": "Please enter a valid email address",
     "errorEmptyEmail": "Please enter an email",
+    "errorEmptyEmailorUserName": "Please enter an email or username",
     "errorPasswordMismatch": "Passwords must match",
     "errorEmptyPassword": "Please enter a password",
     "errorShortPassword": "Password must be at least 6 characters",