Updates

Signed-off-by: Tyler Smalley <tyler@tailscale.com>

Author: tylersmalley

src/serve-panel-provider.ts

@@ -36,15 +36,20 @@ export class ServePanelProvider implements vscode.WebviewViewProvider {
         case 'relayRequest': {
           const { id, endpoint, method } = m;
           Logger.info(`${id}, ${endpoint}, ${method}`, 'serve-panel');
-          response = await this.ts.performFetch(endpoint, method, m.data);
-          Logger.info(`response: ${JSON.stringify(response)}`, 'serve-panel');
-          this.postMessage({
-            id,
-            endpoint,
-            method,
-            type: 'relayResponse',
-            data: response,
-          });
+          try {
+            response = await this.ts.performFetch(endpoint, method, m.data);
+            Logger.info(`response: ${JSON.stringify(response)}`, 'serve-panel');
+            this.postMessage({
+              id,
+              endpoint,
+              method,
+              type: 'relayResponse',
+              data: response,
+            });
+          } catch (e) {
+            vscode.window.showErrorMessage(`${e}`);
+          }
+
           break;
         }
 

src/tailscale/cli.ts

@@ -251,6 +251,7 @@ export class Tailscale {
       });
 
       if (!resp.ok) {
+        Logger.error(`${endpoint} failed: ${JSON.stringify(resp)}`);
         throw new Error(`${endpoint} failed`);
       }
 
@@ -259,7 +260,9 @@ export class Tailscale {
       try {
         return JSON.parse(text);
         // eslint-disable-next-line no-empty
-      } catch {}
+      } catch {
+        Logger.error(`failed to parse json: ${text}`);
+      }
 
       return text;
     } catch (e) {

src/types.ts

@@ -112,6 +112,7 @@ interface OpenLink extends RequestBase {
 }
 
 interface SudoPrompt {
+  id?: number;
   type: 'sudoPrompt';
   operation: 'add' | 'delete';
   params?: ServeParams;

src/webviews/api.ts

@@ -8,37 +8,52 @@ const messagePromises = new Map<
   { resolve: (value: Responses) => void; reject: (reason?: any) => void }
 >();
 
-export function postMessageWithResponse(message: Message) {
-  return new Promise((resolve, reject) => {
+class MessageError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'MessageError';
+  }
+}
+
+/**
+ * Sends a message to the VSCode extension and returns a promise that resolves with the response.
+ * @param message The message to send.
+ * @returns A promise that resolves with the response from the extension.
+ */
+export function postMessageWithResponse(message: Message): Promise<Responses> {
+  return new Promise<Responses>((resolve, reject) => {
     message.id = currentMessageId++;
     messagePromises.set(message.id, { resolve, reject });
 
     vsCodeAPI.postMessage(message);
   });
 }
 
+/**
+ * Handles incoming messages from the VSCode extension.
+ * @param event The message event.
+ */
 window.addEventListener('message', (event) => {
-  const message: Responses = event.data; // The JSON data that the extension sent
-  const { id, type, data, error } = message;
+  const message = event.data ?? {};
 
   console.log('message', message);
 
-  if (!id || !type) {
+  if (!message.id || !message.type) {
     return;
   }
 
-  const promiseMethods = messagePromises.get(id);
+  const promiseMethods = messagePromises.get(message.id);
 
   if (!promiseMethods) {
     return;
   }
 
   const { resolve, reject } = promiseMethods;
-  messagePromises.delete(id);
+  messagePromises.delete(message.id);
 
-  if (error) {
-    reject(new Error(error));
+  if (message.error) {
+    reject(new MessageError(`Message error: ${message.error}`));
   } else {
-    resolve({ type, data } as Responses);
+    resolve(message as Responses);
   }
 });

src/webviews/serve-panel/simple-view.tsx

@@ -8,8 +8,8 @@ import { KB_FUNNEL_USE_CASES } from '../../utils/url';
 import { useServe, useServeMutation } from './swr';
 import { Tooltip } from './components/tooltip';
 import { errorForType } from '../../tailscale/error';
-import { serveReset, serveStatus } from '../tsrelay';
-import { ServeParams, WithErrors } from '../../types';
+import { serveReset } from '../tsrelay';
+import { ServeParams } from '../../types';
 
 export const SimpleView = () => {
   const { data, mutate, isLoading } = useServe();
@@ -228,7 +228,7 @@ export const SimpleView = () => {
       funnel: true,
     };
 
-    const resp = await serveReset();
+    const resp = await trigger(params);
     if (resp.Errors?.length && resp.Errors[0].Type === 'REQUIRES_SUDO') {
       vsCodeAPI.postMessage({
         type: 'sudoPrompt',

src/webviews/tsrelay.ts

@@ -29,5 +29,5 @@ export async function serveUpdate(arg?: ServeParams) {
     data: arg,
   })) as RelayServeResponse;
 
-  return reponse.data as unknown;
+  return reponse.data as WithErrors;
 }