fix: Improve server-side reminder handling and consistency

Enhance server-triggered reminders to include more comprehensive data for cross-device consistency.  Prioritize server-side reminders and prevent fallback to local storage if server reminders are forced.

Author: dushkin

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.notask.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1518016
-        versionName "15.18.16"
+        versionCode 1518017
+        versionName "15.18.17"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "my-notes-and-tasks-modern",
-  "version": "15.18.16",
+  "version": "15.18.17",
   "private": true,
   "license": "Licensed CC BY-ND 4.0. No derivatives allowed.",
   "scripts": {

src/components/reminders/reminderMonitor.js

@@ -610,7 +610,20 @@ async triggerReminder(reminder, settings) {
 
     // Direct trigger from server (for server-scheduled reminders)
     socket.on("reminder:trigger", (reminder) => {
-      this.triggerReminder(reminder, this.currentSettings || {});
+      console.log('🔔 Server triggered reminder received:', reminder);
+      
+      // Enhanced reminder object for cross-device consistency
+      const enhancedReminder = {
+        itemId: reminder.itemId,
+        itemTitle: reminder.itemTitle,
+        timestamp: typeof reminder.timestamp === 'string' 
+          ? new Date(reminder.timestamp).getTime() 
+          : reminder.timestamp,
+        ...reminder.reminderData?.originalReminder,
+        triggeredByServer: true
+      };
+      
+      this.triggerReminder(enhancedReminder, this.currentSettings || {});
     });
   }
 

src/utils/reminderUtils.js

@@ -4,6 +4,9 @@ import { serverReminderService } from '../services/serverReminderService.js';
 const REMINDERS_STORAGE_KEY = 'notes_app_reminders';
 let useServerReminders = true; // Flag to control which system to use
 
+// Force server reminders to be the primary system
+const FORCE_SERVER_REMINDERS = true;
+
 /**
  * Initialize reminder service and migrate if needed
  */
@@ -38,8 +41,8 @@ export const initializeReminderService = async () => {
  * @param {string|null} itemTitle - The title of the item for the reminder.
  */
 export const setReminder = async (itemId, timestamp, repeatOptions = null, itemTitle = null) => {
-  // Try server-side reminders first
-  if (useServerReminders) {
+  // Always try server-side reminders first if forced
+  if (useServerReminders || FORCE_SERVER_REMINDERS) {
     try {
       await serverReminderService.setReminder(itemId, timestamp, repeatOptions, itemTitle);
       console.log(`📡 Reminder set via server for item ${itemId} at ${new Date(timestamp)}`);
@@ -53,6 +56,9 @@ export const setReminder = async (itemId, timestamp, repeatOptions = null, itemT
       return;
     } catch (error) {
       console.warn('⚠️ Failed to set reminder on server, falling back to localStorage:', error);
+      if (FORCE_SERVER_REMINDERS) {
+        throw error; // Don't fall back if server reminders are forced
+      }
     }
   }