@learnpack/learnpack 5.0.346 → 5.0.348

package/src/commands/serve.ts

@@ -55,6 +55,8 @@ import api, {
   RIGOBOT_REALTIME_HOST,
   listUserAcademies,
   doesAssetExists,
+  type AssetSyncError,
+  resolveLearnpackPackageId,
 } from "../utils/api"
 import {
   createUploadMiddleware,
@@ -583,6 +585,16 @@ const getLocalizedValue = (
   return typeof first === "string" ? first : ""
 }
 
+function assetSyncErrorDetail(err: any): string {
+  if (typeof err?.detail === "string") return err.detail
+  if (typeof err?.message === "string") return err.message
+  try {
+    return JSON.stringify(err)
+  } catch {
+    return String(err)
+  }
+}
+
 const createMultiLangAsset = async (
   bucket: Bucket,
   rigoToken: string,
@@ -591,12 +603,27 @@ const createMultiLangAsset = async (
   courseJson: any,
   deployUrl: string,
   academyId?: number
-): Promise<{ errors: Array<{ lang: string; error: any }> }> => {
+): Promise<{ errors: AssetSyncError[] }> => {
+  const learnpackId = await resolveLearnpackPackageId(rigoToken, courseSlug)
+  if (learnpackId === null) {
+    return {
+      errors: [
+        {
+          kind: "package_error",
+          error: {
+            detail:
+              "Could not resolve Learnpack package id; assets not synced to Breathecode.",
+          },
+        },
+      ],
+    }
+  }
+
   const availableLangs = Object.keys(courseJson.title)
   console.log("AVAILABLE LANGUAGES to upload asset", availableLangs)
 
   const all_translations: string[] = []
-  const errors: Array<{ lang: string; error: any }> = []
+  const errors: AssetSyncError[] = []
 
   for (const lang of availableLangs) {
     // eslint-disable-next-line no-await-in-loop
@@ -625,14 +652,16 @@ const createMultiLangAsset = async (
         deployUrl,
         b64IndexReadme,
         academyId,
+        learnpackId,
         undefined,
         all_translations
       )
 
       if (!asset) {
         errors.push({
+          kind: "lang_error",
           lang,
-          error: { detail: "Failed to create asset", status_code: 500 },
+          error: { detail: "Failed to create asset" },
         })
         console.log("No se pudo crear el asset, saltando idioma", lang)
         continue
@@ -644,7 +673,11 @@ const createMultiLangAsset = async (
         error && typeof error === "object" && "response" in error ?
           (error as any).response?.data || error :
           error
-      errors.push({ lang, error: errorData })
+      errors.push({
+        kind: "lang_error",
+        lang,
+        error: { detail: assetSyncErrorDetail(errorData) },
+      })
       console.error(`Error creating asset for language ${lang}:`, error)
     }
   }
@@ -4708,6 +4741,7 @@ class ServeCommand extends SessionCommand {
         }> = []
         let repairedTranslationsInLessons = 0
         let repairedTranslationEntries = 0
+        let fixedLessons = 0
 
         console.log(
           `📋 Checking ${syllabus.lessons.length} lessons in syllabus...`
@@ -4950,6 +4984,35 @@ class ServeCommand extends SessionCommand {
               repairedTranslationsInLessons += 1
             }
           }
+
+          // Fifth pass: fix lessons stuck in GENERATING or ERROR when the file exists in the bucket
+          const primaryLanguage = syllabus.courseInfo.language || "en"
+          for (const lesson of syllabus.lessons) {
+            if (lesson.generated !== false) continue
+            if (lesson.status !== "GENERATING" && lesson.status !== "ERROR")
+              continue
+
+            const candidateSlugs = [
+              slugify(lesson.id + "-" + lesson.title),
+              lesson.uid,
+            ].filter(Boolean) as string[]
+
+            const matchedSlug = candidateSlugs.find(s =>
+              translationsBySlug.has(s)
+            )
+            if (!matchedSlug) continue
+
+            const langs = translationsBySlug.get(matchedSlug) || []
+            if (!langs.includes(primaryLanguage)) continue
+
+            const prevStatus = lesson.status
+            lesson.generated = true
+            lesson.status = "DONE"
+            fixedLessons += 1
+            console.log(
+              `🔧 Fixed lesson: ${lesson.id} - "${lesson.title}" (was generated:false status:${prevStatus}, primary language "${primaryLanguage}" exists in bucket)`
+            )
+          }
         } catch (error) {
           console.error(
             "⚠️ Could not reconcile lesson translations during syllabus sync:",
@@ -4960,11 +5023,12 @@ class ServeCommand extends SessionCommand {
         if (
           totalRemoved > 0 ||
           addedLessons.length > 0 ||
-          repairedTranslationsInLessons > 0
+          repairedTranslationsInLessons > 0 ||
+          fixedLessons > 0
         ) {
           await saveSyllabus(courseSlug, syllabus, bucket)
           console.log(
-            `✅ Syllabus synchronized. Removed ${removedLessons.length} non-existent, ${duplicatesRemoved.length} duplicate(s); added ${addedLessons.length} from bucket; repaired translations in ${repairedTranslationsInLessons} lesson(s).`
+            `✅ Syllabus synchronized. Removed ${removedLessons.length} non-existent, ${duplicatesRemoved.length} duplicate(s); added ${addedLessons.length} from bucket; repaired translations in ${repairedTranslationsInLessons} lesson(s); fixed ${fixedLessons} stuck lesson(s).`
           )
         } else {
           console.log(`✅ Syllabus is already in sync. No changes.`)
@@ -4978,6 +5042,7 @@ class ServeCommand extends SessionCommand {
           removedLessons: removedLessons.length,
           duplicatesResolved: duplicatesRemoved.length,
           addedLessons: addedLessons.length,
+          fixedLessons,
           repairedTranslationsInLessons,
           repairedTranslationEntries,
           removed: removedLessons,
@@ -5620,38 +5685,76 @@ class ServeCommand extends SessionCommand {
         const archive = archiver("zip", { zlib: { level: 9 } })
 
         output.on("close", async () => {
-          // 10) Subir ZIP a RigoBot
-          const form = new FormData()
-          form.append("file", fs.createReadStream(zipPath))
-          form.append("config", JSON.stringify(config))
-
-          const rigoRes = await axios.post(
-            `${RIGOBOT_HOST}/v1/learnpack/upload`,
-            form,
-            {
-              headers: {
-                ...form.getHeaders(),
-                Authorization: "Token " + rigoToken.trim(),
-              },
-            }
-          )
+          let rigoPublishUrl: string | undefined
+          try {
+            // 10) Subir ZIP a RigoBot
+            const form = new FormData()
+            form.append("file", fs.createReadStream(zipPath))
+            form.append("config", JSON.stringify(config))
+
+            const rigoRes = await axios.post(
+              `${RIGOBOT_HOST}/v1/learnpack/upload`,
+              form,
+              {
+                headers: {
+                  ...form.getHeaders(),
+                  Authorization: "Token " + rigoToken.trim(),
+                },
+              }
+            )
+            rigoPublishUrl = rigoRes.data.url
 
-          const assetResults = await createMultiLangAsset(
-            bucket,
-            rigoToken,
-            bcToken,
-            slug,
-            fullConfig.config,
-            rigoRes.data.url,
-            academyId
-          )
+            let errors: AssetSyncError[]
+            try {
+              const assetResults = await createMultiLangAsset(
+                bucket,
+                rigoToken,
+                bcToken,
+                slug,
+                fullConfig.config,
+                rigoRes.data.url,
+                academyId
+              )
+              errors = assetResults.errors
+            } catch (error) {
+              console.error("Asset sync failed unexpectedly:", error)
+              errors = [
+                {
+                  kind: "package_error",
+                  error: { detail: "Asset sync failed unexpectedly." },
+                },
+              ]
+            }
 
-          rimraf.sync(tmpRoot)
-          console.log("RigoRes", rigoRes.data)
-          return res.json({
-            url: rigoRes.data.url,
-            errors: assetResults.errors,
-          })
+            if (res.headersSent) return
+            console.log("RigoRes", rigoRes.data)
+            res.json({
+              url: rigoPublishUrl,
+              errors,
+            })
+          } catch (error) {
+            console.error(error)
+            if (res.headersSent) return
+            if (rigoPublishUrl !== undefined) {
+              res.json({
+                url: rigoPublishUrl,
+                errors: [
+                  {
+                    kind: "package_error",
+                    error: { detail: "Asset sync failed unexpectedly." },
+                  },
+                ],
+              })
+            } else {
+              res.status(500).json({ error: (error as Error).message })
+            }
+          } finally {
+            try {
+              rimraf.sync(tmpRoot)
+            } catch (error) {
+              console.error("rimraf tmpRoot:", error)
+            }
+          }
         })
 
         archive.on("error", err => {