Merge pull request #324 from hwong0305/refactorStatus

Combining API

Author: songz

src/api/index.ts

@@ -2,15 +2,13 @@ import express from 'express'
 import adminRouter from './admin'
 import mappingRouter from './mapping'
 import sshKeyRouter from './sshKeys'
-import statusRouter from './serverStatus'
 import { getAvailableDomains } from '../lib/data'
 
 const apiRouter = express.Router()
 
 apiRouter.use('/admin', adminRouter.app)
 apiRouter.use('/mappings', mappingRouter)
 apiRouter.use('/sshKeys', sshKeyRouter)
-apiRouter.use('/statuses', statusRouter)
 
 apiRouter.get('/availableDomains', (req, res) => {
   const domains = getAvailableDomains()

src/api/mapping.ts

@@ -86,9 +86,30 @@ mappingRouter.post('/', async (req, res) => {
   })
 })
 
-mappingRouter.get('/', (req, res) => {
+mappingRouter.get('/', async (req, res) => {
   const domains = getMappings()
-  res.json(domains)
+  if (isProduction()) {
+    const data = await exec('su - myproxy -c "pm2 jlist"')
+
+    const statusData = JSON.parse(data.stdout).reduce(
+      (statusObj, el) => ({
+        ...statusObj,
+        [el.name]: el.pm2_env.status
+      }),
+      {}
+    )
+    const fullDomainStatusMapping = domains.map(el => {
+      if (statusData[el.fullDomain]) {
+        return { ...el, status: statusData[el.fullDomain] }
+      } else {
+        return { ...el, status: 'not started' }
+      }
+    })
+
+    res.json(fullDomainStatusMapping)
+  } else {
+    res.json(domains.map(el => ({ ...el, status: 'not started' })))
+  }
 })
 
 mappingRouter.delete('/:id', async (req, res) => {

src/api/serverStatus.ts

@@ -101,19 +101,19 @@ class MappingItem {
   }
 }
 
-Promise.all([
-  fetch('/api/mappings').then(r => r.json()),
-  fetch('/api/statuses').then(r => r.json())
-]).then(([mappings, statuses]: [Mapping[], Status[]]) => {
-  domainList.innerHTML = ''
-  mappings
-    .reverse()
-    .filter(e => e.domain && e.port && e.id && e.gitLink && e.fullDomain)
-    .forEach(e => {
-      e.status = statuses[e.fullDomain] || 'not started'
-      new MappingItem(e)
-    })
-})
+fetch('/api/mappings')
+  .then(r => r.json())
+  .then(mappings => {
+    domainList.innerHTML = ''
+    mappings
+      .reverse()
+      .filter(
+        e => e.domain && e.port && e.id && e.gitLink && e.fullDomain && e.status
+      )
+      .forEach(e => {
+        new MappingItem(e)
+      })
+  })
 
 create.onclick = (): void => {
   const subDomain = helper.getElement('.subDomain') as HTMLInputElement

src/public/client.ts

@@ -147,4 +147,21 @@ describe('/api', () => {
     await mappingAdapter(`/${match1.id}`, 'DELETE')
     await mappingAdapter(`/${match2.id}`, 'DELETE')
   })
+
+  it('checks status is returned when querying mappings', async () => {
+    const subDomain = uuidv4()
+    const domain = 'VinDiesel'
+    const port = '3533'
+    await mappingAdapter('/', 'POST', {
+      domain,
+      subDomain,
+      port
+    })
+
+    const getResponse = await mappingAdapter('/', 'GET')
+    const getMappings = await getResponse.json()
+
+    expect(getMappings[0].status).toEqual('not started')
+    await mappingAdapter(`/${getMappings[0].id}`, 'DELETE')
+  })
 })