fix: local server start error should not change to started state (jan…

…hq#2052)
jesst3r · Feb 16, 2024 · 6590ee7 · 6590ee7
1 parent 7fb61bf
commit 6590ee7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/core/src/node/helper/resource.ts b/core/src/node/helper/resource.ts
@@ -6,7 +6,6 @@ export const getSystemResourceInfo = async (): Promise<SystemResourceInfo> => {
   const cpu = await physicalCpuCount()
   const message = `[NITRO]::CPU informations - ${cpu}`
   log(message)
-  logServer(message)
 
   return {
     numCpuPhysicalCore: cpu,

diff --git a/server/index.ts b/server/index.ts
@@ -45,7 +45,7 @@ export interface ServerConfig {
  * Function to start the server
  * @param configs - Server configurations
  */
-export const startServer = async (configs?: ServerConfig) => {
+export const startServer = async (configs?: ServerConfig): Promise<boolean> => {
   // Update server settings
   isVerbose = configs?.isVerboseEnabled ?? true
   hostSetting = configs?.host ?? JAN_API_HOST
@@ -123,10 +123,12 @@ export const startServer = async (configs?: ServerConfig) => {
             `Debug: JAN API listening at: http://${hostSetting}:${portSetting}`
           )
       })
+    return true
   } catch (e) {
     // Log any errors
     if (isVerbose) logServer(`Error: ${e}`)
   }
+  return false
 }
 
 /**

diff --git a/web/screens/LocalServer/index.tsx b/web/screens/LocalServer/index.tsx
@@ -122,20 +122,20 @@ const LocalServerScreen = () => {
               block
               themes={serverEnabled ? 'danger' : 'primary'}
               disabled={stateModel.loading || errorRangePort || !selectedModel}
-              onClick={() => {
+              onClick={async () => {
                 if (serverEnabled) {
                   window.core?.api?.stopServer()
                   setServerEnabled(false)
                   setLoadModelError(undefined)
                 } else {
                   startModel(String(selectedModel?.id))
-                  window.core?.api?.startServer({
+                  const isStarted = await window.core?.api?.startServer({
                     host,
                     port,
                     isCorsEnabled,
                     isVerboseEnabled,
                   })
-                  setServerEnabled(true)
+                  if (isStarted) setServerEnabled(true)
                   if (firstTimeVisitAPIServer) {
                     localStorage.setItem(FIRST_TIME_VISIT_API_SERVER, 'false')
                     setFirstTimeVisitAPIServer(false)