@learnpack/learnpack 5.0.358 → 5.0.359

package/src/commands/serve.ts

@@ -55,9 +55,7 @@ import api, {
   RIGOBOT_HOST,
   RIGOBOT_REALTIME_HOST,
   listUserAcademies,
-  doesAssetExists,
   type AssetSyncError,
-  resolveLearnpackPackageId,
 } from "../utils/api"
 import {
   createUploadMiddleware,
@@ -66,7 +64,12 @@ import {
 import { buildConfig } from "../utils/configBuilder"
 import { checkReadability, slugify } from "../utils/creatorUtilities"
 import { checkAndFixSidebarPure } from "../utils/sidebarGenerator"
-import { handleAssetCreation } from "./publish"
+import {
+  determineAcademyMode,
+  hasPublishedAsset,
+  resolvePackageAssets,
+} from "../utils/assetResolver"
+import { syncPackageAssets } from "../utils/assetSync"
 import {
   FormState,
   Lesson,
@@ -538,36 +541,6 @@ const cleanFormStateForSyllabus = (formState: FormState) => {
   }
 }
 
-const getLocalizedValue = (
-  translations: Record<string, any> | undefined,
-  lang: string,
-  fallbackLangs: string[] = ["en", "us"]
-): string => {
-  if (!translations || typeof translations !== "object") return ""
-
-  const direct = translations[lang]
-  if (typeof direct === "string" && direct.trim().length > 0) return direct
-
-  for (const fb of fallbackLangs) {
-    const v = translations[fb]
-    if (typeof v === "string" && v.trim().length > 0) return v
-  }
-
-  const firstKey = Object.keys(translations)[0]
-  const first = firstKey ? translations[firstKey] : ""
-  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,
@@ -577,85 +550,38 @@ const createMultiLangAsset = async (
   deployUrl: string,
   academyId?: number
 ): 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: AssetSyncError[] = []
-
-  for (const lang of availableLangs) {
-    // eslint-disable-next-line no-await-in-loop
-    const indexReadme = await bucket.file(
+  const readReadme = async (lang: string): Promise<string> => {
+    const indexReadme = bucket.file(
       `courses/${courseSlug}/README${getReadmeExtension(lang)}`
     )
-    let indexReadmeString = ""
     try {
-      // eslint-disable-next-line no-await-in-loop
-      const [indexReadmeContent] = await indexReadme.download()
-      indexReadmeString = indexReadmeContent.toString()
+      const [content] = await indexReadme.download()
+      return content.toString()
     } catch (error) {
       console.error("Error downloading index readme", error)
       // TODO: Trigger generation of the index readme
-      indexReadmeString = ""
+      return ""
     }
+  }
 
-    const b64IndexReadme = Buffer.from(indexReadmeString).toString("base64")
-
-    try {
-      // eslint-disable-next-line no-await-in-loop
-      const asset = await handleAssetCreation(
-        { token: bcToken, rigobotToken: rigoToken.trim() },
-        courseJson,
-        lang,
-        deployUrl,
-        b64IndexReadme,
-        academyId,
-        learnpackId,
-        undefined,
-        all_translations
-      )
-
-      if (!asset) {
-        errors.push({
-          kind: "lang_error",
-          lang,
-          error: { detail: "Failed to create asset" },
-        })
-        console.log("No se pudo crear el asset, saltando idioma", lang)
-        continue
-      }
+  const result = await syncPackageAssets({
+    bcToken,
+    rigoToken,
+    packageSlug: courseSlug,
+    learnJson: courseJson,
+    deployUrl,
+    academyId,
+    readReadme,
+  })
 
-      all_translations.push(asset.slug)
-    } catch (error) {
-      const errorData =
-        error && typeof error === "object" && "response" in error ?
-          (error as any).response?.data || error :
-          error
-      errors.push({
-        kind: "lang_error",
-        lang,
-        error: { detail: assetSyncErrorDetail(errorData) },
-      })
-      console.error(`Error creating asset for language ${lang}:`, error)
-    }
+  for (const warning of result.warnings) console.warn("[assets]", warning)
+  for (const synced of result.synced) {
+    console.log(
+      `[assets] ${synced.action} "${synced.lang}": #${synced.asset.id} ${synced.asset.slug}`
+    )
   }
 
-  return { errors }
+  return { errors: result.errors }
 }
 
 const lessonCleaner = (lesson: Lesson) => {
@@ -5392,6 +5318,10 @@ class ServeCommand extends SessionCommand {
           })
         }
 
+        // Older IDEs only send the Breathecode token; without the Rigobot
+        // token the lookup falls back to the title-derived slugs.
+        const rigoToken = req.header("x-rigo-token")
+
         const configFile = await bucket.file(
           `courses/${slug}/.learn/config.json`
         )
@@ -5399,56 +5329,51 @@ class ServeCommand extends SessionCommand {
         const configJson = JSON.parse(configContent.toString())
         const { config } = configJson
 
-        const availableLangs = Object.keys(config.title || {})
-        let isPublished = false
-
-        // Collect academy ids from all existing assets
-        const foundAcademyIds: number[] = []
-
-        const slugsToCheck = availableLangs
-          .map(lang => {
-            const assetTitle = getLocalizedValue(config.title, lang)
-            if (!assetTitle) return null
-            const assetSlug = slugify(assetTitle).slice(0, 47)
-            return `${assetSlug}-${lang}`
-          })
-          .filter((slug): slug is string => slug !== null)
+        const resolution = await resolvePackageAssets({
+          bcToken,
+          rigoToken,
+          packageSlug: slug,
+          learnJson: config,
+        })
+        for (const warning of resolution.warnings) {
+          console.warn("[package-academy]", warning)
+        }
 
-        const assetChecks = await Promise.all(
-          slugsToCheck.map(slug => doesAssetExists(bcToken, slug))
-        )
+        const isPublished = hasPublishedAsset(resolution)
+        const academyMode = determineAcademyMode(resolution)
+        const warnings = [...resolution.warnings]
+        if (resolution.packageState === "unknown") {
+          warnings.push(
+            `${resolution.packageError}; existing assets could not be checked.`
+          )
+        }
 
-        for (const { exists, academyId: existingAcademyId } of assetChecks) {
-          if (exists) {
-            isPublished = true
-            if (existingAcademyId !== undefined) {
-              foundAcademyIds.push(existingAcademyId)
-            }
+        for (const [lang, entry] of resolution.byLang) {
+          if (entry.status === "unknown") {
+            warnings.push(`"${lang}": ${entry.error}`)
+          } else if (entry.status === "ambiguous") {
+            warnings.push(
+              `"${lang}": ${
+                entry.candidates.length
+              } assets found (${entry.candidates
+                .map(c => `#${c.id} ${c.slug}`)
+                .join(", ")})`
+            )
           }
         }
 
-        const uniqueAcademies = [...new Set(foundAcademyIds)]
-
-        type AcademyMode = "select" | "locked" | "conflict";
-        let mode: AcademyMode
-        let lockedAcademyId: number | undefined
-        let conflictAcademies: number[] | undefined
-
-        if (uniqueAcademies.length === 0) {
-          mode = "select"
-        } else if (uniqueAcademies.length === 1) {
-          mode = "locked"
-          lockedAcademyId = uniqueAcademies[0]
-        } else {
-          mode = "conflict"
-          conflictAcademies = uniqueAcademies
-        }
+        const mode = academyMode.type
+        const lockedAcademyId =
+          academyMode.type === "locked" ? academyMode.academyId : undefined
+        const conflictAcademies =
+          academyMode.type === "conflict" ? academyMode.academies : undefined
 
         return res.json({
           isPublished,
           mode,
           lockedAcademyId,
           conflictAcademies,
+          warnings,
         })
       } catch (error) {
         console.error("Error fetching package academy:", error)