@mo7yw4ng/openape 1.0.4 → 1.0.6

package/esm/src/commands/forums.js

@@ -1,62 +1,25 @@
-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";
-import fs from "node:fs";
+import { stripHtmlTags, getOutputFormat, formatTimestamp } from "../lib/utils.js";
+import { getEnrolledCoursesApi, getForumsApi, getForumDiscussionsApi, getDiscussionPostsApi, addForumDiscussionApi, addForumPostApi, deleteForumPostApi, resolveForumId } from "../lib/moodle.js";
+import { createApiContext } from "../lib/auth.js";
+import { formatAndOutput } from "../index.js";
 export function registerForumsCommand(program) {
     const forumsCmd = program.command("forums");
     forumsCmd.description("Forum operations");
-    // 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;
-        }
-        // Try to load sesskey from cache
-        const sesskey = loadSesskey(sessionPath) || undefined;
-        return {
-            log,
-            session: {
-                wsToken,
-                moodleBaseUrl: "https://ilearning.cycu.edu.tw",
-                sesskey,
-            },
-        };
-    }
-    forumsCmd
-        .command("list")
-        .description("List forums from in-progress courses")
-        .option("--output <format>", "Output format: json|csv|table|silent")
-        .action(async (options, command) => {
-        const apiContext = await createApiContext(options, command);
+    async function listForums(classification) {
+        const apiContext = await createApiContext({});
         if (!apiContext) {
             process.exitCode = 1;
             return;
         }
         const courses = await getEnrolledCoursesApi(apiContext.session, {
-            classification: "inprogress",
+            classification,
         });
-        // Get forums via WS API (no browser needed!)
         const courseIds = courses.map(c => c.id);
         const wsForums = await getForumsApi(apiContext.session, courseIds);
+        const courseMap = new Map(courses.map(c => [c.id, c]));
         const allForums = [];
         for (const wsForum of wsForums) {
-            const course = courses.find(c => c.id === wsForum.courseid);
+            const course = courseMap.get(wsForum.courseid);
             if (course) {
                 allForums.push({
                     course_id: wsForum.courseid,
@@ -66,62 +29,22 @@ export function registerForumsCommand(program) {
                     forum_id: wsForum.id,
                     name: wsForum.name,
                     timemodified: wsForum.timemodified,
-                    // url: `https://ilearning.cycu.edu.tw/mod/forum/view.php?id=${wsForum.cmid}`,
                 });
             }
         }
-        console.log(JSON.stringify({
-            status: "success",
-            timestamp: new Date().toISOString(),
-            total_courses: courses.length,
-            total_forums: allForums.length,
-        }));
-        for (const forum of allForums) {
-            console.log(JSON.stringify(forum));
-        }
-    });
+        formatAndOutput(allForums, "json", apiContext.log, { status: "success", timestamp: new Date().toISOString(), total_courses: courses.length, total_forums: allForums.length });
+    }
+    forumsCmd
+        .command("list")
+        .description("List forums from in-progress courses")
+        .action(() => listForums("inprogress"));
     forumsCmd
         .command("list-all")
         .description("List all forums across all courses")
         .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 apiContext = await createApiContext(options, command);
-        if (!apiContext) {
-            process.exitCode = 1;
-            return;
-        }
+        .action(async (options) => {
         const classification = options.level === "all" ? undefined : "inprogress";
-        const courses = await getEnrolledCoursesApi(apiContext.session, {
-            classification,
-        });
-        // Get forums via WS API (no browser needed!)
-        const courseIds = courses.map(c => c.id);
-        const wsForums = await 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,
-                    intro: wsForum.intro,
-                    cmid: wsForum.cmid.toString(),
-                    forum_id: wsForum.id,
-                    name: wsForum.name,
-                    timemodified: wsForum.timemodified,
-                });
-            }
-        }
-        console.log(JSON.stringify({
-            status: "success",
-            timestamp: new Date().toISOString(),
-            total_courses: courses.length,
-            total_forums: allForums.length,
-        }));
-        for (const forum of allForums) {
-            console.log(JSON.stringify(forum));
-        }
+        await listForums(classification);
     });
     forumsCmd
         .command("discussions")
@@ -129,51 +52,29 @@ export function registerForumsCommand(program) {
         .argument("<forum-id>", "Forum ID")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (forumId, options, command) => {
+        const output = getOutputFormat(command);
         const apiContext = await createApiContext(options, command);
         if (!apiContext) {
             process.exitCode = 1;
             return;
         }
-        // Get courses via WS API
-        const courses = await getEnrolledCoursesApi(apiContext.session, {
-            classification: "inprogress",
-        });
-        // Get forums via WS API
-        const courseIds = courses.map(c => c.id);
-        const wsForums = await 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" }));
+        const resolved = await resolveForumId(apiContext.session, forumId);
+        if (!resolved) {
+            apiContext.log.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 getForumDiscussionsApi(apiContext.session, targetForum.id);
-        // 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,
-            total_discussions: discussions.length,
-        };
-        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 || ""),
-            }));
-        }
+        const discussions = await getForumDiscussionsApi(apiContext.session, resolved.forumId);
+        const items = discussions.map(d => ({
+            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 || ""),
+        }));
+        formatAndOutput(items, output, apiContext.log, { status: "success", timestamp: new Date().toISOString(), forum_id: resolved.forumId, forum_name: resolved.name ?? null, course_id: resolved.courseid ?? null, total_discussions: discussions.length });
     });
     forumsCmd
         .command("posts")
@@ -188,38 +89,17 @@ export function registerForumsCommand(program) {
             return;
         }
         const posts = await 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,
-                    author: p.author,
-                    author_id: p.authorId,
-                    created: formatTimestamp(p.created),
-                    modified: formatTimestamp(p.modified),
-                    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);
-        }
+        const items = posts.map(p => ({
+            id: p.id,
+            subject: p.subject,
+            author: p.author,
+            author_id: p.authorId,
+            created: formatTimestamp(p.created),
+            modified: formatTimestamp(p.modified),
+            message: p.message,
+            unread: p.unread,
+        }));
+        formatAndOutput(items, output, apiContext.log, { status: "success", timestamp: new Date().toISOString(), discussion_id: discussionId, total_posts: posts.length });
     });
     forumsCmd
         .command("post")
@@ -236,22 +116,14 @@ export function registerForumsCommand(program) {
             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) {
+        const resolved = await resolveForumId(session, forumId);
+        if (!resolved) {
             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);
+        log.info(`Posting to forum: ${resolved.name ?? forumId}`);
+        const result = await addForumDiscussionApi(session, resolved.forumId, subject, message);
         if (result.success) {
             log.success(`✓ Discussion posted successfully!`);
             log.info(`  Discussion ID: ${result.discussionId}`);

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

@@ -1 +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"}
+{"version":3,"file":"grades.d.ts","sourceRoot":"","sources":["../../../src/src/commands/grades.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgBpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA+F5D"}

package/esm/src/commands/grades.js

@@ -1,45 +1,10 @@
-import { getBaseDir } from "../lib/utils.js";
 import { getEnrolledCoursesApi, getCourseGradesApi } from "../lib/moodle.js";
-import { createLogger } from "../lib/logger.js";
-import { loadWsToken } from "../lib/token.js";
+import { createApiContext } from "../lib/auth.js";
 import { formatAndOutput } from "../index.js";
-import path from "node:path";
-import fs from "node:fs";
+import { getOutputFormat } from "../lib/utils.js";
 export function registerGradesCommand(program) {
     const gradesCmd = program.command("grades");
     gradesCmd.description("Grade 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;
-        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",
-            },
-        };
-    }
     gradesCmd
         .command("summary")
         .description("Show grade summary across all courses")
@@ -52,9 +17,13 @@ export function registerGradesCommand(program) {
             return;
         }
         const courses = await getEnrolledCoursesApi(apiContext.session);
+        const gradeResults = await Promise.allSettled(courses.map(course => getCourseGradesApi(apiContext.session, course.id)
+            .then(grades => ({ course, grades }))));
         const gradeSummaries = [];
-        for (const course of courses) {
-            const grades = await getCourseGradesApi(apiContext.session, course.id);
+        for (const result of gradeResults) {
+            if (result.status !== "fulfilled")
+                continue;
+            const { course, grades } = result.value;
             gradeSummaries.push({
                 courseId: course.id,
                 courseName: course.fullname,
@@ -64,19 +33,13 @@ export function registerGradesCommand(program) {
                 totalUsers: grades.totalUsers,
             });
         }
-        // Calculate overall statistics
         const gradedCourses = gradeSummaries.filter(g => g.grade !== undefined && g.grade !== null && g.grade !== "-");
         const averageRank = gradeSummaries
             .filter(g => g.rank !== undefined && g.rank !== null)
             .reduce((sum, g) => sum + (g.rank || 0), 0) /
             (gradeSummaries.filter(g => g.rank !== undefined && g.rank !== null).length || 1);
-        const summaryData = {
-            total_courses: courses.length,
-            graded_courses: gradedCourses.length,
-            average_rank: averageRank.toFixed(1),
-            grades: gradeSummaries,
-        };
-        formatAndOutput(summaryData, output, apiContext.log);
+        apiContext.log.info(`Total: ${courses.length} courses, ${gradedCourses.length} graded, avg rank: ${averageRank.toFixed(1)}`);
+        formatAndOutput(gradeSummaries, output, apiContext.log);
     });
     gradesCmd
         .command("course")

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;AAgCpC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA8iB/D"}
+{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../../src/src/commands/materials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4BpC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAwd/D"}