feat(serve): Added '/container-status' endpoint for checking if a container is running/stopped

beneboy · beneboy · commit 8dfeed6a25fc · 2019-02-11T18:53:25.000Z
diff --git a/src/Environment.ts b/src/Environment.ts
@@ -19,6 +19,10 @@ export enum Platform {
   UNIX, WIN, DOCKER
 }
 
+export enum ContainerStatus {
+  RUNNING, STOPPED
+}
+
 const DOCKER_DEFAULT_COMMAND = 'sh'
 const DOCKER_CONTAINER_ID_SHORT_LENGTH = 12
 
diff --git a/src/serve.ts b/src/serve.ts
@@ -5,7 +5,7 @@ import express from 'express'
 
 const jwt = require('express-jwt')
 
-import Environment, { Platform, SessionParameters } from './Environment'
+import Environment, { ContainerStatus, Platform, SessionParameters } from './Environment'
 
 const app = express()
 const expressWs = require('express-ws')(app)
@@ -303,10 +303,32 @@ expressWs.app.post('/stop', async (req: express.Request, res: express.Response)
       error: `Container ${containerId} was not stopped.`
     })
   }
-
 })
 
-// TODO: session (container) info querying (i.e. is container still running)
+expressWs.app.post('/container-status', async (req: express.Request, res: express.Response) => {
+  // req: some JSON -> with container ID that will stop the container
+  if (!doRequestValidation(req, res, ['environmentId', 'containerId'])) {
+    return res.end()
+  }
+
+  const jwtData = getJwtData(req, res, req.body.containerId)
+
+  if (jwtData === null) {
+    return res.end()
+  }
+
+  const env = new Environment(req.body.environmentId)
+  const sessionParameters = new SessionParameters()
+  sessionParameters.platform = Platform.DOCKER
+
+  const containerId = req.body.containerId
+
+  return res.json(
+      {
+        status: ContainerStatus[await env.containerIsRunning(containerId) ? ContainerStatus.RUNNING : ContainerStatus.STOPPED]
+      }
+  ).end()
+})
 
 // Error handling middleware
 app.use((error: Error, req: express.Request, res: express.Response, next: any) => {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ export enum Platform {`
`19`	`19`	`UNIX, WIN, DOCKER`
`20`	`20`	`}`
`21`	`21`
	`22`	`+export enum ContainerStatus {`
	`23`	`+ RUNNING, STOPPED`
	`24`	`+}`
	`25`	`+`
`22`	`26`	`const DOCKER_DEFAULT_COMMAND = 'sh'`
`23`	`27`	`const DOCKER_CONTAINER_ID_SHORT_LENGTH = 12`
`24`	`28`