Add retry on unavailable

Author: jeanp413

src/local-ssh/ipc/extensionServiceServer.ts

@@ -121,7 +121,7 @@ class ExtensionServiceImpl implements ExtensionServiceImplementation {
         } catch (e) {
             let code = Status.INTERNAL;
             if (e instanceof WrapError && typeof e.grpcCode === 'number') {
-                code = e.grpcCode
+                code = e.grpcCode;
             }
             const wrapErr = new WrapError('failed to get workspace auth info', e);
             this.logService.error(wrapErr);

src/publicApi.ts

@@ -208,15 +208,23 @@ export class GitpodPublicApi extends Disposable implements IGitpodAPI {
     }
 
     private async _wrapError<T>(callback: () => Promise<T>): Promise<T> {
-        try {
-            return await callback();
-        } catch (e) {
+        const maxRetries = 5;
+        let retries = 0;
+
+        const onError: (e: any) => Promise<T> = async (e) => {
             const err = ConnectError.from(e);
+            if (retries++ < maxRetries && (err.code === Code.Unavailable || err.code === Code.Aborted)) {
+                await timeout(1000);
+                return callback().catch(onError);
+            }
+
             // https://github.com/gitpod-io/gitpod/blob/d41a38ba83939856e5292e30912f52e749787db1/components/public-api-server/pkg/auth/middleware.go#L73
             // https://github.com/gitpod-io/gitpod/blob/d41a38ba83939856e5292e30912f52e749787db1/components/public-api-server/pkg/proxy/errors.go#L30
             // NOTE: WrapError will omit error's other properties
             throw new WrapError('Failed to call public API', err, 'PublicAPI:' + Code[err.code], err.code);
-        }
+        };
+
+        return callback().catch(onError);
     }
 
     private _workaroundGoAwayBug<T>(callback: () => Promise<T>): () => Promise<T> {

src/workspaceState.ts

@@ -20,7 +20,7 @@ export class WorkspaceState extends Disposable {
     readonly onWorkspaceStateChanged = this._onWorkspaceStateChanged.event;
 
     readonly onWorkspaceRunning = onceEvent(filterEvent(this.onWorkspaceStateChanged, () => this.isWorkspaceRunning));
-    readonly onWorkspaceWillStop = onceEvent(filterEvent(this.onWorkspaceStateChanged, () => this.isWorkspaceStopping));
+    readonly onWorkspaceWillStop = onceEvent(filterEvent(this.onWorkspaceStateChanged, () => this.isWorkspaceStopping || this.isWorkspaceStopped /* it's not guranteed to get stoppping state so check stopped too */));
     readonly onWorkspaceStopped = onceEvent(filterEvent(this.onWorkspaceStateChanged, () => this.isWorkspaceStopped));
 
     public get isWorkspaceStopping() {