@learnpack/learnpack 5.0.346 → 5.0.347

package/lib/commands/publish.d.ts

@@ -8,7 +8,7 @@ type ExistingAssetInfo = {
 export declare const handleAssetCreation: (sessionPayload: {
     token: string;
     rigobotToken: string;
-}, learnJson: any, selectedLang: string, learnpackDeployUrl: string, b64IndexReadme: string, academyId: number | undefined, preflightInfo?: ExistingAssetInfo, all_translations?: string[]) => Promise<any>;
+}, learnJson: any, selectedLang: string, learnpackDeployUrl: string, b64IndexReadme: string, academyId: number | undefined, learnpackId: number, preflightInfo?: ExistingAssetInfo, all_translations?: string[]) => Promise<any>;
 declare class BuildCommand extends SessionCommand {
     static description: string;
     static flags: {

package/lib/commands/publish.js

@@ -71,7 +71,7 @@ const determinePublishAcademyMode = (existingAssets) => {
         return { type: "locked", academyId: unique[0] };
     return { type: "conflict", academies: unique };
 };
-const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, learnpackDeployUrl, b64IndexReadme, academyId, preflightInfo, all_translations = []) => {
+const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, learnpackDeployUrl, b64IndexReadme, academyId, learnpackId, preflightInfo, all_translations = []) => {
     const category = "uncategorized";
     try {
         const user = await api_1.default.validateToken(sessionPayload.token);
@@ -107,6 +107,7 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
                 preview: learnJson.preview,
                 readme_raw: b64IndexReadme,
                 all_translations,
+                learnpack_id: learnpackId,
             };
             if (academyId !== undefined) {
                 assetPayload.academy_id = academyId;
@@ -131,6 +132,7 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
             category: category,
             description: assetDescription,
             all_translations,
+            learnpack_id: learnpackId,
         };
         // Only set academy when the asset has none yet and the user selected one
         if (existingAcademyId === undefined && academyId !== undefined) {
@@ -160,6 +162,11 @@ const createMultiLangAssetFromDisk = async (sessionPayload, learnJson, deployUrl
         console_1.default.error("No languages found in learn.json.title. Add at least one language (e.g. title.en).");
         return;
     }
+    const learnpackId = await api_1.default.resolveLearnpackPackageId(sessionPayload.rigobotToken, learnJson.slug);
+    if (learnpackId === null) {
+        console_1.default.warning("Breathecode assets skipped: could not resolve Learnpack package id");
+        return;
+    }
     const all_translations = [];
     for (const lang of availableLangs) {
         const readmePath = path.join(process.cwd(), `README${(0, creatorUtilities_1.getReadmeExtension)(lang)}`);
@@ -177,7 +184,7 @@ const createMultiLangAssetFromDisk = async (sessionPayload, learnJson, deployUrl
         const preflightInfo = existingAssetsInfo.find((a) => a.lang === lang);
         try {
             // eslint-disable-next-line no-await-in-loop
-            const asset = await (0, exports.handleAssetCreation)(sessionPayload, learnJson, lang, deployUrl, b64IndexReadme, selectedAcademyId, preflightInfo, all_translations);
+            const asset = await (0, exports.handleAssetCreation)(sessionPayload, learnJson, lang, deployUrl, b64IndexReadme, selectedAcademyId, learnpackId, preflightInfo, all_translations);
             if (!asset) {
                 console_1.default.debug("Could not create/update asset for lang", lang);
                 continue;

package/lib/commands/serve.js

@@ -365,8 +365,33 @@ const getLocalizedValue = (translations, lang, fallbackLangs = ["en", "us"]) =>
     const first = firstKey ? translations[firstKey] : "";
     return typeof first === "string" ? first : "";
 };
+function assetSyncErrorDetail(err) {
+    if (typeof (err === null || err === void 0 ? void 0 : err.detail) === "string")
+        return err.detail;
+    if (typeof (err === null || err === void 0 ? void 0 : err.message) === "string")
+        return err.message;
+    try {
+        return JSON.stringify(err);
+    }
+    catch (_a) {
+        return String(err);
+    }
+}
 const createMultiLangAsset = async (bucket, rigoToken, bcToken, courseSlug, courseJson, deployUrl, academyId) => {
     var _a;
+    const learnpackId = await (0, api_1.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 = [];
@@ -388,11 +413,12 @@ const createMultiLangAsset = async (bucket, rigoToken, bcToken, courseSlug, cour
         const b64IndexReadme = buffer_1.Buffer.from(indexReadmeString).toString("base64");
         try {
             // eslint-disable-next-line no-await-in-loop
-            const asset = await (0, publish_1.handleAssetCreation)({ token: bcToken, rigobotToken: rigoToken.trim() }, courseJson, lang, deployUrl, b64IndexReadme, academyId, undefined, all_translations);
+            const asset = await (0, publish_1.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", status_code: 500 },
+                    error: { detail: "Failed to create asset" },
                 });
                 console.log("No se pudo crear el asset, saltando idioma", lang);
                 continue;
@@ -403,7 +429,11 @@ const createMultiLangAsset = async (bucket, rigoToken, bcToken, courseSlug, cour
             const errorData = error && typeof error === "object" && "response" in error ?
                 ((_a = error.response) === null || _a === void 0 ? void 0 : _a.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);
         }
     }
@@ -3913,20 +3943,65 @@ class ServeCommand extends SessionCommand_1.default {
                 const output = fs.createWriteStream(zipPath);
                 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_1.default.post(`${api_1.RIGOBOT_HOST}/v1/learnpack/upload`, form, {
-                        headers: Object.assign(Object.assign({}, form.getHeaders()), { Authorization: "Token " + rigoToken.trim() }),
-                    });
-                    const assetResults = await createMultiLangAsset(bucket, rigoToken, bcToken, slug, fullConfig.config, rigoRes.data.url, academyId);
-                    rimraf.sync(tmpRoot);
-                    console.log("RigoRes", rigoRes.data);
-                    return res.json({
-                        url: rigoRes.data.url,
-                        errors: assetResults.errors,
-                    });
+                    let rigoPublishUrl;
+                    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_1.default.post(`${api_1.RIGOBOT_HOST}/v1/learnpack/upload`, form, {
+                            headers: Object.assign(Object.assign({}, form.getHeaders()), { Authorization: "Token " + rigoToken.trim() }),
+                        });
+                        rigoPublishUrl = rigoRes.data.url;
+                        let errors;
+                        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." },
+                                },
+                            ];
+                        }
+                        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.message });
+                        }
+                    }
+                    finally {
+                        try {
+                            rimraf.sync(tmpRoot);
+                        }
+                        catch (error) {
+                            console.error("rimraf tmpRoot:", error);
+                        }
+                    }
                 });
                 archive.on("error", err => {
                     console.error("ZIP Error:", err);

package/lib/utils/api.d.ts

@@ -11,6 +11,26 @@ export interface TAcademy {
 }
 export declare const listUserAcademies: (breathecodeToken: string) => Promise<TAcademy[]>;
 export declare const validateToken: (token: string) => Promise<any>;
+/** keep in sync with ide/src/components/Creator/PublishButton.tsx AssetSyncError */
+export type AssetSyncError = {
+    kind: "lang_error";
+    lang: string;
+    error: {
+        detail: string;
+    };
+} | {
+    kind: "package_error";
+    error: {
+        detail: string;
+    };
+};
+/**
+ * GET Rigobot package by slug after a successful upload. Does not throw.
+ * @param rigoToken Rigobot API token (Bearer-style `Token` header value).
+ * @param courseSlug Learnpack package slug used in the Rigobot URL path.
+ * @returns Resolved numeric package id from Rigobot, or `null` if the request fails, the id is missing, or it is not a finite integer.
+ */
+export declare function resolveLearnpackPackageId(rigoToken: string, courseSlug: string): Promise<number | null>;
 type TAssetMissing = {
     slug: string;
     title: string;
@@ -27,6 +47,7 @@ type TAssetMissing = {
     readme_raw: string;
     all_translations: string[];
     academy_id?: number;
+    learnpack_id: number;
 };
 export declare const createAsset: (token: string, asset: TAssetMissing) => Promise<any>;
 export declare const doesAssetExists: (token: string, assetSlug: string) => Promise<{
@@ -59,7 +80,10 @@ declare const _default: {
         exists: boolean;
         academyId?: number;
     }>;
-    updateAsset: (token: string, assetSlug: string, asset: Partial<TAssetMissing>) => Promise<any>;
+    updateAsset: (token: string, assetSlug: string, asset: Partial<TAssetMissing> & {
+        learnpack_id: number;
+    }) => Promise<any>;
+    resolveLearnpackPackageId: typeof resolveLearnpackPackageId;
     getCategories: (token: string) => Promise<any>;
     updateRigoPackage: (token: string, slug: string, updates: {
         asset_id?: number;

package/lib/utils/api.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurrentTechnologies = exports.fetchTechnologies = exports.doesAssetExists = exports.createAsset = exports.validateToken = exports.listUserAcademies = exports.getConsumable = exports.countConsumables = exports.RIGOBOT_REALTIME_HOST = exports.RIGOBOT_HOST = void 0;
+exports.resolveLearnpackPackageId = resolveLearnpackPackageId;
 const console_1 = require("../utils/console");
 const storage = require("node-persist");
 const cli_ux_1 = require("cli-ux");
@@ -341,6 +342,35 @@ const validateToken = async (token) => {
     }
 };
 exports.validateToken = validateToken;
+function parseLearnpackPackageId(raw) {
+    if (raw === undefined || raw === null)
+        return null;
+    const n = typeof raw === "number" ? raw : Number(raw);
+    if (!Number.isFinite(n) || !Number.isInteger(n))
+        return null;
+    return n;
+}
+/**
+ * GET Rigobot package by slug after a successful upload. Does not throw.
+ * @param rigoToken Rigobot API token (Bearer-style `Token` header value).
+ * @param courseSlug Learnpack package slug used in the Rigobot URL path.
+ * @returns Resolved numeric package id from Rigobot, or `null` if the request fails, the id is missing, or it is not a finite integer.
+ */
+async function resolveLearnpackPackageId(rigoToken, courseSlug) {
+    var _a;
+    if (!(rigoToken === null || rigoToken === void 0 ? void 0 : rigoToken.trim()) || !courseSlug)
+        return null;
+    const url = `${exports.RIGOBOT_HOST}/v1/learnpack/package/${encodeURIComponent(courseSlug)}/`;
+    try {
+        const response = await axios_1.default.get(url, {
+            headers: { Authorization: `Token ${rigoToken.trim()}` },
+        });
+        return parseLearnpackPackageId((_a = response.data) === null || _a === void 0 ? void 0 : _a.id);
+    }
+    catch (_b) {
+        return null;
+    }
+}
 const createAsset = async (token, asset) => {
     var _a;
     const body = {
@@ -367,6 +397,7 @@ const createAsset = async (token, asset) => {
         intro_video_url: null,
         translations: [asset.lang],
         learnpack_deploy_url: asset.learnpack_deploy_url,
+        learnpack_id: asset.learnpack_id,
         technologies: asset.technologies,
         readme_raw: asset.readme_raw,
         all_translations: asset.all_translations,
@@ -417,9 +448,10 @@ const updateAsset = async (token, assetSlug, asset) => {
     const headers = {
         Authorization: `Token ${token}`,
     };
+    const body = Object.assign(Object.assign({}, asset), { learnpack_id: asset.learnpack_id });
     console.log("[BC] PUT", url, "| academy_id:", (_a = asset.academy_id) !== null && _a !== void 0 ? _a : "none");
     try {
-        const response = await axios_1.default.put(url, asset, { headers });
+        const response = await axios_1.default.put(url, body, { headers });
         return response.data;
     }
     catch (error) {
@@ -551,6 +583,7 @@ exports.default = {
     createAsset: exports.createAsset,
     doesAssetExists: exports.doesAssetExists,
     updateAsset,
+    resolveLearnpackPackageId,
     getCategories,
     updateRigoPackage,
     createRigoPackage,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@learnpack/learnpack",
   "description": "Seamlessly build, sell and/or take interactive & auto-graded tutorials, start learning now or build a new tutorial to your audience.",
-  "version": "5.0.346",
+  "version": "5.0.347",
   "author": "Alejandro Sanchez @alesanchezr",
   "contributors": [
     {

package/src/commands/publish.ts

@@ -109,6 +109,7 @@ export const handleAssetCreation = async (
   learnpackDeployUrl: string,
   b64IndexReadme: string,
   academyId: number | undefined,
+  learnpackId: number,
   preflightInfo?: ExistingAssetInfo,
   all_translations: string[] = []
 ) => {
@@ -160,6 +161,7 @@ export const handleAssetCreation = async (
         preview: learnJson.preview,
         readme_raw: b64IndexReadme,
         all_translations,
+        learnpack_id: learnpackId,
       }
       if (academyId !== undefined) {
         assetPayload.academy_id = academyId
@@ -190,6 +192,7 @@ export const handleAssetCreation = async (
       category: category,
       description: assetDescription,
       all_translations,
+      learnpack_id: learnpackId,
     }
     // Only set academy when the asset has none yet and the user selected one
     if (existingAcademyId === undefined && academyId !== undefined) {
@@ -237,6 +240,17 @@ const createMultiLangAssetFromDisk = async (
     return
   }
 
+  const learnpackId = await api.resolveLearnpackPackageId(
+    sessionPayload.rigobotToken,
+    learnJson.slug
+  )
+  if (learnpackId === null) {
+    Console.warning(
+      "Breathecode assets skipped: could not resolve Learnpack package id"
+    )
+    return
+  }
+
   const all_translations: string[] = []
   for (const lang of availableLangs) {
     const readmePath = path.join(
@@ -266,6 +280,7 @@ const createMultiLangAssetFromDisk = async (
         deployUrl,
         b64IndexReadme,
         selectedAcademyId,
+        learnpackId,
         preflightInfo,
         all_translations
       )

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)
     }
   }
@@ -5620,38 +5653,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 => {