Show ID in log outputs

Author: uellenberg

src/upload/lesson.ts

@@ -16,7 +16,7 @@ import defaultsDeep from "lodash/defaultsDeep";
 export const websockets: WebSocket[] = [];
 
 /**
- * Handles a lesson manifest.
+ * Handles a lesson manifest and returns its actual ID.
  * @param state {State} - is the application's state.
  * @param id {string} - is the friendly name of the lesson.
  * @param name {string} - is the display name of the lesson.
@@ -33,7 +33,7 @@ export async function handleLesson(
     templateDir: string | null,
     lessonClass: number,
     dir: string,
-): Promise<void> {
+): Promise<string> {
     // We need to first figure out what the ID of this lesson is.
     // If it doesn't exist, we'll just set it to null.
     const actualID: string | null = await axios
@@ -225,7 +225,10 @@ export async function handleLesson(
     if (!token) throw new Error("Could not get a token!");
 
     // Next, let's open a websocket channel.
-    return uploadFiles(token, files);
+    await uploadFiles(token, files);
+
+    // And finally, return the lesson ID.
+    return lessonID;
 }
 
 function uploadFiles(

src/upload/manifest.ts

@@ -68,7 +68,9 @@ export async function readManifest(
                 if (typeof lessons !== "object" || Array.isArray(lessons))
                     throw new Error("lessons must be an object!");
 
-                await handleUnit(state, id, name, lessons);
+                const unitID = await handleUnit(state, id, name, lessons);
+                console.log(`Uploaded Unit "${manifest}" (ID: "${unitID}").`);
+
                 break;
             }
             case "lesson": {
@@ -110,7 +112,7 @@ export async function readManifest(
                             "]!",
                     );
 
-                await handleLesson(
+                const lessonID = await handleLesson(
                     state,
                     id,
                     name,
@@ -119,6 +121,8 @@ export async function readManifest(
                     classMap[lessonClass] || 0,
                     Path.dirname(manifest),
                 );
+                console.log(`Uploaded Lesson "${manifest}" (ID: "${lessonID}").`);
+
                 break;
             }
             default: {
@@ -128,8 +132,6 @@ export async function readManifest(
             }
         }
 
-        console.log(`Uploaded ${manifest}.`);
-
         // Handle delays.
         await delay(state);
     } catch (e) {

src/upload/unit.ts

@@ -2,7 +2,7 @@ import axios, { AxiosError } from "axios";
 import { delay, State } from "./index";
 
 /**
- * Handles a unit manifest.
+ * Handles a unit manifest and returns its actual ID.
  * @param state {State} - is the application's state.
  * @param id {string} - is the friendly name of the unit.
  * @param name {string} - is the display name of the unit.
@@ -16,7 +16,7 @@ export async function handleUnit(
         string,
         { next: string[]; previous: string[]; requireAll?: boolean }
     >,
-): Promise<void> {
+): Promise<string> {
     // First, we need to figure out what the actual ID of our unit is.
     // If there isn't one, we'll just set it to null.
     const actualID: string | null = await axios
@@ -71,7 +71,7 @@ export async function handleUnit(
     }
 
     // Create or update the unit.
-    await axios.put(
+    const unitID = await axios.put(
         "https://cratecode.com/internal/api/unit",
         {
             id: actualID,
@@ -84,8 +84,11 @@ export async function handleUnit(
                 authorization: state.key,
             },
         },
-    );
+    ).then((res) => res.data.id as string);
     await delay(state);
+
+    // And finally, return the unit ID.
+    return unitID;
 }
 
 /**