@nbtca/prompt 1.5.11 → 1.5.12

package/dist/app/views/events-render.js

@@ -19,6 +19,8 @@ function renderHubBody(state, now, bodyRows, cols) {
     const rows = Number.isFinite(bodyRows)
         ? Math.max(0, Math.floor(bodyRows))
         : Number.POSITIVE_INFINITY;
+    if (state.stale)
+        lines.push(...wrappedIndentedLines(trans.calendar.stale, cols, type.hint), '');
     const banner = renderCountdownBanner(state.nextEvent, now, cols);
     if (banner)
         lines.push(...banner.split('\n'), '');

package/dist/app/views/events.js

@@ -5,11 +5,12 @@ import { renderEvents } from './events-render.js';
 import { setVimKeysActive } from '../../core/vim-keys.js';
 import { pickIcon } from '../../core/icons.js';
 import { t } from '../../i18n/index.js';
-import { loadCalendarOrThrow, toDisplayEvent, exportEventIcs } from '../../features/calendar.js';
-import { weekRange, monthRange, filterEvents } from '../../features/calendar-query.js';
+import { exportEventIcs, loadCalendarOrCache, toDisplayEvent, yearHeatmap, } from '../../features/calendar.js';
+import { currentEvents, filterEvents, monthRange, weekRange, } from '../../features/calendar-query.js';
 import { addLocalDays } from '../../core/calendar-day.js';
 let state = { mode: 'loading' };
 let calendar = null;
+let stale = false;
 let currentList = [];
 function backLabel() {
     return t().common.back;
@@ -54,19 +55,15 @@ function showList(title, events, ctx) {
 }
 const RECENT_ACTIVITY_FETCH_CAP = 15;
 function goToHub() {
-    const upcoming = calendar ? calendar.upcoming({ days: 30 }) : [];
-    const nextEvent = upcoming[0];
+    const now = new Date();
+    const upcoming = calendar ? currentEvents(calendar, now) : [];
+    const nextEvent = upcoming.find((event) => event.start >= now);
     state = {
         mode: 'hub',
         hubField: buildHubField(),
+        ...(stale ? { stale } : {}),
         ...(nextEvent === undefined ? {} : { nextEvent: toDisplayEvent(nextEvent) }),
-        heatmapBuckets: calendar
-            ? calendar.heatmap({
-                start: addLocalDays(new Date(), -365),
-                end: new Date(),
-                bucket: 'day',
-            })
-            : [],
+        heatmapBuckets: calendar ? yearHeatmap(calendar, now) : [],
         recentEvents: upcoming.slice(0, RECENT_ACTIVITY_FETCH_CAP).map(toDisplayEvent),
     };
 }
@@ -98,10 +95,11 @@ export const eventsView = {
         state = { mode: 'loading' };
         ctx.rerender();
         try {
-            const loadedCalendar = await loadCalendarOrThrow(ctx.signal);
+            const loaded = await loadCalendarOrCache(ctx.signal);
             if (ctx.signal?.aborted)
                 return;
-            calendar = loadedCalendar;
+            calendar = loaded.calendar;
+            stale = loaded.stale;
             goToHub();
         }
         catch {
@@ -153,7 +151,7 @@ export const eventsView = {
                     return;
                 const now = new Date();
                 if (result.selected === 'upcoming') {
-                    showList(t().menu.events, calendar.upcoming({ days: 30 }), ctx);
+                    showList(t().menu.events, currentEvents(calendar, now), ctx);
                     return;
                 }
                 if (result.selected === 'week') {

package/dist/app/views/home.js

@@ -8,6 +8,7 @@ import { weekdayShortLabel } from '../../features/schedule-render.js';
 import { passiveFooterHint } from '../chrome.js';
 import { campusDateTime, campusIsoDate } from '@nbtca/nbtcal/timetable';
 import { isoDayDifference, localDayDifference, parseLocalDate } from '../../core/calendar-day.js';
+import { currentEvents } from '../../features/calendar-query.js';
 import { loadingLines } from '../../core/components/spinner.js';
 const WEEKDAYS = [1, 2, 3, 4, 5, 6, 7];
 function wrappedIndentedLines(label, cols, style) {
@@ -144,8 +145,7 @@ export function renderHome(data, now, bodyRows = 100, cols = 80) {
 const HOME_EVENT_FETCH_CAP = 15;
 function calendarSnapshot(cal, weekAheadInfo) {
     const now = new Date();
-    const eventLines = cal
-        .upcoming({ days: 30 })
+    const eventLines = currentEvents(cal, now)
         .slice(0, HOME_EVENT_FETCH_CAP)
         .map((event) => renderEventBrief(toDisplayEvent(event), now));
     if (!weekAheadInfo)

package/dist/app/views/schedule.js

@@ -513,8 +513,8 @@ export const scheduleView = {
                         writePrivateIcs(out, ics);
                         state = { ...state, statusMessage: `${t().common.success}: ${path.resolve(out)}` };
                     }
-                    catch {
-                        state = { ...state, statusMessage: t().timetable.genericError };
+                    catch (error) {
+                        state = { ...state, statusMessage: safeMessage(error) };
                     }
                     return;
                 }

package/dist/auth/cookie-transport.js

@@ -108,36 +108,9 @@ function safeHeaders(headers) {
     }
     return Object.fromEntries(result.entries());
 }
-function abortSignal(signal, timeoutMs) {
-    const controller = new AbortController();
-    let didTimeout = false;
-    const onAbort = () => {
-        controller.abort(signal?.reason);
-    };
-    signal?.addEventListener('abort', onAbort, { once: true });
-    if (signal?.aborted)
-        onAbort();
-    const timer = setTimeout(() => {
-        didTimeout = true;
-        controller.abort();
-    }, timeoutMs);
-    timer.unref();
-    return {
-        signal: controller.signal,
-        cleanup() {
-            clearTimeout(timer);
-            signal?.removeEventListener('abort', onAbort);
-        },
-        timedOut: () => didTimeout,
-    };
-}
-function safeFetchError(error, stage, didTimeout) {
+function safeFetchError(error, stage) {
     if (error instanceof AuthError)
         return error;
-    if (didTimeout)
-        return new AuthError('TIMEOUT', stage, 'The campus service request timed out.', {
-            retryable: true,
-        });
     if (typeof error === 'object' && error !== null && Reflect.get(error, 'name') === 'AbortError') {
         return new DOMException('The campus service request was aborted.', 'AbortError');
     }
@@ -169,20 +142,24 @@ export function createCampusCookieSession(options = {}) {
         if (init.method && init.method !== 'GET' && init.method !== 'POST') {
             throw new AuthError('UNTRUSTED_URL', stage, 'Only read and login requests are allowed.');
         }
-        const controlled = abortSignal(init.signal, timeoutMs);
+        const timeout = new AbortController();
+        setTimeout(() => {
+            timeout.abort(new AuthError('TIMEOUT', stage, 'The campus service request timed out.', {
+                retryable: true,
+            }));
+        }, timeoutMs).unref();
+        // Keep the timer running after the headers: the caller still has to read the body.
+        const signal = init.signal ? AbortSignal.any([init.signal, timeout.signal]) : timeout.signal;
         try {
             return await cookieFetch(url, {
                 ...init,
                 headers: safeHeaders(init.headers),
-                signal: controlled.signal,
+                signal,
                 maxRedirect: 8,
             });
         }
         catch (error) {
-            throw safeFetchError(error, stage, controlled.timedOut());
-        }
-        finally {
-            controlled.cleanup();
+            throw safeFetchError(error, stage);
         }
     }
     async function timetableTransport(url, init) {

package/dist/cli.js

@@ -1,7 +1,8 @@
 import chalk from 'chalk';
 import { main } from './main.js';
-import { fetchEvents, fetchHeatmapBuckets, renderEventsTable, serializeEvents, } from './features/calendar.js';
+import { loadCalendarOrCache, renderEventsTable, serializeEvents, toDisplayEvent, yearHeatmap, } from './features/calendar.js';
 import { renderHeatmap } from './features/calendar-heatmap.js';
+import { currentEvents, dayRange, monthRange, weekRange } from './features/calendar-query.js';
 import { checkServices, countServiceHealth, hasServiceFailures, renderServiceStatusTable, serializeServiceStatus, } from './features/status.js';
 import { pickIcon } from './core/icons.js';
 import { applyColorModePreference } from './config/preferences.js';
@@ -261,45 +262,34 @@ async function runEventsCommand(flags) {
         console.error(chalk.red(t().cli.invalidNext));
         process.exit(1);
     }
+    const { calendar, stale } = await loadCalendarOrCache();
+    if (stale)
+        console.error(chalk.yellow(t().calendar.stale));
+    const now = new Date();
     if (flags.has('--heatmap')) {
-        const buckets = await fetchHeatmapBuckets();
+        const buckets = yearHeatmap(calendar, now);
         if (flags.has('--json')) {
             process.stdout.write(JSON.stringify(buckets, null, 2) + '\n');
         }
         else {
             const useColor = !flags.has('--plain') && isTty(process.stdout.isTTY);
-            console.log(renderHeatmap(buckets, new Date(), { color: useColor }));
+            const cols = terminalWidth();
+            console.log(renderHeatmap(buckets, now, { color: useColor, ...(cols === undefined ? {} : { cols }) }));
         }
         return;
     }
-    const { weekRange, monthRange } = await import('./features/calendar-query.js');
-    const { fetchInRange } = await import('./features/calendar.js');
-    const now0 = new Date();
-    let events;
-    if (flags.has('--week')) {
-        const r = weekRange(now0);
-        events = await fetchInRange(r.start, r.end);
-    }
-    else if (flags.has('--month')) {
-        const r = monthRange(now0);
-        events = await fetchInRange(r.start, r.end);
-    }
-    else {
-        events = await fetchEvents();
-    }
+    const range = flags.has('--today')
+        ? dayRange(now)
+        : flags.has('--week')
+            ? weekRange(now)
+            : flags.has('--month')
+                ? monthRange(now)
+                : undefined;
+    let events = (range ? calendar.inRange(range.start, range.end) : currentEvents(calendar, now)).map(toDisplayEvent);
     if (searchFlag) {
         const q = searchFlag.slice('--search='.length).toLowerCase();
         events = events.filter((e) => `${e.title} ${e.location}`.toLowerCase().includes(q));
     }
-    if (flags.has('--today')) {
-        const now = new Date();
-        events = events.filter((e) => {
-            const d = e.startDate;
-            return (d.getFullYear() === now.getFullYear() &&
-                d.getMonth() === now.getMonth() &&
-                d.getDate() === now.getDate());
-        });
-    }
     if (next !== undefined)
         events = events.slice(0, next);
     if (flags.has('--json')) {

package/dist/features/calendar-heatmap.js

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import { pickIcon } from '../core/icons.js';
 import { space, type } from '../core/theme.js';
 import { t, getCurrentLanguage } from '../i18n/index.js';
+import { visualWidth } from '../core/text.js';
 function parseBucketDate(date) {
     const parts = date.split('-').map(Number);
     const y = parts[0] ?? 0;
@@ -77,7 +78,7 @@ export function renderHeatmap(buckets, today, options) {
         timeZone: 'UTC',
     });
     const cellsWidth = numCols * cellWidth;
-    const monthChars = new Array(cellsWidth).fill(' ');
+    let monthLine = '';
     let prevMonth = -1;
     for (let col = 0; col < numCols; col++) {
         let labelDate = null;
@@ -93,14 +94,15 @@ export function renderHeatmap(buckets, today, options) {
         const month = labelDate.getUTCMonth();
         if (month !== prevMonth) {
             prevMonth = month;
-            const label = monthFmt.format(labelDate); // e.g. "Jun"
+            const label = monthFmt.format(labelDate);
             const start = col * cellWidth;
-            for (let i = 0; i < label.length && start + i < cellsWidth; i++) {
-                monthChars[start + i] = label[i] ?? ' ';
+            const used = visualWidth(monthLine);
+            if (start >= used + (used > 0 ? 1 : 0) && start + visualWidth(label) <= cellsWidth) {
+                monthLine += ' '.repeat(start - used) + label;
             }
         }
     }
-    const monthLabelLine = space.indent + weekdayLabel + monthChars.join('');
+    const monthLabelLine = space.indent + weekdayLabel + monthLine;
     const weekdayNames = [
         trans.timetable.weekdayMon.slice(0, 2),
         '  ',

package/dist/features/calendar-query.js

@@ -1,3 +1,4 @@
+const UPCOMING_DAYS = 30;
 export function weekRange(now) {
     const start = new Date(now);
     start.setHours(0, 0, 0, 0);
@@ -7,6 +8,24 @@ export function weekRange(now) {
     end.setDate(end.getDate() + 7);
     return { start, end };
 }
+export function dayRange(now) {
+    const start = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+    const end = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
+    return { start, end };
+}
+export function currentEvents(calendar, now) {
+    const { start } = dayRange(now);
+    const end = new Date(now.getTime() + UPCOMING_DAYS * 86_400_000);
+    return calendar.inRange(start, end).filter((event) => {
+        if (event.start >= now)
+            return true;
+        const eventEnd = event.end ??
+            (event.isAllDay
+                ? new Date(event.start.getFullYear(), event.start.getMonth(), event.start.getDate() + 1)
+                : event.start);
+        return eventEnd > now;
+    });
+}
 export function monthRange(now) {
     const start = new Date(now.getFullYear(), now.getMonth(), 1, 0, 0, 0, 0);
     const end = new Date(now.getFullYear(), now.getMonth() + 1, 1, 0, 0, 0, 0);

package/dist/features/calendar.js

@@ -76,16 +76,19 @@ export function toDisplayEvent(e) {
         uid: e.uid,
     };
 }
-export async function fetchEvents() {
-    return (await loadCalendarOrThrow()).upcoming({ days: 30 }).map(toDisplayEvent);
-}
-export async function fetchInRange(start, end) {
-    return (await loadCalendarOrThrow()).inRange(start, end).map(toDisplayEvent);
+export async function loadCalendarOrCache(signal) {
+    try {
+        return { calendar: await loadCalendarOrThrow(signal), stale: false };
+    }
+    catch (err) {
+        const cached = peekCalendar();
+        if (!cached)
+            throw err;
+        return { calendar: cached, stale: true };
+    }
 }
-export async function fetchHeatmapBuckets() {
-    const now = new Date();
-    const start = addLocalDays(now, -365);
-    return (await loadCalendarOrThrow()).heatmap({ start, end: now, bucket: 'day' });
+export function yearHeatmap(calendar, now) {
+    return calendar.heatmap({ start: addLocalDays(now, -365), end: now, bucket: 'day' });
 }
 export function serializeEvents(events) {
     return events.map((event) => ({

package/dist/features/student-timetable.js

@@ -6,7 +6,9 @@ import { runSecretInput, runTextInput } from '../core/components/text-input.js';
 import { AuthError } from '../auth/errors.js';
 import { loginWithStudentPassword, restoreNbtSession, } from '../auth/nbt-auth.js';
 import { createSessionStore } from '../auth/session-store.js';
+import { isoDayDifference, parseLocalMonday } from '../core/calendar-day.js';
 import { clearScheduleCache, termKey } from './schedule-store.js';
+import { sanitizeTerminalLine } from '../core/text.js';
 import { fmt, t } from '../i18n/index.js';
 import { sanitizeAcademicTerm, sanitizeTimetable } from './timetable-sanitize.js';
 export const JWXT_ORIGIN = 'https://jwxt-443.webvpn.nbt.edu.cn';
@@ -43,12 +45,48 @@ function displaySemesterLabel(term) {
         ? fmt(t().timetable.semesterNumber, { number: term.semesterLabel })
         : term.semesterLabel;
 }
+class WeekOneError extends Error {
+    reason;
+    constructor(reason) {
+        super(`--week-one is ${reason}.`);
+        this.reason = reason;
+    }
+}
+export function assertWeekOne(weekOneMonday, calendarDays = []) {
+    try {
+        parseLocalMonday(weekOneMonday);
+    }
+    catch {
+        throw new WeekOneError('invalid');
+    }
+    if (calendarDays.some((day) => isoDayDifference(weekOneMonday, day.date) !== (day.week - 1) * 7 + day.weekday - 1)) {
+        throw new WeekOneError('conflict');
+    }
+}
+class IcsWriteError extends Error {
+    file;
+    reason;
+    constructor(file, reason) {
+        super(`Could not write ${file}.`);
+        this.file = file;
+        this.reason = reason;
+    }
+}
 export function isSessionExpired(error) {
     return ((error instanceof AuthError && error.code === 'SESSION_EXPIRED') ||
         (error instanceof TimetableError && error.code === 'SESSION_EXPIRED'));
 }
 export function safeMessage(error) {
     const trans = t().timetable;
+    if (error instanceof IcsWriteError) {
+        return fmt(trans.writeFailed, {
+            file: sanitizeTerminalLine(error.file),
+            reason: sanitizeTerminalLine(error.reason),
+        });
+    }
+    if (error instanceof WeekOneError) {
+        return error.reason === 'invalid' ? trans.invalidWeekOne : trans.weekOneConflict;
+    }
     if (error instanceof AuthError) {
         switch (error.code) {
             case 'INVALID_CREDENTIALS':
@@ -110,25 +148,28 @@ export function safeMessage(error) {
     }
     return trans.genericError;
 }
+class PromptCancelledError extends Error {
+}
+function answered(value) {
+    if (value === null)
+        throw new PromptCancelledError();
+    return value;
+}
 async function interactiveLogin(isInteractive) {
     const trans = t().timetable;
     if (!isInteractive) {
         throw new AuthError('INVALID_CREDENTIALS', 'credentials', 'Interactive login requires a terminal.');
     }
-    const username = await runTextInput({
+    const username = answered(await runTextInput({
         message: trans.studentId,
         placeholder: trans.studentIdHint,
         allowEmpty: false,
-    });
-    if (!username)
-        throw new AuthError('INVALID_CREDENTIALS', 'credentials', 'Student id is required.');
-    const password = await runSecretInput({
+    }));
+    const password = answered(await runSecretInput({
         message: trans.password,
         placeholder: trans.passwordHint,
         allowEmpty: false,
-    });
-    if (!password)
-        throw new AuthError('INVALID_CREDENTIALS', 'credentials', 'Password is required.');
+    }));
     return loginWithStudentPassword(username, password);
 }
 export async function withAuthenticatedSession(operation, options) {
@@ -200,6 +241,11 @@ export function writePrivateIcs(filePath, contents) {
             /* Best effort on non-POSIX filesystems. */
         }
     }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        // Node appends the syscall and the temporary path; keep only "CODE: description".
+        throw new IcsWriteError(resolved, /^(.+?), \w+ '/.exec(message)?.[1] ?? message);
+    }
     finally {
         try {
             fs.unlinkSync(temporaryPath);
@@ -219,12 +265,13 @@ async function resolveWeekOneMonday(explicitValue, hasAuthoritativeDates, isInte
         return explicitValue;
     if (!isInteractive)
         return undefined;
-    const value = await runTextInput({
+    const value = answered(await runTextInput({
         message: t().timetable.weekOne,
         placeholder: t().timetable.weekOneHint,
         allowEmpty: false,
-    });
-    return value === null || value === '' ? undefined : value;
+    })).trim();
+    assertWeekOne(value);
+    return value;
 }
 export async function runStudentTimetableCommand(subcommandValue, options) {
     const subcommand = (subcommandValue ?? 'export').toLowerCase();
@@ -249,7 +296,10 @@ export async function runStudentTimetableCommand(subcommandValue, options) {
         stderr.write(`${fmt(trans.invalidOption, { flag: invalidFlag })}\n`);
         return 1;
     }
+    const weekOneFlag = flagValue(options.flags, '--week-one=');
     try {
+        if (weekOneFlag !== undefined)
+            assertWeekOne(weekOneFlag);
         if (subcommand === 'logout') {
             store.clear();
             clearScheduleCache();
@@ -291,7 +341,9 @@ export async function runStudentTimetableCommand(subcommandValue, options) {
             const output = outputFlag === undefined || outputFlag === ''
                 ? `timetable-${termKey(selected)}.ics`
                 : outputFlag;
-            const weekOneMonday = await resolveWeekOneMonday(flagValue(options.flags, '--week-one='), timetable.calendarDays.length > 0, isInteractive);
+            const weekOneMonday = await resolveWeekOneMonday(weekOneFlag, timetable.calendarDays.length > 0, isInteractive);
+            if (weekOneMonday !== undefined)
+                assertWeekOne(weekOneMonday, timetable.calendarDays);
             const ics = timetableToIcs(timetable, {
                 ...(weekOneMonday === undefined ? {} : { weekOneMonday }),
                 calendarName: fmt(trans.calendarName, {
@@ -315,6 +367,8 @@ export async function runStudentTimetableCommand(subcommandValue, options) {
         }, { oneShot, isInteractive, store, stderr });
     }
     catch (error) {
+        if (error instanceof PromptCancelledError)
+            return 130;
         if (!isInteractive && error instanceof AuthError && error.code === 'INVALID_CREDENTIALS') {
             stderr.write(`${trans.noSession}\n`);
             return 2;

package/dist/i18n/locales/en.json

@@ -29,7 +29,7 @@
   },
   "menu": {
     "events": "Events",
-    "eventsDesc": "",
+    "eventsDesc": "Upcoming activities",
     "docs": "Docs",
     "docsDesc": "Knowledge base",
     "status": "Status",
@@ -239,6 +239,8 @@
     "loginChanged": "The school login page changed; credentials were not submitted.",
     "unexpectedResponse": "A valid JWXT session could not be confirmed after login.",
     "missingDates": "JWXT returned no calendar dates. Provide --week-one=YYYY-MM-DD.",
+    "invalidWeekOne": "The first teaching week must start on a Monday, written as YYYY-MM-DD.",
+    "weekOneConflict": "--week-one does not match the dates JWXT provided; drop the option to use JWXT's dates.",
     "missingPeriod": "JWXT returned no usable period times, so export cannot continue safely.",
     "termMismatch": "JWXT returned a different academic term. Try again.",
     "invalidData": "The timetable response format is not currently recognized.",
@@ -246,6 +248,7 @@
     "noTerms": "JWXT returned no available terms.",
     "currentTermUnknown": "JWXT did not identify one current term. Choose one with --term=year:code.",
     "genericError": "The timetable operation failed.",
+    "writeFailed": "Could not write {file}: {reason}",
     "hubToday": "Today",
     "hubWeek": "This week",
     "hubSwitchTerm": "Switch term",

package/dist/i18n/locales/zh.json

@@ -29,7 +29,7 @@
   },
   "menu": {
     "events": "活动",
-    "eventsDesc": "",
+    "eventsDesc": "近期活动安排",
     "docs": "文档",
     "docsDesc": "知识库",
     "status": "状态",
@@ -239,6 +239,8 @@
     "loginChanged": "学校登录页结构已经变化，当前版本未提交凭据。",
     "unexpectedResponse": "登录后未能确认有效的教务会话。",
     "missingDates": "教务响应没有可用日期，请用 --week-one=YYYY-MM-DD 指定第一周周一。",
+    "invalidWeekOne": "第一教学周的起始日期必须是周一，并写成 YYYY-MM-DD 格式。",
+    "weekOneConflict": "--week-one 与教务提供的日期对不上；去掉这个选项即可直接使用教务日期。",
     "missingPeriod": "教务响应缺少课程节次时间，无法安全导出。",
     "termMismatch": "教务系统返回了不同学期，请重试。",
     "invalidData": "课表数据格式暂时无法识别。",
@@ -246,6 +248,7 @@
     "noTerms": "教务系统没有返回可用学期。",
     "currentTermUnknown": "教务没有标出唯一的当前学期；请用 --term=学年:代码 指定。",
     "genericError": "课表操作失败。",
+    "writeFailed": "无法写入 {file}：{reason}",
     "hubToday": "今日",
     "hubWeek": "本周",
     "hubSwitchTerm": "切换学期",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nbtca/prompt",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "type": "module",
   "main": "dist/index.js",
   "exports": {