@mo7yw4ng/openape 1.0.3 → 1.0.5

package/script/src/commands/assignments.js

@@ -0,0 +1,269 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerAssignmentsCommand = registerAssignmentsCommand;
+const utils_js_1 = require("../lib/utils.js");
+const moodle_js_1 = require("../lib/moodle.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 promises_1 = __importDefault(require("node:fs/promises"));
+function registerAssignmentsCommand(program) {
+    const assignmentsCmd = program.command("assignments");
+    assignmentsCmd.description("Assignment operations");
+    assignmentsCmd
+        .command("list")
+        .description("List assignments in a course")
+        .argument("<course-id>", "Course ID")
+        .option("--output <format>", "Output format: json|csv|table|silent")
+        .action(async (courseId, 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;
+        }
+        const apiAssignments = await (0, moodle_js_1.getAssignmentsByCoursesApi)(apiContext.session, [parseInt(courseId, 10)]);
+        const assignments = apiAssignments.map(a => ({
+            id: a.id,
+            courseName: courseId,
+            name: a.name,
+            url: a.url,
+            cmid: a.cmid,
+            duedate: (0, utils_js_1.formatMoodleDate)(a.duedate),
+            cutoffdate: (0, utils_js_1.formatMoodleDate)(a.cutoffdate),
+            allowSubmissionsFromDate: (0, utils_js_1.formatMoodleDate)(a.allowSubmissionsFromDate),
+        }));
+        apiContext.log.info(`\n找到 ${assignments.length} 個作業。`);
+        (0, index_js_1.formatAndOutput)(assignments, output, apiContext.log);
+    });
+    assignmentsCmd
+        .command("list-all")
+        .description("List all assignments 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 output = (0, utils_js_1.getOutputFormat)(command);
+        const apiContext = await (0, auth_js_1.createApiContext)(options, command);
+        if (!apiContext) {
+            process.exitCode = 1;
+            return;
+        }
+        const classification = options.level === "all" ? undefined : "inprogress";
+        const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session, {
+            classification,
+        });
+        // Get assignments via WS API (no browser needed!)
+        const courseIds = courses.map(c => c.id);
+        const apiAssignments = await (0, moodle_js_1.getAssignmentsByCoursesApi)(apiContext.session, courseIds);
+        // Build a map of courseId -> course for quick lookup
+        const courseMap = new Map(courses.map(c => [c.id, c]));
+        const allAssignments = [];
+        for (const a of apiAssignments) {
+            const course = courseMap.get(a.courseId);
+            if (course) {
+                allAssignments.push({
+                    id: a.id,
+                    courseName: course.fullname,
+                    name: a.name,
+                    url: a.url,
+                    cmid: a.cmid,
+                    duedate: (0, utils_js_1.formatMoodleDate)(a.duedate),
+                    cutoffdate: (0, utils_js_1.formatMoodleDate)(a.cutoffdate),
+                    allowSubmissionsFromDate: (0, utils_js_1.formatMoodleDate)(a.allowSubmissionsFromDate),
+                });
+            }
+        }
+        apiContext.log.info(`\n總計發現 ${allAssignments.length} 個作業。`);
+        (0, index_js_1.formatAndOutput)(allAssignments, output, apiContext.log);
+    });
+    // ── Submission Status ───────────────────────────────────────────────────────
+    assignmentsCmd
+        .command("status")
+        .description("Check assignment submission status")
+        .argument("<assignment-id>", "Assignment instance ID (from list-all)")
+        .option("--output <format>", "Output format: json|csv|table|silent")
+        .action(async (assignmentId, 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;
+        }
+        const id = parseInt(assignmentId, 10);
+        apiContext.log.info("檢查繳交狀態...");
+        const status = await (0, moodle_js_1.getSubmissionStatusApi)(apiContext.session, id);
+        // Build status data object
+        const statusData = {
+            submitted: status.submitted,
+            submitted_text: status.submitted ? "已繳交" : "尚未繳交",
+            graded: status.graded,
+            graded_text: status.graded ? "已評分" : "尚未評分",
+            last_modified: status.lastModified ? new Date(status.lastModified * 1000).toISOString() : null,
+            last_modified_text: status.lastModified ? new Date(status.lastModified * 1000).toLocaleString("zh-TW") : null,
+            grader: status.grader,
+            grade: status.grade,
+            feedback: status.feedback,
+            files: status.extensions.map(f => ({
+                filename: f.filename,
+                filesize: f.filesize,
+                filesize_kb: (0, utils_js_1.formatFileSize)(f.filesize),
+            })),
+        };
+        (0, index_js_1.formatAndOutput)(statusData, output, apiContext.log);
+    });
+    // ── Submit Assignment ────────────────────────────────────────────────────────
+    assignmentsCmd
+        .command("submit")
+        .description("Submit an assignment (online text or file)")
+        .argument("<assignment-id>", "Assignment instance ID (from list-all)")
+        .option("--text <content>", "Online text content to submit")
+        .option("--file-id <id>", "Draft file ID from file upload")
+        .option("--file <path>", "Upload and submit a file directly")
+        .option("--output <format>", "Output format: json|csv|table|silent")
+        .action(async (assignmentId, 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;
+        }
+        const id = parseInt(assignmentId, 10);
+        // Check submission status first
+        const status = await (0, moodle_js_1.getSubmissionStatusApi)(apiContext.session, id);
+        let fileUploaded;
+        let cancelled = false;
+        if (status.submitted) {
+            const confirm = await promptConfirm("此作業已經繳交！確定要重新繳交嗎？(y/N): ");
+            if (!confirm) {
+                cancelled = true;
+            }
+        }
+        if (cancelled) {
+            const cancelResult = {
+                success: false,
+                cancelled: true,
+                message: "Submission cancelled by user",
+            };
+            (0, index_js_1.formatAndOutput)(cancelResult, output, apiContext.log);
+            return;
+        }
+        // Validate options
+        if (!options.text && !options.fileId && !options.file) {
+            const errorResult = {
+                success: false,
+                error: "請提供 --text、--file-id 或 --file 選項。",
+            };
+            (0, index_js_1.formatAndOutput)(errorResult, output, apiContext.log);
+            process.exitCode = 1;
+            return;
+        }
+        let fileId = options.fileId ? parseInt(options.fileId, 10) : undefined;
+        // Upload file if --file option is provided
+        if (options.file) {
+            const resolvedPath = node_path_1.default.resolve(options.file);
+            // Check if file exists
+            try {
+                await promises_1.default.access(resolvedPath);
+            }
+            catch {
+                const errorResult = {
+                    success: false,
+                    error: `檔案不存在: ${options.file}`,
+                };
+                (0, index_js_1.formatAndOutput)(errorResult, output, apiContext.log);
+                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) {
+                const errorResult = {
+                    success: false,
+                    error: `檔案上傳失敗: ${uploadResult.error}`,
+                };
+                (0, index_js_1.formatAndOutput)(errorResult, output, apiContext.log);
+                process.exitCode = 1;
+                return;
+            }
+            fileId = uploadResult.draftId;
+            fileUploaded = {
+                filename: node_path_1.default.basename(resolvedPath),
+                filesize: stats.size,
+                filesize_kb: (0, utils_js_1.formatFileSize)(stats.size),
+                draft_id: fileId,
+            };
+        }
+        // Submit
+        const result = await (0, moodle_js_1.saveSubmissionApi)(apiContext.session, id, {
+            onlineText: options.text ? { text: options.text } : undefined,
+            fileId: fileId,
+        });
+        const submitResult = {
+            success: result.success,
+            assignment_id: id,
+            submitted: !!result.success,
+            online_text: !!options.text,
+            file_uploaded: fileUploaded,
+            file_id: fileId ?? null,
+            error: result.success ? undefined : result.error,
+            message: result.success ? "Assignment submitted successfully" : result.error,
+        };
+        (0, index_js_1.formatAndOutput)(submitResult, output, apiContext.log);
+        if (!result.success) {
+            process.exitCode = 1;
+        }
+    });
+}
+/**
+ * Prompt user for yes/no confirmation.
+ */
+async function promptConfirm(prompt) {
+    const readline = await Promise.resolve().then(() => __importStar(require("node:readline")));
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    return new Promise((resolve) => {
+        rl.question(prompt, (answer) => {
+            rl.close();
+            resolve(/^y/i.test(answer));
+        });
+    });
+}

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

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/src/commands/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAoQtD"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/src/commands/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkStD"}

package/script/src/commands/auth.js

@@ -9,6 +9,7 @@ const playwright_core_1 = require("playwright-core");
 const logger_js_1 = require("../lib/logger.js");
 const auth_js_1 = require("../lib/auth.js");
 const token_js_1 = require("../lib/token.js");
+const moodle_js_1 = require("../lib/moodle.js");
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = __importDefault(require("node:fs"));
 function registerCommand(program) {
@@ -134,31 +135,41 @@ function registerCommand(program) {
                 catch {
                     // Ignore sesskey extraction errors
                 }
-                // Try to acquire WS token
+                // Acquire WS token
+                let wsToken;
                 try {
-                    const config = {
-                        username: "",
-                        password: "",
-                        courseUrl: "",
-                        moodleBaseUrl: "https://ilearning.cycu.edu.tw",
-                        headless: false,
-                        slowMo: 0,
-                        authStatePath: sessionPath,
-                        ollamaBaseUrl: "",
-                    };
-                    const wsToken = await (0, token_js_1.acquireWsToken)(page, config, log);
+                    wsToken = await (0, token_js_1.acquireWsToken)(page, { moodleBaseUrl: "https://ilearning.cycu.edu.tw" }, log);
                     (0, token_js_1.saveWsToken)(sessionPath, wsToken);
                 }
                 catch {
                     // WS token is optional, ignore errors
                 }
                 const stats = node_fs_1.default.statSync(sessionPath);
+                // Get user info via WS API
+                let user;
+                try {
+                    if (wsToken) {
+                        const siteInfo = await (0, moodle_js_1.getSiteInfoApi)({
+                            wsToken,
+                            moodleBaseUrl: "https://ilearning.cycu.edu.tw",
+                        });
+                        user = {
+                            userid: siteInfo.userid,
+                            username: siteInfo.username,
+                            fullname: siteInfo.fullname,
+                        };
+                    }
+                }
+                catch {
+                    // Ignore
+                }
                 const result = {
                     status: "success",
                     message: "Login successful",
                     session_path: sessionPath,
                     session_size: stats.size,
-                    updated: true
+                    updated: true,
+                    ...(user ? { user } : {}),
                 };
                 console.log(JSON.stringify(result, null, 2));
             }
@@ -217,6 +228,25 @@ function registerCommand(program) {
                         exists: false
                     }
                 };
+                // Try to get user info from WS API
+                try {
+                    const wsToken = (0, token_js_1.loadWsToken)(sessionPath);
+                    if (wsToken) {
+                        const session = {
+                            wsToken,
+                            moodleBaseUrl: "https://ilearning.cycu.edu.tw"
+                        };
+                        const siteInfo = await (0, moodle_js_1.getSiteInfoApi)(session);
+                        result.user = {
+                            userid: siteInfo.userid,
+                            username: siteInfo.username,
+                            fullname: siteInfo.fullname
+                        };
+                    }
+                }
+                catch {
+                    // WS token might not be available or expired, skip user info
+                }
                 console.log(JSON.stringify(result, null, 2));
             }
             catch {
@@ -233,7 +263,7 @@ function registerCommand(program) {
                 status: "error",
                 error: "Session not found",
                 session_path: sessionPath,
-                hint: "Run 'openape auth login' first"
+                hint: "Run 'openape login' first"
             };
             console.log(JSON.stringify(result, null, 2));
         }

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,CAoM9D"}
+{"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"}

package/script/src/commands/calendar.js

@@ -23,19 +23,19 @@ function registerCalendarCommand(program) {
         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);
+        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)) {
-            log.error("未找到登入 session。請先執行 'openape auth login' 進行登入。");
+            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) {
-            log.error("未找到 WS token。請先執行 'openape auth login' 進行登入。");
+            console.error("未找到 WS token。請先執行 'openape login' 進行登入。");
             return null;
         }
         return {
@@ -97,29 +97,28 @@ function registerCalendarCommand(program) {
         if (options.upcoming) {
             filteredEvents = allEvents.filter(e => e.timestart > now);
         }
-        const output = {
+        console.log(JSON.stringify({
             status: "success",
             timestamp: new Date().toISOString(),
-            events: filteredEvents.map(e => ({
+            total_events: allEvents.length,
+            upcoming: allEvents.filter(e => e.timestart > now).length,
+            by_type: allEvents.reduce((acc, e) => {
+                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: new Date(e.timestart).toISOString(),
-                end_time: e.timeduration ? new Date(e.timestart + e.timeduration / 1000).toISOString() : null,
+                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,
-            })),
-            summary: {
-                total_events: allEvents.length,
-                upcoming: allEvents.filter(e => e.timestart > now).length,
-                by_type: allEvents.reduce((acc, e) => {
-                    acc[e.eventtype] = (acc[e.eventtype] || 0) + 1;
-                    return acc;
-                }, {}),
-            },
-        };
-        console.log(JSON.stringify(output));
+            }));
+        }
     });
     calendarCmd
         .command("export")
@@ -167,8 +166,8 @@ function registerCalendarCommand(program) {
                 description: e.description,
                 course_id: e.courseid,
                 event_type: e.eventtype,
-                start_time: new Date(e.timestart).toISOString(),
-                end_time: e.timeduration ? new Date(e.timestart + e.timeduration / 1000).toISOString() : null,
+                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,
             })),
             summary: {

package/script/src/commands/courses.js

@@ -24,19 +24,19 @@ function registerCoursesCommand(program) {
         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);
+        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)) {
-            log.error("未找到登入 session。請先執行 'openape auth login' 進行登入。");
+            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) {
-            log.error("未找到 WS token。請先執行 'openape auth login' 進行登入。");
+            console.error("未找到 WS token。請先執行 'openape login' 進行登入。");
             return null;
         }
         return {
@@ -117,8 +117,8 @@ function registerCoursesCommand(program) {
             courseId: course.id,
             courseName: course.fullname,
             progress: course.progress ?? 0,
-            startDate: course.startdate ? new Date(course.startdate * 1000).toISOString() : null,
-            endDate: course.enddate ? new Date(course.enddate * 1000).toISOString() : null,
+            startDate: course.startdate ? (0, utils_js_1.formatTimestamp)(course.startdate) : null,
+            endDate: course.enddate ? (0, utils_js_1.formatTimestamp)(course.enddate) : null,
         };
         (0, index_js_1.formatAndOutput)(progressData, output, apiContext.log);
     });

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;AAkBpC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA6P5D"}
+{"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"}