@learnpack/learnpack 5.0.250 → 5.0.254

package/src/commands/serve.ts

@@ -36,6 +36,7 @@ import * as dotenv from "dotenv"
 import {
   extractImagesFromMarkdown,
   getFilenameFromUrl,
+  getReadmeExtension,
 } from "../utils/creatorUtilities"
 // import { handleAssetCreation } from "./publish"
 import axios from "axios"
@@ -66,25 +67,18 @@ export const createLearnJson = (courseInfo: FormState) => {
   // console.log("courseInfo to create learn json", courseInfo)
 
   const expectedPreviewUrl = `https://${courseInfo.slug}.learn-pack.com/preview.png`
-  console.log("Preview url in generated learn.json", expectedPreviewUrl)
 
   const language = courseInfo.language || "en"
 
   const learnJson = {
     slug: courseInfo.slug,
-    title:
-      language === "en" || language === "us" ?
-        {
-            us: courseInfo.title,
-          } :
-        {
-            [language]: courseInfo.title,
-          },
+    title: {
+      [language]: courseInfo.title,
+    },
     technologies: courseInfo.technologies || [],
     difficulty: "beginner",
     description: {
-      [language === "en" || language === "us" ? "us" : language]:
-        courseInfo.description,
+      [language]: courseInfo.description,
     },
     grading: "isolated",
     telemetry: {
@@ -140,12 +134,10 @@ const createInitialSidebar = async (
   slugs: string[],
   initialLanguage = "en"
 ) => {
-  const language = initialLanguage === "en" ? "us" : initialLanguage
-
   const sidebar: Record<string, Record<string, string>> = {}
   for (const slug of slugs) {
     sidebar[slug] = {
-      [language]: slug,
+      [initialLanguage]: slug,
     }
   }
 
@@ -208,9 +200,7 @@ const createMultiLangAsset = async (
   for (const lang of availableLangs) {
     // eslint-disable-next-line no-await-in-loop
     const indexReadme = await bucket.file(
-      `courses/${courseSlug}/README.${
-        lang === "us" || lang === "en" ? "md" : `${lang}.md`
-      }`
+      `courses/${courseSlug}/README${getReadmeExtension(lang)}`
     )
     // eslint-disable-next-line no-await-in-loop
     const [indexReadmeContent] = await indexReadme.download()
@@ -227,6 +217,11 @@ const createMultiLangAsset = async (
       all_translations
     )
 
+    if (!asset) {
+      console.log("No se pudo crear el asset, saltando idioma", lang)
+      continue
+    }
+
     all_translations.push(asset.slug)
   }
 }
@@ -526,15 +521,10 @@ export default class ServeCommand extends SessionCommand {
         const body = req.body
 
         // Save the file as courses/courseSlug/README.md
-        const filePath = `courses/${courseSlug}/README.${
-          body.parsed.language_code === "us" ||
-          body.parsed.language_code === "en" ?
-            "md" :
-            `${body.parsed.language_code}.md`
-        }`
-        console.log("Saving initial readme to", filePath)
+        const filePath = `courses/${courseSlug}/README${getReadmeExtension(
+          body.parsed.language_code
+        )}`
         await uploadFileToBucket(bucket, body.parsed.content, filePath)
-        console.log("Initial readme saved to", filePath)
 
         res.json({ status: "SUCCESS" })
       }
@@ -725,6 +715,32 @@ export default class ServeCommand extends SessionCommand {
       res.json({ exists, file: file.name })
     })
 
+    app.post(
+      "/webhooks/:courseSlug/:exSlug/:lang/update-readme/:notificationId",
+      async (req, res) => {
+        console.log("RECEIVING README UPDATE WEBHOOK")
+        const { courseSlug, exSlug, lang, notificationId } = req.params
+        const body = req.body
+
+        console.log("BODY", body)
+
+        const readmePath = `courses/${courseSlug}/exercises/${exSlug}/README${getReadmeExtension(
+          lang
+        )}`
+
+        if (body.parsed.content) {
+          await uploadFileToBucket(bucket, body.parsed.content, readmePath)
+        }
+
+        emitToNotification(notificationId, {
+          status: "SUCCESS",
+          message: "Readme updated successfully",
+        })
+
+        res.json({ status: "SUCCESS" })
+      }
+    )
+
     app.get("/create", (req, res) => {
       console.log("GET /create")
       res.redirect("/creator/")
@@ -778,7 +794,9 @@ export default class ServeCommand extends SessionCommand {
 
       const { slug } = req.params
       const courseSlug = req.query.slug
-      const lang = req.query.lang || "us"
+      const lang = req.query.lang || "en"
+
+      console.log("LANG", lang)
 
       if (!courseSlug) {
         return res.status(400).json({ error: "Missing courseSlug" })
@@ -796,30 +814,37 @@ export default class ServeCommand extends SessionCommand {
           return res.status(404).json({ error: "No README files found" })
         }
 
-        const requestedFilename =
-          lang === "us" || lang === "en" ?
-            `${basePath}README.md` :
-            `${basePath}README.${lang}.md`
+        const requestedFilename = `${basePath}README${getReadmeExtension(
+          lang as string
+        )}`
 
         let selectedFile = readmeFiles.find(f => f === requestedFilename)
 
         if (!selectedFile) {
+          console.log("No se encontro en ese idioma, devolviendo el primero")
           selectedFile = readmeFiles[0]
           console.warn(
             `Requested README not found for lang '${lang}', using '${selectedFile}'`
           )
         }
 
-        let foundLang = "us"
+        let foundLang = "en"
         const match = selectedFile.match(/readme(?:\.([a-z]{2}))?\.md$/i)
         if (match && match[1]) {
           foundLang = match[1].toLowerCase()
         }
 
         const [contentBuffer] = await bucket.file(selectedFile).download()
-        const { attributes, body } = frontMatter(contentBuffer.toString())
-
-        res.send({ attributes, body, lang: foundLang })
+        try {
+          const { attributes, body } = frontMatter(contentBuffer.toString())
+          res.send({ attributes, body, lang: foundLang })
+        } catch {
+          res.status(200).json({
+            attributes: {},
+            body: contentBuffer.toString(),
+            lang: foundLang,
+          })
+        }
       } catch (error) {
         console.error(error)
         res.status(500).json({ error: "Internal server error" })
@@ -885,9 +910,9 @@ export default class ServeCommand extends SessionCommand {
 
       const courseSlug = query.slug
 
-      const fileName = `courses/${courseSlug}/exercises/${title}/README${
-        language === "us" || language === "en" ? "" : `.${language}`
-      }.md`
+      const fileName = `courses/${courseSlug}/exercises/${title}/README${getReadmeExtension(
+        language
+      )}`
       const file = bucket.file(fileName)
       await file.save(readme)
       const created = await file.exists()
@@ -935,11 +960,9 @@ export default class ServeCommand extends SessionCommand {
       try {
         await Promise.all(
           exerciseSlugs.map(async (slug: string) => {
-            const readmePath = `courses/${courseSlug}/exercises/${slug}/README${
-              currentLanguage === "us" || currentLanguage === "en" ?
-                "" :
-                `.${currentLanguage}`
-            }.md`
+            const readmePath = `courses/${courseSlug}/exercises/${slug}/README${getReadmeExtension(
+              currentLanguage
+            )}`
 
             const readme = await bucket.file(readmePath).download()
 
@@ -952,12 +975,9 @@ export default class ServeCommand extends SessionCommand {
                 })
 
                 const translatedReadme = await bucket.file(
-                  `courses/${courseSlug}/exercises/${slug}/README${
-                    response.parsed.output_language_code === "us" ||
-                    response.parsed.output_language_code === "en" ?
-                      "" :
-                      `.${response.parsed.output_language_code}`
-                  }.md`
+                  `courses/${courseSlug}/exercises/${slug}/README${getReadmeExtension(
+                    response.parsed.output_language_code
+                  )}`
                 )
                 await translatedReadme.save(response.parsed.translation)
 
@@ -967,11 +987,6 @@ export default class ServeCommand extends SessionCommand {
           })
         )
 
-        if (languageCodes.has("en")) {
-          languageCodes.delete("en")
-          languageCodes.add("us")
-        }
-
         const currentLanguages = Object.keys(courseJson.title)
         for (const languageCode of currentLanguages) {
           if (languageCodes.has(languageCode)) {
@@ -980,8 +995,6 @@ export default class ServeCommand extends SessionCommand {
         }
 
         if ([...languageCodes].length > 0) {
-          console.log("TRANSLATING COURSE METADATA", languageCodes)
-
           const translatedCourseMetadata = await Promise.all(
             [...languageCodes].map(async languageCode => {
               const result = await translateCourseMetadata(rigoToken, {
@@ -1011,11 +1024,7 @@ export default class ServeCommand extends SessionCommand {
           )
 
           const previewReadme = await bucket.file(
-            `courses/${courseSlug}/README${
-              currentLanguage === "us" || currentLanguage === "en" ?
-                "" :
-                `.${currentLanguage}`
-            }.md`
+            `courses/${courseSlug}/README${getReadmeExtension(currentLanguage)}`
           )
           const [previewReadmeContent] = await previewReadme.download()
           const previewReadmeContentString = previewReadmeContent.toString()
@@ -1033,11 +1042,9 @@ export default class ServeCommand extends SessionCommand {
 
               await bucket
                 .file(
-                  `courses/${courseSlug}/README${
-                    languageCode === "us" || languageCode === "en" ?
-                      "" :
-                      `.${languageCode}`
-                  }.md`
+                  `courses/${courseSlug}/README${getReadmeExtension(
+                    languageCode as string
+                  )}`
                 )
                 .save(translatedPreviewReadme.parsed.translation)
             })
@@ -1436,10 +1443,10 @@ export default class ServeCommand extends SessionCommand {
 
         const availableLangs = Object.keys(config.title)
 
-        let selectedLang = "us"
+        let selectedLang = "en"
         let title = ""
-        if (availableLangs.includes("us")) {
-          title = config.title.us
+        if (availableLangs.includes("en")) {
+          title = config.title.en
         } else {
           // Select the first available lang
           title = config.title[availableLangs[0]]

package/src/creator/src/App.tsx

@@ -174,7 +174,7 @@ function App() {
       let techs = technologies.filter((t) => t.lang === formState.language)
 
       if (techs.length === 0) {
-        techs = technologies.filter((t) => t.lang === "us")
+        techs = technologies.filter((t) => t.lang === "en")
       }
 
       const res = await publicInteractiveCreation(

package/src/creator/src/utils/rigo.ts

@@ -24,6 +24,8 @@ export const publicInteractiveCreation = async (
           "https://9cw5zmww-3000.use2.devtunnels.ms"
     }/notifications/${randomUID}`
 
+    console.log("WEBHOOK URL to send to Rigo", webhookUrl)
+
     const response = await axios.post(
       `${RIGOBOT_HOST}/v1/prompting${
         publicRequest ? "/public" : ""

package/src/creatorDist/assets/{index-CZYzWk3G.js → index-CFM_Ypyi.js}

@@ -18251,28 +18251,31 @@ const d2 = async (e) => {
     try {
       const l = Ku(15),
         u = `https://9cw5zmww-3000.use2.devtunnels.ms/notifications/${l}`
-      return {
-        res: (
-          await Pe.post(
-            `${Ds}/v1/prompting${r ? "/public" : ""}/completion/${
-              L1 ? "39" : "390"
-            }/`,
-            {
-              inputs: e,
-              include_purpose_objective: !0,
-              purpose_slug: n,
-              webhook_url: u,
-            },
-            {
-              headers: {
-                "Content-Type": "application/json",
-                Authorization: `Token ${t}`,
+      return (
+        console.log("WEBHOOK URL to send to Rigo", u),
+        {
+          res: (
+            await Pe.post(
+              `${Ds}/v1/prompting${r ? "/public" : ""}/completion/${
+                L1 ? "39" : "390"
+              }/`,
+              {
+                inputs: e,
+                include_purpose_objective: !0,
+                purpose_slug: n,
+                webhook_url: u,
               },
-            }
-          )
-        ).data,
-        notificationId: l,
-      }
+              {
+                headers: {
+                  "Content-Type": "application/json",
+                  Authorization: `Token ${t}`,
+                },
+              }
+            )
+          ).data,
+          notificationId: l,
+        }
+      )
     } catch (l) {
       const u = l
       return (
@@ -21192,7 +21195,7 @@ function K7() {
             y.rigoToken &&
             l({ ...y, rigoToken: "", bcToken: "", userId: "", user: null })
         let $ = T.filter((ee) => ee.lang === r.language)
-        $.length === 0 && ($ = T.filter((ee) => ee.lang === "us"))
+        $.length === 0 && ($ = T.filter((ee) => ee.lang === "en"))
         const Q = await p2(
           {
             courseInfo: `${JSON.stringify(

package/src/creatorDist/index.html

@@ -10,7 +10,7 @@
     />
 
     <title>Learnpack Creator: Craft tutorials in seconds!</title>
-    <script type="module" crossorigin src="/creator/assets/index-CZYzWk3G.js"></script>
+    <script type="module" crossorigin src="/creator/assets/index-CFM_Ypyi.js"></script>
     <link rel="stylesheet" crossorigin href="/creator/assets/index-DmpsXknz.css">
   </head>
   <body>

package/src/managers/config/exercise.ts

@@ -85,15 +85,12 @@ export const exercise = (
     //   fs.writeFileSync(path + "/" + file, updatedMarkdown, "utf8")
     // }
 
-    if (parts.length === 3) 
-translations[parts[1]] = file
-    else 
-translations.us = file
+    if (parts.length === 3) translations[parts[1]] = file
+    else translations.us = file
   }
 
   // if the slug is a dot, it means there is not "exercises" folder, and its just a single README.md
-  if (slug === ".") 
-slug = "default-index"
+  if (slug === ".") slug = "default-index"
 
   const detected = detect(configObject, files)
 
@@ -120,16 +117,14 @@ slug = "default-index"
         exercises[position].done :
         false,
     getReadme: function (lang = null) {
-      if (lang === "us") 
-lang = null // <-- english is default, no need to append it to the file name
+      if (lang === "en" || lang === "us") lang = null // <-- english is default, no need to append it to the file name
 
       if (!fs.existsSync(`${this.path}/README${lang ? "." + lang : ""}.md`)) {
         Console.error(
           `Language ${lang} not found for exercise ${slug}, switching to default language`
         )
 
-        if (lang) 
-lang = null
+        if (lang) lang = null
 
         if (!fs.existsSync(`${this.path}/README${lang ? "." + lang : ""}.md`))
           throw new Error(
@@ -169,8 +164,7 @@ lang = null
 
       for (const _file of this.files) {
         const stats = fs.statSync(_file.path)
-        if (stats.isDirectory() || _file.hidden) 
-continue
+        if (stats.isDirectory() || _file.hidden) continue
         const fileContent = fs.readFileSync(_file.path)
         if (
           !fs.existsSync(`${config?.dirPath}/resets/${this.slug}/${_file.name}`)
@@ -217,8 +211,7 @@ continue
     getTestReport: function () {
       const _path = `${configObject?.confPath?.base}/reports/${this.slug}.json`
 
-      if (!fs.existsSync(_path)) 
-return {}
+      if (!fs.existsSync(_path)) return {}
 
       const content = fs.readFileSync(_path)
       const data = JSON.parse(`${content}`)
@@ -230,8 +223,7 @@ return {}
 }
 
 export const validateExerciseDirectoryName = (str: string) => {
-  if (str === "./") 
-return true
+  if (str === "./") return true
   // TODO: Add nameValidationREgex from the config
   const regex = /^(\d{2,3}(\.\d{1,2})?-([\dA-Za-z]+(-|_)?)+)$/
   return regex.test(str)