Alter readiness check to use the is_ready API endpoint

src/contexts/workspaces-context/api.ts

@@ -316,6 +316,12 @@ export class WorkspacesAPI implements IWorkspacesAPI {
         await this.axios.delete(`/instances/${ sid }`)
     }
 
+    @APIRequest()
+    async getAppInstanceIsReady(sid: string, fetchOptions: AxiosRequestConfig={}): Promise<AppInstanceIsReadyResponse> {
+        const res = await this.axios.get<AppInstanceIsReadyResponse>(`/instances/${ sid }/is_ready/`);
+        return res.data;
+    }
+
     @APIRequest()
     async updateAppInstance(
         sid: string,
@@ -416,4 +422,4 @@ export class WorkspacesAPI implements IWorkspacesAPI {
         };
         return descriptor;
     };
-}
+}

src/contexts/workspaces-context/api.types.ts

@@ -139,13 +139,18 @@ export interface AppInstance {
     cpus: number
     gpus: number
     memory: string
+    is_ready: boolean
     url: string
     status: string
 }
 export interface AvailableAppsResponse {
     [appName: string]: AvailableApp
 }
 export type AppInstancesResponse = AppInstance[]
+export interface AppInstanceIsReadyResponse {
+    is_ready: boolean
+}
+
 export interface UpdateAppInstanceResponse {
     status: "success" | "error"
     message: string
@@ -227,4 +232,4 @@ export interface IWorkspacesAPI {
     updateAppInstance(sid: string, workspace: string, cpu: string, gpu: string, memory: string, fetchOptions?: AxiosRequestConfig): Promise<UpdateAppInstanceResponse>
     launchApp(appId: string, cpus: number, gpus: number, memory: string, fetchOptions?: AxiosRequestConfig): Promise<LaunchAppResponse>
     getAppReady(appUrl: string, fetchOptions?: AxiosRequestConfig): Promise<boolean>
-}
+}

src/views/splash-screen.js

@@ -15,7 +15,7 @@ export const SplashScreenView = withWorkspaceAuthentication((props) => {
     if(header !== null) header.style.visibility = "hidden";
     if(sidePanel !== null) sidePanel.style.visibility = "hidden";
     const { context } = useEnvironment();
-    const { appstoreContext } = useWorkspacesAPI()
+    const { api, appstoreContext } = useWorkspacesAPI()
     const [loading, setLoading] = useState(true);
     const [errorPresent, setErrorPresent] = useState(false);
 
@@ -32,15 +32,18 @@ export const SplashScreenView = withWorkspaceAuthentication((props) => {
         let shouldCancel = false;
         (async () => {
             try {
+                let parts = decoded_url.split('/');
+                let sid = (parts.length >= 2)?parts[parts.length - 2]:"";
+
                 await callWithRetry(async () => { 
-                    const res = await axios.get(decoded_url) 
-                    if (res.status === 200 && shouldCancel === false) {
+                    const res = await api.getAppInstanceIsReady(sid);
+                    if (res.is_ready == true && shouldCancel === false) {
                         setLoading(false)
                     } else {
-                        throw new Error("Could not ensure readiness of app URL")
+                        throw new Error("app not ready")
                     }
                 }, {
-                    failedCallback: () => {
+                    failedCallback: (e) => {
                         return shouldCancel
                     },
                     timeout: 240000,
@@ -88,4 +91,4 @@ export const SplashScreenView = withWorkspaceAuthentication((props) => {
         window.location = decoded_url;
     }
 
-})
+})