@mo7yw4ng/openape 1.0.1 → 1.0.3

package/script/src/commands/calendar.js

@@ -3,16 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerCalendarCommand = void 0;
+exports.registerCalendarCommand = registerCalendarCommand;
 const utils_js_1 = require("../lib/utils.js");
 const moodle_js_1 = require("../lib/moodle.js");
 const logger_js_1 = require("../lib/logger.js");
-const auth_js_1 = require("../lib/auth.js");
-const session_js_1 = require("../lib/session.js");
-const auth_js_2 = require("../lib/auth.js");
 const token_js_1 = require("../lib/token.js");
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_fs_1 = __importDefault(require("node:fs"));
 function registerCalendarCommand(program) {
     const calendarCmd = program.command("calendar");
     calendarCmd.description("Calendar operations");
@@ -28,14 +25,17 @@ function registerCalendarCommand(program) {
         const silent = outputFormat === "json" && !opts.verbose;
         const log = (0, logger_js_1.createLogger)(opts.verbose, silent);
         const baseDir = (0, utils_js_1.getBaseDir)();
-        const sessionPath = path_1.default.resolve(baseDir, ".auth", "storage-state.json");
+        const sessionPath = node_path_1.default.resolve(baseDir, ".auth", "storage-state.json");
         // Check if session exists
-        if (!fs_1.default.existsSync(sessionPath)) {
+        if (!node_fs_1.default.existsSync(sessionPath)) {
+            log.error("未找到登入 session。請先執行 'openape auth login' 進行登入。");
+            log.info(`Session 預期位置: ${sessionPath}`);
             return null;
         }
         // Try to load WS token
         const wsToken = (0, token_js_1.loadWsToken)(sessionPath);
         if (!wsToken) {
+            log.error("未找到 WS token。請先執行 'openape auth login' 進行登入。");
             return null;
         }
         return {
@@ -46,46 +46,6 @@ function registerCalendarCommand(program) {
             },
         };
     }
-    // Helper function to create session context
-    async function createSessionContext(options, command) {
-        // Get global options if command is provided (for --verbose, --silent flags)
-        const opts = command?.optsWithGlobals ? command.optsWithGlobals() : options;
-        // Auto-enable silent mode for JSON output (unless --verbose is also set)
-        const outputFormat = getOutputFormat(command || { optsWithGlobals: () => ({ output: "json" }) });
-        const silent = outputFormat === "json" && !opts.verbose;
-        const log = (0, logger_js_1.createLogger)(opts.verbose, silent);
-        // Determine session path
-        const baseDir = (0, utils_js_1.getBaseDir)();
-        const sessionPath = path_1.default.resolve(baseDir, ".auth", "storage-state.json");
-        // Check if session exists
-        if (!fs_1.default.existsSync(sessionPath)) {
-            log.error("未找到登入 session。請先執行 'openape auth login' 進行登入。");
-            log.info(`Session 預期位置: ${sessionPath}`);
-            return null;
-        }
-        // Create minimal config
-        const config = {
-            username: "",
-            password: "",
-            courseUrl: "",
-            moodleBaseUrl: "https://ilearning.cycu.edu.tw",
-            headless: !options.headed,
-            slowMo: 0,
-            authStatePath: sessionPath,
-            ollamaBaseUrl: "",
-        };
-        log.info("啟動瀏覽器...");
-        const { browser, context, page } = await (0, auth_js_1.launchAuthenticated)(config, log);
-        try {
-            const session = await (0, session_js_1.extractSessionInfo)(page, config, log);
-            return { log, page, session, browser, context };
-        }
-        catch (err) {
-            await context.close();
-            await browser.close();
-            throw err;
-        }
-    }
     calendarCmd
         .command("events")
         .description("List calendar events")
@@ -95,150 +55,71 @@ function registerCalendarCommand(program) {
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (options, command) => {
         const days = parseInt(options.days, 10);
-        // Try pure API mode (no browser, fast!)
         const apiContext = await createApiContext(options, command);
-        if (apiContext) {
-            try {
-                const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session);
-                // Calculate time range
-                const now = Math.floor(Date.now() / 1000);
-                const endTime = now + (days * 24 * 60 * 60);
-                let allEvents = [];
-                if (options.course) {
-                    // Get events for specific course
-                    const courseId = parseInt(options.course, 10);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session);
+        // Calculate time range
+        const now = Math.floor(Date.now() / 1000);
+        const endTime = now + (days * 24 * 60 * 60);
+        let allEvents = [];
+        if (options.course) {
+            // Get events for specific course
+            const courseId = parseInt(options.course, 10);
+            const events = await (0, moodle_js_1.getCalendarEventsApi)(apiContext.session, {
+                startTime: now,
+                endTime: endTime,
+            });
+            allEvents = events.filter(e => e.courseid === courseId);
+        }
+        else {
+            // Get events for all courses
+            for (const course of courses) {
+                try {
                     const events = await (0, moodle_js_1.getCalendarEventsApi)(apiContext.session, {
+                        courseId: course.id,
                         startTime: now,
                         endTime: endTime,
                     });
-                    allEvents = events.filter(e => e.courseid === courseId);
-                }
-                else {
-                    // Get events for all courses
-                    for (const course of courses) {
-                        try {
-                            const events = await (0, moodle_js_1.getCalendarEventsApi)(apiContext.session, {
-                                courseId: course.id,
-                                startTime: now,
-                                endTime: endTime,
-                            });
-                            allEvents.push(...events);
-                        }
-                        catch (err) {
-                            apiContext.log.debug(`Failed to fetch calendar events for ${course.fullname}: ${err}`);
-                        }
-                    }
-                }
-                // Sort by start time
-                allEvents.sort((a, b) => a.timestart - b.timestart);
-                // Filter upcoming only if requested
-                let filteredEvents = allEvents;
-                if (options.upcoming) {
-                    filteredEvents = allEvents.filter(e => e.timestart > now);
+                    allEvents.push(...events);
                 }
-                const output = {
-                    status: "success",
-                    timestamp: new Date().toISOString(),
-                    events: filteredEvents.map(e => ({
-                        id: e.id,
-                        name: e.name,
-                        description: e.description,
-                        course_id: e.courseid,
-                        event_type: e.eventtype,
-                        start_time: new Date(e.timestart).toISOString(),
-                        end_time: e.timeduration ? new Date(e.timestart + e.timeduration / 1000).toISOString() : null,
-                        location: e.location,
-                    })),
-                    summary: {
-                        total_events: allEvents.length,
-                        upcoming: allEvents.filter(e => e.timestart > now).length,
-                        by_type: allEvents.reduce((acc, e) => {
-                            acc[e.eventtype] = (acc[e.eventtype] || 0) + 1;
-                            return acc;
-                        }, {}),
-                    },
-                };
-                console.log(JSON.stringify(output));
-                return;
-            }
-            catch (e) {
-                // API failed, fall through to browser mode
-                const msg = e instanceof Error ? e.message : String(e);
-                console.error(`// API mode failed: ${msg}, trying browser mode...`);
-            }
-        }
-        // Fallback to browser mode
-        const context = await createSessionContext(options, command);
-        if (!context) {
-            process.exitCode = 1;
-            return;
-        }
-        const { log, page, session, browser, context: browserContext } = context;
-        try {
-            const courses = await (0, moodle_js_1.getEnrolledCourses)(page, session, log);
-            // Calculate time range
-            const now = Math.floor(Date.now() / 1000);
-            const endTime = now + (days * 24 * 60 * 60);
-            let allEvents = [];
-            if (options.course) {
-                // Get events for specific course
-                const courseId = parseInt(options.course, 10);
-                const events = await (0, moodle_js_1.getCalendarEvents)(page, session, {
-                    startTime: now,
-                    endTime: endTime,
-                });
-                allEvents = events.filter(e => e.courseid === courseId);
-            }
-            else {
-                // Get events for all courses
-                for (const course of courses) {
-                    try {
-                        const events = await (0, moodle_js_1.getCalendarEvents)(page, session, {
-                            courseId: course.id,
-                            startTime: now,
-                            endTime: endTime,
-                        });
-                        allEvents.push(...events);
-                    }
-                    catch (err) {
-                        log.debug(`Failed to fetch calendar events for ${course.fullname}: ${err}`);
-                    }
+                catch (err) {
+                    apiContext.log.debug(`Failed to fetch calendar events for ${course.fullname}: ${err}`);
                 }
             }
-            // Sort by start time
-            allEvents.sort((a, b) => a.timestart - b.timestart);
-            // Filter upcoming only if requested
-            let filteredEvents = allEvents;
-            if (options.upcoming) {
-                filteredEvents = allEvents.filter(e => e.timestart > now);
-            }
-            const output = {
-                status: "success",
-                timestamp: new Date().toISOString(),
-                events: filteredEvents.map(e => ({
-                    id: e.id,
-                    name: e.name,
-                    description: e.description,
-                    course_id: e.courseid,
-                    event_type: e.eventtype,
-                    start_time: new Date(e.timestart).toISOString(),
-                    end_time: e.timeduration ? new Date(e.timestart + e.timeduration / 1000).toISOString() : null,
-                    location: e.location,
-                })),
-                summary: {
-                    total_events: allEvents.length,
-                    upcoming: allEvents.filter(e => e.timestart > now).length,
-                    by_type: allEvents.reduce((acc, e) => {
-                        acc[e.eventtype] = (acc[e.eventtype] || 0) + 1;
-                        return acc;
-                    }, {}),
-                },
-            };
-            console.log(JSON.stringify(output));
         }
-        finally {
-            await (0, auth_js_2.closeBrowserSafely)(browser, browserContext);
+        // Sort by start time
+        allEvents.sort((a, b) => a.timestart - b.timestart);
+        // Filter upcoming only if requested
+        let filteredEvents = allEvents;
+        if (options.upcoming) {
+            filteredEvents = allEvents.filter(e => e.timestart > now);
         }
+        const output = {
+            status: "success",
+            timestamp: new Date().toISOString(),
+            events: filteredEvents.map(e => ({
+                id: e.id,
+                name: e.name,
+                description: e.description,
+                course_id: e.courseid,
+                event_type: e.eventtype,
+                start_time: new Date(e.timestart).toISOString(),
+                end_time: e.timeduration ? new Date(e.timestart + e.timeduration / 1000).toISOString() : null,
+                location: e.location,
+            })),
+            summary: {
+                total_events: allEvents.length,
+                upcoming: allEvents.filter(e => e.timestart > now).length,
+                by_type: allEvents.reduce((acc, e) => {
+                    acc[e.eventtype] = (acc[e.eventtype] || 0) + 1;
+                    return acc;
+                }, {}),
+            },
+        };
+        console.log(JSON.stringify(output));
     });
     calendarCmd
         .command("export")
@@ -246,130 +127,60 @@ function registerCalendarCommand(program) {
         .option("--output <path>", "Output file path", "./calendar.json")
         .option("--days <n>", "Number of days ahead to include", "30")
         .action(async (options, command) => {
-        // Try pure API mode (no browser, fast!)
         const apiContext = await createApiContext(options, command);
-        if (apiContext) {
-            try {
-                const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session);
-                // Calculate time range
-                const now = Math.floor(Date.now() / 1000);
-                const days = parseInt(options.days, 10);
-                const endTime = now + (days * 24 * 60 * 60);
-                const allEvents = [];
-                for (const course of courses) {
-                    try {
-                        const events = await (0, moodle_js_1.getCalendarEventsApi)(apiContext.session, {
-                            courseId: course.id,
-                            startTime: now,
-                            endTime: endTime,
-                        });
-                        allEvents.push(...events);
-                    }
-                    catch (err) {
-                        apiContext.log.debug(`Failed to fetch calendar events for ${course.fullname}: ${err}`);
-                    }
-                }
-                // Sort by start time
-                allEvents.sort((a, b) => a.timestart - b.timestart);
-                // Export data
-                const exportData = {
-                    exported_at: new Date().toISOString(),
-                    time_range: {
-                        start: new Date(now * 1000).toISOString(),
-                        end: new Date(endTime * 1000).toISOString(),
-                        days: days,
-                    },
-                    events: allEvents.map(e => ({
-                        id: e.id,
-                        name: e.name,
-                        description: e.description,
-                        course_id: e.courseid,
-                        event_type: e.eventtype,
-                        start_time: new Date(e.timestart).toISOString(),
-                        end_time: e.timeduration ? new Date(e.timestart + e.timeduration / 1000).toISOString() : null,
-                        location: e.location,
-                    })),
-                    summary: {
-                        total_events: allEvents.length,
-                        by_type: allEvents.reduce((acc, e) => {
-                            acc[e.eventtype] = (acc[e.eventtype] || 0) + 1;
-                            return acc;
-                        }, {}),
-                    },
-                };
-                // Write to file
-                fs_1.default.writeFileSync(options.output, JSON.stringify(exportData));
-                apiContext.log.success(`Exported ${allEvents.length} events to ${options.output}`);
-                return;
-            }
-            catch (e) {
-                // API failed, fall through to browser mode
-                const msg = e instanceof Error ? e.message : String(e);
-                console.error(`// API mode failed: ${msg}, trying browser mode...`);
-            }
-        }
-        // Fallback to browser mode
-        const context = await createSessionContext(options, command);
-        if (!context) {
+        if (!apiContext) {
             process.exitCode = 1;
             return;
         }
-        const { log, page, session, browser, context: browserContext } = context;
-        try {
-            const courses = await (0, moodle_js_1.getEnrolledCourses)(page, session, log);
-            // Calculate time range
-            const now = Math.floor(Date.now() / 1000);
-            const days = parseInt(options.days, 10);
-            const endTime = now + (days * 24 * 60 * 60);
-            const allEvents = [];
-            for (const course of courses) {
-                try {
-                    const events = await (0, moodle_js_1.getCalendarEvents)(page, session, {
-                        courseId: course.id,
-                        startTime: now,
-                        endTime: endTime,
-                    });
-                    allEvents.push(...events);
-                }
-                catch (err) {
-                    log.debug(`Failed to fetch calendar events for ${course.fullname}: ${err}`);
-                }
+        const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session);
+        // Calculate time range
+        const now = Math.floor(Date.now() / 1000);
+        const days = parseInt(options.days, 10);
+        const endTime = now + (days * 24 * 60 * 60);
+        const allEvents = [];
+        for (const course of courses) {
+            try {
+                const events = await (0, moodle_js_1.getCalendarEventsApi)(apiContext.session, {
+                    courseId: course.id,
+                    startTime: now,
+                    endTime: endTime,
+                });
+                allEvents.push(...events);
+            }
+            catch (err) {
+                apiContext.log.debug(`Failed to fetch calendar events for ${course.fullname}: ${err}`);
             }
-            // Sort by start time
-            allEvents.sort((a, b) => a.timestart - b.timestart);
-            // Export data
-            const exportData = {
-                exported_at: new Date().toISOString(),
-                time_range: {
-                    start: new Date(now * 1000).toISOString(),
-                    end: new Date(endTime * 1000).toISOString(),
-                    days: days,
-                },
-                events: allEvents.map(e => ({
-                    id: e.id,
-                    name: e.name,
-                    description: e.description,
-                    course_id: e.courseid,
-                    event_type: e.eventtype,
-                    start_time: new Date(e.timestart).toISOString(),
-                    end_time: e.timeduration ? new Date(e.timestart + e.timeduration / 1000).toISOString() : null,
-                    location: e.location,
-                })),
-                summary: {
-                    total_events: allEvents.length,
-                    by_type: allEvents.reduce((acc, e) => {
-                        acc[e.eventtype] = (acc[e.eventtype] || 0) + 1;
-                        return acc;
-                    }, {}),
-                },
-            };
-            // Write to file
-            fs_1.default.writeFileSync(options.output, JSON.stringify(exportData));
-            log.success(`Exported ${allEvents.length} events to ${options.output}`);
-        }
-        finally {
-            await (0, auth_js_2.closeBrowserSafely)(browser, browserContext);
         }
+        // Sort by start time
+        allEvents.sort((a, b) => a.timestart - b.timestart);
+        // Export data
+        const exportData = {
+            exported_at: new Date().toISOString(),
+            time_range: {
+                start: new Date(now * 1000).toISOString(),
+                end: new Date(endTime * 1000).toISOString(),
+                days: days,
+            },
+            events: allEvents.map(e => ({
+                id: e.id,
+                name: e.name,
+                description: e.description,
+                course_id: e.courseid,
+                event_type: e.eventtype,
+                start_time: new Date(e.timestart).toISOString(),
+                end_time: e.timeduration ? new Date(e.timestart + e.timeduration / 1000).toISOString() : null,
+                location: e.location,
+            })),
+            summary: {
+                total_events: allEvents.length,
+                by_type: allEvents.reduce((acc, e) => {
+                    acc[e.eventtype] = (acc[e.eventtype] || 0) + 1;
+                    return acc;
+                }, {}),
+            },
+        };
+        // Write to file
+        node_fs_1.default.writeFileSync(options.output, JSON.stringify(exportData));
+        apiContext.log.success(`Exported ${allEvents.length} events to ${options.output}`);
     });
 }
-exports.registerCalendarCommand = registerCalendarCommand;

package/script/src/commands/courses.d.ts

@@ -1,2 +1,3 @@
 import { Command } from "commander";
 export declare function registerCoursesCommand(program: Command): void;
+//# sourceMappingURL=courses.d.ts.map

package/script/src/commands/courses.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"courses.d.ts","sourceRoot":"","sources":["../../../src/src/commands/courses.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA4Y7D"}