@mo7yw4ng/openape 1.0.2 → 1.0.4

package/esm/src/commands/forums.js

@@ -1,5 +1,5 @@
-import { getBaseDir, stripHtmlTags } from "../lib/utils.js";
-import { getEnrolledCoursesApi, getForumsApi, getForumDiscussionsApi, getDiscussionPostsApi } from "../lib/moodle.js";
+import { getBaseDir, stripHtmlTags, getOutputFormat, formatTimestamp } from "../lib/utils.js";
+import { getEnrolledCoursesApi, getForumsApi, getForumDiscussionsApi, getDiscussionPostsApi, addForumDiscussionApi, addForumPostApi, deleteForumPostApi } from "../lib/moodle.js";
 import { createLogger } from "../lib/logger.js";
 import { loadWsToken, loadSesskey } from "../lib/token.js";
 import path from "node:path";
@@ -7,10 +7,6 @@ import fs from "node:fs";
 export function registerForumsCommand(program) {
     const forumsCmd = program.command("forums");
     forumsCmd.description("Forum operations");
-    function getOutputFormat(command) {
-        const opts = command.optsWithGlobals();
-        return opts.output || "json";
-    }
     // Pure API context - no browser required (fast!)
     async function createApiContext(options, command) {
         const opts = command?.optsWithGlobals ? command.optsWithGlobals() : options;
@@ -65,23 +61,24 @@ export function registerForumsCommand(program) {
                 allForums.push({
                     course_id: wsForum.courseid,
                     course_name: course.fullname,
+                    intro: wsForum.intro,
                     cmid: wsForum.cmid.toString(),
                     forum_id: wsForum.id,
                     name: wsForum.name,
+                    timemodified: wsForum.timemodified,
                     // url: `https://ilearning.cycu.edu.tw/mod/forum/view.php?id=${wsForum.cmid}`,
                 });
             }
         }
-        const result = {
+        console.log(JSON.stringify({
             status: "success",
             timestamp: new Date().toISOString(),
-            forums: allForums,
-            summary: {
-                total_courses: courses.length,
-                total_forums: allForums.length,
-            },
-        };
-        console.log(JSON.stringify(result));
+            total_courses: courses.length,
+            total_forums: allForums.length,
+        }));
+        for (const forum of allForums) {
+            console.log(JSON.stringify(forum));
+        }
     });
     forumsCmd
         .command("list-all")
@@ -108,30 +105,29 @@ export function registerForumsCommand(program) {
                 allForums.push({
                     course_id: wsForum.courseid,
                     course_name: course.fullname,
+                    intro: wsForum.intro,
                     cmid: wsForum.cmid.toString(),
                     forum_id: wsForum.id,
                     name: wsForum.name,
-                    url: `https://ilearning.cycu.edu.tw/mod/forum/view.php?id=${wsForum.cmid}`,
+                    timemodified: wsForum.timemodified,
                 });
             }
         }
-        const result = {
+        console.log(JSON.stringify({
             status: "success",
             timestamp: new Date().toISOString(),
-            forums: allForums,
-            summary: {
-                total_courses: courses.length,
-                total_forums: allForums.length,
-            },
-        };
-        console.log(JSON.stringify(result));
+            total_courses: courses.length,
+            total_forums: allForums.length,
+        }));
+        for (const forum of allForums) {
+            console.log(JSON.stringify(forum));
+        }
     });
     forumsCmd
         .command("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 apiContext = await createApiContext(options, command);
         if (!apiContext) {
@@ -155,32 +151,29 @@ export function registerForumsCommand(program) {
         const course = courses.find(c => c.id === targetForum.courseid);
         // Get discussions via WS API
         const discussions = await getForumDiscussionsApi(apiContext.session, targetForum.id);
-        const result = {
+        // Output NDJSON: one line per discussion entry for stream-friendly parsing
+        const meta = {
             status: "success",
             timestamp: new Date().toISOString(),
             forum_id: targetForum.id,
             forum_name: targetForum.name,
+            forum_intro: targetForum.intro,
             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,
-                };
-                if (options.msg) {
-                    discussion.message = stripHtmlTags(d.message || "");
-                }
-                return discussion;
-            }),
-            summary: {
-                total_discussions: discussions.length,
-            },
+            total_discussions: discussions.length,
         };
-        console.log(JSON.stringify(result));
+        console.log(JSON.stringify(meta));
+        for (const d of discussions) {
+            console.log(JSON.stringify({
+                id: d.id,
+                name: d.name,
+                user_id: d.userId,
+                time_modified: d.timeModified,
+                post_count: d.postCount,
+                unread: d.unread,
+                message: stripHtmlTags(d.message || ""),
+            }));
+        }
     });
     forumsCmd
         .command("posts")
@@ -205,8 +198,8 @@ export function registerForumsCommand(program) {
                     subject: p.subject,
                     author: p.author,
                     author_id: p.authorId,
-                    created: new Date(p.created * 1000).toISOString(),
-                    modified: new Date(p.modified * 1000).toISOString(),
+                    created: formatTimestamp(p.created),
+                    modified: formatTimestamp(p.modified),
                     message: p.message,
                     unread: p.unread,
                 })),
@@ -228,4 +221,98 @@ export function registerForumsCommand(program) {
             console.table(tablePosts);
         }
     });
+    forumsCmd
+        .command("post")
+        .description("Post a new discussion to a forum")
+        .argument("<forum-id>", "Forum ID")
+        .argument("<subject>", "Discussion subject")
+        .argument("<message>", "Discussion message")
+        .option("--subscribe", "Subscribe to the discussion", false)
+        .option("--pin", "Pin the discussion", false)
+        .action(async (forumId, subject, message, options, command) => {
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        const { log, session } = apiContext;
+        // Get courses to find the forum
+        const courses = await getEnrolledCoursesApi(session, {
+            classification: "inprogress",
+        });
+        const courseIds = courses.map(c => c.id);
+        const wsForums = await getForumsApi(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) {
+            log.error(`Forum not found: ${forumId}`);
+            process.exitCode = 1;
+            return;
+        }
+        const course = courses.find(c => c.id === targetForum.courseid);
+        log.info(`Posting to forum: ${targetForum.name} (${course?.fullname})`);
+        const result = await addForumDiscussionApi(session, targetForum.id, subject, message);
+        if (result.success) {
+            log.success(`✓ Discussion posted successfully!`);
+            log.info(`  Discussion ID: ${result.discussionId}`);
+        }
+        else {
+            log.error(`✗ Failed to post discussion: ${result.error}`);
+            process.exitCode = 1;
+        }
+    });
+    forumsCmd
+        .command("reply")
+        .description("Reply to a discussion post")
+        .argument("<post-id>", "Parent post ID to reply to")
+        .argument("<subject>", "Reply subject")
+        .argument("<message>", "Reply message")
+        .option("--attachment-id <id>", "Draft file ID for attachment")
+        .option("--inline-attachment-id <id>", "Draft file ID for inline attachment")
+        .action(async (postId, subject, message, options, command) => {
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        const { log, session } = apiContext;
+        log.info(`Replying to post: ${postId}`);
+        log.info(`  Subject: ${subject}`);
+        log.info(`  Message: ${message}`);
+        if (options.attachmentId) {
+            log.info(`  Attachment ID: ${options.attachmentId}`);
+        }
+        const result = await addForumPostApi(session, parseInt(postId, 10), subject, message, {
+            attachmentId: options.attachmentId ? parseInt(options.attachmentId, 10) : undefined,
+            inlineAttachmentId: options.inlineAttachmentId ? parseInt(options.inlineAttachmentId, 10) : undefined,
+        });
+        if (result.success) {
+            log.success(`✓ Reply posted successfully!`);
+            log.info(`  Post ID: ${result.postId}`);
+        }
+        else {
+            log.error(`✗ Failed to post reply: ${result.error}`);
+            process.exitCode = 1;
+        }
+    });
+    forumsCmd
+        .command("delete")
+        .description("Delete a forum post or discussion (by post ID)")
+        .argument("<post-id>", "Post ID to delete (deletes entire discussion if it's the first post)")
+        .action(async (postId, options, command) => {
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        const { log, session } = apiContext;
+        const result = await deleteForumPostApi(session, parseInt(postId, 10));
+        if (result.success) {
+            log.success(`✓ Post ${postId} deleted successfully!`);
+        }
+        else {
+            log.error(`✗ Failed to delete post: ${result.error}`);
+            process.exitCode = 1;
+        }
+    });
 }

package/esm/src/commands/materials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../../src/src/commands/materials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+BpC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAka/D"}
+{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../../src/src/commands/materials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgCpC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA8iB/D"}

package/esm/src/commands/materials.js

@@ -1,56 +1,22 @@
-import { getBaseDir } from "../lib/utils.js";
-import { getEnrolledCourses, getEnrolledCoursesApi, getResourcesByCoursesApi } from "../lib/moodle.js";
+import { getOutputFormat, sanitizeFilename, getSessionPath, formatFileSize } from "../lib/utils.js";
+import { getEnrolledCourses, getEnrolledCoursesApi, getResourcesByCoursesApi, updateActivityCompletionStatusManually, getSiteInfoApi, moodleApiCall } from "../lib/moodle.js";
 import { createLogger } from "../lib/logger.js";
-import { launchAuthenticated } from "../lib/auth.js";
+import { launchAuthenticated, createApiContext } from "../lib/auth.js";
 import { extractSessionInfo } from "../lib/session.js";
 import { closeBrowserSafely } from "../lib/auth.js";
-import { loadWsToken } from "../lib/token.js";
+import { formatAndOutput } from "../index.js";
 import path from "node:path";
 import fs from "node:fs";
 export function registerMaterialsCommand(program) {
     const materialsCmd = program.command("materials");
     materialsCmd.description("Material/resource operations");
-    // Helper to get output format from global or local options
-    function getOutputFormat(command) {
-        const opts = command.optsWithGlobals();
-        return opts.output || "json";
-    }
-    // Pure API context - no browser required (fast!)
-    async function createApiContext(options, command) {
-        const opts = command?.optsWithGlobals ? command.optsWithGlobals() : options;
-        const outputFormat = getOutputFormat(command || { optsWithGlobals: () => ({ output: "json" }) });
-        const silent = outputFormat === "json" && !opts.verbose;
-        const log = createLogger(opts.verbose, silent);
-        const baseDir = getBaseDir();
-        const sessionPath = path.resolve(baseDir, ".auth", "storage-state.json");
-        // Check if session exists
-        if (!fs.existsSync(sessionPath)) {
-            log.error("未找到登入 session。請先執行 'openape auth login' 進行登入。");
-            log.info(`Session 預期位置: ${sessionPath}`);
-            return null;
-        }
-        // Try to load WS token
-        const wsToken = loadWsToken(sessionPath);
-        if (!wsToken) {
-            log.error("未找到 WS token。請先執行 'openape auth login' 進行登入。");
-            return null;
-        }
-        return {
-            log,
-            session: {
-                wsToken,
-                moodleBaseUrl: "https://ilearning.cycu.edu.tw",
-            },
-        };
-    }
     // Helper function to create session context (for download commands)
     async function createSessionContext(options, command) {
         const opts = command?.optsWithGlobals ? command.optsWithGlobals() : options;
         const outputFormat = getOutputFormat(command || { optsWithGlobals: () => ({ output: "json" }) });
         const silent = outputFormat === "json" && !opts.verbose;
         const log = createLogger(opts.verbose, silent);
-        const baseDir = getBaseDir();
-        const sessionPath = path.resolve(baseDir, ".auth", "storage-state.json");
+        const sessionPath = getSessionPath();
         if (!fs.existsSync(sessionPath)) {
             log.error("未找到登入 session。請先執行 'openape auth login' 進行登入。");
             return null;
@@ -77,10 +43,6 @@ export function registerMaterialsCommand(program) {
             throw err;
         }
     }
-    // Helper to sanitize filenames
-    function sanitizeFilename(name) {
-        return name.replace(/[<>:"/\\|?*]/g, "_").replace(/\s+/g, "_");
-    }
     // Helper to download a single resource
     async function downloadResource(page, resource, outputDir, log) {
         try {
@@ -91,9 +53,7 @@ export function registerMaterialsCommand(program) {
             }
             // Create course directory
             const courseDir = path.join(outputDir, sanitizeFilename(resource.course_name));
-            if (!fs.existsSync(courseDir)) {
-                fs.mkdirSync(courseDir, { recursive: true });
-            }
+            await fs.promises.mkdir(courseDir, { recursive: true });
             // Navigate to resource page
             log.debug(`  Downloading: ${resource.name}`);
             await page.goto(resource.url, { waitUntil: "domcontentloaded", timeout: 30000 });
@@ -134,8 +94,8 @@ export function registerMaterialsCommand(program) {
             const download = await downloadPromise;
             // Save file
             await download.saveAs(outputPath);
-            const stats = fs.statSync(outputPath);
-            log.success(`    Downloaded: ${filename} (${(stats.size / 1024).toFixed(1)} KB)`);
+            const stats = await fs.promises.stat(outputPath);
+            log.success(`    Downloaded: ${filename} (${formatFileSize(stats.size, 1)} KB)`);
             return {
                 filename,
                 path: outputPath,
@@ -359,4 +319,172 @@ export function registerMaterialsCommand(program) {
             await closeBrowserSafely(browser, browserContext);
         }
     });
+    materialsCmd
+        .command("complete")
+        .description("Mark all incomplete resources (non-video) as complete in a course")
+        .argument("<course-id>", "Course ID")
+        .option("--dry-run", "Show what would be marked complete without doing it")
+        .option("--output <format>", "Output format: json|csv|table|silent")
+        .action(async (courseId, options, command) => {
+        const output = getOutputFormat(command);
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        try {
+            const { log, session } = apiContext;
+            // Get user ID
+            const siteInfo = await getSiteInfoApi(session);
+            // Get completion status for all activities in the course
+            const completionData = await moodleApiCall(session, "core_completion_get_activities_completion_status", { courseid: parseInt(courseId, 10), userid: siteInfo.userid });
+            if (!completionData?.statuses) {
+                log.info("No activities found in this course.");
+                return;
+            }
+            // Filter for resources (non-video) that have completion enabled but are not complete
+            const incompleteResources = completionData.statuses.filter((status) => {
+                // Only resources, not supervideo
+                if (status.modname === "supervideo")
+                    return false;
+                // Must have completion enabled
+                if (!status.hascompletion)
+                    return false;
+                // Must be incomplete
+                if (status.isoverallcomplete)
+                    return false;
+                return true;
+            });
+            if (incompleteResources.length === 0) {
+                log.info("All resources are already complete (or no resources with completion tracking).");
+                return;
+            }
+            log.info(`Found ${incompleteResources.length} incomplete resources to complete:`);
+            for (const resource of incompleteResources) {
+                log.info(`  - ${resource.name} (cmid: ${resource.cmid})`);
+            }
+            if (options.dryRun) {
+                log.info("\n[Dry run] No changes made.");
+                return;
+            }
+            // Mark each resource as complete
+            const results = [];
+            for (const resource of incompleteResources) {
+                const success = await updateActivityCompletionStatusManually(session, resource.cmid, true);
+                results.push({
+                    cmid: resource.cmid,
+                    name: resource.name,
+                    success,
+                });
+                if (success) {
+                    log.success(`  ✓ Completed: ${resource.name}`);
+                }
+                else {
+                    log.error(`  ✗ Failed: ${resource.name}`);
+                }
+            }
+            const completed = results.filter(r => r.success).length;
+            const failed = results.filter(r => !r.success).length;
+            log.info(`\n執行結果: ${completed} 成功, ${failed} 失敗`);
+            if (output !== "silent") {
+                formatAndOutput(results, output, log);
+            }
+        }
+        catch (e) {
+            apiContext.log.error(`Error: ${e instanceof Error ? e.message : String(e)}`);
+            process.exitCode = 1;
+        }
+    });
+    materialsCmd
+        .command("complete-all")
+        .description("Mark all incomplete resources (non-video) as complete across all in-progress courses")
+        .option("--dry-run", "Show what would be marked complete without doing it")
+        .option("--level <type>", "Course level: in_progress (default) | all", "in_progress")
+        .option("--output <format>", "Output format: json|csv|table|silent")
+        .action(async (options, command) => {
+        const output = getOutputFormat(command);
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        try {
+            const { log, session } = apiContext;
+            // Get user ID
+            const siteInfo = await getSiteInfoApi(session);
+            // Get all courses
+            const classification = options.level === "all" ? undefined : "inprogress";
+            const courses = await getEnrolledCoursesApi(session, { classification });
+            log.info(`Scanning ${courses.length} courses for incomplete resources...`);
+            const allResults = [];
+            let totalIncomplete = 0;
+            for (const course of courses) {
+                try {
+                    // Get completion status for all activities in the course
+                    const completionData = await moodleApiCall(session, "core_completion_get_activities_completion_status", { courseid: course.id, userid: siteInfo.userid });
+                    if (!completionData?.statuses)
+                        continue;
+                    // Filter for resources (non-video) that have completion enabled but are not complete
+                    const incompleteResources = completionData.statuses.filter((status) => {
+                        if (status.modname === "supervideo")
+                            return false;
+                        if (!status.hascompletion)
+                            return false;
+                        if (status.isoverallcomplete)
+                            return false;
+                        return true;
+                    });
+                    if (incompleteResources.length > 0) {
+                        log.info(`\n${course.fullname}: ${incompleteResources.length} incomplete resources`);
+                        totalIncomplete += incompleteResources.length;
+                        if (options.dryRun) {
+                            for (const resource of incompleteResources) {
+                                log.info(`  - ${resource.name} (cmid: ${resource.cmid})`);
+                            }
+                        }
+                        else {
+                            for (const resource of incompleteResources) {
+                                const success = await updateActivityCompletionStatusManually(session, resource.cmid, true);
+                                allResults.push({
+                                    courseId: course.id,
+                                    courseName: course.fullname,
+                                    cmid: resource.cmid,
+                                    name: resource.name,
+                                    success,
+                                });
+                                if (success) {
+                                    log.success(`  ✓ Completed: ${resource.name}`);
+                                }
+                                else {
+                                    log.error(`  ✗ Failed: ${resource.name}`);
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (e) {
+                    log.warn(`Failed to process course ${course.fullname}: ${e}`);
+                }
+            }
+            if (totalIncomplete === 0) {
+                log.info("\nAll resources are already complete (or no resources with completion tracking).");
+                return;
+            }
+            if (options.dryRun) {
+                log.info(`\n[Dry run] Found ${totalIncomplete} incomplete resources across ${courses.length} courses.`);
+                log.info("Run without --dry-run to mark them as complete.");
+                return;
+            }
+            const completed = allResults.filter(r => r.success).length;
+            const failed = allResults.filter(r => !r.success).length;
+            log.info(`\n執行結果: ${completed} 成功, ${failed} 失敗`);
+            if (output !== "silent") {
+                formatAndOutput(allResults, output, log);
+            }
+        }
+        catch (e) {
+            apiContext.log.error(`Error: ${e instanceof Error ? e.message : String(e)}`);
+            process.exitCode = 1;
+        }
+    });
 }

package/esm/src/commands/quizzes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quizzes.d.ts","sourceRoot":"","sources":["../../../src/src/commands/quizzes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuL7D"}
+{"version":3,"file":"quizzes.d.ts","sourceRoot":"","sources":["../../../src/src/commands/quizzes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwDpC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA0Q7D"}