Fix(timezone): Implement True UTC calculation and bump to v0.3.0

icalendar.ts

@@ -1,7 +1,7 @@
 import { clientStore, config, datastore, editor, index } from "@silverbulletmd/silverbullet/syscalls";
 import { convertIcsCalendar, type IcsCalendar, type IcsEvent, type IcsDateObjects } from "ts-ics";
 
-const VERSION = "0.2.15";
+const VERSION = "0.3.0";
 const CACHE_KEY = "icalendar:lastSync";
 const DEFAULT_CACHE_DURATION_SECONDS = 21600; // 6 hours
 
@@ -20,8 +20,6 @@ const TIMEZONE_OFFSETS: Record<string, number> = {
   "None": 0
 };
 
-console.log(`[iCalendar] Plug loading (Version ${VERSION})...`);
-
 // ============================================================================
 // Types
 // ============================================================================
@@ -38,7 +36,7 @@ interface Source {
 }
 
 interface PlugConfig {
-  sources: Source[];
+  sources: any;
   cacheDuration: number | undefined;
   tzShift: number | undefined;
 }
@@ -53,9 +51,6 @@ interface CalendarEvent extends DateToString<IcsEvent> {
 // Utility Functions
 // ============================================================================
 
-/**
- * Standard SilverBullet local date string formatter
- */
 function toLocalISO(d: Date): string {
   const pad = (n: number) => String(n).padStart(2, "0");
   return d.getFullYear() +
@@ -67,43 +62,33 @@ function toLocalISO(d: Date): string {
     "." + String(d.getMilliseconds()).padStart(3, "0");
 }
 
-/**
- * Robustly converts an ICS date object to a localized PST string
- */
 function processIcsDate(obj: any, manualShift = 0): string {
   if (!obj) return "";
-
-  // 1. Get the "Wall Time" (the hour shown in the organizer's calendar)
-  // ts-ics often puts this in obj.local.date but marks it with 'Z'
-  let wallTimeStr = (obj.local && typeof obj.local.date === "string") 
-    ? obj.local.date 
-    : (typeof obj.date === "string" ? obj.date : "");
+  let wallTimeStr = "";
+  if (obj.local && typeof obj.local.date === "string") {
+    wallTimeStr = obj.local.date;
+  } else if (typeof obj.date === "string") {
+    wallTimeStr = obj.date;
+  } else if (obj.date instanceof Date) {
+    wallTimeStr = obj.date.toISOString();
+  } else if (obj instanceof Date) {
+    wallTimeStr = obj.toISOString();
+  }
     
   if (!wallTimeStr) return "";
 
-  // Remove any 'Z' to treat it as a raw floating time initially
-  wallTimeStr = wallTimeStr.replace("Z", "");
+  // 1. Extract the "Wall Time" from the string (ignoring Z if present)
+  const baseDate = new Date(wallTimeStr.replace("Z", "") + "Z");
   
-  // Parse as UTC so we have a stable starting point
-  const baseDate = new Date(wallTimeStr + "Z");
-  
-  // 2. Identify the Source Timezone
+  // 2. Determine Source Timezone Offset
   const tzName = obj.local?.timezone || obj.timezone || "UTC";
   const sourceOffset = TIMEZONE_OFFSETS[tzName] ?? 0;
   
-  // 3. Calculate True UTC
-  // UTC = WallTime - SourceOffset
-  // Example: 16:00 WallTime in GMT+1 (+1) -> 15:00 UTC
+  // 3. Calculate True UTC: WallTime - SourceOffset
   const utcMillis = baseDate.getTime() - (sourceOffset * 3600000);
   
-  const envOffset = new Date().getTimezoneOffset();
-  console.log(`[iCalendar] Date Calc: Wall=${wallTimeStr}, TZ=${tzName}, SourceOffset=${sourceOffset}, EnvOffset=${envOffset}, UTC=${new Date(utcMillis).toISOString()}`);
-
-  // 4. Apply User's Manual Shift (if any)
-  const finalMillis = utcMillis + (manualShift * 3600000);
-
-  // 5. Localize to environment
-  return toLocalISO(new Date(finalMillis));
+  // 4. Apply User's Manual Shift and Localize
+  return toLocalISO(new Date(utcMillis + (manualShift * 3600000)));
 }
 
 function isIcsDateObjects(obj: any): obj is IcsDateObjects {
@@ -120,19 +105,9 @@ async function sha256Hash(str: string): Promise<string> {
 
 function convertDatesToStrings<T>(obj: T, hourShift = 0): DateToString<T> {
   if (obj === null || obj === undefined) return obj as DateToString<T>;
-
-  if (isIcsDateObjects(obj)) {
-    return processIcsDate(obj, hourShift) as DateToString<T>;
-  }
-
-  if (obj instanceof Date) {
-    return toLocalISO(new Date(obj.getTime() + (hourShift * 3600000))) as DateToString<T>;
-  }
-
-  if (Array.isArray(obj)) {
-    return obj.map(item => convertDatesToStrings(item, hourShift)) as DateToString<T>;
-  }
-
+  if (isIcsDateObjects(obj)) return processIcsDate(obj, hourShift) as DateToString<T>;
+  if (obj instanceof Date) return processIcsDate({ date: obj }, hourShift) as DateToString<T>;
+  if (Array.isArray(obj)) return obj.map(item => convertDatesToStrings(item, hourShift)) as DateToString<T>;
   if (typeof obj === 'object') {
     const result: any = {};
     for (const key in obj) {
@@ -142,7 +117,6 @@ function convertDatesToStrings<T>(obj: T, hourShift = 0): DateToString<T> {
     }
     return result as DateToString<T>;
   }
-
   return obj as DateToString<T>;
 }
 
@@ -150,12 +124,30 @@ function convertDatesToStrings<T>(obj: T, hourShift = 0): DateToString<T> {
 // Configuration & Commands
 // ============================================================================
 
-async function getSources(): Promise<Source[]> {
-  const plugConfig = await config.get<PlugConfig>("icalendar", { sources: [] });
-  if (!plugConfig.sources) return [];
-  let sources = plugConfig.sources;
-  if (!Array.isArray(sources)) sources = [sources as unknown as Source];
-  return sources.filter(s => typeof s.url === "string");
+async function getSources(): Promise<{ sources: Source[], tzShift: number }> {
+  try {
+    const rawConfig = await config.get<PlugConfig>("icalendar", { sources: [] });
+    let sources: Source[] = [];
+    let tzShift = rawConfig.tzShift ?? 0;
+
+    let rawSources = rawConfig.sources;
+    if (rawSources && typeof rawSources === "object") {
+      if (rawSources.tzShift !== undefined && tzShift === 0) tzShift = rawSources.tzShift;
+      if (Array.isArray(rawSources)) {
+        sources = rawSources.filter(s => s && typeof s.url === "string");
+      } else if (rawSources.url) {
+        sources = [rawSources];
+      } else {
+        for (const key in rawSources) {
+          if (rawSources[key] && typeof rawSources[key].url === "string") sources.push(rawSources[key]);
+        }
+      }
+    }
+    return { sources, tzShift };
+  } catch (e) {
+    console.error("Failed to load configuration", e);
+    return { sources: [], tzShift: 0 };
+  }
 }
 
 async function fetchAndParseCalendar(source: Source, hourShift = 0): Promise<CalendarEvent[]> {
@@ -188,20 +180,22 @@ async function fetchAndParseCalendar(source: Source, hourShift = 0): Promise<Cal
 
 export async function syncCalendars() {
   try {
-    const plugConfig = await config.get<PlugConfig>("icalendar", { sources: [] });
-    const hourShift = plugConfig.tzShift ?? 0;
-    const sources = await getSources();
-    if (sources.length === 0) return;
+    const { sources, tzShift } = await getSources();
+    if (sources.length === 0) {
+        console.log("[iCalendar] No sources configured.");
+        return;
+    }
 
     await editor.flashNotification("Syncing calendars...", "info");
 
     const allEvents: CalendarEvent[] = [];
     for (const source of sources) {
       try {
-        const events = await fetchAndParseCalendar(source, hourShift);
+        const events = await fetchAndParseCalendar(source, tzShift);
         allEvents.push(...events);
       } catch (err) {
         console.error(`[iCalendar] Failed to sync ${source.name}:`, err);
+        await editor.flashNotification(`Failed to sync ${source.name}`, "error");
       }
     }