@mo7yw4ng/openape 1.0.5 → 1.0.6

package/script/src/commands/announcements.js

@@ -1,51 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerAnnouncementsCommand = registerAnnouncementsCommand;
 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 token_js_1 = require("../lib/token.js");
-const node_path_1 = __importDefault(require("node:path"));
-const node_fs_1 = __importDefault(require("node:fs"));
+const auth_js_1 = require("../lib/auth.js");
+const index_js_1 = require("../index.js");
 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 = (0, logger_js_1.createLogger)(opts.verbose, silent, outputFormat);
-        const baseDir = (0, utils_js_1.getBaseDir)();
-        const sessionPath = node_path_1.default.resolve(baseDir, ".auth", "storage-state.json");
-        // Check if session exists
-        if (!node_fs_1.default.existsSync(sessionPath)) {
-            console.error("未找到登入 session。請先執行 'openape login' 進行登入。");
-            log.info(`Session 預期位置: ${sessionPath}`);
-            return null;
-        }
-        // Try to load WS token
-        const wsToken = (0, token_js_1.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")
@@ -54,55 +16,31 @@ 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 = (0, utils_js_1.getOutputFormat)(command);
         const limit = parseInt(options.limit, 10);
-        const apiContext = await createApiContext(options, command);
+        const apiContext = await (0, auth_js_1.createApiContext)(options, command);
         if (!apiContext) {
             process.exitCode = 1;
             return;
         }
-        // Get site info to retrieve userid
         const siteInfo = await (0, moodle_js_1.getSiteInfoApi)(apiContext.session);
-        // Get messages for the current user
         const messages = await (0, moodle_js_1.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: (0, utils_js_1.formatTimestamp)(m.timecreated),
+            modified_at: (0, utils_js_1.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: (0, utils_js_1.formatTimestamp)(a.createdAt),
-                modified_at: (0, utils_js_1.formatTimestamp)(a.modifiedAt),
-                unread: a.unread,
-            }));
-        }
+        allAnnouncements.sort((a, b) => b.created_at > a.created_at ? 1 : -1);
+        const shown = allAnnouncements.slice(0, limit);
+        (0, index_js_1.formatAndOutput)(shown, output, apiContext.log, { status: "success", timestamp: new Date().toISOString(), total_announcements: allAnnouncements.length, shown: shown.length });
     });
     announcementsCmd
         .command("read")
@@ -110,7 +48,8 @@ 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 apiContext = await createApiContext(options, command);
+        const output = (0, utils_js_1.getOutputFormat)(command);
+        const apiContext = await (0, auth_js_1.createApiContext)(options, command);
         if (!apiContext) {
             process.exitCode = 1;
             return;
@@ -122,19 +61,14 @@ 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: (0, utils_js_1.formatTimestamp)(firstPost.created),
-                modified_at: (0, utils_js_1.formatTimestamp)(firstPost.modified),
-                message: firstPost.message,
-            },
-        };
-        console.log(JSON.stringify(output));
+        (0, index_js_1.formatAndOutput)({
+            id: announcementId,
+            subject: firstPost.subject,
+            author: firstPost.author,
+            author_id: firstPost.authorId,
+            created_at: (0, utils_js_1.formatTimestamp)(firstPost.created),
+            modified_at: (0, utils_js_1.formatTimestamp)(firstPost.modified),
+            message: firstPost.message,
+        }, output, apiContext.log);
     });
 }

package/script/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/script/src/commands/assignments.js

@@ -197,9 +197,9 @@ function registerAssignmentsCommand(program) {
         // Upload file if --file option is provided
         if (options.file) {
             const resolvedPath = node_path_1.default.resolve(options.file);
-            // Check if file exists
+            let stats;
             try {
-                await promises_1.default.access(resolvedPath);
+                stats = await promises_1.default.stat(resolvedPath);
             }
             catch {
                 const errorResult = {
@@ -210,7 +210,6 @@ function registerAssignmentsCommand(program) {
                 process.exitCode = 1;
                 return;
             }
-            const stats = await promises_1.default.stat(resolvedPath);
             const fileSizeKB = (0, utils_js_1.formatFileSize)(stats.size);
             const uploadResult = await (0, moodle_js_1.uploadFileApi)(apiContext.session, resolvedPath);
             if (!uploadResult.success) {

package/script/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/script/src/commands/calendar.js

@@ -6,46 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 token_js_1 = require("../lib/token.js");
-const node_path_1 = __importDefault(require("node:path"));
+const auth_js_1 = require("../lib/auth.js");
+const index_js_1 = require("../index.js");
 const node_fs_1 = __importDefault(require("node:fs"));
 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 = (0, logger_js_1.createLogger)(opts.verbose, silent, outputFormat);
-        const baseDir = (0, utils_js_1.getBaseDir)();
-        const sessionPath = node_path_1.default.resolve(baseDir, ".auth", "storage-state.json");
-        // Check if session exists
-        if (!node_fs_1.default.existsSync(sessionPath)) {
-            console.error("未找到登入 session。請先執行 'openape login' 進行登入。");
-            log.info(`Session 預期位置: ${sessionPath}`);
-            return null;
-        }
-        // Try to load WS token
-        const wsToken = (0, token_js_1.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")
@@ -54,19 +20,18 @@ 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 = (0, utils_js_1.getOutputFormat)(command);
         const days = parseInt(options.days, 10);
-        const apiContext = await createApiContext(options, command);
+        const apiContext = await (0, auth_js_1.createApiContext)(options, command);
         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,
@@ -75,29 +40,32 @@ 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 (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}`);
-                }
+            const results = await Promise.allSettled(courses.map(course => (0, moodle_js_1.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: (0, utils_js_1.formatTimestamp)(e.timestart),
+            end_time: e.timeduration ? (0, utils_js_1.formatTimestamp)(e.timestart + Math.floor(e.timeduration / 1000)) : null,
+            location: e.location,
+        }));
+        (0, index_js_1.formatAndOutput)(items, output, apiContext.log, {
             status: "success",
             timestamp: new Date().toISOString(),
             total_events: allEvents.length,
@@ -106,19 +74,7 @@ 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: (0, utils_js_1.formatTimestamp)(e.timestart),
-                end_time: e.timeduration ? (0, utils_js_1.formatTimestamp)(e.timestart + Math.floor(e.timeduration / 1000)) : null,
-                location: e.location,
-            }));
-        }
+        });
     });
     calendarCmd
         .command("export")
@@ -126,33 +82,26 @@ 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) => {
-        const apiContext = await createApiContext(options, command);
+        const apiContext = await (0, auth_js_1.createApiContext)(options, command);
         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 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}`);
-            }
+        const results = await Promise.allSettled(courses.map(course => (0, moodle_js_1.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: {
@@ -178,7 +127,6 @@ function registerCalendarCommand(program) {
                 }, {}),
             },
         };
-        // Write to file
         node_fs_1.default.writeFileSync(options.output, JSON.stringify(exportData));
         apiContext.log.success(`Exported ${allEvents.length} events to ${options.output}`);
     });

package/script/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/script/src/commands/courses.js

@@ -1,52 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerCoursesCommand = registerCoursesCommand;
 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 token_js_1 = require("../lib/token.js");
+const auth_js_1 = require("../lib/auth.js");
 const index_js_1 = require("../index.js");
-const node_path_1 = __importDefault(require("node:path"));
-const node_fs_1 = __importDefault(require("node:fs"));
 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 = (0, logger_js_1.createLogger)(opts.verbose, silent, outputFormat);
-        const baseDir = (0, utils_js_1.getBaseDir)();
-        const sessionPath = node_path_1.default.resolve(baseDir, ".auth", "storage-state.json");
-        // Check if session exists
-        if (!node_fs_1.default.existsSync(sessionPath)) {
-            console.error("未找到登入 session。請先執行 'openape login' 進行登入。");
-            log.info(`Session 預期位置: ${sessionPath}`);
-            return null;
-        }
-        // Try to load WS token
-        const wsToken = (0, token_js_1.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")
@@ -54,8 +15,8 @@ function registerCoursesCommand(program) {
         .option("--output <format>", "Output format: json|csv|table|silent")
         .option("--level <type>", "Course level: in_progress (default) | past | future | all", "in_progress")
         .action(async (options, command) => {
-        const output = getOutputFormat(command);
-        const apiContext = await createApiContext(options, command);
+        const output = (0, utils_js_1.getOutputFormat)(command);
+        const apiContext = await (0, auth_js_1.createApiContext)(options, command);
         if (!apiContext) {
             process.exitCode = 1;
             return;
@@ -79,8 +40,8 @@ function registerCoursesCommand(program) {
         .argument("<course-id>", "Course ID")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (courseId, options, command) => {
-        const output = getOutputFormat(command);
-        const apiContext = await createApiContext(options, command);
+        const output = (0, utils_js_1.getOutputFormat)(command);
+        const apiContext = await (0, auth_js_1.createApiContext)(options, command);
         if (!apiContext) {
             process.exitCode = 1;
             return;
@@ -100,8 +61,8 @@ function registerCoursesCommand(program) {
         .argument("<course-id>", "Course ID")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (courseId, options, command) => {
-        const output = getOutputFormat(command);
-        const apiContext = await createApiContext(options, command);
+        const output = (0, utils_js_1.getOutputFormat)(command);
+        const apiContext = await (0, auth_js_1.createApiContext)(options, command);
         if (!apiContext) {
             process.exitCode = 1;
             return;
@@ -309,8 +270,8 @@ function registerCoursesCommand(program) {
         .argument("<course-id>", "Course ID")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (courseId, options, command) => {
-        const output = getOutputFormat(command);
-        const apiContext = await createApiContext(options, command);
+        const output = (0, utils_js_1.getOutputFormat)(command);
+        const apiContext = await (0, auth_js_1.createApiContext)(options, command);
         if (!apiContext) {
             process.exitCode = 1;
             return;

package/script/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"}