@mo7yw4ng/openape 1.0.1 → 1.0.3

package/script/src/commands/grades.js

@@ -3,17 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerGradesCommand = void 0;
+exports.registerGradesCommand = registerGradesCommand;
 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 auth_js_1 = require("../lib/auth.js");
-const session_js_1 = require("../lib/session.js");
-const auth_js_2 = require("../lib/auth.js");
-const index_js_1 = require("../index.js");
 const token_js_1 = require("../lib/token.js");
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
+const index_js_1 = require("../index.js");
+const node_path_1 = __importDefault(require("node:path"));
+const node_fs_1 = __importDefault(require("node:fs"));
 function registerGradesCommand(program) {
     const gradesCmd = program.command("grades");
     gradesCmd.description("Grade operations");
@@ -28,14 +25,17 @@ function registerGradesCommand(program) {
         const silent = outputFormat === "json" && !opts.verbose;
         const log = (0, logger_js_1.createLogger)(opts.verbose, silent);
         const baseDir = (0, utils_js_1.getBaseDir)();
-        const sessionPath = path_1.default.resolve(baseDir, ".auth", "storage-state.json");
+        const sessionPath = node_path_1.default.resolve(baseDir, ".auth", "storage-state.json");
         // Check if session exists
-        if (!fs_1.default.existsSync(sessionPath)) {
+        if (!node_fs_1.default.existsSync(sessionPath)) {
+            log.error("未找到登入 session。請先執行 'openape auth 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' 進行登入。");
             return null;
         }
         return {
@@ -46,128 +46,43 @@ function registerGradesCommand(program) {
             },
         };
     }
-    // Helper function to create session context
-    async function createSessionContext(options, command) {
-        // Get global options if command is provided (for --verbose, --silent flags)
-        const opts = command?.optsWithGlobals ? command.optsWithGlobals() : options;
-        // Auto-enable silent mode for JSON output (unless --verbose is also set)
-        const outputFormat = getOutputFormat(command || { optsWithGlobals: () => ({ output: "json" }) });
-        const silent = outputFormat === "json" && !opts.verbose;
-        const log = (0, logger_js_1.createLogger)(opts.verbose, silent);
-        // Determine session path
-        const baseDir = (0, utils_js_1.getBaseDir)();
-        const sessionPath = path_1.default.resolve(baseDir, ".auth", "storage-state.json");
-        // Check if session exists
-        if (!fs_1.default.existsSync(sessionPath)) {
-            log.error("未找到登入 session。請先執行 'openape auth login' 進行登入。");
-            log.info(`Session 預期位置: ${sessionPath}`);
-            return null;
-        }
-        // Create minimal config
-        const config = {
-            username: "",
-            password: "",
-            courseUrl: "",
-            moodleBaseUrl: "https://ilearning.cycu.edu.tw",
-            headless: !options.headed,
-            slowMo: 0,
-            authStatePath: sessionPath,
-            ollamaBaseUrl: "",
-        };
-        log.info("啟動瀏覽器...");
-        const { browser, context, page } = await (0, auth_js_1.launchAuthenticated)(config, log);
-        try {
-            const session = await (0, session_js_1.extractSessionInfo)(page, config, log);
-            return { log, page, session, browser, context };
-        }
-        catch (err) {
-            await context.close();
-            await browser.close();
-            throw err;
-        }
-    }
     gradesCmd
         .command("summary")
         .description("Show grade summary across all courses")
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (options, command) => {
         const output = getOutputFormat(command);
-        // Try pure API mode (no browser, fast!)
         const apiContext = await createApiContext(options, command);
-        if (apiContext) {
-            try {
-                const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session);
-                const gradeSummaries = [];
-                for (const course of courses) {
-                    const grades = await (0, moodle_js_1.getCourseGradesApi)(apiContext.session, course.id);
-                    gradeSummaries.push({
-                        courseId: course.id,
-                        courseName: course.fullname,
-                        grade: grades.grade,
-                        gradeFormatted: grades.gradeFormatted,
-                        rank: grades.rank,
-                        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,
-                };
-                (0, index_js_1.formatAndOutput)(summaryData, output, apiContext.log);
-                return;
-            }
-            catch (e) {
-                // API failed, fall through to browser mode
-                const msg = e instanceof Error ? e.message : String(e);
-                console.error(`// API mode failed: ${msg}, trying browser mode...`);
-            }
-        }
-        // Fallback to browser mode
-        const context = await createSessionContext(options, command);
-        if (!context) {
+        if (!apiContext) {
             process.exitCode = 1;
             return;
         }
-        const { log, page, session, browser, context: browserContext } = context;
-        try {
-            const courses = await (0, moodle_js_1.getEnrolledCourses)(page, session, log);
-            const gradeSummaries = [];
-            for (const course of courses) {
-                const grades = await (0, moodle_js_1.getCourseGrades)(page, session, course.id);
-                gradeSummaries.push({
-                    courseId: course.id,
-                    courseName: course.fullname,
-                    grade: grades.grade,
-                    gradeFormatted: grades.gradeFormatted,
-                    rank: grades.rank,
-                    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,
-            };
-            (0, index_js_1.formatAndOutput)(summaryData, output, log);
-        }
-        finally {
-            await (0, auth_js_2.closeBrowserSafely)(browser, browserContext);
+        const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session);
+        const gradeSummaries = [];
+        for (const course of courses) {
+            const grades = await (0, moodle_js_1.getCourseGradesApi)(apiContext.session, course.id);
+            gradeSummaries.push({
+                courseId: course.id,
+                courseName: course.fullname,
+                grade: grades.grade,
+                gradeFormatted: grades.gradeFormatted,
+                rank: grades.rank,
+                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,
+        };
+        (0, index_js_1.formatAndOutput)(summaryData, output, apiContext.log);
     });
     gradesCmd
         .command("course")
@@ -176,84 +91,37 @@ function registerGradesCommand(program) {
         .option("--output <format>", "Output format: json|csv|table|silent")
         .action(async (courseId, options, command) => {
         const output = getOutputFormat(command);
-        // Try pure API mode (no browser, fast!)
         const apiContext = await createApiContext(options, command);
-        if (apiContext) {
-            try {
-                const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session);
-                const course = courses.find(c => c.id === parseInt(courseId, 10));
-                if (!course) {
-                    apiContext.log.error(`Course not found: ${courseId}`);
-                    process.exitCode = 1;
-                    return;
-                }
-                const grades = await (0, moodle_js_1.getCourseGradesApi)(apiContext.session, course.id);
-                const gradeData = {
-                    courseId: grades.courseId,
-                    courseName: grades.courseName,
-                    grade: grades.grade,
-                    gradeFormatted: grades.gradeFormatted,
-                    rank: grades.rank,
-                    totalUsers: grades.totalUsers,
-                    items: grades.items?.map(item => ({
-                        name: item.name,
-                        grade: item.grade,
-                        gradeFormatted: item.gradeFormatted,
-                        range: item.range,
-                        percentage: item.percentage,
-                        weight: item.weight,
-                        feedback: item.feedback,
-                        graded: item.graded,
-                    })),
-                };
-                (0, index_js_1.formatAndOutput)(gradeData, output, apiContext.log);
-                return;
-            }
-            catch (e) {
-                // API failed, fall through to browser mode
-                const msg = e instanceof Error ? e.message : String(e);
-                console.error(`// API mode failed: ${msg}, trying browser mode...`);
-            }
-        }
-        // Fallback to browser mode
-        const context = await createSessionContext(options, command);
-        if (!context) {
+        if (!apiContext) {
             process.exitCode = 1;
             return;
         }
-        const { log, page, session, browser, context: browserContext } = context;
-        try {
-            const courses = await (0, moodle_js_1.getEnrolledCourses)(page, session, log);
-            const course = courses.find(c => c.id === parseInt(courseId, 10));
-            if (!course) {
-                log.error(`Course not found: ${courseId}`);
-                process.exitCode = 1;
-                return;
-            }
-            const grades = await (0, moodle_js_1.getCourseGrades)(page, session, course.id);
-            const gradeData = {
-                courseId: grades.courseId,
-                courseName: grades.courseName,
-                grade: grades.grade,
-                gradeFormatted: grades.gradeFormatted,
-                rank: grades.rank,
-                totalUsers: grades.totalUsers,
-                items: grades.items?.map(item => ({
-                    name: item.name,
-                    grade: item.grade,
-                    gradeFormatted: item.gradeFormatted,
-                    range: item.range,
-                    percentage: item.percentage,
-                    weight: item.weight,
-                    feedback: item.feedback,
-                    graded: item.graded,
-                })),
-            };
-            (0, index_js_1.formatAndOutput)(gradeData, output, log);
-        }
-        finally {
-            await (0, auth_js_2.closeBrowserSafely)(browser, browserContext);
+        const courses = await (0, moodle_js_1.getEnrolledCoursesApi)(apiContext.session);
+        const course = courses.find(c => c.id === parseInt(courseId, 10));
+        if (!course) {
+            apiContext.log.error(`Course not found: ${courseId}`);
+            process.exitCode = 1;
+            return;
         }
+        const grades = await (0, moodle_js_1.getCourseGradesApi)(apiContext.session, course.id);
+        const gradeData = {
+            courseId: grades.courseId,
+            courseName: grades.courseName,
+            grade: grades.grade,
+            gradeFormatted: grades.gradeFormatted,
+            rank: grades.rank,
+            totalUsers: grades.totalUsers,
+            items: grades.items?.map(item => ({
+                name: item.name,
+                grade: item.grade,
+                gradeFormatted: item.gradeFormatted,
+                range: item.range,
+                percentage: item.percentage,
+                weight: item.weight,
+                feedback: item.feedback,
+                graded: item.graded,
+            })),
+        };
+        (0, index_js_1.formatAndOutput)(gradeData, output, apiContext.log);
     });
 }
-exports.registerGradesCommand = registerGradesCommand;

package/script/src/commands/materials.d.ts

@@ -1,2 +1,3 @@
 import { Command } from "commander";
 export declare function registerMaterialsCommand(program: Command): void;
+//# sourceMappingURL=materials.d.ts.map

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

@@ -0,0 +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,CAqlB/D"}