Changes to bring back fileserver (#106)

* Changes to bring back fileserver * Bumped version to 0.3.3
ir-engine · Jun 22, 2023 · b32ff55 · b32ff55
1 parent 0238061
commit b32ff55
Show file tree

Hide file tree

Showing 11 changed files with 157 additions and 5 deletions.
diff --git a/assets/scripts/configure-file-server.sh b/assets/scripts/configure-file-server.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+#===========
+# Parameters
+#===========
+
+while getopts f: flag; do
+    case "${flag}" in
+    f) ENGINE_FOLDER=${OPTARG} ;;
+    *)
+        echo "Invalid arguments passed" >&2
+        exit 1
+        ;;
+    esac
+done
+
+if [[ -z $ENGINE_FOLDER ]]; then
+    echo "Missing arguments"
+    exit 1
+fi
+
+#=========================
+# Verify Local File Server
+#=========================
+
+if lsof -Pi :8642 -sTCP:LISTEN -t >/dev/null; then
+    echo "file server is configured"
+    lsof -Pi :8642 -sTCP:LISTEN
+else
+    echo "file server is not configured"
+
+    cd "$ENGINE_FOLDER"/packages/server
+
+    npm run serve-local-files
+fi
+
+exit 0
diff --git a/release/app/package.json b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "etherealengine-control-center",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "A desktop app for managing Ethereal Engine cluster.",
   "license": "MIT",
   "author": {

diff --git a/src/constants/Channels.ts b/src/constants/Channels.ts
@@ -27,6 +27,7 @@ const Channels = {
     PushBranch: 'PushBranch'
   },
   Engine: {
+    StartFileServer: 'StartFileServer',
     EnsureAdminAccess: 'EnsureAdminAccess',
     EnsureAdminAccessError: 'EnsureAdminAccessError',
     EnsureAdminAccessResponse: 'EnsureAdminAccessResponse'

diff --git a/src/main/Clusters/MicroK8s/MicroK8s.appstatus.ts b/src/main/Clusters/MicroK8s/MicroK8s.appstatus.ts
@@ -41,7 +41,6 @@ export const MicroK8sAppsStatus = (sudoPassword?: string): AppModel[] => {
     getAppModel('docker', 'Docker', 'docker --version;'),
     getAppModel('dockercompose', 'Docker Compose', 'docker-compose --version;'),
     getAppModel('mysql', 'MySql', 'docker top etherealengine_minikube_db;'),
-    getAppModel('minio', 'MinIO', 'docker top etherealengine_minio_s3;'),
     getAppModel('kubectl', 'kubectl', 'kubectl version --client --output=yaml;'),
     getAppModel('helm', 'Helm', 'helm version;'),
     getAppModel(
@@ -61,6 +60,20 @@ export const MicroK8sAppsStatus = (sudoPassword?: string): AppModel[] => {
     ),
     getAppModel('redis', 'Redis', microk8sDependantScript(`helm status local-redis;`, microk8sPrefix)),
     getAppModel('agones', 'Agones', microk8sDependantScript(`helm status agones;`, microk8sPrefix)),
+    getAppModel(
+      'fileserver',
+      'Local File Server',
+      `
+    if lsof -Pi :8642 -sTCP:LISTEN -t >/dev/null ; then
+      echo 'File server configured:';
+      lsof -Pi :8642 -sTCP:LISTEN;
+      ${type !== 'Windows_NT' ? 'exit 0;' : ''}
+    else
+      echo 'File server not configured' >&2;
+      ${type !== 'Windows_NT' ? 'exit 1;' : ''}
+    fi
+    `
+    ),
     getAppModel(
       'hostfile',
       'Hostfile',

diff --git a/src/main/Clusters/MicroK8s/MicroK8s.class.ts b/src/main/Clusters/MicroK8s/MicroK8s.class.ts
@@ -14,6 +14,7 @@ import { ClusterModel } from '../../../models/Cluster'
 import { LogModel } from '../../../models/Log'
 import Utilities from '../../handlers/Utilities/Utilities.class'
 import { executeWebViewJS } from '../../managers/BrowserManager'
+import { startFileServer } from '../../managers/FileServerManager'
 import { assetsPath, ensureConfigsFolder, ensureWindowsToWSLPath, scriptsPath } from '../../managers/PathManager'
 import { execStream, execStreamScriptFile } from '../../managers/ShellManager'
 import { ensureConfigs } from '../../managers/YamlManager'
@@ -156,6 +157,8 @@ class MicroK8s {
       if (code !== 0) {
         throw `Failed with error code ${code}.`
       }
+
+      await startFileServer(window, cluster)
     } catch (err) {
       log.error('Error in configureCluster MicroK8s.', err)
       window.webContents.send(Channels.Utilities.Log, cluster.id, {

diff --git a/src/main/Clusters/Minikube/Minikube.appstatus.ts b/src/main/Clusters/Minikube/Minikube.appstatus.ts
@@ -21,7 +21,6 @@ export const MinikubeAppsStatus: AppModel[] = [
   getAppModel('docker', 'Docker', 'docker --version;'),
   getAppModel('dockercompose', 'Docker Compose', 'docker-compose --version;'),
   getAppModel('mysql', 'MySql', 'docker top etherealengine_minikube_db;'),
-  getAppModel('minio', 'MinIO', 'docker top etherealengine_minio_s3;'),
   getAppModel('virtualbox', 'VirtualBox', 'vboxmanage --version;'),
   getAppModel('kubectl', 'kubectl', 'kubectl version --client --output=yaml;'),
   getAppModel('helm', 'Helm', 'helm version;'),
@@ -35,6 +34,20 @@ export const MinikubeAppsStatus: AppModel[] = [
   ),
   getAppModel('redis', 'Redis', minikubeDependantScript('helm status local-redis;')),
   getAppModel('agones', 'Agones', minikubeDependantScript('helm status agones;')),
+  getAppModel(
+    'fileserver',
+    'Local File Server',
+    `
+  if lsof -Pi :8642 -sTCP:LISTEN -t >/dev/null ; then
+    echo 'File server configured:'
+    lsof -Pi :8642 -sTCP:LISTEN
+    exit 0;
+  else
+    echo 'File server not configured' >&2;
+    exit 1;
+  fi
+  `
+  ),
   getAppModel(
     'hostfile',
     'Hostfile',

diff --git a/src/main/Clusters/Minikube/Minikube.class.ts b/src/main/Clusters/Minikube/Minikube.class.ts
@@ -8,6 +8,7 @@ import Storage from '../../../constants/Storage'
 import { DeploymentAppModel } from '../../../models/AppStatus'
 import { ClusterModel } from '../../../models/Cluster'
 import { LogModel } from '../../../models/Log'
+import { startFileServer } from '../../managers/FileServerManager'
 import { assetsPath, ensureConfigsFolder, isValidUrl, scriptsPath } from '../../managers/PathManager'
 import { execStream, execStreamScriptFile } from '../../managers/ShellManager'
 import { ensureConfigs } from '../../managers/YamlManager'
@@ -111,6 +112,8 @@ class Minikube {
       if (code !== 0) {
         throw `Failed with error code ${code}.`
       }
+
+      await startFileServer(window, cluster)
     } catch (err) {
       log.error('Error in configureCluster Minikube.', err)
       window.webContents.send(Channels.Utilities.Log, cluster.id, {

diff --git a/src/main/handlers/Engine/Engine.class.ts b/src/main/handlers/Engine/Engine.class.ts
@@ -8,6 +8,7 @@ import Storage from '../../../constants/Storage'
 import { ClusterModel } from '../../../models/Cluster'
 import { LogModel } from '../../../models/Log'
 import { executeJS } from '../../managers/BrowserManager'
+import { startFileServer } from '../../managers/FileServerManager'
 import { exec } from '../../managers/ShellManager'
 
 class Engine {
@@ -118,6 +119,18 @@ class Engine {
       )
     }
   }
+
+  static startFileServer = async (parentWindow: BrowserWindow, cluster: ClusterModel) => {
+    try {
+      await startFileServer(parentWindow, cluster)
+    } catch (err) {
+      parentWindow.webContents.send(Channels.Utilities.Log, cluster.id, {
+        category: 'file server',
+        message: JSON.stringify(err)
+      } as LogModel)
+      throw err
+    }
+  }
 }
 
 export default Engine
diff --git a/src/main/handlers/Engine/Engine.handler.ts b/src/main/handlers/Engine/Engine.handler.ts
@@ -10,6 +10,9 @@ class EngineHandler implements IBaseHandler {
   configure = (window: BrowserWindow) => {
     ipcMain.handle(Channels.Engine.EnsureAdminAccess, async (_event: IpcMainInvokeEvent, cluster: ClusterModel) => {
       await Engine.ensureAdminAccess(window, cluster)
+    }),
+    ipcMain.handle(Channels.Engine.StartFileServer, async (_event: IpcMainInvokeEvent, cluster: ClusterModel) => {
+      await Engine.startFileServer(window, cluster)
     })
   }
 }

diff --git a/src/main/managers/FileServerManager.ts b/src/main/managers/FileServerManager.ts
@@ -0,0 +1,56 @@
+import { app, BrowserWindow } from 'electron'
+import path from 'path'
+import { kill } from 'ps-node'
+
+import Channels from '../../constants/Channels'
+import Storage from '../../constants/Storage'
+import { ClusterModel } from '../../models/Cluster'
+import { LogModel } from '../../models/Log'
+import { scriptsPath } from './PathManager'
+import { execStreamScriptFile, getProcessList } from './ShellManager'
+
+export const startFileServer = async (window: BrowserWindow, cluster: ClusterModel) => {
+  const existingServer = await getProcessList('http-server')
+  if (existingServer.length > 0) {
+    window.webContents.send(Channels.Utilities.Log, cluster.id, {
+      category: 'file server',
+      message: `File server already running. http-server count: ${existingServer.length}`
+    } as LogModel)
+    return
+  }
+
+  // Below block of code is to ensure file server is stopped when app is closed.
+  app.on('before-quit', async (e) => {
+    try {
+      e.preventDefault()
+
+      const existingServers = await getProcessList('http-server')
+      existingServers.forEach((httpProcess) => {
+        kill(httpProcess.pid)
+      })
+    } catch {}
+
+    app.quit()
+    process.exit()
+  })
+
+  const scriptsFolder = scriptsPath()
+  const fileServerScript = path.join(scriptsFolder, 'configure-file-server.sh')
+
+  const onFileServerStd = (data: any) => {
+    try {
+      window.webContents.send(Channels.Utilities.Log, cluster.id, {
+        category: 'file server',
+        message: data
+      } as LogModel)
+    } catch {}
+  }
+
+  execStreamScriptFile(
+    fileServerScript,
+    [`-f "${cluster.configs[Storage.ENGINE_PATH]}"`],
+    onFileServerStd,
+    onFileServerStd
+  )
+}
+
diff --git a/src/renderer/components/StatusView.tsx b/src/renderer/components/StatusView.tsx
@@ -1,3 +1,4 @@
+import { delay } from 'common/UtilitiesManager'
 import Channels from 'constants/Channels'
 import Storage from 'constants/Storage'
 import { AppModel, AppStatus } from 'models/AppStatus'
@@ -143,7 +144,7 @@ export const StatusViewItem = ({ status, titleVariant, verticalAlignTop, titleSx
 
       {status.detail && <InfoTooltip sx={titleSx} message={status.detail} />}
 
-      {status.status === AppStatus.NotConfigured && (status.id === 'mysql' || status.id === 'minio') && (
+      {status.status === AppStatus.NotConfigured && (status.id === 'mysql' || status.id === 'fileserver') && (
         <>
           {isFixing && <CircularProgress size={20} sx={{ ml: 2 }} />}
           {isFixing === false && (
@@ -174,7 +175,7 @@ const onFix = async (appStatus: AppModel, setFixing: React.Dispatch<React.SetSta
 
   const clonedCluster = cloneCluster(selectedCluster)
 
-  if (appStatus.id === 'mysql' || appStatus.id === 'minio') {
+  if (appStatus.id === 'mysql') {
     await processOnFix(appStatus, clonedCluster, async () => {
       const command = `cd '${clonedCluster.configs[Storage.ENGINE_PATH]}' && npm run dev-docker`
 
@@ -187,6 +188,13 @@ const onFix = async (appStatus: AppModel, setFixing: React.Dispatch<React.SetSta
         throw output.error
       }
     })
+  } else if (appStatus.id === 'fileserver') {
+    await processOnFix(appStatus, clonedCluster, async () => {
+      await window.electronAPI.invoke(Channels.Engine.StartFileServer, clonedCluster)
+
+      // Delay to wait for fileserver to start
+      await delay(4000)
+    })
   }
 
   setFixing(false)