@mo7yw4ng/openape 1.0.0 → 1.0.2

package/script/src/commands/forums.js

@@ -3,17 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerForumsCommand = void 0;
+exports.registerForumsCommand = registerForumsCommand;
 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 index_js_1 = require("../index.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 registerForumsCommand(program) {
     const forumsCmd = program.command("forums");
     forumsCmd.description("Forum operations");
@@ -28,324 +24,169 @@ function registerForumsCommand(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;
         }
+        // Try to load sesskey from cache
+        const sesskey = (0, token_js_1.loadSesskey)(sessionPath) || undefined;
         return {
             log,
             session: {
                 wsToken,
                 moodleBaseUrl: "https://ilearning.cycu.edu.tw",
+                sesskey,
             },
         };
     }
-    // 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, wsToken } = await (0, auth_js_1.launchAuthenticated)(config, log);
-        try {
-            const session = await (0, session_js_1.extractSessionInfo)(page, config, log, wsToken);
-            return { log, page, session, browser, context };
-        }
-        catch (err) {
-            await context.close();
-            await browser.close();
-            throw err;
-        }
-    }
     forumsCmd
         .command("list")
         .description("List forums from in-progress courses")
-        .option("--unread-only", "Show only forums with unread discussions")
-        .option("--fetch-instance", "Fetch forum instance IDs (slower)")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (options, command) => {
-        const output = getOutputFormat(command);
-        // Try pure WS API mode (no browser, fast!)
         const apiContext = await createApiContext(options, command);
-        if (apiContext) {
-            try {
-                const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session, {
-                    classification: "inprogress",
-                });
-                // Get forums via WS API (no browser needed!)
-                const courseIds = courses.map(c => c.id);
-                const wsForums = await (0, moodle_js_1.getForumsApi)(apiContext.session, courseIds);
-                const allForums = [];
-                for (const wsForum of wsForums) {
-                    const course = courses.find(c => c.id === wsForum.courseid);
-                    if (course) {
-                        allForums.push({
-                            course_id: wsForum.courseid,
-                            course_name: course.fullname,
-                            cmid: wsForum.cmid.toString(),
-                            forum_id: wsForum.id,
-                            name: wsForum.name,
-                            url: `https://ilearning.cycu.edu.tw/mod/forum/view.php?id=${wsForum.cmid}`,
-                        });
-                    }
-                }
-                const result = {
-                    status: "success",
-                    timestamp: new Date().toISOString(),
-                    forums: allForums,
-                    summary: {
-                        total_courses: courses.length,
-                        total_forums: allForums.length,
-                    },
-                };
-                console.log(JSON.stringify(result));
-                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, {
-                classification: "inprogress",
-            });
-            const allForums = [];
-            for (const course of courses) {
-                const forums = await (0, moodle_js_1.getForumsInCourse)(page, session, course.id, log);
-                for (const forum of forums) {
-                    let instance = forum.forumId;
-                    // Fetch instance ID if requested
-                    if (options.fetchInstance) {
-                        log.info(`  正在取得 forum ${forum.cmid} 的 instance ID...`);
-                        instance = await (0, moodle_js_1.getForumIdFromPage)(page, parseInt(forum.cmid, 10), session) ?? 0;
-                    }
-                    allForums.push({
-                        course_id: course.id,
-                        course_name: course.fullname,
-                        cmid: forum.cmid,
-                        forum_id: instance,
-                        name: forum.name,
-                        url: forum.url,
-                    });
-                }
+        const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session, {
+            classification: "inprogress",
+        });
+        // Get forums via WS API (no browser needed!)
+        const courseIds = courses.map(c => c.id);
+        const wsForums = await (0, moodle_js_1.getForumsApi)(apiContext.session, courseIds);
+        const allForums = [];
+        for (const wsForum of wsForums) {
+            const course = courses.find(c => c.id === wsForum.courseid);
+            if (course) {
+                allForums.push({
+                    course_id: wsForum.courseid,
+                    course_name: course.fullname,
+                    cmid: wsForum.cmid.toString(),
+                    forum_id: wsForum.id,
+                    name: wsForum.name,
+                    // url: `https://ilearning.cycu.edu.tw/mod/forum/view.php?id=${wsForum.cmid}`,
+                });
             }
-            const output = {
-                status: "success",
-                timestamp: new Date().toISOString(),
-                forums: allForums.map(f => ({
-                    course_id: f.course_id,
-                    course_name: f.course_name,
-                    cmid: f.cmid,
-                    forum_id: f.forum_id,
-                    name: f.name,
-                    url: f.url,
-                })),
-                summary: {
-                    total_courses: courses.length,
-                    total_forums: allForums.length,
-                },
-            };
-            console.log(JSON.stringify(output));
-        }
-        finally {
-            await (0, auth_js_2.closeBrowserSafely)(browser, browserContext);
         }
+        const result = {
+            status: "success",
+            timestamp: new Date().toISOString(),
+            forums: allForums,
+            summary: {
+                total_courses: courses.length,
+                total_forums: allForums.length,
+            },
+        };
+        console.log(JSON.stringify(result));
     });
     forumsCmd
         .command("list-all")
         .description("List all forums across all courses")
         .option("--level <type>", "Course level: in_progress (default) | all", "in_progress")
-        .option("--unread-only", "Show only forums with unread discussions")
-        .option("--fetch-instance", "Fetch forum instance IDs (slower)")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (options, command) => {
-        // Try pure WS API mode (no browser, fast!)
         const apiContext = await createApiContext(options, command);
-        if (apiContext) {
-            try {
-                const classification = options.level === "all" ? undefined : "inprogress";
-                const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session, {
-                    classification,
-                });
-                // Get forums via WS API (no browser needed!)
-                const courseIds = courses.map(c => c.id);
-                const wsForums = await (0, moodle_js_1.getForumsApi)(apiContext.session, courseIds);
-                const allForums = [];
-                for (const wsForum of wsForums) {
-                    const course = courses.find(c => c.id === wsForum.courseid);
-                    if (course) {
-                        allForums.push({
-                            course_id: wsForum.courseid,
-                            course_name: course.fullname,
-                            cmid: wsForum.cmid.toString(),
-                            forum_id: wsForum.id,
-                            name: wsForum.name,
-                            url: `https://ilearning.cycu.edu.tw/mod/forum/view.php?id=${wsForum.cmid}`,
-                        });
-                    }
-                }
-                const result = {
-                    status: "success",
-                    timestamp: new Date().toISOString(),
-                    forums: allForums,
-                    summary: {
-                        total_courses: courses.length,
-                        total_forums: allForums.length,
-                    },
-                };
-                console.log(JSON.stringify(result));
-                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 classification = options.level === "all" ? undefined : "inprogress";
-            const courses = await (0, moodle_js_1.getEnrolledCourses)(page, session, log, { classification });
-            const allForums = [];
-            for (const course of courses) {
-                const forums = await (0, moodle_js_1.getForumsInCourse)(page, session, course.id, log);
-                for (const forum of forums) {
-                    let instance = forum.forumId;
-                    // Fetch instance ID if requested
-                    if (options.fetchInstance) {
-                        log.info(`  正在取得 forum ${forum.cmid} 的 instance ID...`);
-                        instance = await (0, moodle_js_1.getForumIdFromPage)(page, parseInt(forum.cmid, 10), session) ?? 0;
-                    }
-                    allForums.push({
-                        course_id: course.id,
-                        course_name: course.fullname,
-                        cmid: forum.cmid,
-                        forum_id: instance,
-                        name: forum.name,
-                        url: forum.url,
-                    });
-                }
+        const classification = options.level === "all" ? undefined : "inprogress";
+        const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session, {
+            classification,
+        });
+        // Get forums via WS API (no browser needed!)
+        const courseIds = courses.map(c => c.id);
+        const wsForums = await (0, moodle_js_1.getForumsApi)(apiContext.session, courseIds);
+        const allForums = [];
+        for (const wsForum of wsForums) {
+            const course = courses.find(c => c.id === wsForum.courseid);
+            if (course) {
+                allForums.push({
+                    course_id: wsForum.courseid,
+                    course_name: course.fullname,
+                    cmid: wsForum.cmid.toString(),
+                    forum_id: wsForum.id,
+                    name: wsForum.name,
+                    url: `https://ilearning.cycu.edu.tw/mod/forum/view.php?id=${wsForum.cmid}`,
+                });
             }
-            const output = {
-                status: "success",
-                timestamp: new Date().toISOString(),
-                forums: allForums.map(f => ({
-                    course_id: f.course_id,
-                    course_name: f.course_name,
-                    cmid: f.cmid,
-                    forum_id: f.forum_id,
-                    name: f.name,
-                    url: f.url,
-                })),
-                summary: {
-                    total_courses: courses.length,
-                    total_forums: allForums.length,
-                },
-            };
-            console.log(JSON.stringify(output));
-        }
-        finally {
-            await (0, auth_js_2.closeBrowserSafely)(browser, browserContext);
         }
+        const result = {
+            status: "success",
+            timestamp: new Date().toISOString(),
+            forums: allForums,
+            summary: {
+                total_courses: courses.length,
+                total_forums: allForums.length,
+            },
+        };
+        console.log(JSON.stringify(result));
     });
     forumsCmd
         .command("discussions")
-        .description("List discussions in a forum (use cmid or instance ID)")
-        .argument("<forum-id>", "Forum cmid or instance ID")
-        .option("--unread-only", "Show only unread discussions")
+        .description("List discussions in a forum (use forum ID)")
+        .argument("<forum-id>", "Forum ID")
         .option("--output <format>", "Output format: json|csv|table|silent")
+        .option("--msg", "Include message content in response")
         .action(async (forumId, options, command) => {
-        const context = await createSessionContext({ verbose: false }, command);
-        if (!context) {
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
             process.exitCode = 1;
             return;
         }
-        const { log, page, session, browser, context: browserContext } = context;
-        try {
-            // Find forum by cmid or instance ID
-            const courses = await (0, moodle_js_1.getEnrolledCourses)(page, session, log);
-            let targetForum = null;
-            for (const course of courses) {
-                const forums = await (0, moodle_js_1.getForumsInCourse)(page, session, course.id, log);
-                const forum = forums.find(f => f.cmid === forumId || f.forumId === parseInt(forumId, 10));
-                if (forum) {
-                    targetForum = { forumId: forum.forumId, forumName: forum.name };
-                    break;
-                }
-            }
-            if (!targetForum) {
-                console.log(JSON.stringify({ status: "error", error: "Forum not found" }));
-                process.exitCode = 1;
-                return;
-            }
-            // Use WS API to get discussions
-            const discussions = await (0, moodle_js_1.getForumDiscussions)(page, session, targetForum.forumId);
-            const output = {
-                status: "success",
-                timestamp: new Date().toISOString(),
-                forum_id: targetForum.forumId,
-                forum_name: targetForum.forumName,
-                discussions: discussions.map(d => ({
+        // Get courses via WS API
+        const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session, {
+            classification: "inprogress",
+        });
+        // Get forums via WS API
+        const courseIds = courses.map(c => c.id);
+        const wsForums = await (0, moodle_js_1.getForumsApi)(apiContext.session, courseIds);
+        // Find forum by cmid or instance ID
+        const targetForum = wsForums.find(f => f.cmid.toString() === forumId || f.id === parseInt(forumId, 10));
+        if (!targetForum) {
+            console.log(JSON.stringify({ status: "error", error: "Forum not found" }));
+            process.exitCode = 1;
+            return;
+        }
+        const course = courses.find(c => c.id === targetForum.courseid);
+        // Get discussions via WS API
+        const discussions = await (0, moodle_js_1.getForumDiscussionsApi)(apiContext.session, targetForum.id);
+        const result = {
+            status: "success",
+            timestamp: new Date().toISOString(),
+            forum_id: targetForum.id,
+            forum_name: targetForum.name,
+            course_id: course?.id,
+            course_name: course?.fullname,
+            discussions: discussions.map(d => {
+                const discussion = {
                     id: d.id,
                     name: d.name,
                     user_id: d.userId,
                     time_modified: d.timeModified,
                     post_count: d.postCount,
                     unread: d.unread,
-                })),
-                summary: {
-                    total_discussions: discussions.length,
-                },
-            };
-            console.log(JSON.stringify(output));
-        }
-        finally {
-            await (0, auth_js_2.closeBrowserSafely)(browser, browserContext);
-        }
+                };
+                if (options.msg) {
+                    discussion.message = (0, utils_js_1.stripHtmlTags)(d.message || "");
+                }
+                return discussion;
+            }),
+            summary: {
+                total_discussions: discussions.length,
+            },
+        };
+        console.log(JSON.stringify(result));
     });
     forumsCmd
         .command("posts")
@@ -353,51 +194,44 @@ function registerForumsCommand(program) {
         .argument("<discussion-id>", "Discussion ID")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (discussionId, options, command) => {
-        const context = await createSessionContext(options, command);
-        if (!context) {
+        const output = getOutputFormat(command);
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
             process.exitCode = 1;
             return;
         }
-        const { log, page, session, browser, context: browserContext } = context;
-        const output = getOutputFormat(command);
-        try {
-            const posts = await (0, moodle_js_1.getDiscussionPosts)(page, session, parseInt(discussionId, 10));
-            if (output === "json") {
-                const result = {
-                    status: "success",
-                    timestamp: new Date().toISOString(),
-                    discussion_id: discussionId,
-                    posts: posts.map(p => ({
-                        id: p.id,
-                        subject: p.subject,
-                        author: p.author,
-                        author_id: p.authorId,
-                        created: new Date(p.created * 1000).toISOString(),
-                        modified: new Date(p.modified * 1000).toISOString(),
-                        message: p.message,
-                        unread: p.unread,
-                    })),
-                    summary: {
-                        total_posts: posts.length,
-                    },
-                };
-                console.log(JSON.stringify(result));
-            }
-            else if (output === "table") {
-                console.log(`Discussion ${discussionId} - ${posts.length} posts`);
-                console.log("Use --output json to see full post content");
-                const tablePosts = posts.map(p => ({
+        const posts = await (0, moodle_js_1.getDiscussionPostsApi)(apiContext.session, parseInt(discussionId, 10));
+        if (output === "json") {
+            const result = {
+                status: "success",
+                timestamp: new Date().toISOString(),
+                discussion_id: discussionId,
+                posts: posts.map(p => ({
                     id: p.id,
-                    subject: p.subject.substring(0, 50) + (p.subject.length > 50 ? "..." : ""),
+                    subject: p.subject,
                     author: p.author,
-                    created: new Date(p.created * 1000).toLocaleString(),
-                }));
-                (0, index_js_1.formatAndOutput)(tablePosts, "table", log);
-            }
-        }
-        finally {
-            await (0, auth_js_2.closeBrowserSafely)(browser, browserContext);
+                    author_id: p.authorId,
+                    created: new Date(p.created * 1000).toISOString(),
+                    modified: new Date(p.modified * 1000).toISOString(),
+                    message: p.message,
+                    unread: p.unread,
+                })),
+                summary: {
+                    total_posts: posts.length,
+                },
+            };
+            console.log(JSON.stringify(result));
+        }
+        else if (output === "table") {
+            console.log(`Discussion ${discussionId} - ${posts.length} posts`);
+            console.log("Use --output json to see full post content");
+            const tablePosts = posts.map(p => ({
+                id: p.id,
+                subject: p.subject.substring(0, 50) + (p.subject.length > 50 ? "..." : ""),
+                author: p.author,
+                created: new Date(p.created * 1000).toLocaleString(),
+            }));
+            console.table(tablePosts);
         }
     });
 }
-exports.registerForumsCommand = registerForumsCommand;

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

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

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

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