serve/simple: Use message passing instead of HTTP

Implements a frameworks to support asynchronous requests using messages.

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

Author: tylersmalley

package.json

@@ -112,11 +112,6 @@
     ],
     "menus": {
       "view/title": [
-        {
-          "command": "tailscale.refreshServe",
-          "group": "overflow",
-          "when": "view == tailscale-serve-view"
-        },
         {
           "command": "tailscale.resetServe",
           "group": "overflow",
@@ -145,11 +140,6 @@
         "title": "Reset",
         "category": "Tailscale"
       },
-      {
-        "command": "tailscale.refreshServe",
-        "title": "Refresh",
-        "category": "Tailscale"
-      },
       {
         "command": "tailscale.openFunnelPanel",
         "title": "Open Funnel Panel",

src/extension.ts

@@ -45,19 +45,10 @@ export async function activate(context: vscode.ExtensionContext) {
     tailscaleInstance
   );
 
-  context.subscriptions.push(
-    vscode.commands.registerCommand('tailscale.refreshServe', () => {
-      Logger.info('called tailscale.refreshServe', 'command');
-      servePanelProvider.refreshState();
-    })
-  );
-
   context.subscriptions.push(
     vscode.commands.registerCommand('tailscale.resetServe', async () => {
       Logger.info('called tailscale.resetServe', 'command');
       await tailscaleInstance.serveDelete();
-      servePanelProvider.refreshState();
-
       vscode.window.showInformationMessage('Serve configuration reset');
     })
   );

src/serve-panel-provider.ts

@@ -18,12 +18,6 @@ export class ServePanelProvider implements vscode.WebviewViewProvider {
     this._view.webview.postMessage(message);
   }
 
-  public async refreshState() {
-    this.postMessage({
-      type: 'refreshState',
-    });
-  }
-
   resolveWebviewView(webviewView: vscode.WebviewView) {
     this._view = webviewView;
     webviewView.webview.html = this._getHtmlForWebview(webviewView.webview);
@@ -33,69 +27,35 @@ export class ServePanelProvider implements vscode.WebviewViewProvider {
     };
 
     webviewView.webview.onDidReceiveMessage(async (m: Message) => {
-      switch (m.type) {
-        case 'refreshState': {
-          Logger.info('Called refreshState', 'serve-panel');
-          await this.refreshState();
-          break;
-        }
-
-        case 'deleteServe': {
-          Logger.info('Called deleteServe', 'serve-panel');
-          try {
-            await this.ts.serveDelete(m.params);
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          } catch (e: any) {
-            vscode.window.showErrorMessage('Unable to delete serve', e.message);
-          }
-
-          await this.refreshState();
-          break;
-        }
-
-        case 'addServe': {
-          Logger.info('Called addServe', 'serve-panel');
-          await this.ts.serveAdd(m.params);
-          await this.refreshState();
-          break;
-        }
-
-        case 'setFunnel': {
-          Logger.info('Called setFunnel', 'serve-panel');
-          try {
-            await this.ts.setFunnel(parseInt(m.params.port), m.params.allow);
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          } catch (e: any) {
-            vscode.window.showErrorMessage('Unable to toggle funnel', e.message);
-          }
-
-          await this.refreshState();
-          break;
-        }
-
-        case 'resetServe': {
-          Logger.info('Called resetServe', 'serve-panel');
-          try {
-            await this.ts.serveDelete();
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          } catch (e: any) {
-            vscode.window.showErrorMessage('Unable to delete serve', e.message);
-          }
-
-          await this.refreshState();
+      const { type } = m;
+      Logger.info(`called ${type}`, 'serve-panel');
+
+      let response;
+
+      switch (type) {
+        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,
+          });
           break;
         }
 
         case 'writeToClipboard': {
-          Logger.info('Called writeToClipboard', 'serve-panel');
-          vscode.env.clipboard.writeText(m.params.text);
+          vscode.env.clipboard.writeText(m.data.text);
           vscode.window.showInformationMessage('Copied to clipboard');
           break;
         }
 
         case 'openLink': {
-          Logger.info(`Called openLink: ${m.params.url}`, 'serve-panel');
-          vscode.env.openExternal(vscode.Uri.parse(m.params.url));
+          vscode.env.openExternal(vscode.Uri.parse(m.data.url));
           break;
         }
 

src/tailscale/cli.ts

@@ -221,83 +221,49 @@ export class Tailscale {
   }
 
   async serveStatus(): Promise<ServeStatus> {
-    if (!this.url) {
-      throw new Error('uninitialized client');
-    }
-    try {
-      const resp = await fetch(`${this.url}/serve`, {
-        headers: {
-          Authorization: 'Basic ' + this.authkey,
-        },
-      });
-
-      const status = (await resp.json()) as ServeStatus;
-      return status;
-    } catch (e) {
-      Logger.error(`error calling status: ${JSON.stringify(e, null, 2)}`);
-      throw e;
-    }
+    return (await this.performFetch('/serve')) as ServeStatus;
   }
 
   async serveAdd(p: ServeParams) {
-    if (!this.url) {
-      throw new Error('uninitialized client');
-    }
-    try {
-      const resp = await fetch(`${this.url}/serve`, {
-        method: 'POST',
-        headers: {
-          Authorization: 'Basic ' + this.authkey,
-        },
-        body: JSON.stringify(p),
-      });
-      if (!resp.ok) {
-        throw new Error('/serve failed');
-      }
-    } catch (e) {
-      Logger.info(`error adding serve: ${e}`);
-      throw e;
-    }
+    await this.performFetch('/serve', 'POST', p);
   }
 
   async serveDelete(p?: ServeParams) {
-    if (!this.url) {
-      throw new Error('uninitialized client');
-    }
-    try {
-      const resp = await fetch(`${this.url}/serve`, {
-        method: 'DELETE',
-        headers: {
-          Authorization: 'Basic ' + this.authkey,
-        },
-        body: JSON.stringify(p),
-      });
-      if (!resp.ok) {
-        throw new Error('/serve failed');
-      }
-    } catch (e) {
-      Logger.info(`error deleting serve: ${e}`);
-      throw e;
-    }
+    await this.performFetch('/serve', 'DELETE', p);
   }
 
   async setFunnel(port: number, on: boolean) {
+    await this.performFetch('/funnel', 'POST', { port, on });
+  }
+
+  async performFetch(endpoint: string, method = 'GET', body?: unknown) {
     if (!this.url) {
       throw new Error('uninitialized client');
     }
+
     try {
-      const resp = await fetch(`${this.url}/funnel`, {
-        method: 'POST',
+      const resp = await fetch(`${this.url}${endpoint}`, {
+        method,
         headers: {
           Authorization: 'Basic ' + this.authkey,
         },
-        body: JSON.stringify({ port, on }),
+        body: body !== undefined && typeof body === 'object' ? JSON.stringify(body) : undefined,
       });
+
       if (!resp.ok) {
-        throw new Error('/serve failed');
+        throw new Error(`${endpoint} failed`);
       }
+
+      const text = await resp.text();
+
+      try {
+        return JSON.parse(text);
+        // eslint-disable-next-line no-empty
+      } catch {}
+
+      return text;
     } catch (e) {
-      Logger.info(`error deleting serve: ${e}`);
+      Logger.info(`error in ${method} ${endpoint}: ${e}`);
       throw e;
     }
   }

src/types.ts

@@ -80,73 +80,68 @@ export interface Version {
  * Messages sent from the webview to the extension.
  */
 
-interface RefreshState {
-  type: 'refreshState';
+interface RequestBase {
+  id?: number;
+  type: string;
+  data?: unknown;
 }
 
-interface DeleteServe {
-  type: 'deleteServe';
-  params: ServeParams;
+interface RelayRequestBase extends RequestBase {
+  type: 'relayRequest';
+  endpoint: string;
+  method: string;
 }
 
-interface AddServe {
-  type: 'addServe';
-  params: ServeParams;
+interface RelayServeRequest extends RelayRequestBase {
+  endpoint: '/serve';
+  method: 'GET' | 'POST' | 'DELETE';
 }
 
-interface ResetServe {
-  type: 'resetServe';
-}
-
-interface SetFunnel {
-  type: 'setFunnel';
-  params: {
-    port: string;
-    allow: boolean;
-  };
-}
-
-interface WriteToClipboard {
+interface WriteToClipboard extends RequestBase {
   type: 'writeToClipboard';
-  params: {
+  data: {
     text: string;
   };
 }
 
-interface OpenLink {
+interface OpenLink extends RequestBase {
   type: 'openLink';
-  params: {
+  data: {
     url: string;
   };
 }
 
-export type Message =
-  | RefreshState
-  | DeleteServe
-  | AddServe
-  | ResetServe
-  | SetFunnel
-  | WriteToClipboard
-  | OpenLink
-  | SudoPrompt;
-
 interface SudoPrompt {
   type: 'sudoPrompt';
   operation: 'add' | 'delete';
   params?: ServeParams;
 }
 
+export type Message = RelayServeRequest | WriteToClipboard | OpenLink | SudoPrompt;
+export type MessageWithId = Omit<Message, 'id'> & { id: number };
+
 /**
  * Messages sent from the extension to the webview.
  */
 
-interface UpdateState {
-  type: 'updateState';
-  state: ServeConfig;
+interface ResponseBase {
+  id?: number;
+  type: string;
+  data?: unknown;
+  error?: string;
+}
+
+interface RelayResponseBase extends Omit<RelayRequestBase, 'type'>, Omit<ResponseBase, 'type'> {
+  id?: number;
+  endpoint: string;
+  method: string;
+  body?: unknown;
+  error?: string;
 }
 
-interface RefreshState {
-  type: 'refreshState';
+export interface RelayServeResponse extends RelayResponseBase {
+  type: 'relayResponse';
+  body?: ServeStatus;
 }
 
 interface WebpackOk {
@@ -161,7 +156,8 @@ interface WebpackStillOk {
   type: 'webpackStillOk';
 }
 
-export type WebviewData = UpdateState | RefreshState | WebpackOk | WebpackInvalid | WebpackStillOk;
+export type Responses = RelayServeResponse;
+export type WebviewData = Responses | WebpackOk | WebpackInvalid | WebpackStillOk;
 export type WebviewEvent = Event & { data: WebviewData };
 
 export interface NewPortNotification {

src/vscode-api.ts

@@ -11,7 +11,7 @@ class VSCodeWrapper {
   public writeToClipboard(text: string): void {
     this.postMessage({
       type: 'writeToClipboard',
-      params: {
+      data: {
         text,
       },
     });
@@ -20,7 +20,7 @@ class VSCodeWrapper {
   public openLink(url: string): void {
     this.postMessage({
       type: 'openLink',
-      params: {
+      data: {
         url,
       },
     });