@learnpack/learnpack 5.0.9 → 5.0.11

package/src/managers/gitpod.ts

@@ -1,84 +1,84 @@
-import Console from '../utils/console'
-import * as shell from 'shelljs'
-import socket from './socket'
-import * as fs from 'fs'
-
-import {TFile, IGitpod} from '../models/gitpod-data'
-import {IConfigObj} from '../models/config'
-
-const Gitpod: IGitpod = {
-  socket: null,
-  config: null,
-  initialized: false,
-  hasGPCommand: false,
-  init: function (config?: IConfigObj) {
-    if (this.initialized) {
-      return
-    }
-
-    this.initialized = true
-
-    if (config) {
-      this.config = config
-    }
-
-    if (shell.exec('gp -h', {silent: true}).code === 0) {
-      this.hasGPCommand = true
-      if (config) {
-        config.address = shell
-        .exec('gp url', {silent: true})
-        .stdout.replace(/(\r\n|\n|\r)/gm, '')
-      }
-    } else {
-      Console.debug('Gitpod command line tool not found')
-    }
-  },
-  openFiles: async function (files: Array<TFile>) {
-    Console.debug('Attempting to open files in gitpod mode', files)
-    this.init() // initilize gitpod config
-
-    // gitpod will open files only on isolated mode
-    if (!this.config || this.config.config?.grading !== 'isolated') {
-      Console.debug(
-        'Files cannot be automatically opened because we are not on isolated grading (only for isolated)',
-      )
-      socket.log('ready', ['Ready to compile or test...'])
-      return true
-    }
-
-    if (this.hasGPCommand)
-      for (const f of files.reverse()) {
-        if (shell.exec(`gp open ${f}`).code > 0) {
-          Console.debug(`Error opening file ${f} on gitpod`)
-        }
-      }
-
-    socket.log('ready', ['Ready to compile or test...'])
-  },
-  setup(config?: IConfigObj) {
-    this.init(config) // initilize gitpod config
-    this.autosave('on')
-  },
-  autosave: async function (value = 'on') {
-    this.init() // initilize gitpod config
-
-    if (this.hasGPCommand) {
-      if (!fs.existsSync('./.theia'))
-        fs.mkdirSync('./.theia')
-      if (!fs.existsSync('./.theia/settings.json')) {
-        fs.writeFileSync(
-          './.theia/settings.json',
-          JSON.stringify(
-            {
-              'editor.autoSave': value,
-            },
-            null,
-            4,
-          ),
-        )
-      }
-    }
-  },
-}
-
-export default Gitpod
+import Console from '../utils/console'
+import * as shell from 'shelljs'
+import socket from './socket'
+import * as fs from 'fs'
+
+import {TFile, IGitpod} from '../models/gitpod-data'
+import {IConfigObj} from '../models/config'
+
+const Gitpod: IGitpod = {
+  socket: null,
+  config: null,
+  initialized: false,
+  hasGPCommand: false,
+  init: function (config?: IConfigObj) {
+    if (this.initialized) {
+      return
+    }
+
+    this.initialized = true
+
+    if (config) {
+      this.config = config
+    }
+
+    if (shell.exec('gp -h', {silent: true}).code === 0) {
+      this.hasGPCommand = true
+      if (config) {
+        config.address = shell
+        .exec('gp url', {silent: true})
+        .stdout.replace(/(\r\n|\n|\r)/gm, '')
+      }
+    } else {
+      Console.debug('Gitpod command line tool not found')
+    }
+  },
+  openFiles: async function (files: Array<TFile>) {
+    Console.debug('Attempting to open files in gitpod mode', files)
+    this.init() // initilize gitpod config
+
+    // gitpod will open files only on isolated mode
+    if (!this.config || this.config.config?.grading !== 'isolated') {
+      Console.debug(
+        'Files cannot be automatically opened because we are not on isolated grading (only for isolated)',
+      )
+      socket.log('ready', ['Ready to compile or test...'])
+      return true
+    }
+
+    if (this.hasGPCommand)
+      for (const f of files.reverse()) {
+        if (shell.exec(`gp open ${f}`).code > 0) {
+          Console.debug(`Error opening file ${f} on gitpod`)
+        }
+      }
+
+    socket.log('ready', ['Ready to compile or test...'])
+  },
+  setup(config?: IConfigObj) {
+    this.init(config) // initilize gitpod config
+    this.autosave('on')
+  },
+  autosave: async function (value = 'on') {
+    this.init() // initilize gitpod config
+
+    if (this.hasGPCommand) {
+      if (!fs.existsSync('./.theia'))
+        fs.mkdirSync('./.theia')
+      if (!fs.existsSync('./.theia/settings.json')) {
+        fs.writeFileSync(
+          './.theia/settings.json',
+          JSON.stringify(
+            {
+              'editor.autoSave': value,
+            },
+            null,
+            4,
+          ),
+        )
+      }
+    }
+  },
+}
+
+export default Gitpod

package/src/managers/server/index.ts

@@ -1,78 +1,78 @@
-import * as express from "express"
-// eslint-disable-next-line
-import * as cors from "cors";
-import * as http from "http"
-import Console from "../../utils/console"
-import addRoutes from "./routes"
-import cli from "cli-ux"
-import { IConfigObj } from "../../models/config"
-import { IConfigManager } from "../../models/config-manager"
-
-export let TEST_SERVER: http.Server
-
-export default async function (
-  configObj: IConfigObj,
-  configManager: IConfigManager,
-  isTestingEnvironment = false
-) {
-  const { config } = configObj
-  const app = express()
-  let server: any
-
-  if (isTestingEnvironment) {
-    if (TEST_SERVER === undefined) 
-TEST_SERVER = require("http").Server(app)
-    server = TEST_SERVER
-  } else 
-server = require("http").Server(app)
-
-  app.use(cors())
-
-  // app.use(function(req, res, next) {
-  //     res.header("Access-Control-Allow-Origin", "*")
-  //     res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept")
-  //     res.header("Access-Control-Allow-Methods", "GET,PUT")
-  //     next()
-  // })
-
-  // add all needed endpoints
-
-  await addRoutes(app, configObj, configManager)
-
-  server.listen(isTestingEnvironment ? 5000 : config?.port, function () {
-    if (!isTestingEnvironment) {
-      Console.success(
-        `Exercises are running 😃 Open your browser to start practicing!`
-      )
-      Console.success(`\n            Open the exercise on this link:`)
-      Console.log(`            ${config?.publicUrl}`)
-
-      if (config?.editor.mode === "preview") 
-cli.open(`${config.publicUrl}`)
-    }
-  })
-
-  const sockets: any = new Set()
-
-  server.on("connection", (socket: any) => {
-    sockets.add(socket)
-
-    server.once("close", () => {
-      sockets.delete(socket)
-    })
-  })
-
-  /**
-   * Forcefully terminates HTTP server.
-   */
-  server.terminate = (callback: void) => {
-    for (const socket of sockets) {
-      socket.destroy()
-      sockets.delete(socket)
-    }
-
-    server.close(callback)
-  }
-
-  return server
-}
+import * as express from "express"
+// eslint-disable-next-line
+import * as cors from "cors";
+import * as http from "http"
+import Console from "../../utils/console"
+import addRoutes from "./routes"
+import cli from "cli-ux"
+import { IConfigObj } from "../../models/config"
+import { IConfigManager } from "../../models/config-manager"
+
+export let TEST_SERVER: http.Server
+
+export default async function (
+  configObj: IConfigObj,
+  configManager: IConfigManager,
+  isTestingEnvironment = false
+) {
+  const { config } = configObj
+  const app = express()
+  let server: any
+
+  if (isTestingEnvironment) {
+    if (TEST_SERVER === undefined) 
+TEST_SERVER = require("http").Server(app)
+    server = TEST_SERVER
+  } else 
+server = require("http").Server(app)
+
+  app.use(cors())
+
+  // app.use(function(req, res, next) {
+  //     res.header("Access-Control-Allow-Origin", "*")
+  //     res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept")
+  //     res.header("Access-Control-Allow-Methods", "GET,PUT")
+  //     next()
+  // })
+
+  // add all needed endpoints
+
+  await addRoutes(app, configObj, configManager)
+
+  server.listen(isTestingEnvironment ? 5000 : config?.port, function () {
+    if (!isTestingEnvironment) {
+      Console.success(
+        `Exercises are running 😃 Open your browser to start practicing!`
+      )
+      Console.success(`\n            Open the exercise on this link:`)
+      Console.log(`            ${config?.publicUrl}`)
+
+      if (config?.editor.mode === "preview") 
+cli.open(`${config.publicUrl}`)
+    }
+  })
+
+  const sockets: any = new Set()
+
+  server.on("connection", (socket: any) => {
+    sockets.add(socket)
+
+    server.once("close", () => {
+      sockets.delete(socket)
+    })
+  })
+
+  /**
+   * Forcefully terminates HTTP server.
+   */
+  server.terminate = (callback: void) => {
+    for (const socket of sockets) {
+      socket.destroy()
+      sockets.delete(socket)
+    }
+
+    server.close(callback)
+  }
+
+  return server
+}

package/src/managers/session.ts

@@ -112,10 +112,11 @@ const Session: ISession = {
     })
 
     const data = await api.login(email, password)
+
     if (data) {
       Console.debug("Login successfull")
       // cli.log(data)
-      this.start({ token: data.token, payload: data })
+      await this.start({ token: data.token, payload: data })
       return data
     }
   },