refactor: deduplicate shared utilities + fix cookie store

src/services/assignment.ts

@@ -12,6 +12,7 @@ import type {
 import { debug } from "@/utils/debug";
 import {
   getQueryParamValue,
+  isLoginHtml,
   parseAssignmentIdFromMoodleUrl,
 } from "@/utils/moodle-url";
 import {
@@ -158,15 +159,6 @@ const parseNumberValue = (
   return null;
 };
 
-const isLoginHtml = (html: string): boolean => {
-  const normalized = html.replace(/\s+/g, " ");
-  return (
-    normalized.includes('name="logintoken"') ||
-    normalized.includes('id="login"') ||
-    normalized.includes("/login/index.php")
-  );
-};
-
 const ensureAuthenticatedSession = async (): Promise<boolean> => {
   const hasSession = await checkSession();
   if (hasSession) return true;

src/services/cookie-store.ts

@@ -59,7 +59,10 @@ class CookieStore {
       if (keyLower === "domain") cookie.domain = val?.trim();
       if (keyLower === "path") cookie.path = val?.trim();
       if (keyLower === "expires" && val) {
-        cookie.expires = new Date(val.trim());
+        const parsed = new Date(val.trim());
+        if (!Number.isNaN(parsed.getTime())) {
+          cookie.expires = parsed;
+        }
       }
     }
 

src/services/dashboard.ts

@@ -2,6 +2,7 @@ import type { TimelineEvent } from "@/types";
 import { debug } from "@/utils/debug";
 import { api } from "./api";
 import { dedupeTimelineEvents } from "./dashboard-event-utils";
+import { getSesskey } from "./sesskey";
 
 interface MoodleTimelineResponse {
   error: boolean;
@@ -13,17 +14,6 @@ interface MoodleTimelineResponse {
   };
 }
 
-const getSesskey = async (): Promise<string | null> => {
-  const response = await api.get<string>("/my/");
-  const match = response.data.match(/"sesskey":"([^"]+)"/);
-  if (match) {
-    debug.scraper(`Found sesskey: ${match[1]}`);
-    return match[1];
-  }
-  debug.scraper("Sesskey not found");
-  return null;
-};
-
 type ActionEventsByTimesortArgs = {
   limitnum: number;
   timesortfrom: number;

src/services/feedback-autofill.ts

@@ -13,6 +13,7 @@ import {
   querySelectorAll,
 } from "@/utils/html-parser";
 import { debug } from "@/utils/debug";
+import { isLoginHtml } from "@/utils/moodle-url";
 import type { Element } from "domhandler";
 
 type FeedbackAutofillOptions = {
@@ -60,15 +61,6 @@ type FillResult = {
   textFieldsFilled: number;
 };
 
-const isLoginHtml = (html: string): boolean => {
-  const normalized = html.replace(/\s+/g, " ");
-  return (
-    normalized.includes('name="logintoken"') ||
-    normalized.includes('id="login"') ||
-    normalized.includes("/login/index.php")
-  );
-};
-
 const toAbsoluteUrl = (href: string): string => {
   const baseUrl = getCurrentBaseUrl();
   try {

src/services/lms-download.ts

@@ -9,6 +9,7 @@ import type {
   LmsDownloadSuccess,
 } from "@/types";
 import { debug } from "@/utils/debug";
+import { isLoginHtml } from "@/utils/moodle-url";
 import { File, Paths } from "expo-file-system";
 import { fetch as expoFetch } from "expo/fetch";
 
@@ -83,14 +84,6 @@ const toAbsoluteLmsUrl = (url: string): string => {
   return `${baseUrl}/${url.replace(/^\.?\//, "")}`;
 };
 
-const isLoginHtml = (html: string): boolean => {
-  const condensed = html.replace(/\s+/g, " ");
-  return (
-    condensed.includes('name="logintoken"') ||
-    condensed.includes('id="login"') ||
-    condensed.includes("/login/index.php")
-  );
-};
 
 const buildFailure = (
   reason: LmsDownloadFailureReason,

src/services/resources-scraper.ts

@@ -13,21 +13,13 @@ import {
   querySelector,
   querySelectorAll,
 } from "@/utils/html-parser";
+import { isLoginHtml } from "@/utils/moodle-url";
 import type { Element } from "domhandler";
 import { api, BASE_URL } from "./api";
 
 const normalizeText = (value: string): string =>
   value.replace(/\s+/g, " ").trim();
 
-const isLoginHtml = (html: string): boolean => {
-  const normalized = html.replace(/\s+/g, " ");
-  return (
-    normalized.includes('name="logintoken"') ||
-    normalized.includes('id="login"') ||
-    normalized.includes("/login/index.php")
-  );
-};
-
 const toAbsoluteUrl = (href: string): string => {
   if (href.startsWith("http://") || href.startsWith("https://")) {
     return href;

src/services/scraper.ts

@@ -16,22 +16,7 @@ import {
   querySelectorAll,
 } from "@/utils/html-parser";
 import { api, BASE_URL } from "./api";
-
-// Get sesskey from page for API calls
-const getSesskey = async (): Promise<string | null> => {
-  const response = await api.get<string>("/my/");
-
-  // Find sesskey in page - it's in M.cfg.sesskey in a script tag
-  const match = response.data.match(/"sesskey":"([^"]+)"/);
-
-  if (match) {
-    debug.scraper(`Found sesskey: ${match[1]}`);
-    return match[1];
-  }
-
-  debug.scraper("Sesskey not found");
-  return null;
-};
+import { getSesskey } from "./sesskey";
 
 // Fetch courses using Moodle's AJAX API (only "in progress" courses)
 export const fetchCourses = async (): Promise<Course[]> => {

src/services/sesskey.ts

@@ -0,0 +1,14 @@
+import { debug } from "@/utils/debug";
+import { api } from "./api";
+
+/** Extract sesskey from the Moodle dashboard page (M.cfg.sesskey). */
+export const getSesskey = async (): Promise<string | null> => {
+  const response = await api.get<string>("/my/");
+  const match = response.data.match(/"sesskey":"([^"]+)"/);
+  if (match) {
+    debug.scraper(`Found sesskey: ${match[1]}`);
+    return match[1];
+  }
+  debug.scraper("Sesskey not found");
+  return null;
+};

src/utils/moodle-url.ts

@@ -1,5 +1,15 @@
 const ASSIGNMENT_VIEW_PATH = "/mod/assign/view.php";
 
+/** Check if HTML response is a Moodle login page (session expired). */
+export const isLoginHtml = (html: string): boolean => {
+  const normalized = html.replace(/\s+/g, " ");
+  return (
+    normalized.includes('name="logintoken"') ||
+    normalized.includes('id="login"') ||
+    normalized.includes("/login/index.php")
+  );
+};
+
 export const getQueryParamValue = (url: string, key: string): string | null => {
   if (!url) return null;