@learnpack/learnpack 4.0.7 → 4.0.8

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @learnpack/learnpack
 $ learnpack COMMAND
 running command...
 $ learnpack (-v|--version|version)
-@learnpack/learnpack/4.0.7 win32-x64 node-v20.16.0
+@learnpack/learnpack/4.0.8 win32-x64 node-v20.16.0
 $ learnpack --help [COMMAND]
 USAGE
   $ learnpack COMMAND
@@ -74,7 +74,7 @@ DESCRIPTION
        12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)
 ```
 
-_See code: [src\commands\audit.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.7/src\commands\audit.ts)_
+_See code: [src\commands\audit.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.8/src\commands\audit.ts)_
 
 ## `learnpack clean`
 
@@ -89,7 +89,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src\commands\clean.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.7/src\commands\clean.ts)_
+_See code: [src\commands\clean.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.8/src\commands\clean.ts)_
 
 ## `learnpack download [PACKAGE]`
 
@@ -107,7 +107,7 @@ DESCRIPTION
   Extra documentation goes here
 ```
 
-_See code: [src\commands\download.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.7/src\commands\download.ts)_
+_See code: [src\commands\download.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.8/src\commands\download.ts)_
 
 ## `learnpack help [COMMAND]`
 
@@ -138,7 +138,7 @@ OPTIONS
   -h, --grading  show CLI help
 ```
 
-_See code: [src\commands\init.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.7/src\commands\init.ts)_
+_See code: [src\commands\init.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.8/src\commands\init.ts)_
 
 ## `learnpack login [PACKAGE]`
 
@@ -156,7 +156,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src\commands\login.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.7/src\commands\login.ts)_
+_See code: [src\commands\login.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.8/src\commands\login.ts)_
 
 ## `learnpack logout [PACKAGE]`
 
@@ -174,7 +174,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src\commands\logout.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.7/src\commands\logout.ts)_
+_See code: [src\commands\logout.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.8/src\commands\logout.ts)_
 
 ## `learnpack plugins`
 
@@ -309,7 +309,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src\commands\publish.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.7/src\commands\publish.ts)_
+_See code: [src\commands\publish.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.8/src\commands\publish.ts)_
 
 ## `learnpack start`
 
@@ -330,7 +330,7 @@ OPTIONS
   -w, --watch                         Watch for file changes
 ```
 
-_See code: [src\commands\start.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.7/src\commands\start.ts)_
+_See code: [src\commands\start.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.8/src\commands\start.ts)_
 
 ## `learnpack test [EXERCISESLUG]`
 
@@ -344,7 +344,7 @@ ARGUMENTS
   EXERCISESLUG  The name of the exercise to test
 ```
 
-_See code: [src\commands\test.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.7/src\commands\test.ts)_
+_See code: [src\commands\test.ts](https://github.com/learnpack/learnpack-cli/blob/v4.0.8/src\commands\test.ts)_
 <!-- commandsstop -->
 
 > > > > > > > 0cb3e56d84c197f9d008836bb573eade212b7e57

package/lib/commands/start.js

@@ -22,7 +22,7 @@ class StartCommand extends SessionCommand_1.default {
         await this.initSession(flags);
     }
     async run() {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f;
         // get configuration object
         const configObject = (_a = this.configManager) === null || _a === void 0 ? void 0 : _a.get();
         const hasXDG = await osOperations_1.eventManager.checkXDGInstalled();
@@ -77,18 +77,6 @@ class StartCommand extends SessionCommand_1.default {
                     }
                 }
                 socket_1.default.start(config, server, false);
-                if ((_g = config === null || config === void 0 ? void 0 : config.warnings) === null || _g === void 0 ? void 0 : _g.agent) {
-                    const message = config.warnings.agent;
-                    setTimeout(() => {
-                        socket_1.default.dialog(message);
-                    }, 2000);
-                }
-                if ((_h = config === null || config === void 0 ? void 0 : config.warnings) === null || _h === void 0 ? void 0 : _h.extension) {
-                    const message = config.warnings.extension;
-                    setTimeout(() => {
-                        socket_1.default.dialog(message);
-                    }, 3000);
-                }
                 socket_1.default.on("open", (data) => {
                     console_1.default.debug("Opening these files: ", data);
                     const files = misc_1.prioritizeHTMLFile(data.files);

package/lib/managers/config/defaults.d.ts

@@ -31,18 +31,18 @@ declare const _default: {
             python3: string;
             java: string;
         };
+        suggestions: {
+            agent: null;
+        };
+        warnings: {
+            agent: null;
+        };
     };
     address: string;
     currentExercise: null;
     exercises: never[];
     bugsLink: null;
     videoSolutions: boolean;
-    suggestions: {
-        agent: null;
-    };
-    warnings: {
-        agent: null;
-    };
     localhostOnly: boolean;
 };
 export default _default;

package/lib/managers/config/defaults.js

@@ -35,17 +35,17 @@ exports.default = {
             python3: "app.py",
             java: "app.java",
         },
+        suggestions: {
+            agent: null,
+        },
+        warnings: {
+            agent: null,
+        },
     },
     address: "http://localhost",
     currentExercise: null,
     exercises: [],
     bugsLink: null,
     videoSolutions: false,
-    suggestions: {
-        agent: null,
-    },
-    warnings: {
-        agent: null,
-    },
     localhostOnly: false,
 };

package/lib/managers/config/index.js

@@ -153,6 +153,7 @@ exports.default = async ({ grading, mode, disableGrading, version, }) => {
     }
     if (configObj.config.suggestions &&
         configObj.config.editor &&
+        configObj.config.suggestions.agent !== null &&
         configObj.config.suggestions.agent !== configObj.config.editor.agent) {
         console_1.default.warning(`The suggested agent "${configObj.config.suggestions.agent}" is different from the detected agent "${configObj.config.editor.agent}"`);
         try {
@@ -169,7 +170,7 @@ exports.default = async ({ grading, mode, disableGrading, version, }) => {
     }
     if (!configObj.config.editor.mode) {
         configObj.config.editor.mode =
-            configObj.config.editor.agent === "vscode" ? "extension" : "preview";
+            process.env.TERM_PROGRAM === "vscode" ? "extension" : "preview";
     }
     if (version)
         configObj.config.editor.version = version;
@@ -240,13 +241,13 @@ exports.default = async ({ grading, mode, disableGrading, version, }) => {
             console_1.default.debug(`Validating engine for ${language} compilation`);
             let result = shell.exec("learnpack plugins", { silent: true });
             if (result.code === 0 &&
-                result.stdout.includes(`learnpack-${language}`)) {
+                result.stdout.includes(`@learnpack/${language}`)) {
                 this.validLanguages[language] = true;
                 return true;
             }
             console_1.default.info(`Language engine for ${language} not found, installing...`);
             // Install the compiler in their new versions
-            result = shell.exec(`learnpack plugins:install learnpack-${language}`, {
+            result = shell.exec(`learnpack plugins:install @learnpack/${language}`, {
                 silent: true,
             });
             if (result.code === 0) {
@@ -374,7 +375,7 @@ exports.default = async ({ grading, mode, disableGrading, version, }) => {
             });
         },
         save: () => {
-            // Console.debug("Saving configuration with: ", configObj)
+            console_1.default.debug("Saving configuration with: ", configObj);
             // remove the duplicates form the actions array
             // configObj.config.actions = [...new Set(configObj.config.actions)];
             if (configObj.config) {

package/lib/managers/server/routes.js

@@ -36,7 +36,8 @@ async function default_1(app, configObject, configManager) {
         path: `${config === null || config === void 0 ? void 0 : config.dirPath}/vscode_queue.json`,
     });
     app.get("/config", withHandler((_, res) => {
-        res.json(configObject);
+        const confObject = configManager.get();
+        res.json(confObject);
     }));
     // Added this line to parse the json body
     const jsonBodyParser = bodyParser.json();

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"4.0.7","commands":{"audit":{"id":"audit","description":"learnpack audit is the command in charge of creating an auditory of the repository\n...\nlearnpack audit checks for the following information in a repository:\n    1. The configuration object has slug, repository and description. (Error)\n    2. The command learnpack clean has been run. (Error)\n    3. If a markdown or test file doesn't have any content. (Error)\n    4. The links are accessing to valid servers. (Error)\n    5. The relative images are working (If they have the shortest path to the image or if the images exists in the assets). (Error)\n    6. The external images are working (If they are pointing to a valid server). (Error)\n    7. The exercises directory names are valid. (Error)\n    8. If an exercise doesn't have a README file. (Error)\n    9. The exercises array (Of the config file) has content. (Error)\n    10. The exercses have the same translations. (Warning)\n    11. The .gitignore file exists. (Warning)\n    12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"clean":{"id":"clean","description":"Clean the configuration object\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"download":{"id":"download","description":"Describe the command here\n...\nExtra documentation goes here\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"init":{"id":"init","description":"Create a new learning package: Book, Tutorial or Exercise","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"grading":{"name":"grading","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"login":{"id":"login","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"logout":{"id":"logout","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"publish":{"id":"publish","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"start":{"id":"start","description":"Runs a small server with all the exercise instructions","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"server port"},"host":{"name":"host","type":"option","char":"h","description":"server host"},"disableGrading":{"name":"disableGrading","type":"boolean","char":"D","description":"disble grading functionality","allowNo":false},"watch":{"name":"watch","type":"boolean","char":"w","description":"Watch for file changes","allowNo":false},"editor":{"name":"editor","type":"option","char":"e","description":"[preview, extension]","options":["extension","preview"]},"version":{"name":"version","type":"option","char":"v","description":"E.g: 1.0.1"},"grading":{"name":"grading","type":"option","char":"g","description":"[isolated, incremental]","options":["isolated","incremental"]},"debug":{"name":"debug","type":"boolean","char":"d","description":"debugger mode for more verbage","allowNo":false}},"args":[]},"test":{"id":"test","description":"Test exercises","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"exerciseSlug","description":"The name of the exercise to test","required":false,"hidden":false}]}}}
+{"version":"4.0.8","commands":{"audit":{"id":"audit","description":"learnpack audit is the command in charge of creating an auditory of the repository\n...\nlearnpack audit checks for the following information in a repository:\n    1. The configuration object has slug, repository and description. (Error)\n    2. The command learnpack clean has been run. (Error)\n    3. If a markdown or test file doesn't have any content. (Error)\n    4. The links are accessing to valid servers. (Error)\n    5. The relative images are working (If they have the shortest path to the image or if the images exists in the assets). (Error)\n    6. The external images are working (If they are pointing to a valid server). (Error)\n    7. The exercises directory names are valid. (Error)\n    8. If an exercise doesn't have a README file. (Error)\n    9. The exercises array (Of the config file) has content. (Error)\n    10. The exercses have the same translations. (Warning)\n    11. The .gitignore file exists. (Warning)\n    12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"clean":{"id":"clean","description":"Clean the configuration object\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"download":{"id":"download","description":"Describe the command here\n...\nExtra documentation goes here\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"init":{"id":"init","description":"Create a new learning package: Book, Tutorial or Exercise","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"grading":{"name":"grading","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"login":{"id":"login","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"logout":{"id":"logout","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"publish":{"id":"publish","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"start":{"id":"start","description":"Runs a small server with all the exercise instructions","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"server port"},"host":{"name":"host","type":"option","char":"h","description":"server host"},"disableGrading":{"name":"disableGrading","type":"boolean","char":"D","description":"disble grading functionality","allowNo":false},"watch":{"name":"watch","type":"boolean","char":"w","description":"Watch for file changes","allowNo":false},"editor":{"name":"editor","type":"option","char":"e","description":"[preview, extension]","options":["extension","preview"]},"version":{"name":"version","type":"option","char":"v","description":"E.g: 1.0.1"},"grading":{"name":"grading","type":"option","char":"g","description":"[isolated, incremental]","options":["isolated","incremental"]},"debug":{"name":"debug","type":"boolean","char":"d","description":"debugger mode for more verbage","allowNo":false}},"args":[]},"test":{"id":"test","description":"Test exercises","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"exerciseSlug","description":"The name of the exercise to test","required":false,"hidden":false}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@learnpack/learnpack",
   "description": "Create, sell or download and take learning amazing learning packages",
-  "version": "4.0.7",
+  "version": "4.0.8",
   "author": "Alejandro Sanchez @alesanchezr",
   "contributors": [
     {

package/src/commands/start.ts

@@ -170,20 +170,6 @@ export default class StartCommand extends SessionCommand {
 
         socket.start(config, server, false)
 
-        if (config?.warnings?.agent) {
-          const message = config.warnings.agent
-          setTimeout(() => {
-            socket.dialog(message)
-          }, 2000)
-        }
-
-        if (config?.warnings?.extension) {
-          const message = config.warnings.extension
-          setTimeout(() => {
-            socket.dialog(message)
-          }, 3000)
-        }
-
         socket.on("open", (data: IGitpodData) => {
           Console.debug("Opening these files: ", data)
 

package/src/managers/config/defaults.ts

@@ -33,17 +33,17 @@ export default {
       python3: "app.py",
       java: "app.java",
     },
+    suggestions: {
+      agent: null,
+    },
+    warnings: {
+      agent: null,
+    },
   },
   address: "http://localhost",
   currentExercise: null,
   exercises: [],
   bugsLink: null,
   videoSolutions: false,
-  suggestions: {
-    agent: null,
-  },
-  warnings: {
-    agent: null,
-  },
   localhostOnly: false, // if true, the exercise should not run on gitpod or codespaces but show an error message encouraging the user to run locally
 }

package/src/managers/config/index.ts

@@ -221,6 +221,7 @@ throw InternalError("Config object not found")
   if (
     configObj.config.suggestions &&
     configObj.config.editor &&
+    configObj.config.suggestions.agent !== null &&
     configObj.config.suggestions.agent !== configObj.config.editor.agent
   ) {
     Console.warning(
@@ -249,7 +250,7 @@ throw InternalError("Config object not found")
 
   if (!configObj.config.editor.mode) {
     configObj.config.editor.mode =
-      configObj.config.editor.agent === "vscode" ? "extension" : "preview"
+      process.env.TERM_PROGRAM === "vscode" ? "extension" : "preview"
   }
 
   if (version) 
@@ -337,7 +338,7 @@ return true
 
       if (
         result.code === 0 &&
-        result.stdout.includes(`learnpack-${language}`)
+        result.stdout.includes(`@learnpack/${language}`)
       ) {
         this.validLanguages[language] = true
         return true
@@ -345,7 +346,7 @@ return true
 
       Console.info(`Language engine for ${language} not found, installing...`)
       // Install the compiler in their new versions
-      result = shell.exec(`learnpack plugins:install learnpack-${language}`, {
+      result = shell.exec(`learnpack plugins:install @learnpack/${language}`, {
         silent: true,
       })
       if (result.code === 0) {
@@ -515,8 +516,7 @@ fs.mkdirSync(confPath.base)
     },
 
     save: () => {
-      // Console.debug("Saving configuration with: ", configObj)
-
+      Console.debug("Saving configuration with: ", configObj)
       // remove the duplicates form the actions array
       // configObj.config.actions = [...new Set(configObj.config.actions)];
       if (configObj.config) {
@@ -599,7 +599,7 @@ We strongly recommend using VSCode for a better learning experience.
     `
   }
 
- if (agent === "os") {
+  if (agent === "os") {
     return `
 # Steps to Change Agent to OS
 

package/src/managers/server/routes.ts

@@ -1,330 +1,327 @@
-import Console from "../../utils/console"
-import * as express from "express"
-import * as fs from "fs"
-import * as bodyParser from "body-parser"
-import socket from "../socket"
-import queue from "../../utils/fileQueue"
-// import gitpod from '../gitpod'
-import { detect, filterFiles } from "../config/exercise"
-import { IFile } from "../../models/file"
-import { IConfigObj, TEntries } from "../../models/config"
-import { IConfigManager } from "../../models/config-manager"
-import { IExercise } from "../../models/exercise-obj"
-import SessionManager from "../../managers/session"
-import TelemetryManager from "../telemetry"
-import { eventManager } from "../../utils/osOperations"
-
-const withHandler =
-  (func: (req: express.Request, res: express.Response) => void) =>
-  (req: express.Request, res: express.Response) => {
-    try {
-      func(req, res)
-    } catch (error) {
-      Console.debug(error)
-      const _err = {
-        message: (error as TypeError).message || "There has been an error",
-        status: (error as any).status || 500,
-        type: (error as any).type || null,
-      }
-      Console.error(_err.message)
-
-      // send rep to the server
-      res.status(_err.status)
-      res.json(_err)
-    }
-  }
-
-export default async function (
-  app: express.Application,
-  configObject: IConfigObj,
-  configManager: IConfigManager
-) {
-  const { config, exercises } = configObject
-  const session = await SessionManager.get(configManager?.get())
-
-  const dispatcher = queue.dispatcher({
-    create: true,
-    path: `${config?.dirPath}/vscode_queue.json`,
-  })
-  app.get(
-    "/config",
-    withHandler((_: express.Request, res: express.Response) => {
-      res.json(configObject)
-    })
-  )
-
-  // Added this line to parse the json body
-
-  const jsonBodyParser = bodyParser.json()
-  // Trying to log in from frontend
-  app.post(
-    "/login",
-    jsonBodyParser,
-    withHandler(async (req: express.Request, res: express.Response) => {
-      const email = req.body.email
-      const password = req.body.password
-
-      SessionManager.destroy()
-      const payload = await SessionManager.loginWeb(email, password)
-
-      res.json(payload)
-    })
-  )
-  app.post(
-    "/set-rigobot-token",
-    jsonBodyParser,
-    withHandler(async (req: express.Request, res: express.Response) => {
-      const token = req.body.token
-      // Ensure token is provided in the request body
-      if (!token) {
-        return res.status(400).json({ error: "Token is required" })
-      }
-
-      try {
-        const tokenSaved = await SessionManager.setRigoToken(token)
-        // Check if the token was saved successfully
-        if (tokenSaved) {
-          res.json({ status: "ok" })
-        } else {
-          res.status(500).json({ error: "Failed to save the token" })
-        }
-      } catch {
-        // Handle any unexpected errors during the process
-        res.status(500).json({ error: "Internal server error" })
-      }
-    })
-  )
-  app.get(
-    "/check/rigo/status",
-    withHandler(async (_: express.Request, res: express.Response) => {
-      const payload = await SessionManager.getPayload()
-
-      if (payload && payload.rigobot && payload.rigobot.key) {
-        res.json({ rigoToken: payload.rigobot.key })
-      } else {
-        res
-          .status(400)
-          .json({ details: `Rigobot token not found, please log in first!` })
-      }
-    })
-  )
-
-  // symbolic link to maintain path compatiblity
-  const fetchStaticAsset = withHandler((req, res) => {
-    const filePath = `${config?.dirPath}/assets/${req.params.filePath}`
-    if (!fs.existsSync(filePath))
-      throw new Error("File not found: " + filePath)
-    const content = fs.readFileSync(filePath)
-    res.write(content)
-    res.end()
-  })
-
-  app.get(
-    `${
-      config?.dirPath.indexOf("./") === 0 ?
-        config.dirPath.slice(1) :
-        config?.dirPath
-    }/assets/:filePath`,
-    fetchStaticAsset
-  )
-
-  app.get("/assets/:filePath", fetchStaticAsset)
-
-  app.get(
-    "/exercise",
-    withHandler((_: express.Request, res: express.Response) => {
-      res.json(exercises)
-    })
-  )
-
-  app.get(
-    "/exercise/:slug/readme",
-    withHandler(
-      (
-        { params: { slug }, query: { lang } }: express.Request,
-        res: express.Response
-      ) => {
-        const exercise: IExercise = configManager.getExercise(slug)
-
-        if (exercise && exercise.getReadme) {
-          const readme = exercise.getReadme((lang as string) || null)
-          res.json(readme)
-        } else {
-          res.status(400)
-        }
-      }
-    )
-  )
-
-  app.get(
-    "/exercise/:slug/report",
-    withHandler(
-      ({ params: { slug } }: express.Request, res: express.Response) => {
-        const exercise = configManager.getExercise(slug)
-        if (exercise && exercise.getTestReport) {
-          const report = exercise.getTestReport()
-          res.json(JSON.stringify(report))
-        }
-      }
-    )
-  )
-
-  app.get(
-    "/exercise/:slug",
-    withHandler((req: express.Request, res: express.Response) => {
-      // no need to re-start exercise if it's already started
-      if (
-        configObject.currentExercise &&
-        req.params.slug === configObject.currentExercise
-      ) {
-        const exercise = configManager.getExercise(req.params.slug)
-        res.json(exercise)
-        if (exercise.position) {
-          TelemetryManager.registerStepEvent(
-            exercise.position,
-            "open_step",
-            {}
-          )
-        }
-
-        return
-      }
-
-      const exercise = configManager.startExercise(req.params.slug)
-      if (exercise.position) {
-        TelemetryManager.registerStepEvent(exercise.position, "open_step", {})
-      }
-
-      if (configObject.config?.editor.agent === "os") {
-        eventManager.enqueue(dispatcher.events.START_EXERCISE, exercise)
-      } else {
-        dispatcher.enqueue(dispatcher.events.START_EXERCISE, req.params.slug)
-      }
-
-      type TEntry = "python3" | "html" | "node" | "react" | "java";
-
-      const entries = new Set(
-        Object.keys(config?.entries!).map(
-          lang => config?.entries[lang as TEntry]
-        )
-      )
-
-      // if we are in incremental grading, the entry file can by dinamically detected
-      // based on the changes the student is making during the exercise
-      if (config?.grading === "incremental") {
-        const scanedFiles = fs.readdirSync("./")
-
-        // update the file hierarchy with updates
-        exercise.files = [
-          ...exercise.files.filter(f => f.name.includes("test.")),
-          ...filterFiles(scanedFiles),
-        ]
-        Console.debug(`Exercise updated files: `, exercise.files)
-      }
-
-      const detected = detect(
-        configObject,
-        exercise.files
-          .filter(fileName => entries.has(fileName.name))
-          .map(f => f.name || f) as string[]
-      )
-
-      // if a new language for the testing engine is detected, we replace it
-      // if not we leave it as it was before
-      if (config?.language && !["", "auto"].includes(config?.language)) {
-        Console.debug(
-          `Exercise language ignored, instead imported from configuration ${config?.language}`
-        )
-        exercise.language = detected?.language
-      } else if (
-        detected?.language &&
-        (!config?.language || config?.language === "auto")
-      ) {
-        Console.debug(
-          `Switching to ${detected.language} engine in this exercise`
-        )
-        exercise.language = detected.language
-      }
-
-      // WARNING: has to be the FULL PATH to the entry path
-      // We need to detect entry in both gradings: Incremental and Isolate
-      exercise.entry = detected?.entry
-      Console.debug(
-        `Exercise detected entry: ${detected?.entry} and language ${exercise.language}`
-      )
-
-      // exercises.graded and exercises.disableGrading deprecated.
-      if (
-        !exercise.graded ||
-        config?.disableGrading ||
-        config?.disabledActions?.includes("test")
-      ) {
-        socket.removeAllowed("test")
-      } else {
-        socket.addAllowed("test")
-      }
-
-      if (!exercise.entry || config?.disabledActions?.includes("build")) {
-        socket.removeAllowed("build")
-      } else {
-        socket.addAllowed("build")
-      }
-
-      if (
-        exercise.files.filter(
-          (f: IFile) =>
-            !f.name.toLowerCase().includes("readme.") &&
-            !f.name.toLowerCase().includes("test.")
-        ).length === 0 ||
-        config?.disabledActions?.includes("reset")
-      ) {
-        socket.removeAllowed("reset")
-      } else if (!config?.disabledActions?.includes("reset")) {
-        socket.addAllowed("reset")
-      }
-
-      socket.log("ready")
-      res.json(exercise)
-    })
-  )
-
-  app.get(
-    "/exercise/:slug/file/:fileName",
-    withHandler((req: express.Request, res: express.Response) => {
-      const exercise = configManager.getExercise(req.params.slug)
-      if (exercise && exercise.getFile) {
-        res.write(exercise.getFile(req.params.fileName))
-        res.end()
-      }
-    })
-  )
-
-  /*
-  app.post(
-    "/exercise/:slug/file/:fileName",
-    withHandler((req: express.Request, res: express.Response) => {
-      get tokens but also, add allowed action for 'generate'
-      use the sessionManager to keep compatibility with the cli login command.
-    })
-  );
-  */
-
-  const textBodyParser = bodyParser.text()
-  app.put(
-    "/exercise/:slug/file/:fileName",
-    textBodyParser,
-    withHandler((req: express.Request, res: express.Response) => {
-      const exercise = configManager.getExercise(req.params.slug)
-      if (exercise && exercise.saveFile) {
-        exercise.saveFile(req.params.fileName, req.body)
-        res.end()
-      }
-    })
-  )
-
-  if (config?.outputPath) {
-    app.use("/preview", express.static(config.outputPath))
-  }
-
-  app.use("/", express.static(`${config?.dirPath}/_app`))
-}
+import Console from "../../utils/console"
+import * as express from "express"
+import * as fs from "fs"
+import * as bodyParser from "body-parser"
+import socket from "../socket"
+import queue from "../../utils/fileQueue"
+// import gitpod from '../gitpod'
+import { detect, filterFiles } from "../config/exercise"
+import { IFile } from "../../models/file"
+import { IConfigObj, TEntries } from "../../models/config"
+import { IConfigManager } from "../../models/config-manager"
+import { IExercise } from "../../models/exercise-obj"
+import SessionManager from "../../managers/session"
+import TelemetryManager from "../telemetry"
+import { eventManager } from "../../utils/osOperations"
+
+const withHandler =
+  (func: (req: express.Request, res: express.Response) => void) =>
+  (req: express.Request, res: express.Response) => {
+    try {
+      func(req, res)
+    } catch (error) {
+      Console.debug(error)
+      const _err = {
+        message: (error as TypeError).message || "There has been an error",
+        status: (error as any).status || 500,
+        type: (error as any).type || null,
+      }
+      Console.error(_err.message)
+
+      // send rep to the server
+      res.status(_err.status)
+      res.json(_err)
+    }
+  }
+
+export default async function (
+  app: express.Application,
+  configObject: IConfigObj,
+  configManager: IConfigManager
+) {
+  const { config, exercises } = configObject
+  const session = await SessionManager.get(configManager?.get())
+
+  const dispatcher = queue.dispatcher({
+    create: true,
+    path: `${config?.dirPath}/vscode_queue.json`,
+  })
+  app.get(
+    "/config",
+    withHandler((_: express.Request, res: express.Response) => {
+      const confObject = configManager.get()
+      res.json(confObject)
+    })
+  )
+
+  // Added this line to parse the json body
+
+  const jsonBodyParser = bodyParser.json()
+  // Trying to log in from frontend
+  app.post(
+    "/login",
+    jsonBodyParser,
+    withHandler(async (req: express.Request, res: express.Response) => {
+      const email = req.body.email
+      const password = req.body.password
+
+      SessionManager.destroy()
+      const payload = await SessionManager.loginWeb(email, password)
+
+      res.json(payload)
+    })
+  )
+  app.post(
+    "/set-rigobot-token",
+    jsonBodyParser,
+    withHandler(async (req: express.Request, res: express.Response) => {
+      const token = req.body.token
+      // Ensure token is provided in the request body
+      if (!token) {
+        return res.status(400).json({ error: "Token is required" })
+      }
+
+      try {
+        const tokenSaved = await SessionManager.setRigoToken(token)
+        // Check if the token was saved successfully
+        if (tokenSaved) {
+          res.json({ status: "ok" })
+        } else {
+          res.status(500).json({ error: "Failed to save the token" })
+        }
+      } catch {
+        // Handle any unexpected errors during the process
+        res.status(500).json({ error: "Internal server error" })
+      }
+    })
+  )
+  app.get(
+    "/check/rigo/status",
+    withHandler(async (_: express.Request, res: express.Response) => {
+      const payload = await SessionManager.getPayload()
+
+      if (payload && payload.rigobot && payload.rigobot.key) {
+        res.json({ rigoToken: payload.rigobot.key })
+      } else {
+        res
+          .status(400)
+          .json({ details: `Rigobot token not found, please log in first!` })
+      }
+    })
+  )
+
+  // symbolic link to maintain path compatiblity
+  const fetchStaticAsset = withHandler((req, res) => {
+    const filePath = `${config?.dirPath}/assets/${req.params.filePath}`
+    if (!fs.existsSync(filePath)) 
+throw new Error("File not found: " + filePath)
+    const content = fs.readFileSync(filePath)
+    res.write(content)
+    res.end()
+  })
+
+  app.get(
+    `${
+      config?.dirPath.indexOf("./") === 0 ?
+        config.dirPath.slice(1) :
+        config?.dirPath
+    }/assets/:filePath`,
+    fetchStaticAsset
+  )
+
+  app.get("/assets/:filePath", fetchStaticAsset)
+
+  app.get(
+    "/exercise",
+    withHandler((_: express.Request, res: express.Response) => {
+      res.json(exercises)
+    })
+  )
+
+  app.get(
+    "/exercise/:slug/readme",
+    withHandler(
+      (
+        { params: { slug }, query: { lang } }: express.Request,
+        res: express.Response
+      ) => {
+        const exercise: IExercise = configManager.getExercise(slug)
+
+        if (exercise && exercise.getReadme) {
+          const readme = exercise.getReadme((lang as string) || null)
+          res.json(readme)
+        } else {
+          res.status(400)
+        }
+      }
+    )
+  )
+
+  app.get(
+    "/exercise/:slug/report",
+    withHandler(
+      ({ params: { slug } }: express.Request, res: express.Response) => {
+        const exercise = configManager.getExercise(slug)
+        if (exercise && exercise.getTestReport) {
+          const report = exercise.getTestReport()
+          res.json(JSON.stringify(report))
+        }
+      }
+    )
+  )
+
+  app.get(
+    "/exercise/:slug",
+    withHandler((req: express.Request, res: express.Response) => {
+      // no need to re-start exercise if it's already started
+      if (
+        configObject.currentExercise &&
+        req.params.slug === configObject.currentExercise
+      ) {
+        const exercise = configManager.getExercise(req.params.slug)
+        res.json(exercise)
+        if (exercise.position) {
+          TelemetryManager.registerStepEvent(exercise.position, "open_step", {})
+        }
+
+        return
+      }
+
+      const exercise = configManager.startExercise(req.params.slug)
+      if (exercise.position) {
+        TelemetryManager.registerStepEvent(exercise.position, "open_step", {})
+      }
+
+      if (configObject.config?.editor.agent === "os") {
+        eventManager.enqueue(dispatcher.events.START_EXERCISE, exercise)
+      } else {
+        dispatcher.enqueue(dispatcher.events.START_EXERCISE, req.params.slug)
+      }
+
+      type TEntry = "python3" | "html" | "node" | "react" | "java"
+
+      const entries = new Set(
+        Object.keys(config?.entries!).map(
+          lang => config?.entries[lang as TEntry]
+        )
+      )
+
+      // if we are in incremental grading, the entry file can by dinamically detected
+      // based on the changes the student is making during the exercise
+      if (config?.grading === "incremental") {
+        const scanedFiles = fs.readdirSync("./")
+
+        // update the file hierarchy with updates
+        exercise.files = [
+          ...exercise.files.filter(f => f.name.includes("test.")),
+          ...filterFiles(scanedFiles),
+        ]
+        Console.debug(`Exercise updated files: `, exercise.files)
+      }
+
+      const detected = detect(
+        configObject,
+        exercise.files
+          .filter(fileName => entries.has(fileName.name))
+          .map(f => f.name || f) as string[]
+      )
+
+      // if a new language for the testing engine is detected, we replace it
+      // if not we leave it as it was before
+      if (config?.language && !["", "auto"].includes(config?.language)) {
+        Console.debug(
+          `Exercise language ignored, instead imported from configuration ${config?.language}`
+        )
+        exercise.language = detected?.language
+      } else if (
+        detected?.language &&
+        (!config?.language || config?.language === "auto")
+      ) {
+        Console.debug(
+          `Switching to ${detected.language} engine in this exercise`
+        )
+        exercise.language = detected.language
+      }
+
+      // WARNING: has to be the FULL PATH to the entry path
+      // We need to detect entry in both gradings: Incremental and Isolate
+      exercise.entry = detected?.entry
+      Console.debug(
+        `Exercise detected entry: ${detected?.entry} and language ${exercise.language}`
+      )
+
+      // exercises.graded and exercises.disableGrading deprecated.
+      if (
+        !exercise.graded ||
+        config?.disableGrading ||
+        config?.disabledActions?.includes("test")
+      ) {
+        socket.removeAllowed("test")
+      } else {
+        socket.addAllowed("test")
+      }
+
+      if (!exercise.entry || config?.disabledActions?.includes("build")) {
+        socket.removeAllowed("build")
+      } else {
+        socket.addAllowed("build")
+      }
+
+      if (
+        exercise.files.filter(
+          (f: IFile) =>
+            !f.name.toLowerCase().includes("readme.") &&
+            !f.name.toLowerCase().includes("test.")
+        ).length === 0 ||
+        config?.disabledActions?.includes("reset")
+      ) {
+        socket.removeAllowed("reset")
+      } else if (!config?.disabledActions?.includes("reset")) {
+        socket.addAllowed("reset")
+      }
+
+      socket.log("ready")
+      res.json(exercise)
+    })
+  )
+
+  app.get(
+    "/exercise/:slug/file/:fileName",
+    withHandler((req: express.Request, res: express.Response) => {
+      const exercise = configManager.getExercise(req.params.slug)
+      if (exercise && exercise.getFile) {
+        res.write(exercise.getFile(req.params.fileName))
+        res.end()
+      }
+    })
+  )
+
+  /*
+  app.post(
+    "/exercise/:slug/file/:fileName",
+    withHandler((req: express.Request, res: express.Response) => {
+      get tokens but also, add allowed action for 'generate'
+      use the sessionManager to keep compatibility with the cli login command.
+    })
+  );
+  */
+
+  const textBodyParser = bodyParser.text()
+  app.put(
+    "/exercise/:slug/file/:fileName",
+    textBodyParser,
+    withHandler((req: express.Request, res: express.Response) => {
+      const exercise = configManager.getExercise(req.params.slug)
+      if (exercise && exercise.saveFile) {
+        exercise.saveFile(req.params.fileName, req.body)
+        res.end()
+      }
+    })
+  )
+
+  if (config?.outputPath) {
+    app.use("/preview", express.static(config.outputPath))
+  }
+
+  app.use("/", express.static(`${config?.dirPath}/_app`))
+}