@learnpack/learnpack 5.0.319 → 5.0.322

package/lib/commands/serve.js

@@ -32,6 +32,7 @@ const creatorUtilities_2 = require("../utils/creatorUtilities");
 const sidebarGenerator_1 = require("../utils/sidebarGenerator");
 const publish_1 = require("./publish");
 const export_1 = require("../utils/export");
+const errorHandler_1 = require("../utils/errorHandler");
 const frontMatter = require("front-matter");
 if (process.env.NEW_RELIC_ENABLED === "true") {
     require("newrelic");
@@ -90,18 +91,18 @@ async function fetchComponentsYml() {
             axios_1.default.get("https://raw.githubusercontent.com/learnpack/ide/refs/heads/master/docs/assessment_components.yml"),
             axios_1.default.get("https://raw.githubusercontent.com/learnpack/ide/refs/heads/master/docs/explanatory_components.yml"),
         ]);
-        const combinedContent = `
-# ASSESSMENT COMPONENTS
-These components are designed for evaluation and knowledge assessment:
-
-${assessmentResponse.data}
-
----
-
-# EXPLANATORY COMPONENTS  
-These components are designed for explanation and learning support:
-
-${explanatoryResponse.data}
+        const combinedContent = `
+# ASSESSMENT COMPONENTS
+These components are designed for evaluation and knowledge assessment:
+
+${assessmentResponse.data}
+
+---
+
+# EXPLANATORY COMPONENTS  
+These components are designed for explanation and learning support:
+
+${explanatoryResponse.data}
 `;
         return combinedContent;
     }
@@ -135,10 +136,10 @@ const createInitialSidebar = async (slugs, initialLanguage = "en") => {
     return sidebar;
 };
 const uploadInitialReadme = async (bucket, exSlug, targetDir, packageContext) => {
-    const isGeneratingText = `
-  \`\`\`loader slug="${exSlug}"
-  :rigo
-  \`\`\`
+    const isGeneratingText = `
+  \`\`\`loader slug="${exSlug}"
+  :rigo
+  \`\`\`
       `;
     const readmeFilename = `README${(0, creatorUtilities_1.getReadmeExtension)(packageContext.language || "en")}`;
     await uploadFileToBucket(bucket, isGeneratingText, `${targetDir}/${readmeFilename}`);
@@ -148,7 +149,7 @@ const cleanFormState = (formState) => {
     return rest;
 };
 const cleanFormStateForSyllabus = (formState) => {
-    return Object.assign(Object.assign({}, formState), { description: formState.description, technologies: formState.technologies, purposse: undefined, duration: undefined, hasContentIndex: undefined, variables: undefined, currentStep: undefined, language: undefined, isCompleted: undefined });
+    return Object.assign(Object.assign({}, formState), { description: formState.description, technologies: formState.technologies, contentIndex: formState.contentIndex, purposse: undefined, duration: undefined, hasContentIndex: undefined, variables: undefined, currentStep: undefined, language: undefined, isCompleted: undefined });
 };
 const createMultiLangAsset = async (bucket, rigoToken, bcToken, courseSlug, courseJson, deployUrl) => {
     const availableLangs = Object.keys(courseJson.title);
@@ -182,6 +183,13 @@ const lessonCleaner = (lesson) => {
     return Object.assign(Object.assign({}, lesson), { duration: undefined, generated: undefined, status: undefined, translations: undefined, uid: undefined, initialContent: undefined, locked: undefined });
 };
 async function startInitialContentGeneration(rigoToken, steps, packageContext, exercise, courseSlug, purposeSlug, lastLesson = "") {
+    // Defensive validation
+    if (!exercise) {
+        throw new errorHandler_1.ValidationError("Exercise is required but was not provided");
+    }
+    if (!exercise.id || !exercise.title) {
+        throw new errorHandler_1.ValidationError(`Exercise is missing required properties: id=${exercise.id}, title=${exercise.title}`);
+    }
     const exSlug = (0, creatorUtilities_2.slugify)(exercise.id + "-" + exercise.title);
     console.log("Starting initial content generation for", exSlug);
     const webhookUrl = `${process.env.HOST}/webhooks/${courseSlug}/initial-content-processor/${exercise.uid}/${rigoToken}`;
@@ -649,9 +657,8 @@ class ServeCommand extends SessionCommand_1.default {
                             return res.status(404).json({ error: "Exercise not found" });
                         }
                         const exerciseDir = `courses/${courseSlug}/exercises/${exercise.slug}`;
-                        for (const fileStr of files) {
+                        for (const fileObj of files) {
                             try {
-                                const fileObj = JSON.parse(fileStr);
                                 console.log(`📄 Processing file: ${fileObj.name}`);
                                 // Save the main file with content
                                 if (fileObj.name && fileObj.content) {
@@ -696,7 +703,7 @@ class ServeCommand extends SessionCommand_1.default {
                 res.status(500).json({ error: error.message });
             }
         });
-        app.post("/actions/continue-generating/:courseSlug/:lessonUid", async (req, res) => {
+        app.post("/actions/continue-generating/:courseSlug/:lessonUid", (0, errorHandler_1.asyncHandler)(async (req, res) => {
             const { courseSlug, lessonUid } = req.params;
             const { feedback, mode } = req.body;
             const rigoToken = req.header("x-rigo-token");
@@ -706,13 +713,23 @@ class ServeCommand extends SessionCommand_1.default {
             // console.log("FEEDBACK", feedback);
             // console.log("MODE", mode);
             if (!rigoToken) {
-                return res.status(400).json({
-                    error: "Rigo token is required. x-rigo-token header is missing",
-                });
+                throw new errorHandler_1.ValidationError("Rigo token is required. x-rigo-token header is missing");
             }
             const syllabus = await getSyllabus(courseSlug, bucket);
             const exercise = syllabus.lessons.find(lesson => lesson.uid === lessonUid);
             const exerciseIndex = syllabus.lessons.findIndex(lesson => lesson.uid === lessonUid);
+            // Validate that exercise exists
+            if (!exercise) {
+                throw new errorHandler_1.NotFoundError(`Lesson with UID "${lessonUid}" not found in course "${courseSlug}"`);
+            }
+            // Validate that exercise index is valid (defensive check)
+            if (exerciseIndex === -1) {
+                throw new errorHandler_1.NotFoundError(`Lesson with UID "${lessonUid}" not found in course "${courseSlug}"`);
+            }
+            // Validate that exercise has required properties
+            if (!exercise.id || !exercise.title) {
+                throw new errorHandler_1.ValidationError(`Lesson "${lessonUid}" is missing required properties (id or title)`);
+            }
             // previous exercise
             let previousReadme = "---";
             const previousExercise = syllabus.lessons[exerciseIndex - 1];
@@ -753,7 +770,7 @@ class ServeCommand extends SessionCommand_1.default {
             syllabus.generationMode = mode;
             await saveSyllabus(courseSlug, syllabus, bucket);
             res.json({ status: "SUCCESS" });
-        });
+        }));
         // TODO: Check if this command is being used
         app.post("/actions/generate-image/:courseSlug", async (req, res) => {
             const rigoToken = req.header("x-rigo-token");
@@ -1383,22 +1400,49 @@ class ServeCommand extends SessionCommand_1.default {
             res.set("Content-Disposition", `attachment; filename="${file}"`);
             fileStream.pipe(res);
         });
-        app.put("/exercise/:slug/file/:fileName", express.text(), async (req, res) => {
+        app.put("/exercise/:slug/file/:fileName", express.text(), (0, errorHandler_1.asyncHandler)(async (req, res) => {
+            var _a, _b;
             const { slug, fileName } = req.params;
             const query = req.query;
-            console.log(`PUT /exercise/${slug}/file/${fileName}`);
             const courseSlug = query.slug;
-            // console.log("COURSE SLUG", courseSlug)
-            // Update the file in the bucket
-            const file = await bucket.file(`courses/${courseSlug}/exercises/${slug}/${fileName}`);
-            await file.save(req.body);
-            const created = await file.exists();
-            // console.log("File updated", created)
-            res.send({
-                message: "File updated",
-                created,
-            });
-        });
+            console.log(`PUT /exercise/${slug}/file/${fileName}`);
+            // Validate required parameters
+            if (!courseSlug) {
+                throw new errorHandler_1.ValidationError("Course slug is required in query parameters");
+            }
+            if (!fileName || !slug) {
+                throw new errorHandler_1.ValidationError("File name and exercise slug are required");
+            }
+            try {
+                // Update the file in the bucket
+                const file = bucket.file(`courses/${courseSlug}/exercises/${slug}/${fileName}`);
+                await file.save(req.body, {
+                    resumable: false,
+                });
+                const created = await file.exists();
+                res.send({
+                    message: "File updated",
+                    created,
+                });
+            }
+            catch (error) {
+                // Handle Google Cloud Storage rate limit errors (429)
+                if (error.code === 429 ||
+                    ((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes("rate limit")) ||
+                    ((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes("rateLimitExceeded"))) {
+                    throw new errorHandler_1.ConflictError("Storage rate limit exceeded. Please try again in a few moments.", {
+                        code: "STORAGE_RATE_LIMIT",
+                        retryAfter: 60, // seconds
+                    });
+                }
+                // Handle other GCS errors
+                if (error.code) {
+                    throw new errorHandler_1.InternalServerError(`Storage error: ${error.message || "Failed to update file"}`, { code: error.code });
+                }
+                // Re-throw if it's already an operational error
+                throw error;
+            }
+        }));
         // Create a new step for a course
         app.post("/course/:slug/create-step", async (req, res) => {
             console.log("POST /course/:slug/create-step");
@@ -2393,6 +2437,10 @@ class ServeCommand extends SessionCommand_1.default {
                     .json({ error: "Export failed", details: error.message });
             }
         });
+        // 404 error handler
+        app.use(errorHandler_1.notFoundHandler);
+        // Global error handler
+        app.use(errorHandler_1.errorHandler);
         server.listen(PORT, () => {
             console.log(`🚀 Creator UI server running at http://localhost:${PORT}/creator`);
         });