@nbtca/prompt 1.5.0 → 1.5.2

package/dist/app/views/schedule.js

@@ -21,6 +21,21 @@ let session = null;
 let client = null;
 let catalog = [];
 let pendingId = '';
+let lifecycleGeneration = 0;
+const closingSessions = new WeakMap();
+function isLifecycleActive(ctx, generation) {
+    return generation === lifecycleGeneration && ctx.signal?.aborted !== true;
+}
+async function closeSession(target) {
+    let closing = closingSessions.get(target);
+    if (!closing) {
+        closing = Promise.resolve()
+            .then(() => target.close())
+            .catch(() => undefined);
+        closingSessions.set(target, closing);
+    }
+    await closing;
+}
 async function releaseSession(target = session) {
     if (!target)
         return;
@@ -28,10 +43,7 @@ async function releaseSession(target = session) {
         session = null;
         client = null;
     }
-    try {
-        await target.close();
-    }
-    catch { }
+    await closeSession(target);
 }
 function isTimetableLike(value) {
     return (!!value &&
@@ -88,12 +100,16 @@ function buildPublicField() {
     });
 }
 const PUBLIC_UPCOMING_FETCH_CAP = 15;
-async function goToPublic(ctx) {
+async function goToPublic(ctx, generation = lifecycleGeneration) {
+    if (!isLifecycleActive(ctx, generation))
+        return;
     setVimKeysActive(true);
     state = { mode: 'public', publicField: buildPublicField() };
     ctx.rerender();
     try {
-        const cal = await loadCalendarOrThrow();
+        const cal = await loadCalendarOrThrow(ctx.signal);
+        if (!isLifecycleActive(ctx, generation))
+            return;
         const now = new Date();
         const windowEvents = cal.inRange(addLocalDays(now, -400), addLocalDays(now, 400));
         const publicWindow = currentAcademicWindow(windowEvents, now);
@@ -105,13 +121,18 @@ async function goToPublic(ctx) {
         state = { ...state, publicWindow, publicUpcoming };
     }
     catch {
+        if (!isLifecycleActive(ctx, generation))
+            return;
         state = { ...state, publicWindow: null };
     }
-    ctx.rerender();
+    if (isLifecycleActive(ctx, generation))
+        ctx.rerender();
 }
-async function tryInferWeekOne() {
+async function tryInferWeekOne(ctx, generation) {
     try {
-        const cal = await loadCalendarOrThrow();
+        const cal = await loadCalendarOrThrow(ctx.signal);
+        if (!isLifecycleActive(ctx, generation))
+            return null;
         const now = new Date();
         const events = cal.inRange(addLocalDays(now, -400), addLocalDays(now, 400));
         return inferWeekOneMonday(events, now);
@@ -120,19 +141,32 @@ async function tryInferWeekOne() {
         return null;
     }
 }
-async function afterAuthenticated(ctx, s) {
+async function afterAuthenticated(ctx, s, generation) {
+    if (!isLifecycleActive(ctx, generation)) {
+        await closeSession(s);
+        return;
+    }
     const hadCache = state.mode === 'hub';
     if (session && session !== s)
         await releaseSession(session);
+    if (!isLifecycleActive(ctx, generation)) {
+        await closeSession(s);
+        return;
+    }
     session = s;
     client = createNbtTimetableClient(s.timetableTransport, { baseUrl: JWXT_ORIGIN });
     try {
-        catalog = (await client.listTerms()).map(sanitizeAcademicTerm);
+        const nextCatalog = (await client.listTerms(ctx.signal === undefined ? {} : { signal: ctx.signal })).map(sanitizeAcademicTerm);
+        if (!isLifecycleActive(ctx, generation))
+            return;
+        catalog = nextCatalog;
         const term = resolveTerm(catalog);
         const key = termKey(term);
         let weekOne = loadWeekOne(key);
         if (!weekOne) {
-            weekOne = await tryInferWeekOne();
+            weekOne = await tryInferWeekOne(ctx, generation);
+            if (!isLifecycleActive(ctx, generation))
+                return;
             if (weekOne)
                 saveWeekOne(key, weekOne);
         }
@@ -151,9 +185,11 @@ async function afterAuthenticated(ctx, s) {
             ctx.rerender();
             return;
         }
-        await fetchAndShowHub(ctx, term, key, weekOne);
+        await fetchAndShowHub(ctx, term, key, weekOne, generation);
     }
     catch (err) {
+        if (!isLifecycleActive(ctx, generation))
+            return;
         if (isSessionExpired(err)) {
             createSessionStore().clear();
             await releaseSession(s);
@@ -168,13 +204,15 @@ async function afterAuthenticated(ctx, s) {
         ctx.rerender();
     }
 }
-async function fetchAndShowHub(ctx, term, key, weekOne) {
-    if (!client)
+async function fetchAndShowHub(ctx, term, key, weekOne, generation = lifecycleGeneration) {
+    if (!client || !isLifecycleActive(ctx, generation))
         return;
     state = { mode: 'loading', statusMessage: t().calendar.loading };
     ctx.rerender();
     try {
-        const timetable = sanitizeTimetable(await client.fetchTerm(term));
+        const timetable = sanitizeTimetable(await client.fetchTerm(term, ctx.signal === undefined ? {} : { signal: ctx.signal }));
+        if (!isLifecycleActive(ctx, generation))
+            return;
         const schedule = createTimetableSchedule(timetable, { weekOneMonday: weekOne });
         saveTimetableCache(key, timetable);
         saveCurrentPointer(key, weekOne);
@@ -188,6 +226,8 @@ async function fetchAndShowHub(ctx, term, key, weekOne) {
         };
     }
     catch (err) {
+        if (!isLifecycleActive(ctx, generation))
+            return;
         if (isSessionExpired(err)) {
             createSessionStore().clear();
             await releaseSession();
@@ -197,27 +237,36 @@ async function fetchAndShowHub(ctx, term, key, weekOne) {
             state = { mode: 'error', errorMessage: safeMessage(err) };
         }
     }
-    ctx.rerender();
+    if (isLifecycleActive(ctx, generation))
+        ctx.rerender();
 }
-async function refreshFromNetwork(ctx) {
+async function refreshFromNetwork(ctx, generation) {
+    if (!isLifecycleActive(ctx, generation))
+        return;
     const hadCache = state.mode === 'hub';
     try {
         const store = createSessionStore();
         const persisted = store.load();
         if (!persisted) {
             if (!hadCache)
-                await goToPublic(ctx);
+                await goToPublic(ctx, generation);
             return;
         }
         const restored = await restoreNbtSession(persisted);
-        await afterAuthenticated(ctx, restored);
+        if (!isLifecycleActive(ctx, generation)) {
+            await closeSession(restored);
+            return;
+        }
+        await afterAuthenticated(ctx, restored, generation);
     }
     catch (err) {
+        if (!isLifecycleActive(ctx, generation))
+            return;
         if (!hadCache) {
             if (err instanceof AuthError && isSessionExpired(err)) {
                 createSessionStore().clear();
             }
-            await goToPublic(ctx);
+            await goToPublic(ctx, generation);
         }
     }
 }
@@ -225,6 +274,9 @@ export const scheduleView = {
     id: 'schedule',
     title: t().timetable.menuEntry,
     async load(ctx) {
+        const generation = ++lifecycleGeneration;
+        if (!isLifecycleActive(ctx, generation))
+            return;
         const ptr = loadCurrentPointer();
         const cached = readCachedTimetable(ptr ? loadTimetableCache(ptr.termKey) : null);
         if (ptr && cached) {
@@ -241,15 +293,20 @@ export const scheduleView = {
             state = { mode: 'loading' };
         }
         ctx.rerender();
-        await refreshFromNetwork(ctx);
+        await refreshFromNetwork(ctx, generation);
     },
     async dispose() {
+        lifecycleGeneration += 1;
+        setVimKeysActive(true);
         await releaseSession();
     },
     render(ctx) {
         state.termField?.setMaxVisible(computeMaxVisible(ctx.bodyRows));
         return renderSchedule(state, new Date(), ctx.bodyRows, ctx.size.cols);
     },
+    isBusy() {
+        return state.mode === 'loading';
+    },
     capturesInput() {
         return (state.mode === 'needsLoginId' ||
             state.mode === 'needsLoginPassword' ||
@@ -331,23 +388,33 @@ export const scheduleView = {
                 }
                 if (result?.submitted !== undefined) {
                     const password = result.submitted;
+                    const generation = lifecycleGeneration;
                     setVimKeysActive(true);
                     state = { mode: 'authenticating', statusMessage: t().timetable.loginWillSave };
                     ctx.rerender();
-                    void loginWithStudentPassword(pendingId, password)
+                    void loginWithStudentPassword(pendingId, password, ctx.signal === undefined ? {} : { signal: ctx.signal })
                         .then(async (s) => {
-                        let handedOff = false;
                         try {
-                            createSessionStore().save(await s.snapshot());
-                            handedOff = true;
-                            await afterAuthenticated(ctx, s);
+                            if (!isLifecycleActive(ctx, generation)) {
+                                await closeSession(s);
+                                return;
+                            }
+                            const snapshot = await s.snapshot();
+                            if (!isLifecycleActive(ctx, generation)) {
+                                await closeSession(s);
+                                return;
+                            }
+                            createSessionStore().save(snapshot);
+                            await afterAuthenticated(ctx, s, generation);
                         }
-                        finally {
-                            if (!handedOff)
-                                await releaseSession(s);
+                        catch (error) {
+                            await closeSession(s);
+                            throw error;
                         }
                     })
                         .catch((err) => {
+                        if (!isLifecycleActive(ctx, generation))
+                            return;
                         goToLoginId(safeMessage(err));
                         ctx.rerender();
                     });
@@ -377,7 +444,7 @@ export const scheduleView = {
                     }
                     saveWeekOne(targetKey, trimmed);
                     setVimKeysActive(true);
-                    void fetchAndShowHub(ctx, targetTerm, targetKey, trimmed);
+                    void fetchAndShowHub(ctx, targetTerm, targetKey, trimmed, lifecycleGeneration);
                 }
                 return;
             }
@@ -456,10 +523,11 @@ export const scheduleView = {
                     return;
                 }
                 if (shortcut.key === 'x') {
+                    const generation = ++lifecycleGeneration;
                     createSessionStore().clear();
                     clearScheduleCache();
                     void releaseSession();
-                    void goToPublic(ctx);
+                    void goToPublic(ctx, generation);
                 }
                 return;
             }
@@ -528,7 +596,7 @@ export const scheduleView = {
                     };
                     return;
                 }
-                void fetchAndShowHub(ctx, term, newTermKey, weekOne);
+                void fetchAndShowHub(ctx, term, newTermKey, weekOne, lifecycleGeneration);
                 return;
             }
             case 'loading':