@mo7yw4ng/openape 1.0.5 → 1.0.6

package/README.md

@@ -1,6 +1,9 @@
 <h1 align="center">
   <img src="assets/logo.svg" width="150" /><br/>
-  OpenApe CLI (Unofficial)
+  OpenApe CLI (Unofficial)<br/>
+  <a href="https://www.npmjs.com/package/@mo7yw4ng/openape"><img src="https://img.shields.io/npm/v/@mo7yw4ng/openape" alt="npm version" /></a>
+  <a href="https://jsr.io/@openape/openape"><img src="https://jsr.io/badges/@openape/openape" alt="JSR" /></a>
+  <a href="https://www.npmjs.com/package/@mo7yw4ng/openape"><img src="https://img.shields.io/npm/dm/@mo7yw4ng/openape" alt="npm downloads" /></a>
 </h1>
 
 中原大學 [i-Learning](https://ilearning.cycu.edu.tw/) (Moodle) 平台自動化命令列工具 (CLI)，幫助你快速查詢課程、觀看影片、下載教材。
@@ -53,8 +56,8 @@ openape courses syllabus <id>      # 顯示課程大綱
 ```bash
 openape videos list <course-id>      # 列出課程中的影片
 openape videos complete <id>         # 標記特定影片為已觀看
-openape videos complete-all <id>     # 影片批次完成
-openape videos download <id>         # 下載影片
+openape videos complete-all            # 影片批次完成
+openape videos download <id>         # 下載影片 (支援 --output-dir)
 ```
 
 ### 測驗與教材 (Quizzes & Materials)
@@ -65,8 +68,8 @@ openape quizzes start <quiz-id>      # 開始測驗
 openape quizzes info <attempt-id>    # 查看測驗題目
 openape quizzes save <attempt-id> '<answers>' # 儲存測驗答案
 openape materials list-all           # 列出所有可下載教材
-openape materials download <id>      # 下載指定教材
-openape materials download-all       # 批次下載教材
+openape materials download <id>      # 下載指定教材 (支援 --output-dir)
+openape materials download-all       # 批次下載教材 (支援 --output-dir, --level)
 openape materials complete <id>      # 標記教材為已完成
 openape materials complete-all       # 批次標記教材為已完成
 ```
@@ -79,13 +82,13 @@ openape forums list                  # 列出進行中課程的討論區
 openape forums list-all              # 列出所有討論區
 openape forums discussions <forum-id>      # 列出討論區中的討論串
 openape forums posts <discussion-id>       # 列出討論串中的貼文
-openape forums reply <post-id> <subject> <message>  # 回覆貼文
+openape forums reply <post-id> <subject> <message>  # 回覆貼文 (支援 --attachment-id)
 openape forums post <forum-id> <subject> <message>  # 發起新討論
 openape forums delete <post-id>      # 刪除討論貼文
 openape announcements list-all       # 列出所有公告
 openape announcements read <id>      # 閱讀特定公告
-openape calendar events              # 查詢行事曆事件
-openape calendar export              # 匯出事件
+openape calendar events              # 查詢行事曆事件 (支援 --upcoming, --days, --course)
+openape calendar export              # 匯出事件 (支援 --output, --days)
 ```
 
 ### 作業與檔案上傳 (Assignments & Upload)

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "@openape/openape",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "description": "CLI tool for CYCU i-Learning platform",
     "license": "MIT",
     "exports": "./src/index.ts",

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

@@ -1 +1 @@
-{"version":3,"file":"announcements.d.ts","sourceRoot":"","sources":["../../../src/src/commands/announcements.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqBpC,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAoJnE"}
+{"version":3,"file":"announcements.d.ts","sourceRoot":"","sources":["../../../src/src/commands/announcements.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuFnE"}

package/esm/src/commands/announcements.js

@@ -1,45 +1,10 @@
-import { getBaseDir, formatTimestamp } from "../lib/utils.js";
+import { getOutputFormat, formatTimestamp } from "../lib/utils.js";
 import { getSiteInfoApi, getMessagesApi, getDiscussionPostsApi } from "../lib/moodle.js";
-import { createLogger } from "../lib/logger.js";
-import { loadWsToken } from "../lib/token.js";
-import path from "node:path";
-import fs from "node:fs";
+import { createApiContext } from "../lib/auth.js";
+import { formatAndOutput } from "../index.js";
 export function registerAnnouncementsCommand(program) {
     const announcementsCmd = program.command("announcements");
     announcementsCmd.description("Announcement 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, outputFormat);
-        const baseDir = getBaseDir();
-        const sessionPath = path.resolve(baseDir, ".auth", "storage-state.json");
-        // Check if session exists
-        if (!fs.existsSync(sessionPath)) {
-            console.error("未找到登入 session。請先執行 'openape login' 進行登入。");
-            log.info(`Session 預期位置: ${sessionPath}`);
-            return null;
-        }
-        // Try to load WS token
-        const wsToken = loadWsToken(sessionPath);
-        if (!wsToken) {
-            console.error("未找到 WS token。請先執行 'openape login' 進行登入。");
-            return null;
-        }
-        return {
-            log,
-            session: {
-                wsToken,
-                moodleBaseUrl: "https://ilearning.cycu.edu.tw",
-            },
-        };
-    }
     announcementsCmd
         .command("list-all")
         .description("List all announcements across all courses")
@@ -48,55 +13,31 @@ export function registerAnnouncementsCommand(program) {
         .option("--limit <n>", "Maximum number of announcements to show", "20")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (options, command) => {
+        const output = getOutputFormat(command);
         const limit = parseInt(options.limit, 10);
         const apiContext = await createApiContext(options, command);
         if (!apiContext) {
             process.exitCode = 1;
             return;
         }
-        // Get site info to retrieve userid
         const siteInfo = await getSiteInfoApi(apiContext.session);
-        // Get messages for the current user
         const messages = await getMessagesApi(apiContext.session, siteInfo.userid, {
             limitnum: limit,
         });
-        // Convert messages to announcement format
         const allAnnouncements = messages.map(m => ({
-            course_id: 0, // Messages don't have courseId
+            course_id: 0,
             course_name: "Notifications",
             id: m.id,
             subject: m.subject,
             author: `User ${m.useridfrom}`,
-            authorId: m.useridfrom,
-            createdAt: m.timecreated,
-            modifiedAt: m.timecreated,
-            unread: false, // Messages API doesn't provide unread status
-            forumId: 0,
+            author_id: m.useridfrom,
+            created_at: formatTimestamp(m.timecreated),
+            modified_at: formatTimestamp(m.timecreated),
+            unread: false,
         }));
-        // Sort by created date (newest first)
-        allAnnouncements.sort((a, b) => b.createdAt - a.createdAt);
-        // Apply limit
-        let filteredAnnouncements = allAnnouncements.slice(0, limit);
-        console.log(JSON.stringify({
-            status: "success",
-            timestamp: new Date().toISOString(),
-            level: options.level,
-            total_announcements: allAnnouncements.length,
-            shown: filteredAnnouncements.length,
-        }));
-        for (const a of filteredAnnouncements) {
-            console.log(JSON.stringify({
-                course_id: a.course_id,
-                course_name: a.course_name,
-                id: a.id,
-                subject: a.subject,
-                author: a.author,
-                author_id: a.authorId,
-                created_at: formatTimestamp(a.createdAt),
-                modified_at: formatTimestamp(a.modifiedAt),
-                unread: a.unread,
-            }));
-        }
+        allAnnouncements.sort((a, b) => b.created_at > a.created_at ? 1 : -1);
+        const shown = allAnnouncements.slice(0, limit);
+        formatAndOutput(shown, output, apiContext.log, { status: "success", timestamp: new Date().toISOString(), total_announcements: allAnnouncements.length, shown: shown.length });
     });
     announcementsCmd
         .command("read")
@@ -104,6 +45,7 @@ export function registerAnnouncementsCommand(program) {
         .argument("<announcement-id>", "Discussion ID of the announcement")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (announcementId, options, command) => {
+        const output = getOutputFormat(command);
         const apiContext = await createApiContext(options, command);
         if (!apiContext) {
             process.exitCode = 1;
@@ -116,19 +58,14 @@ export function registerAnnouncementsCommand(program) {
             return;
         }
         const firstPost = posts[0];
-        const output = {
-            status: "success",
-            timestamp: new Date().toISOString(),
-            announcement: {
-                id: announcementId,
-                subject: firstPost.subject,
-                author: firstPost.author,
-                author_id: firstPost.authorId,
-                created_at: formatTimestamp(firstPost.created),
-                modified_at: formatTimestamp(firstPost.modified),
-                message: firstPost.message,
-            },
-        };
-        console.log(JSON.stringify(output));
+        formatAndOutput({
+            id: announcementId,
+            subject: firstPost.subject,
+            author: firstPost.author,
+            author_id: firstPost.authorId,
+            created_at: formatTimestamp(firstPost.created),
+            modified_at: formatTimestamp(firstPost.modified),
+            message: firstPost.message,
+        }, output, apiContext.log);
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"assignments.d.ts","sourceRoot":"","sources":["../../../src/src/commands/assignments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA0PjE"}
+{"version":3,"file":"assignments.d.ts","sourceRoot":"","sources":["../../../src/src/commands/assignments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAyPjE"}

package/esm/src/commands/assignments.js

@@ -158,9 +158,9 @@ export function registerAssignmentsCommand(program) {
         // Upload file if --file option is provided
         if (options.file) {
             const resolvedPath = path.resolve(options.file);
-            // Check if file exists
+            let stats;
             try {
-                await fs.access(resolvedPath);
+                stats = await fs.stat(resolvedPath);
             }
             catch {
                 const errorResult = {
@@ -171,7 +171,6 @@ export function registerAssignmentsCommand(program) {
                 process.exitCode = 1;
                 return;
             }
-            const stats = await fs.stat(resolvedPath);
             const fileSizeKB = formatFileSize(stats.size);
             const uploadResult = await uploadFileApi(apiContext.session, resolvedPath);
             if (!uploadResult.success) {

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

@@ -1 +1 @@
-{"version":3,"file":"calendar.d.ts","sourceRoot":"","sources":["../../../src/src/commands/calendar.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmM9D"}
+{"version":3,"file":"calendar.d.ts","sourceRoot":"","sources":["../../../src/src/commands/calendar.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAqJ9D"}

package/esm/src/commands/calendar.js

@@ -1,45 +1,11 @@
-import { getBaseDir, formatTimestamp } from "../lib/utils.js";
+import { getOutputFormat, formatTimestamp } from "../lib/utils.js";
 import { getEnrolledCoursesApi, getCalendarEventsApi } from "../lib/moodle.js";
-import { createLogger } from "../lib/logger.js";
-import { loadWsToken } from "../lib/token.js";
-import path from "node:path";
+import { createApiContext } from "../lib/auth.js";
+import { formatAndOutput } from "../index.js";
 import fs from "node:fs";
 export function registerCalendarCommand(program) {
     const calendarCmd = program.command("calendar");
     calendarCmd.description("Calendar 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, outputFormat);
-        const baseDir = getBaseDir();
-        const sessionPath = path.resolve(baseDir, ".auth", "storage-state.json");
-        // Check if session exists
-        if (!fs.existsSync(sessionPath)) {
-            console.error("未找到登入 session。請先執行 'openape login' 進行登入。");
-            log.info(`Session 預期位置: ${sessionPath}`);
-            return null;
-        }
-        // Try to load WS token
-        const wsToken = loadWsToken(sessionPath);
-        if (!wsToken) {
-            console.error("未找到 WS token。請先執行 'openape login' 進行登入。");
-            return null;
-        }
-        return {
-            log,
-            session: {
-                wsToken,
-                moodleBaseUrl: "https://ilearning.cycu.edu.tw",
-            },
-        };
-    }
     calendarCmd
         .command("events")
         .description("List calendar events")
@@ -48,6 +14,7 @@ export function registerCalendarCommand(program) {
         .option("--course <id>", "Filter by course ID")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (options, command) => {
+        const output = getOutputFormat(command);
         const days = parseInt(options.days, 10);
         const apiContext = await createApiContext(options, command);
         if (!apiContext) {
@@ -55,12 +22,10 @@ export function registerCalendarCommand(program) {
             return;
         }
         const courses = await 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 getCalendarEventsApi(apiContext.session, {
                 startTime: now,
@@ -69,29 +34,32 @@ export function registerCalendarCommand(program) {
             allEvents = events.filter(e => e.courseid === courseId);
         }
         else {
-            // Get events for all courses
-            for (const course of courses) {
-                try {
-                    const events = await 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}`);
-                }
+            const results = await Promise.allSettled(courses.map(course => getCalendarEventsApi(apiContext.session, {
+                courseId: course.id,
+                startTime: now,
+                endTime: endTime,
+            })));
+            for (const result of results) {
+                if (result.status === "fulfilled")
+                    allEvents.push(...result.value);
             }
         }
-        // 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);
         }
-        console.log(JSON.stringify({
+        const items = filteredEvents.map(e => ({
+            id: e.id,
+            name: e.name,
+            description: e.description,
+            course_id: e.courseid,
+            event_type: e.eventtype,
+            start_time: formatTimestamp(e.timestart),
+            end_time: e.timeduration ? formatTimestamp(e.timestart + Math.floor(e.timeduration / 1000)) : null,
+            location: e.location,
+        }));
+        formatAndOutput(items, output, apiContext.log, {
             status: "success",
             timestamp: new Date().toISOString(),
             total_events: allEvents.length,
@@ -100,19 +68,7 @@ export function registerCalendarCommand(program) {
                 acc[e.eventtype] = (acc[e.eventtype] || 0) + 1;
                 return acc;
             }, {}),
-        }));
-        for (const e of filteredEvents) {
-            console.log(JSON.stringify({
-                id: e.id,
-                name: e.name,
-                description: e.description,
-                course_id: e.courseid,
-                event_type: e.eventtype,
-                start_time: formatTimestamp(e.timestart),
-                end_time: e.timeduration ? formatTimestamp(e.timestart + Math.floor(e.timeduration / 1000)) : null,
-                location: e.location,
-            }));
-        }
+        });
     });
     calendarCmd
         .command("export")
@@ -126,27 +82,20 @@ export function registerCalendarCommand(program) {
             return;
         }
         const courses = await 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 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}`);
-            }
+        const results = await Promise.allSettled(courses.map(course => getCalendarEventsApi(apiContext.session, {
+            courseId: course.id,
+            startTime: now,
+            endTime: endTime,
+        })));
+        for (const result of results) {
+            if (result.status === "fulfilled")
+                allEvents.push(...result.value);
         }
-        // Sort by start time
         allEvents.sort((a, b) => a.timestart - b.timestart);
-        // Export data
         const exportData = {
             exported_at: new Date().toISOString(),
             time_range: {
@@ -172,7 +121,6 @@ export function registerCalendarCommand(program) {
                 }, {}),
             },
         };
-        // Write to file
         fs.writeFileSync(options.output, JSON.stringify(exportData));
         apiContext.log.success(`Exported ${allEvents.length} events to ${options.output}`);
     });

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

@@ -1 +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"}
+{"version":3,"file":"courses.d.ts","sourceRoot":"","sources":["../../../src/src/commands/courses.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkW7D"}

package/esm/src/commands/courses.js

@@ -1,46 +1,10 @@
-import { getBaseDir, formatTimestamp } from "../lib/utils.js";
+import { getOutputFormat, formatTimestamp } from "../lib/utils.js";
 import { getEnrolledCoursesApi } 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";
 export function registerCoursesCommand(program) {
     const coursesCmd = program.command("courses");
     coursesCmd.description("Course 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, outputFormat);
-        const baseDir = getBaseDir();
-        const sessionPath = path.resolve(baseDir, ".auth", "storage-state.json");
-        // Check if session exists
-        if (!fs.existsSync(sessionPath)) {
-            console.error("未找到登入 session。請先執行 'openape login' 進行登入。");
-            log.info(`Session 預期位置: ${sessionPath}`);
-            return null;
-        }
-        // Try to load WS token
-        const wsToken = loadWsToken(sessionPath);
-        if (!wsToken) {
-            console.error("未找到 WS token。請先執行 'openape login' 進行登入。");
-            return null;
-        }
-        return {
-            log,
-            session: {
-                wsToken,
-                moodleBaseUrl: "https://ilearning.cycu.edu.tw",
-            },
-        };
-    }
     coursesCmd
         .command("list")
         .description("List enrolled courses")

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

@@ -1 +1 @@
-{"version":3,"file":"forums.d.ts","sourceRoot":"","sources":["../../../src/src/commands/forums.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAmBpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkX5D"}
+{"version":3,"file":"forums.d.ts","sourceRoot":"","sources":["../../../src/src/commands/forums.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA+O5D"}