track-cli 3.1.0-rc1 → 4.0.0-rc0

package/esm/_dnt.shims.d.ts

@@ -5,7 +5,7 @@ import { fetch, File, FormData, Headers, Request, Response } from "undici";
 export { fetch, File, FormData, Headers, Request, Response, type BodyInit, type HeadersInit, type RequestInit, type ResponseInit } from "undici";
 import { alert, confirm, prompt } from "./shim/prompts.js";
 export { alert, confirm, prompt } from "./shim/prompts.js";
-export declare const dntGlobalThis: Omit<typeof globalThis, "Deno" | "crypto" | "fetch" | "File" | "FormData" | "Headers" | "Request" | "Response" | "alert" | "confirm" | "prompt"> & {
+export declare const dntGlobalThis: Omit<typeof globalThis, "fetch" | "Request" | "Response" | "FormData" | "Headers" | "Deno" | "crypto" | "File" | "alert" | "confirm" | "prompt"> & {
     Deno: typeof Deno;
     crypto: import("@deno/shim-crypto").Crypto;
     fetch: typeof fetch;

package/esm/_dnt.shims.js

@@ -20,6 +20,7 @@ const dntGlobals = {
     prompt,
 };
 export const dntGlobalThis = createMergeProxy(globalThis, dntGlobals);
+// deno-lint-ignore ban-types
 function createMergeProxy(baseObj, extObj) {
     return new Proxy(baseObj, {
         get(_target, prop, _receiver) {

package/esm/src/action/add.js

@@ -1,14 +1,14 @@
 import * as dntShim from "../../_dnt.shims.js";
-import { CONFIG_FILE_PATH } from "../shared/config.js";
+import { CONFIG_FILE_PATH, load as loadConfig } from "../shared/config.js";
 import { CantReadFile, NewFilesNotAllowed } from "../shared/errors.js";
 import { pathsToFilenameSet, toNativeStyle } from "../shared/file.js";
-import { getCommonChallengeContext, listFileNames, printWorkingFileSet, } from "../shared/mod.js";
-import { FileListType } from "../track/types.js";
+import { getCommonChallengeContext, listFileNames, printWorkingFileSet, trackClientFromConfig, } from "../shared/mod.js";
+import { FileListType } from "../shared/types.js";
 import * as colors from "../../deps/deno.land/std@0.195.0/fmt/colors.js";
 export async function add(filePaths) {
-    // console.log("add", filePaths);
-    const trackContext = await getCommonChallengeContext();
-    const { config, api, codingContext } = trackContext;
+    const config = await loadConfig();
+    const api = trackClientFromConfig(config);
+    const [codingContext, _challenge] = await getCommonChallengeContext(config, api);
     if (!codingContext.settings.allowNewFile) {
         throw new NewFilesNotAllowed();
     }
@@ -45,8 +45,8 @@ export async function add(filePaths) {
             console.log(`\t${toNativeStyle(path)}`);
         }
         console.log();
-        await api.saveFiles(config.applicantExamId, config.challengeResultId, saveFilesRequest);
-        const newCodingContext = await api.getChallengeCodingContext(config.applicantExamId, config.challengeResultId);
+        await api.saveFiles(saveFilesRequest);
+        const newCodingContext = await api.context();
         printWorkingFileSet(newCodingContext);
     }
     else {

package/esm/src/action/clone.js

@@ -1,108 +1,78 @@
 import * as dntShim from "../../_dnt.shims.js";
 import * as config from "../shared/config.js";
-import { ChallengeDirectoryExists, InvalidChallengeId, LocalExamNotAllowed, OtherError, } from "../shared/errors.js";
-import { downloadChallengeFilesTo, ensureExamInProgress, getChallengeFromExamSession, printTimeLeft, tryStartingChallenge, } from "../shared/mod.js";
-import { TrackClient } from "../track/client.js";
+import { LocalCodingNotAllowed, OtherError } from "../shared/errors.js";
+import { downloadChallengeFilesTo, printTimeLeft, tryStartingChallenge, } from "../shared/mod.js";
+import { CloneUrl, TrackApp } from "../shared/types.js";
+import { TestClient } from "../track/test.js";
+import { TrainingClient } from "../track/training.js";
 import { exists } from "../../deps/deno.land/std@0.195.0/fs/mod.js";
 export async function clone(url, options) {
     // console.log(`url: ${url}`);
     // console.log(`target_dir: ${targetDir}`);
     // console.log(`basicAuthUser: ${basicAuthUser}`);
     // console.log(`basicAuthPassword: ${basicAuthPassword}`);
-    const cloneData = parseUrl(url);
+    const cloneUrl = new CloneUrl(url);
     const basicAuth = options?.basicAuthUser
         ? {
             username: options?.basicAuthUser,
             password: options?.basicAuthPassword,
         }
         : undefined;
-    const authData = {
-        examToken: cloneData.examToken,
-        orgName: cloneData.orgName,
-    };
-    const api = new TrackClient(cloneData.scheme, cloneData.host, basicAuth, authData);
-    await api.authenticate();
-    const applicantExam = await api.getApplicantExamNoAuth(cloneData.examToken);
-    const webUrl = `${cloneData.scheme}://${cloneData.host}/${cloneData.orgName}/exams/${cloneData.examToken}`;
-    ensureExamInProgress(applicantExam, webUrl);
-    const examSession = await api.getExamSession(applicantExam.id);
-    // Determine challenge directory
-    const challengePosition = examSession.challengesSets
-        .flatMap((set) => set.challenges)
-        .findIndex((challenge) => challenge.id === cloneData.challengeId) +
-        1;
-    const challengeDir = options?.targetDir ||
-        `${cloneData.orgName}-challenge-${challengePosition}`;
-    const configDir = `${challengeDir}/.track`;
-    const configFile = `${configDir}/config.json`;
-    const pathExists = await exists(challengeDir);
-    if (pathExists) {
-        // オリジナルの Track CLI では空ディレクトリなら OK だったが、そのケースで特に便利にならないので、ファイル・ディレクトリが存在したら無条件でエラーに
-        throw new ChallengeDirectoryExists(challengeDir);
+    let api;
+    switch (cloneUrl.app) {
+        case TrackApp.Test:
+            api = new TestClient(cloneUrl.baseUrl, cloneUrl.orgName, cloneUrl.token, cloneUrl.id, basicAuth);
+            break;
+        case TrackApp.Training:
+            api = new TrainingClient(cloneUrl.baseUrl, cloneUrl.orgName, cloneUrl.token, cloneUrl.id, 0, 0, basicAuth);
+            break;
     }
-    const challenge = getChallengeFromExamSession(examSession, cloneData.challengeId);
-    if (!challenge) {
-        throw new InvalidChallengeId(cloneData.challengeId);
-    }
-    if (!challenge.localExamEnabled) {
-        throw new LocalExamNotAllowed(webUrl);
+    await api.authenticate();
+    const challenge = await api.startChallengeSession();
+    if (!challenge.localCodingAllowed) {
+        const webUrl = cloneUrl.toString(); // TODO: Test の場合は clone URL がそのまま受験画面だったけど、Training の場合は?
+        throw new LocalCodingNotAllowed(webUrl);
     }
-    // Find the challenge result if it exists
-    const resultOpt = getResultFromExamSession(examSession, cloneData.challengeId);
-    // Steps:
-    // - Prepare Challenge
-    // - Change language
-    // - Start Challenge
-    // - TimeLeft
-    // - Context
-    // - Presigned
-    // - Download files
-    // TODO - Print warnings about challenge time limit, having
-    //        a stable internet connection, and what to do next
-    //        in the challenge solving process.
-    const result = await tryStartingChallenge(challenge, api, applicantExam, resultOpt);
+    // Determine challenge directory
+    const challengeDir = await createChallengeDir(options?.targetDir ||
+        `${cloneUrl.orgName}-challenge-${challenge.challengeId}`);
+    const result = await tryStartingChallenge(api, challenge);
     if (!result) {
         throw new OtherError("Expected to have a challenge result after preparing and starting");
     }
-    const timeLeft = await api.timeLeft(applicantExam.id, result.id);
+    const timeLeft = await api.timeLeft();
     printTimeLeft(timeLeft);
-    const codingContext = await api.getChallengeCodingContext(applicantExam.id, result.id);
+    const codingContext = await api.context();
     await dntShim.Deno.mkdir(challengeDir, { recursive: true });
     const showFileDiff = false;
     const includeTarball = true;
-    await downloadChallengeFilesTo(codingContext, challengeDir, api, applicantExam.id, result.id, showFileDiff, includeTarball);
-    const trackConfig = {
-        scheme: cloneData.scheme,
-        host: cloneData.host,
-        orgName: cloneData.orgName,
+    await downloadChallengeFilesTo(codingContext, challengeDir, api, showFileDiff, includeTarball);
+    const trackConfig = Object.assign(api.config(), {
+        app: cloneUrl.app,
+        baseUrl: cloneUrl.baseUrl,
+        orgName: cloneUrl.orgName,
         basicAuth: basicAuth,
-        examToken: cloneData.examToken,
-        applicantExamId: applicantExam.id,
-        challengeId: cloneData.challengeId,
-        challengeResultId: result.id,
+        token: cloneUrl.token,
         cookies: api.getCookies(),
         programmingLanguage: result.programmingLanguage,
-    };
-    await config.save(trackConfig, { path: configFile });
+    });
+    await config.save(trackConfig, {
+        path: `${challengeDir}/.track/config.json`,
+    });
     console.log();
     console.log(`Challenge downloaded to ${challengeDir}`);
     console.log(`Run 'cd ${challengeDir} && track status' to begin!`);
 }
-const PATH_PATTERN = new RegExp("([^/]+)/exams/([^/]+)/challenges/(\\d+)");
-function parseUrl(url) {
-    const urlObj = new URL(url);
-    const caps = PATH_PATTERN.exec(url);
-    if (!caps) {
-        throw new OtherError(`Invalid URL: ${url}`);
+async function createChallengeDir(base) {
+    let i = 1;
+    while (true) {
+        const challengeDir = i == 1 ? base : `${base}-${i}`;
+        const pathExists = await exists(challengeDir);
+        if (pathExists) {
+            i++;
+            continue;
+        }
+        await dntShim.Deno.mkdir(challengeDir, { recursive: true });
+        return challengeDir;
     }
-    return {
-        scheme: urlObj.protocol.slice(0, -1),
-        host: urlObj.host + (urlObj.port ? ":" + urlObj.port : ""),
-        orgName: caps[1],
-        examToken: caps[2],
-        challengeId: parseInt(caps[3]),
-    };
-}
-function getResultFromExamSession(examSession, challengeId) {
-    return examSession.results.find((r) => r.challengeId === challengeId);
 }

package/esm/src/action/lang.js

@@ -1,19 +1,15 @@
 import * as dntShim from "../../_dnt.shims.js";
-import { save as saveConfig } from "../shared/config.js";
-import { CantChooseLanguage, InvalidChallengeId } from "../shared/errors.js";
-import { archiveExistingChallengeFiles, chooseProgrammingLanguage, downloadChallengeFilesTo, getChallengeFromExamSession, getCommonChallengeContext, } from "../shared/mod.js";
+import { load as loadConfig, save as saveConfig, } from "../shared/config.js";
+import { CantChooseLanguage } from "../shared/errors.js";
+import { archiveExistingChallengeFiles, chooseProgrammingLanguage, downloadChallengeFilesTo, getCommonChallengeContext, trackClientFromConfig, } from "../shared/mod.js";
 export async function lang() {
-    const trackContext = await getCommonChallengeContext();
-    const { config, api, codingContext, applicantExam, challengeResult, challengePosition, } = trackContext;
-    const examSession = await api.getExamSession(applicantExam.id);
-    const challenge = getChallengeFromExamSession(examSession, codingContext.challengeId) ??
-        (() => {
-            throw new InvalidChallengeId(codingContext.challengeId);
-        })();
+    const config = await loadConfig();
+    const api = trackClientFromConfig(config);
+    const [codingContext, challenge] = await getCommonChallengeContext(config, api);
     if (challenge.programmingLanguages.length === 0) {
         throw new CantChooseLanguage();
     }
-    const availableLanguages = (await api.getProgrammingLanguages())
+    const availableLanguages = (await api.languages())
         .filter((pl) => codingContext.programmingLanguages.find((n) => n === pl.value));
     console.log("Your existing code will be archived in this directory and the original challenge code for the new language will be downloaded");
     const shouldContinue = dntShim.confirm("Are you sure you want to continue?");
@@ -25,14 +21,13 @@ export async function lang() {
         console.log("You are already using this language");
         return;
     }
-    await api.switchChallengeLanguage(config.applicantExamId, config.challengeResultId, desiredLanguage.value);
+    await api.updateLanguage(desiredLanguage.value);
     const currentDir = dntShim.Deno.cwd();
-    const selectedLanguage = availableLanguages.find((pl) => pl.value === codingContext.selectedLanguage);
-    await archiveExistingChallengeFiles(config.orgName, challengePosition, { selectedLanguage, challengeDir: currentDir });
-    const newCodingContext = await api.getChallengeCodingContext(config.applicantExamId, config.challengeResultId);
+    await archiveExistingChallengeFiles(config.orgName);
+    const newCodingContext = await api.context();
     const showFileDiff = false;
     const includeTarball = true;
-    await downloadChallengeFilesTo(newCodingContext, currentDir, api, applicantExam.id, challengeResult.id, showFileDiff, includeTarball);
+    await downloadChallengeFilesTo(newCodingContext, currentDir, api, showFileDiff, includeTarball);
     const updatedConfig = Object.assign({}, config, {
         programmingLanguage: desiredLanguage.value,
     });

package/esm/src/action/pull.js

@@ -1,16 +1,16 @@
 import * as dntShim from "../../_dnt.shims.js";
-import { save as saveConfig } from "../shared/config.js";
-import { archiveExistingChallengeFiles, downloadChallengeFilesTo, getCommonChallengeContext, } from "../shared/mod.js";
+import { load as loadConfig, save as saveConfig, } from "../shared/config.js";
+import { archiveExistingChallengeFiles, downloadChallengeFilesTo, getCommonChallengeContext, trackClientFromConfig, } from "../shared/mod.js";
 export async function pull() {
-    const trackContext = await getCommonChallengeContext();
-    const { api, codingContext, applicantExam, challengeResult, config, challengePosition, } = trackContext;
+    const config = await loadConfig();
+    const api = trackClientFromConfig(config);
+    const [codingContext, _challenge] = await getCommonChallengeContext(config, api);
     const configLang = config.programmingLanguage;
-    const currentLang = challengeResult.programmingLanguage;
+    const currentLang = codingContext.selectedLanguage;
     const currentDir = dntShim.Deno.cwd();
     if (configLang && currentLang && configLang !== currentLang) {
         console.log("Your programming language has changed elsewhere since you last ran this challenge");
-        const selectedLanguage = await api.findProgrammingLanguage(configLang);
-        await archiveExistingChallengeFiles(config.orgName, challengePosition, { selectedLanguage, challengeDir: currentDir });
+        await archiveExistingChallengeFiles(config.orgName);
         const updatedConfig = Object.assign({}, config, {
             programmingLanguage: currentLang,
         });
@@ -18,5 +18,5 @@ export async function pull() {
     }
     const showFileDiff = true;
     const includeTarball = false;
-    await downloadChallengeFilesTo(codingContext, currentDir, api, applicantExam.id, challengeResult.id, showFileDiff, includeTarball);
+    await downloadChallengeFilesTo(codingContext, currentDir, api, showFileDiff, includeTarball);
 }

package/esm/src/action/remove.js

@@ -1,12 +1,14 @@
 import * as dntShim from "../../_dnt.shims.js";
+import { load as loadConfig } from "../shared/config.js";
 import { DeleteFilesNotAllowed, OtherError } from "../shared/errors.js";
 import { isEmptyDirectory, pathsToFilenameSet, toNativeStyle, } from "../shared/file.js";
-import { getCommonChallengeContext, listFileNames, printWorkingFileSet, } from "../shared/mod.js";
-import { FileListType } from "../track/types.js";
+import { getCommonChallengeContext, listFileNames, printWorkingFileSet, trackClientFromConfig, } from "../shared/mod.js";
+import { FileListType } from "../shared/types.js";
 import * as colors from "../../deps/deno.land/std@0.195.0/fmt/colors.js";
 export async function remove(filePaths, options) {
-    const trackContext = await getCommonChallengeContext();
-    const { config, api, codingContext } = trackContext;
+    const config = await loadConfig();
+    const api = trackClientFromConfig(config);
+    const [codingContext, _challenge] = await getCommonChallengeContext(config, api);
     if (!codingContext.settings.allowNewFile) {
         throw new DeleteFilesNotAllowed();
     }
@@ -35,7 +37,7 @@ export async function remove(filePaths, options) {
             addedFiles: filesToKeep,
             updatedFiles: {},
         };
-        await api.saveFiles(config.applicantExamId, config.challengeResultId, saveFilesRequest);
+        await api.saveFiles(saveFilesRequest);
         await Promise.all(filesToDelete.map((file) => dntShim.Deno.remove(file)))
             .catch((e) => Promise.reject(new OtherError(`An error occurred while deleting files: ${e}`)));
         // For each file to delete, walk the file's parents and delete directories
@@ -55,7 +57,7 @@ export async function remove(filePaths, options) {
                 current = parent;
             }
         }
-        const newCodingContext = await api.getChallengeCodingContext(config.applicantExamId, config.challengeResultId);
+        const newCodingContext = await api.context();
         printWorkingFileSet(newCodingContext);
     }
     else {

package/esm/src/action/reset.js

@@ -1,21 +1,20 @@
 import * as dntShim from "../../_dnt.shims.js";
-import { archiveExistingChallengeFiles, downloadChallengeFilesTo, getCommonChallengeContext, } from "../shared/mod.js";
+import { load as loadConfig } from "../shared/config.js";
+import { archiveExistingChallengeFiles, downloadChallengeFilesTo, getCommonChallengeContext, trackClientFromConfig, } from "../shared/mod.js";
 export async function reset() {
-    const trackContext = await getCommonChallengeContext();
-    const { config, api, codingContext, applicantExam, challengeResult, challengePosition, } = trackContext;
+    const config = await loadConfig();
+    const api = trackClientFromConfig(config);
+    const [_codingContext, _challenge] = await getCommonChallengeContext(config, api);
     console.log("Your existing code will be archived in this directory and the original challenge code will be downloaded");
     const shouldContinue = dntShim.confirm("Are you sure you want to reset this challenge?");
     if (!shouldContinue) {
         return;
     }
     const currentDir = dntShim.Deno.cwd();
-    const selectedLanguage = codingContext.selectedLanguage
-        ? await api.findProgrammingLanguage(codingContext.selectedLanguage)
-        : undefined;
-    await archiveExistingChallengeFiles(config.orgName, challengePosition, { selectedLanguage, challengeDir: currentDir });
-    await api.reset(config.applicantExamId, config.challengeResultId);
-    const newCodingContext = await api.getChallengeCodingContext(config.applicantExamId, config.challengeResultId);
+    await archiveExistingChallengeFiles(config.orgName);
+    await api.reset();
+    const newCodingContext = await api.context();
     const showFileDiff = false;
     const includeTarball = true;
-    await downloadChallengeFilesTo(newCodingContext, currentDir, api, applicantExam.id, challengeResult.id, showFileDiff, includeTarball);
+    await downloadChallengeFilesTo(newCodingContext, currentDir, api, showFileDiff, includeTarball);
 }

package/esm/src/action/run.js

@@ -1,21 +1,20 @@
 import * as dntShim from "../../_dnt.shims.js";
-import { webUrl } from "../shared/config.js";
+import { load as loadConfig } from "../shared/config.js";
 import { CantReadFile } from "../shared/errors.js";
-import { getCommonChallengeContext, listFileNames, printTimeLeft, } from "../shared/mod.js";
-import { EnvSettings, FileListType, } from "../track/types.js";
+import { getCommonChallengeContext, listFileNames, printTimeLeft, trackClientFromConfig, } from "../shared/mod.js";
+import { EnvSettings, FileListType, } from "../shared/types.js";
 import { OrcaClient } from "../orca/client.js";
 import { FileType } from "../orca/types.js";
 import * as colors from "../../deps/deno.land/std@0.195.0/fmt/colors.js";
 const MAX_MEMORY_FOR_TEST = 512 * 1024 * 1024; // 512 MB
 export async function run(options) {
-    const trackContext = await getCommonChallengeContext();
-    const api = trackContext.api;
-    const config = trackContext.config;
-    const codingContext = trackContext.codingContext;
+    const config = await loadConfig();
+    const api = trackClientFromConfig(config);
+    const [codingContext, challenge] = await getCommonChallengeContext(config, api);
     // const orcaHost = Deno.env.get("ORCA_HOST") || "track-prod-frontend.orca.run";
     // Temporary code to retrieve the Orca host. Will be able to get from CodingContext in the future.
     const orcaHost = codingContext.orcaHost || await api.orcaHost();
-    const token = await api.orcaToken(codingContext.urlForOrcaToken);
+    const token = await api.orcaToken(codingContext);
     const orca = new OrcaClient(orcaHost, token);
     await orca.connect();
     const envConfig = codingContext.answers.envConfig || EnvSettings.default;
@@ -47,7 +46,7 @@ export async function run(options) {
             updatedFiles: updatedFiles,
         };
         console.log("Saving challenge files");
-        await api.saveFiles(config.applicantExamId, config.challengeResultId, saveFilesRequest);
+        await api.saveFiles(saveFilesRequest);
         console.log(colors.green("Challenge files saved"));
     }
     console.log();
@@ -97,13 +96,13 @@ export async function run(options) {
         console.log("Test Results");
         console.log("-".repeat(50));
         console.log();
-        if (trackContext.challenge.openTestcases) {
+        if (challenge.openTestcases) {
             const totalPassed = scoreCounter.totalPassed();
-            const scoreStr = `${totalPassed}/${trackContext.challenge.openTestcases}`;
+            const scoreStr = `${totalPassed}/${challenge.openTestcases}`;
             console.log(`Score: ${colors.green(scoreStr)}`);
-            await api.updateEditorScore(config.applicantExamId, config.challengeResultId, totalPassed);
+            await api.updateEditorScore(totalPassed);
         }
-        const timeLeft = await api.timeLeft(config.applicantExamId, config.challengeResultId);
+        const timeLeft = await api.timeLeft();
         printTimeLeft(timeLeft);
     }
     else {
@@ -121,9 +120,7 @@ export async function run(options) {
         for (const file of updatedDisplayFiles) {
             console.log(colors.green(`\t${file}`));
         }
-        const url = `${webUrl(config)}/challenges/${config.challengeId}`;
-        console.log();
-        console.log(`Files uploaded successfully to ${url}`);
+        console.log(`Files uploaded successfully.`);
     }
 }
 async function getAllEditableFileContent(context) {

package/esm/src/action/status.js

@@ -1,5 +1,8 @@
-import { getCommonChallengeContext, printChallengeInfo } from "../shared/mod.js";
+import { load as loadConfig } from "../shared/config.js";
+import { getCommonChallengeContext, printChallengeInfo, trackClientFromConfig, } from "../shared/mod.js";
 export async function status() {
-    const trackContext = await getCommonChallengeContext();
-    await printChallengeInfo(trackContext);
+    const config = await loadConfig();
+    const api = trackClientFromConfig(config);
+    const [codingContext, challenge] = await getCommonChallengeContext(config, api);
+    await printChallengeInfo(api, codingContext, challenge);
 }

package/esm/src/meta.d.ts

@@ -1,3 +1,3 @@
-export declare const VERSION = "3.1.0-rc1";
+export declare const VERSION = "4.0.0-rc0";
 export declare const DESCRIPTION = "A CLI for interacting with tracks.run and running code tests on track's servers";
 export declare function checkUpdates(): Promise<boolean>;

package/esm/src/meta.js

@@ -1,7 +1,7 @@
 import * as colors from "../deps/deno.land/std@0.195.0/fmt/colors.js";
 // @ts-ignore: has no exported member
 import { CookieJar, fetch } from "node-fetch-cookies";
-export const VERSION = "3.1.0-rc1";
+export const VERSION = "4.0.0-rc0";
 export const DESCRIPTION = "A CLI for interacting with tracks.run and running code tests on track's servers";
 const VERSION_RE = /^(\d+)\.(\d+)\.(\d+)(?:-?(.*))$/;
 function parseSemver(s) {

package/esm/src/shared/config.d.ts

@@ -1,18 +1,26 @@
 import { BasicAuth } from "../track/client.js";
-import { ProgrammingLanguage } from "../track/types.js";
+import { ProgrammingLanguage, TrackApp } from "./types.js";
 export declare const CONFIG_FILE_PATH = ".track/config.json";
-export interface TrackConfig {
-    scheme: string;
-    host: string;
+export interface TrackConfigCore {
+    app: TrackApp;
+    baseUrl: string;
     orgName: string;
     basicAuth?: BasicAuth;
-    examToken: string;
-    applicantExamId: number;
+    token: string;
+    programmingLanguage?: ProgrammingLanguage;
+    cookies: Record<string, string>;
+}
+export interface TrackTestConfigPart {
     challengeId: number;
+    applicantExamId: number;
     challengeResultId: number;
-    cookies: Record<string, string>;
-    programmingLanguage?: ProgrammingLanguage;
 }
+export interface TrackTrainingConfigPart {
+    courseMaterialId: number;
+    klassId: number;
+    klassResultId: number;
+}
+export type TrackConfig = TrackConfigCore & (TrackTestConfigPart | TrackTrainingConfigPart);
 export type SaveConfigOptions = {
     path?: string;
 };
@@ -21,4 +29,3 @@ export type LoadConfigOptions = {
     path?: string;
 };
 export declare function load(options?: LoadConfigOptions): Promise<TrackConfig>;
-export declare function webUrl(config: TrackConfig): string;

package/esm/src/shared/config.js

@@ -19,6 +19,3 @@ export async function load(options) {
     const configStr = new TextDecoder().decode(data);
     return JSON.parse(configStr);
 }
-export function webUrl(config) {
-    return `${config.scheme}://${config.host}/${config.orgName}/exams/${config.examToken}`;
-}

package/esm/src/shared/errors.d.ts

@@ -72,7 +72,7 @@ export declare class NewFilesNotAllowed extends TrackError {
 export declare class DeleteFilesNotAllowed extends TrackError {
     constructor();
 }
-export declare class LocalExamNotAllowed extends TrackError {
+export declare class LocalCodingNotAllowed extends TrackError {
     url: string;
     constructor(url: string);
 }

package/esm/src/shared/errors.js

@@ -11,6 +11,7 @@ export class APIError extends TrackError {
         this.name = "APIError";
     }
     static async fromResponse(res) {
+        console.log(res.url);
         const body = await res.text();
         if (HttpStatus.isClientError(res)) {
             return new APIError(`A client error occurred (${res.status}): ${body}`);
@@ -202,16 +203,16 @@ export class DeleteFilesNotAllowed extends TrackError {
         this.name = "DeleteFilesNotAllowed";
     }
 }
-export class LocalExamNotAllowed extends TrackError {
+export class LocalCodingNotAllowed extends TrackError {
     constructor(url) {
-        super(`You are not allowed to take this challenge in your local CLI.\nPlease continue your exam on tracks.run:\n\n${url}`);
+        super(`You are not allowed to take this challenge in your local CLI.\nPlease continue your challenge on web:\n\n${url}`);
         Object.defineProperty(this, "url", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: url
         });
-        this.name = "LocalExamNotAllowed";
+        this.name = "LocalCodingNotAllowed";
     }
 }
 export class OtherError extends TrackError {

package/esm/src/shared/mod.d.ts

@@ -1,8 +1,8 @@
+/// <reference types="node" />
 import * as dntShim from "../../_dnt.shims.js";
-import { TrackCLIContext } from "./types.js";
+import { TrackConfig } from "./config.js";
+import { ChallengeResult, ChallengeSession, ChallengeSettings, CodingAnswers, CodingContext, FileListType, ProgrammingLanguageInfo } from "./types.js";
 import { TrackClient } from "../track/client.js";
-import { ApplicantExamForNoAuth, ChallengeResult, ChallengeSettings, CodingContext, ExamSession, ExamSessionChallenge, FileListType, ProgrammingLanguageInfo } from "../track/types.js";
-import { CodingAnswers } from "../track/types.js";
 export declare const _internals: {
     prompt: typeof dntShim.prompt;
     scoreRatio: typeof scoreRatio;
@@ -11,6 +11,7 @@ export declare const HttpStatus: {
     readonly OK: 200;
     readonly Unauthorized: 401;
     readonly isSuccess: (r: number | dntShim.Response) => boolean;
+    readonly isRedirect: (r: number | dntShim.Response) => boolean;
     readonly isClientError: (r: number | dntShim.Response) => boolean;
     readonly isServerError: (r: number | dntShim.Response) => boolean;
 };
@@ -18,9 +19,7 @@ export declare const Prompt: {
     select(message: string, items: string[]): number | undefined;
 };
 export declare function printTimeLeft(timeLeftSeconds: number): void;
-export declare function ensureExamInProgress(applicantExam: ApplicantExamForNoAuth, webUrlRedirect: string): void;
-export declare function getChallengeFromExamSession(examSession: ExamSession, challengeId: number): ExamSessionChallenge | undefined;
-export declare function tryStartingChallenge(challenge: ExamSessionChallenge, api: TrackClient, applicantExam: ApplicantExamForNoAuth, resultOpt?: ChallengeResult): Promise<ChallengeResult | undefined>;
+export declare function tryStartingChallenge(api: TrackClient, challenge: ChallengeSession): Promise<ChallengeResult | undefined>;
 export declare function chooseProgrammingLanguage(languages: ProgrammingLanguageInfo[]): ProgrammingLanguageInfo;
 export declare function listFileNames(context: {
     settings: ChallengeSettings;
@@ -30,14 +29,15 @@ export declare const SnakeCase: {
     to<T>(obj: T): T;
     from<T_1>(obj: T_1): T_1;
 };
-export declare function getCommonChallengeContext(): Promise<TrackCLIContext>;
+export declare function getCommonChallengeContext(config: TrackConfig, api: TrackClient): Promise<[CodingContext, ChallengeSession]>;
 declare function scoreRatio(editorScore: number | undefined, openTestcases: number | undefined): string;
-export declare function printChallengeInfo(trackContext: TrackCLIContext): Promise<void>;
+export declare function printChallengeInfo(api: TrackClient, codingContext: CodingContext, challenge: ChallengeSession): Promise<void>;
 export declare function printWorkingFileSet(codingContext: CodingContext): void;
-export declare function downloadChallengeFilesTo(codingContext: CodingContext, dest: string, api: TrackClient, applicantExamId: number, challengeResultId: number, showFileDiff: boolean, includeTarball: boolean): Promise<void>;
+export declare function downloadChallengeFilesTo(codingContext: CodingContext, dest: string, api: TrackClient, showFileDiff: boolean, includeTarball: boolean): Promise<void>;
 export type ArchiveExistingChallengeFilesOptions = {
     challengeDir?: string;
     selectedLanguage?: ProgrammingLanguageInfo;
 };
-export declare function archiveExistingChallengeFiles(orgName: string, challengePosition: number, options?: ArchiveExistingChallengeFilesOptions): Promise<void>;
+export declare function archiveExistingChallengeFiles(orgName: string): Promise<void>;
+export declare function trackClientFromConfig(config: TrackConfig): TrackClient;
 export {};