💄

Author: jeanp413

src/common/utils.ts

@@ -115,22 +115,20 @@ export function getServiceURL(gitpodHost: string): string {
 }
 
 export class WrapError extends Error {
-	code: string | undefined;
 	constructor(
 		msg: string,
-		err: any,
-		code?: string,
-		readonly grpcCode?: number
+		readonly cause: any,
+		readonly code?: string
 	) {
-		const isErr = err instanceof Error;
-		super(isErr ? `${msg}: ${err.message}` : msg);
+		const isErr = cause instanceof Error;
+		super(isErr ? `${msg}: ${cause.message}` : msg);
 		if (isErr) {
-			this.name = err.name;
-			this.stack = this.stack + '\n\n' + err.stack;
+			this.name = cause.name;
+			this.stack = this.stack + '\n\n' + cause.stack;
 		}
-		this.code = code ? code : err.code;
+		this.code ??= cause.code;
 	}
 }
 
 const ProductionUntrustedSegmentKey = 'untrusted-dummy-key';
-export const isBuiltFromGHA = process.env.SEGMENT_KEY === ProductionUntrustedSegmentKey;
+export const isBuiltFromGHA = process.env.SEGMENT_KEY === ProductionUntrustedSegmentKey;

src/local-ssh/ipc/extensionServiceServer.ts

@@ -5,7 +5,6 @@
 
 import { ExtensionServiceDefinition, ExtensionServiceImplementation, GetWorkspaceAuthInfoRequest, GetWorkspaceAuthInfoResponse, PingRequest, SendErrorReportRequest, SendLocalSSHUserFlowStatusRequest } from '../../proto/typescript/ipc/v1/ipc';
 import { Disposable } from '../../common/dispose';
-export { ExtensionServiceDefinition } from '../../proto/typescript/ipc/v1/ipc';
 import { withServerApi } from '../../internalApi';
 import { Workspace, WorkspaceInstanceStatus_Phase } from '@gitpod/public-api/lib/gitpod/experimental/v1';
 import { WorkspaceInfo, WorkspaceInstancePhase } from '@gitpod/gitpod-protocol';
@@ -26,6 +25,7 @@ import * as ssh2 from 'ssh2';
 import { ParsedKey } from 'ssh2-streams';
 import { isPortUsed } from '../../common/ports';
 import { WrapError } from '../../common/utils';
+import { ConnectError } from '@bufbuild/connect';
 
 const phaseMap: Record<WorkspaceInstanceStatus_Phase, WorkspaceInstancePhase | undefined> = {
     [WorkspaceInstanceStatus_Phase.CREATING]: 'pending',
@@ -124,8 +124,8 @@ class ExtensionServiceImpl implements ExtensionServiceImplementation {
             };
         } catch (e) {
             let code = Status.INTERNAL;
-            if (e instanceof WrapError && typeof e.grpcCode === 'number') {
-                code = e.grpcCode;
+            if (e instanceof WrapError && e.cause instanceof ConnectError) {
+                code = e.cause.code as unknown as Status;
             }
             const wrapErr = new WrapError('failed to get workspace auth info', e);
             this.logService.error(wrapErr);

src/local-ssh/proxy.ts

@@ -9,6 +9,7 @@ import { importKey, importKeyBytes } from '@microsoft/dev-tunnels-ssh-keys';
 import { ExtensionServiceDefinition, GetWorkspaceAuthInfoResponse } from '../proto/typescript/ipc/v1/ipc';
 import { Client, ClientError, Status, createChannel, createClient } from 'nice-grpc';
 import { retry, timeout } from '../common/async';
+import { WrapError } from '../common/utils';
 import { WebSocket } from 'ws';
 import * as stream from 'stream';
 import { ILogService } from '../services/logService';

src/publicApi.ts

@@ -228,7 +228,7 @@ export class GitpodPublicApi extends Disposable implements IGitpodAPI {
             // 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);
+            throw new WrapError('Failed to call public API', err, 'PublicAPI:' + Code[err.code]);
         };
 
         return callback().catch(onError);