#79 upgrade to wails v2

.gitignore

@@ -6,4 +6,7 @@ rcc*
 
 # new v2
 build
-.data
+.data
+
+# ide
+.idea

DEVELOPMENT.md

@@ -23,6 +23,7 @@ In a separate terminal you will need to start the frontend:
 
 ```zsh
 $ cd frontend
+$ npm install
 $ npm run dev
 ```
 

frontend/.nvmrc

@@ -0,0 +1 @@
+v20.11.1

frontend/package.json.md5

@@ -1 +1 @@
-6a960a181aa10c64fb4a7c4e5ce62dc0
+bc54f44fd436dcc1b0e8f281025b3b74

frontend/src/main.js

@@ -1,21 +1,24 @@
 import "./monaco";
-import * as Wails from '@wailsapp/runtime';
 import App from './views/App.svelte';
 
-let app;
 
-Wails.Init(() => {
-    Wails.Events.Once("wombat:init", ({build_mode}) => {
-        if (build_mode === "prod") window.addEventListener('contextmenu', e => e.preventDefault());
-    });
+const app = new App({
+    target: document.body,
+});
 
-    // TODO: v2
-    // Hack until we have wails v2 and can use CSS variables again
-    window.isWin = window.navigator.platform.startsWith("Win")
-
-    app = new App({
-        target: document.body,
-    });
-}); 
+// TODO: viqueen - figure out how to handle this
+// Wails.Init(() => {
+//     Wails.Events.Once("wombat:init", ({build_mode}) => {
+//         if (build_mode === "prod") window.addEventListener('contextmenu', e => e.preventDefault());
+//     });
+//
+//     // TODO: v2
+//     // Hack until we have wails v2 and can use CSS variables again
+//     window.isWin = window.navigator.platform.startsWith("Win")
+//
+//     app = new App({
+//         target: document.body,
+//     });
+// });
 
 export default app;

frontend/src/views/Errors.svelte

@@ -3,9 +3,10 @@
 
   let errors = [];
 
-  wails.Events.On("wombat:error", err => {
-    errors = [...errors, err];
-  })
+  // TODO: viqueen - figure out how to handle this
+  // wails.Events.On("wombat:error", err => {
+  //   errors = [...errors, err];
+  // })
 
   const onOKClicked = () => {
     errors.shift();

frontend/src/views/Header.svelte

@@ -5,16 +5,17 @@
   import WorkspaceOptions from "./WorkspaceOptions.svelte";
   import WorkspaceSwitcher from "./WorkspaceSwitcher.svelte";
 
+  // TODO: viqueen - figure out how to handle this
   let addr = "";
-  wails.Events.On("wombat:client_connected", data => addr = data);
+  // wails.Events.On("wombat:client_connected", data => addr = data);
 
   let status = "";
-  wails.Events.On("wombat:client_state_changed", data => status = data.toLowerCase());
+  // wails.Events.On("wombat:client_state_changed", data => status = data.toLowerCase());
 
-  wails.Events.On("wombat:client_connect_started", data => {
-    addr = data;
-    status = "connecting";
-  })
+  // wails.Events.On("wombat:client_connect_started", data => {
+  //   addr = data;
+  //   status = "connecting";
+  // })
 
   const { open } = getContext('modal');
   const onWorkspaceClicked = () => open(WorkspaceOptions);
@@ -94,10 +95,10 @@
   <div class="hitem">
     <Button
       text="Workspace"
-      bgColor={isWin ? "#5e81ac" : "var(--accent-color3)"}
+      bgColor="var(--accent-color3)"
       on:click={onWorkspaceClicked}
     /><Button
-      bgColor={isWin ? "#81a1c1" : "var(--accent-color2)"}
+      bgColor="var(--accent-color2)"
       on:click={onNewWorkspaceClicked}
       style="height:40px;min-width:auto;" >
       <svg width="14" height="14">

frontend/src/views/InputPane.svelte

@@ -32,33 +32,35 @@
     return tick();
   }
 
-  wails.Events.On("wombat:method_input_changed", async (data, initState, m) => {
-    await reset();
-    if (!data) {
-      return
-    }
-    methodInput = data.message;
-    if (initState) {
-      state = JSON.parse(initState);
-      metadata = m;
-    } else {
-      const rawState = await backend.api.GetRawMessageState(data.full_name);
-      if (rawState) {
-        state = JSON.parse(rawState);
-      }
-    }
-  });
-
-  wails.Events.On("wombat:client_connect_started", async (addr) => {
-    await reset(true)
-    const m = await backend.api.GetMetadata(addr);
-    if (m) {
-      metadata = m;
-    }
-  })
+  // TODO: viqueen - figure out how to handle this
+  // wails.Events.On("wombat:method_input_changed", async (data, initState, m) => {
+  //   await reset();
+  //   if (!data) {
+  //     return
+  //   }
+  //   methodInput = data.message;
+  //   if (initState) {
+  //     state = JSON.parse(initState);
+  //     metadata = m;
+  //   } else {
+  //     const rawState = await backend.api.GetRawMessageState(data.full_name);
+  //     if (rawState) {
+  //       state = JSON.parse(rawState);
+  //     }
+  //   }
+  // });
+  //
+  // wails.Events.On("wombat:client_connect_started", async (addr) => {
+  //   await reset(true)
+  //   const m = await backend.api.GetMetadata(addr);
+  //   if (m) {
+  //     metadata = m;
+  //   }
+  // })
 
   const onSend = ({ detail: { method } }) => {
-    backend.api.Send(method, JSON.stringify(state), metadata)
+    // TODO: viqueen - figure out how to handle this
+    // backend.api.Send(method, JSON.stringify(state), metadata)
     // console.log(method, state, metadata);
   }
 

frontend/src/views/MethodInput.svelte

@@ -49,7 +49,7 @@
   <div class="edit">
     <Button 
       text="Edit"
-      color={isWin ? "#81a1c1" : "var(--accent-color2)"}
+      color="var(--accent-color2)"
       bgColor="transparent"
       style="min-width:auto"
       on:click={onEdit}

frontend/src/views/MethodSelect.svelte

@@ -21,21 +21,22 @@
     }))
   }
 
-  wails.Events.On("wombat:services_select_changed", async (data = [], methodFullName, initState, metadata) => {
-    reset()
-    servicesSelect = data;
-    serviceOptions = data.map((s, i) => ({value: i, label: s.full_name}))
-    if (methodFullName) {
-      holdon = true;
-      serviceSelected = serviceOptions.find(it => methodFullName.startsWith(`/${it.label}/`))
-      initServiceSelection(serviceOptions.indexOf(serviceSelected))
-      methodSelected = methodOptions.find(it => it.value == methodFullName)
-      await backend.api.SelectMethod(methodSelected.value, initState ?? "{}", metadata ?? []);
-      holdon = false;
-    } else if (serviceOptions.length > 0) {
-      serviceSelected = serviceOptions[0]
-    }
-  });
+  // TODO: viqueen - figure out how to handle this
+  // wails.Events.On("wombat:services_select_changed", async (data = [], methodFullName, initState, metadata) => {
+  //   reset()
+  //   servicesSelect = data;
+  //   serviceOptions = data.map((s, i) => ({value: i, label: s.full_name}))
+  //   if (methodFullName) {
+  //     holdon = true;
+  //     serviceSelected = serviceOptions.find(it => methodFullName.startsWith(`/${it.label}/`))
+  //     initServiceSelection(serviceOptions.indexOf(serviceSelected))
+  //     methodSelected = methodOptions.find(it => it.value == methodFullName)
+  //     await backend.api.SelectMethod(methodSelected.value, initState ?? "{}", metadata ?? []);
+  //     holdon = false;
+  //   } else if (serviceOptions.length > 0) {
+  //     serviceSelected = serviceOptions[0]
+  //   }
+  // });
 
   const serviceSelectionChanged = ({ detail: { value } }) => {
     if (holdon) return
@@ -46,8 +47,9 @@
   }
 
   const methodSelectionChanged = ({ detail: { value } }) => {
-    if (holdon) return
-    backend.api.SelectMethod(value, "", []);
+    if (holdon) return;
+    // TODO: viqueen - figure out how to handle this
+    // backend.api.SelectMethod(value, "", []);
   }
 
   const dispatch = createEventDispatcher();
@@ -84,7 +86,7 @@
   <div class="spacer" />
   <Button 
     text="Send"
-    color={isWin ? "#88c0d0" : "var(--primary-color)"}
+    color="var(--primary-color)"
     on:click={onSend}
   />
 </div>

frontend/src/views/OutputPane.svelte

@@ -21,19 +21,20 @@
 
   const respModel = monaco.editor.createModel("", "javascript");
 
-  wails.Events.On("wombat:rpc_started", data => {
-    headers = {};
-    trailers = {};
-    rpc = {};
-    stats = [];
-    inflight = true;
-    client_stream = data.client_stream;
-    server_stream = data.server_stream;
-    outCount = 0;
-    inCount = 0;
-
-    respModel.setValue("");
-  })
+  // TODO: viqueen - figure out how to handle this
+  // wails.Events.On("wombat:rpc_started", data => {
+  //   headers = {};
+  //   trailers = {};
+  //   rpc = {};
+  //   stats = [];
+  //   inflight = true;
+  //   client_stream = data.client_stream;
+  //   server_stream = data.server_stream;
+  //   outCount = 0;
+  //   inCount = 0;
+  //
+  //   respModel.setValue("");
+  // })
 
   const append = (payload = "", type = "") => {
     let isEmpty = false;
@@ -68,38 +69,40 @@
     respModel.deltaDecorations([], decors);
   }
 
-  wails.Events.On("wombat:in_header_received", data => headers = data)
-  wails.Events.On("wombat:in_trailer_received", data => trailers = data)
-
-  wails.Events.On("wombat:out_payload_received", data => {
-    append(data, "out-payload");
-  })
-
-  wails.Events.On("wombat:in_payload_received", data => {
-    append(data, "in-payload");
-  })
-
-  wails.Events.On("wombat:error_received", data => {
-    append(data, "error");
-  })
-
-  wails.Events.On("wombat:rpc_ended", data => {
-    rpc = data;
-    inflight = false;
-  })
+  // TODO: viqueen - figure out how to handle this
+  // wails.Events.On("wombat:in_header_received", data => headers = data)
+  // wails.Events.On("wombat:in_trailer_received", data => trailers = data)
+  //
+  // wails.Events.On("wombat:out_payload_received", data => {
+  //   append(data, "out-payload");
+  // })
+  //
+  // wails.Events.On("wombat:in_payload_received", data => {
+  //   append(data, "in-payload");
+  // })
+  //
+  // wails.Events.On("wombat:error_received", data => {
+  //   append(data, "error");
+  // })
+  //
+  // wails.Events.On("wombat:rpc_ended", data => {
+  //   rpc = data;
+  //   inflight = false;
+  // })
 
   const addStat = (type, data) => {
     data.type = type;
     stats = [...stats, data];
   }
-  wails.Events.On("wombat:stat_begin", data => addStat("begin", data));
-  wails.Events.On("wombat:stat_out_header", data => addStat("outHeader", data));
-  wails.Events.On("wombat:stat_out_payload", data => { addStat("outPayload", data); outCount = outCount + 1; });
-  wails.Events.On("wombat:stat_out_trailer", data => addStat("outTrailer", data));
-  wails.Events.On("wombat:stat_in_header", data => addStat("inHeader", data));
-  wails.Events.On("wombat:stat_in_payload", data => { addStat("inPayload", data); inCount = inCount + 1; });
-  wails.Events.On("wombat:stat_in_trailer", data => addStat("inTrailer", data));
-  wails.Events.On("wombat:stat_end", data => addStat("end", data));
+  // TODO: viqueen - figure out how to handle this
+  // wails.Events.On("wombat:stat_begin", data => addStat("begin", data));
+  // wails.Events.On("wombat:stat_out_header", data => addStat("outHeader", data));
+  // wails.Events.On("wombat:stat_out_payload", data => { addStat("outPayload", data); outCount = outCount + 1; });
+  // wails.Events.On("wombat:stat_out_trailer", data => addStat("outTrailer", data));
+  // wails.Events.On("wombat:stat_in_header", data => addStat("inHeader", data));
+  // wails.Events.On("wombat:stat_in_payload", data => { addStat("inPayload", data); inCount = inCount + 1; });
+  // wails.Events.On("wombat:stat_in_trailer", data => addStat("inTrailer", data));
+  // wails.Events.On("wombat:stat_end", data => addStat("end", data));
 
 </script>
 

frontend/src/views/Updater.svelte

@@ -6,12 +6,13 @@
   let newVersion = "";
   let releaseURL = "";
 
-  wails.Events.On("wombat:update_available", ({old_version, new_version, url}) => {
-    oldVersion = old_version;
-    newVersion = new_version;
-    releaseURL = url;
-    visible = true;
-  });
+  // TODO: viqueen - figure out how to handle this
+  // wails.Events.On("wombat:update_available", ({old_version, new_version, url}) => {
+  //   oldVersion = old_version;
+  //   newVersion = new_version;
+  //   releaseURL = url;
+  //   visible = true;
+  // });
 
   const onCloseClicked = () => visible = false;
   const onDownloadClicked = async () => {