fix(chat): simplified error message coming from Cloudflare when using…

… a VPN
sourcegraph · Mar 5, 2025 · dae72ad · dae72ad
1 parent d1a5d47
commit dae72ad
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/vscode/src/completions/nodeClient.ts b/vscode/src/completions/nodeClient.ts
@@ -192,19 +192,29 @@ export class SourcegraphNodeCompletionsClient extends SourcegraphCompletionsClie
                         })
 
                         res.on('error', e => handleError(e))
-                        res.on('end', () =>
-                            handleError(
+                        res.on('end', () => {
+                            const errorOptions = {
+                                url: url.toString(),
+                                status: statusCode,
+                                statusText: res.statusMessage ?? '',
+                            }
+                            let outputMessage = errorMessage
+
+                            if (statusCode === 403 && res.headers.server === 'cloudflare') {
+                                outputMessage = `Cloudflare has blocked this request. 
+                                This may be due to using a VPN or other non-trusted network deemed dangerous.
+                                Please try again without using such an network.
+                                Cloudflare Ray ID: ${res.headers['cf-ray']}`
+                                errorOptions.url = 'Sourcegraph'
+                            }
+                            return handleError(
                                 new NetworkError(
-                                    {
-                                        url: url.toString(),
-                                        status: statusCode,
-                                        statusText: res.statusMessage ?? '',
-                                    },
-                                    errorMessage,
+                                    errorOptions,
+                                    outputMessage,
                                     getActiveTraceAndSpanId()?.traceId
                                 )
                             )
-                        )
+                        })
                         return
                     }