Merge pull request #751 from rage/sha

langs shasum

Author: nygrenh

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [3.5.0] - 2025-06-16
+
+-   Added shasum check for langs CLI executable.
+
 ## [3.4.0] - 2025-06-16
 
 -   Improved error handling during initialization.

bin/updateLangs.bash

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -euxo pipefail
+
+if [ -z ${1+x} ]; then
+  echo -e "Missing version argument"
+  exit 1
+fi
+
+VERSION="$1"
+BINDINGS_DOWNLOAD_URL="https://raw.githubusercontent.com/rage/tmc-langs-rust/${VERSION}/crates/tmc-langs-cli/bindings.d.ts"
+BINDINGS_DOWNLOAD_TARGET="./shared/langsSchema.ts"
+
+echo "Removing old schema"
+rm "$BINDINGS_DOWNLOAD_TARGET"
+
+echo "Downloading generated type definitions"
+GENERATED=$(curl "$BINDINGS_DOWNLOAD_URL")
+
+# write version to the file
+printf "// VERSION=%s\n" "$VERSION" > "$BINDINGS_DOWNLOAD_TARGET"
+# write URL to the file to make it easy to keep track of the version
+printf "// %s\n\n" "$BINDINGS_DOWNLOAD_URL" >> "$BINDINGS_DOWNLOAD_TARGET"
+echo "$GENERATED" | npx prettier --parser typescript >> "$BINDINGS_DOWNLOAD_TARGET"
+
+# update version number
+sed -i s/"TMC_LANGS_RUST_VERSION = .*"/"TMC_LANGS_RUST_VERSION = \"${VERSION}\";/" ./config.js

config.js

@@ -3,7 +3,7 @@
 
 const path = require("path");
 
-const TMC_LANGS_RUST_VERSION = "0.37.1";
+const TMC_LANGS_RUST_VERSION = "0.38.0";
 
 const mockTmcLocalMooc = {
     __TMC_BACKEND_URL__: JSON.stringify("http://localhost:4001"),

package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "test-my-code",
     "displayName": "TestMyCode",
-    "version": "3.4.0",
+    "version": "3.5.0",
     "description": "TestMyCode extension for Visual Studio Code",
     "categories": [
         "Education",
@@ -465,6 +465,7 @@
         "trailingComma": "all"
     },
     "dependencies": {
+        "@aws-crypto/sha256-js": "^5.2.0",
         "del": "^8.0.0",
         "fs-extra": "^11.2.0",
         "get-folder-size": "^5.0.0",

package.json

@@ -1,4 +1,5 @@
-// https://raw.githubusercontent.com/rage/tmc-langs-rust/master/crates/tmc-langs-cli/bindings.d.ts
+// VERSION=0.38.0
+// https://raw.githubusercontent.com/rage/tmc-langs-rust/0.38.0/crates/tmc-langs-cli/bindings.d.ts
 
 export type Locale = string;
 
@@ -16,14 +17,19 @@ export type DataKind =
           "output-data-kind": "exercise-packaging-configuration";
           "output-data": ExercisePackagingConfiguration;
       }
-    | { "output-data-kind": "local-exercises"; "output-data": Array<LocalExercise> }
+    | { "output-data-kind": "local-tmc-exercises"; "output-data": Array<LocalTmcExercise> }
+    | { "output-data-kind": "local-mooc-exercises"; "output-data": Array<LocalMoocExercise> }
     | { "output-data-kind": "refresh-result"; "output-data": RefreshData }
     | { "output-data-kind": "test-result"; "output-data": RunResult }
     | { "output-data-kind": "exercise-desc"; "output-data": ExerciseDesc }
     | { "output-data-kind": "updated-exercises"; "output-data": Array<UpdatedExercise> }
     | {
-          "output-data-kind": "exercise-download";
-          "output-data": DownloadOrUpdateCourseExercisesResult;
+          "output-data-kind": "tmc-exercise-download";
+          "output-data": DownloadOrUpdateTmcCourseExercisesResult;
+      }
+    | {
+          "output-data-kind": "mooc-exercise-download";
+          "output-data": DownloadOrUpdateMoocCourseExercisesResult;
       }
     | { "output-data-kind": "combined-course-data"; "output-data": CombinedCourseData }
     | { "output-data-kind": "course-details"; "output-data": CourseDetails }
@@ -64,9 +70,9 @@ export type Kind =
     | "invalid-token"
     | {
           "failed-exercise-download": {
-              completed: Array<ExerciseDownload>;
-              skipped: Array<ExerciseDownload>;
-              failed: Array<[ExerciseDownload, Array<string>]>;
+              completed: Array<TmcExerciseDownload>;
+              skipped: Array<TmcExerciseDownload>;
+              failed: Array<[TmcExerciseDownload, Array<string>]>;
           };
       };
 
@@ -131,7 +137,11 @@ export type ExercisePackagingConfiguration = {
     exercise_file_paths: Array<string>;
 };
 
-export type LocalExercise = { "exercise-slug": string; "exercise-path": string };
+export type LocalExercise = { tmc: LocalTmcExercise } | { mooc: LocalMoocExercise };
+
+export type LocalTmcExercise = { "exercise-slug": string; "exercise-path": string };
+
+export type LocalMoocExercise = { "exercise-id": string; "exercise-path": string };
 
 export type Compression = "tar" | "zip" | "zstd";
 
@@ -247,19 +257,27 @@ export type TestDesc = {
 
 export type UpdatedExercise = { id: number };
 
-export type DownloadOrUpdateCourseExercisesResult = {
-    downloaded: Array<ExerciseDownload>;
-    skipped: Array<ExerciseDownload>;
-    failed?: Array<[ExerciseDownload, Array<string>]>;
+export type DownloadOrUpdateTmcCourseExercisesResult = {
+    downloaded: Array<TmcExerciseDownload>;
+    skipped: Array<TmcExerciseDownload>;
+    failed?: Array<[TmcExerciseDownload, Array<string>]>;
 };
 
-export type ExerciseDownload = {
+export type DownloadOrUpdateMoocCourseExercisesResult = {
+    downloaded: Array<MoocExerciseDownload>;
+    skipped: Array<MoocExerciseDownload>;
+    failed?: Array<[MoocExerciseDownload, Array<string>]>;
+};
+
+export type TmcExerciseDownload = {
     id: number;
     "course-slug": string;
     "exercise-slug": string;
     path: string;
 };
 
+export type MoocExerciseDownload = { id: string; path: string };
+
 export type CombinedCourseData = {
     details: CourseDetails;
     exercises: Array<CourseExercise>;
@@ -615,12 +633,12 @@ export type TmcExerciseTask = {
 };
 
 export type PublicSpec =
-    | { type: "browser"; files: Array<ExerciseFile> }
-    | { type: "editor"; archiveName: string; archiveDownloadUrl: string; checksum: string };
+    | { type: "Browser"; files: Array<ExerciseFile> }
+    | { type: "Editor"; archive_name: string; archive_download_url: string; checksum: string };
 
 export type ModelSolutionSpec =
-    | { type: "browser"; solutionFiles: Array<ExerciseFile> }
-    | { type: "editor"; archiveDownloadUrl: string };
+    | { type: "Browser"; solution_files: Array<ExerciseFile> }
+    | { type: "Editor"; download_url: string };
 
 export type ExerciseFile = { filepath: string; contents: string };
 

shared/langsSchema.ts

@@ -29,9 +29,9 @@ import {
     CourseDetails,
     CourseExercise,
     DataKind,
-    DownloadOrUpdateCourseExercisesResult,
+    DownloadOrUpdateTmcCourseExercisesResult,
     ExerciseDetails,
-    LocalExercise,
+    LocalTmcExercise,
     Organization,
     OutputData,
     RunResult,
@@ -229,25 +229,25 @@ export default class TMC {
     }
 
     /**
-     * Lists local exercises for given course. Uses TMC-langs `list-local-course-exercises` command
+     * Lists local exercises for given course. Uses TMC-langs `list-local-tmc-course-exercises` command
      * internally.
      *
      * @param courseSlug Course which's exercises should be listed.
      */
     public async listLocalCourseExercises(
         courseSlug: string,
-    ): Promise<Result<LocalExercise[], Error>> {
+    ): Promise<Result<LocalTmcExercise[], Error>> {
         const res = await this._executeLangsCommand(
             {
                 args: [
-                    "list-local-course-exercises",
+                    "list-local-tmc-course-exercises",
                     "--client-name",
                     this.clientName,
                     "--course-slug",
                     courseSlug,
                 ],
             },
-            "local-exercises",
+            "local-tmc-exercises",
         );
         return res.map((x) => x.data["output-data"]);
     }
@@ -464,7 +464,7 @@ export default class TMC {
         ids: number[],
         downloadTemplate: boolean,
         onDownloaded: (value: { id: number; percent: number; message?: string }) => void,
-    ): Promise<Result<DownloadOrUpdateCourseExercisesResult, Error>> {
+    ): Promise<Result<DownloadOrUpdateTmcCourseExercisesResult, Error>> {
         const onStdout = (res: StatusUpdateData): void => {
             if (
                 res["update-data-kind"] === "client-update-data" &&
@@ -488,7 +488,7 @@ export default class TMC {
                 ),
                 onStdout,
             },
-            "exercise-download",
+            "tmc-exercise-download",
         );
         return res.andThen((x) => {
             // Invalidate exercise update cache

src/api/tmc.ts

@@ -67,7 +67,7 @@ async function activateInner(context: vscode.ExtensionContext): Promise<void> {
 
     const dialog = new Dialog();
     const cliFolderPath = cliFolder(context);
-    const cliPathResult = await init.downloadCorrectLangsVersion(cliFolderPath, dialog);
+    const cliPathResult = await init.ensureLangsUpdated(cliFolderPath, dialog);
 
     // download langs if necessary
     let tmc: Result<TMC, Error>;