@mo7yw4ng/openape 1.0.3 → 1.0.5

package/esm/src/commands/materials.js

@@ -1,107 +1,24 @@
-import { getBaseDir, getOutputFormat, sanitizeFilename } from "../lib/utils.js";
-import { getEnrolledCourses, getEnrolledCoursesApi, getResourcesByCoursesApi, updateActivityCompletionStatusManually, getSiteInfoApi, moodleApiCall } from "../lib/moodle.js";
-import { createLogger } from "../lib/logger.js";
-import { launchAuthenticated } from "../lib/auth.js";
-import { extractSessionInfo } from "../lib/session.js";
-import { closeBrowserSafely } from "../lib/auth.js";
+import { getOutputFormat, sanitizeFilename, formatFileSize } from "../lib/utils.js";
+import { getEnrolledCoursesApi, getResourcesByCoursesApi, updateActivityCompletionStatusManually, getSiteInfoApi, moodleApiCall } from "../lib/moodle.js";
+import { createApiContext } from "../lib/auth.js";
 import { formatAndOutput } from "../index.js";
-import { loadWsToken } from "../lib/token.js";
 import path from "node:path";
 import fs from "node:fs";
 export function registerMaterialsCommand(program) {
     const materialsCmd = program.command("materials");
     materialsCmd.description("Material/resource 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;
-        }
-        return {
-            log,
-            session: {
-                wsToken,
-                moodleBaseUrl: "https://ilearning.cycu.edu.tw",
-            },
-        };
-    }
-    // Helper function to create session context (for download commands)
-    async function createSessionContext(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");
-        if (!fs.existsSync(sessionPath)) {
-            log.error("未找到登入 session。請先執行 'openape auth login' 進行登入。");
-            return null;
-        }
-        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 launchAuthenticated(config, log);
-        try {
-            const session = await extractSessionInfo(page, config, log);
-            return { log, page, session, browser, context };
-        }
-        catch (err) {
-            await context.close();
-            await browser.close();
-            throw err;
-        }
-    }
-    // Helper to download a single resource
-    async function downloadResource(page, resource, outputDir, log) {
+    // Helper to download a single resource via HTTP (no browser needed)
+    async function downloadResourceHttp(resource, outputDir, log, token) {
         try {
             // Only download resource type (skip url)
             if (resource.modType !== "resource") {
                 log.debug(`  Skipping ${resource.modType}: ${resource.name}`);
                 return null;
             }
-            // Create course directory
             const courseDir = path.join(outputDir, sanitizeFilename(resource.course_name));
-            if (!fs.existsSync(courseDir)) {
-                fs.mkdirSync(courseDir, { recursive: true });
-            }
-            // Navigate to resource page
-            log.debug(`  Downloading: ${resource.name}`);
-            await page.goto(resource.url, { waitUntil: "domcontentloaded", timeout: 30000 });
-            // Try to find download link on the page
-            const downloadLinks = await page.$$eval('a[href*="forcedownload=1"]', (links) => links.map((a) => a.href));
-            if (downloadLinks.length === 0) {
-                log.warn(`    No download link found for: ${resource.name}`);
-                return null;
-            }
-            // Download the first available file
-            const downloadUrl = downloadLinks[0];
-            // Extract filename from URL or use resource name
-            const urlObj = new URL(downloadUrl);
-            const filenameParam = urlObj.searchParams.get("filename");
-            let filename = filenameParam || sanitizeFilename(resource.name);
-            // Add extension if missing
+            await fs.promises.mkdir(courseDir, { recursive: true });
+            // Build filename
+            let filename = sanitizeFilename(resource.name);
             if (resource.mimetype && !path.extname(filename)) {
                 const extMap = {
                     "application/pdf": ".pdf",
@@ -120,27 +37,54 @@ export function registerMaterialsCommand(program) {
                 }
             }
             const outputPath = path.join(courseDir, filename);
-            // Trigger download
-            const downloadPromise = page.waitForEvent("download", { timeout: 30000 });
-            await page.goto(downloadUrl, { waitUntil: "domcontentloaded" });
-            const download = await downloadPromise;
-            // Save file
-            await download.saveAs(outputPath);
-            const stats = fs.statSync(outputPath);
-            log.success(`    Downloaded: ${filename} (${(stats.size / 1024).toFixed(1)} KB)`);
-            return {
-                filename,
-                path: outputPath,
-                size: stats.size,
-                course_id: resource.course_id,
-                course_name: resource.course_name,
-            };
+            // Skip if already exists
+            if (fs.existsSync(outputPath)) {
+                log.debug(`  Skipping (exists): ${filename}`);
+                const stats = await fs.promises.stat(outputPath);
+                return { filename, path: outputPath, size: stats.size, course_id: resource.course_id, course_name: resource.course_name };
+            }
+            // Download via HTTP with WS token
+            const separator = resource.url.includes("?") ? "&" : "?";
+            const downloadUrl = `${resource.url}${separator}token=${token}`;
+            log.debug(`  Downloading: ${resource.name}`);
+            const response = await fetch(downloadUrl);
+            if (!response.ok) {
+                log.warn(`    Failed to download ${resource.name}: HTTP ${response.status}`);
+                return null;
+            }
+            const arrayBuffer = await response.arrayBuffer();
+            const data = new Uint8Array(arrayBuffer);
+            await fs.promises.writeFile(outputPath, data);
+            log.success(`    Downloaded: ${filename} (${formatFileSize(data.byteLength, 1)} KB)`);
+            return { filename, path: outputPath, size: data.byteLength, course_id: resource.course_id, course_name: resource.course_name };
         }
         catch (err) {
             log.warn(`    Failed to download ${resource.name}: ${err instanceof Error ? err.message : String(err)}`);
             return null;
         }
     }
+    // Helper to build material list from API resources
+    function buildMaterialsList(courses, apiResources) {
+        const courseMap = new Map(courses.map(c => [c.id, c]));
+        const materials = [];
+        for (const resource of apiResources) {
+            const course = courseMap.get(resource.courseId);
+            if (course) {
+                materials.push({
+                    course_id: resource.courseId,
+                    course_name: course.fullname,
+                    cmid: resource.cmid,
+                    name: resource.name,
+                    url: resource.url,
+                    modType: resource.modType,
+                    mimetype: resource.mimetype,
+                    filesize: resource.filesize,
+                    modified: resource.modified,
+                });
+            }
+        }
+        return materials;
+    }
     materialsCmd
         .command("list-all")
         .description("List all materials/resources across all courses")
@@ -206,150 +150,97 @@ export function registerMaterialsCommand(program) {
     });
     materialsCmd
         .command("download")
-        .description("Download all materials from a specific course (requires browser)")
+        .description("Download all materials from a specific course")
         .argument("<course-id>", "Course ID")
         .option("--output-dir <path>", "Output directory", "./downloads")
         .action(async (courseId, options, command) => {
-        const context = await createSessionContext(options, command);
-        if (!context) {
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
             process.exitCode = 1;
             return;
         }
-        const { log, page, session, browser, context: browserContext } = context;
-        try {
-            const courses = await 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;
-            }
-            // Navigate to course page to find materials
-            await page.goto(`https://ilearning.cycu.edu.tw/course/view.php?id=${course.id}`, { waitUntil: "domcontentloaded" });
-            // Find all resource links
-            const materials = [];
-            const resourceLinks = await page.$$eval('a[href*="/mod/resource/view.php"]', (links) => {
-                return links.map((a) => ({
-                    url: a.href,
-                    name: a.textContent?.trim() || "",
-                }));
-            });
-            for (const link of resourceLinks) {
-                const cmidMatch = link.url.match(/id=(\d+)/);
-                if (cmidMatch) {
-                    materials.push({
-                        course_id: course.id,
-                        course_name: course.fullname,
-                        cmid: cmidMatch[1],
-                        name: link.name,
-                        url: link.url,
-                        modType: "resource",
-                    });
-                }
-            }
-            log.info(`Found ${materials.length} materials in course: ${course.fullname}`);
-            const downloadedFiles = [];
-            for (const material of materials) {
-                const result = await downloadResource(page, material, options.outputDir, log);
-                if (result) {
-                    downloadedFiles.push(result);
-                }
+        const { log, session } = apiContext;
+        const courses = await getEnrolledCoursesApi(session);
+        const course = courses.find((c) => c.id === parseInt(courseId, 10));
+        if (!course) {
+            log.error(`Course not found: ${courseId}`);
+            process.exitCode = 1;
+            return;
+        }
+        const apiResources = await getResourcesByCoursesApi(session, [course.id]);
+        const materials = buildMaterialsList(courses, apiResources);
+        log.info(`Found ${materials.length} materials in course: ${course.fullname}`);
+        const downloadedFiles = [];
+        for (const material of materials) {
+            const result = await downloadResourceHttp(material, options.outputDir, log, session.wsToken);
+            if (result) {
+                downloadedFiles.push(result);
             }
-            const summary = {
+        }
+        const output = {
+            status: "success",
+            timestamp: new Date().toISOString(),
+            downloaded_files: downloadedFiles.map(f => ({
+                filename: f.filename,
+                path: f.path,
+                size: f.size,
+                course_id: f.course_id,
+                course_name: f.course_name,
+            })),
+            summary: {
                 total_materials: materials.length,
                 downloaded: downloadedFiles.length,
                 skipped: materials.length - downloadedFiles.length,
                 total_size: downloadedFiles.reduce((sum, f) => sum + f.size, 0),
-            };
-            const output = {
-                status: "success",
-                timestamp: new Date().toISOString(),
-                downloaded_files: downloadedFiles.map(f => ({
-                    filename: f.filename,
-                    path: f.path,
-                    size: f.size,
-                    course_id: f.course_id,
-                    course_name: f.course_name,
-                })),
-                summary,
-            };
-            console.log(JSON.stringify(output));
-        }
-        finally {
-            await closeBrowserSafely(browser, browserContext);
-        }
+            },
+        };
+        console.log(JSON.stringify(output));
     });
     materialsCmd
         .command("download-all")
-        .description("Download all materials from all courses (requires browser)")
+        .description("Download all materials from all courses")
         .option("--output-dir <path>", "Output directory", "./downloads")
         .option("--level <type>", "Course level: in_progress (default) | all", "in_progress")
         .action(async (options, command) => {
-        const context = await createSessionContext(options, command);
-        if (!context) {
+        const apiContext = await createApiContext(options, command);
+        if (!apiContext) {
             process.exitCode = 1;
             return;
         }
-        const { log, page, session, browser, context: browserContext } = context;
-        try {
-            const classification = options.level === "all" ? undefined : "inprogress";
-            const courses = await getEnrolledCourses(page, session, log, { classification });
-            log.info(`Scanning ${courses.length} courses for materials...`);
-            const allMaterials = [];
-            for (const course of courses) {
-                await page.goto(`https://ilearning.cycu.edu.tw/course/view.php?id=${course.id}`, { waitUntil: "domcontentloaded" });
-                const resourceLinks = await page.$$eval('a[href*="/mod/resource/view.php"]', (links) => {
-                    return links.map((a) => ({
-                        url: a.href,
-                        name: a.textContent?.trim() || "",
-                    }));
-                });
-                for (const link of resourceLinks) {
-                    const cmidMatch = link.url.match(/id=(\d+)/);
-                    if (cmidMatch) {
-                        allMaterials.push({
-                            course_id: course.id,
-                            course_name: course.fullname,
-                            cmid: cmidMatch[1],
-                            name: link.name,
-                            url: link.url,
-                            modType: "resource",
-                        });
-                    }
-                }
-            }
-            log.info(`Found ${allMaterials.length} materials across ${courses.length} courses`);
-            const downloadedFiles = [];
-            for (const material of allMaterials) {
-                const result = await downloadResource(page, material, options.outputDir, log);
-                if (result) {
-                    downloadedFiles.push(result);
-                }
+        const { log, session } = apiContext;
+        const classification = options.level === "all" ? undefined : "inprogress";
+        const courses = await getEnrolledCoursesApi(session, { classification });
+        log.info(`Scanning ${courses.length} courses for materials...`);
+        const courseIds = courses.map((c) => c.id);
+        const apiResources = await getResourcesByCoursesApi(session, courseIds);
+        const allMaterials = buildMaterialsList(courses, apiResources);
+        log.info(`Found ${allMaterials.length} materials across ${courses.length} courses`);
+        const downloadedFiles = [];
+        for (const material of allMaterials) {
+            const result = await downloadResourceHttp(material, options.outputDir, log, session.wsToken);
+            if (result) {
+                downloadedFiles.push(result);
             }
-            const summary = {
+        }
+        const output = {
+            status: "success",
+            timestamp: new Date().toISOString(),
+            downloaded_files: downloadedFiles.map(f => ({
+                filename: f.filename,
+                path: f.path,
+                size: f.size,
+                course_id: f.course_id,
+                course_name: f.course_name,
+            })),
+            summary: {
                 total_courses: courses.length,
                 total_materials: allMaterials.length,
                 downloaded: downloadedFiles.length,
                 skipped: allMaterials.length - downloadedFiles.length,
                 total_size: downloadedFiles.reduce((sum, f) => sum + f.size, 0),
-            };
-            const output = {
-                status: "success",
-                timestamp: new Date().toISOString(),
-                downloaded_files: downloadedFiles.map(f => ({
-                    filename: f.filename,
-                    path: f.path,
-                    size: f.size,
-                    course_id: f.course_id,
-                    course_name: f.course_name,
-                })),
-                summary,
-            };
-            console.log(JSON.stringify(output));
-        }
-        finally {
-            await closeBrowserSafely(browser, browserContext);
-        }
+            },
+        };
+        console.log(JSON.stringify(output));
     });
     materialsCmd
         .command("complete")

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

@@ -1 +1 @@
-{"version":3,"file":"quizzes.d.ts","sourceRoot":"","sources":["../../../src/src/commands/quizzes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuL7D"}
+{"version":3,"file":"quizzes.d.ts","sourceRoot":"","sources":["../../../src/src/commands/quizzes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAyEpC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAoQ7D"}