Schema/refresh phase2

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-media-annotator",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "author": {
     "name": "Kitware, Inc.",
     "email": "viame-web@kitware.com"
@@ -16,7 +16,7 @@
     "build:cli": "tsc -p tsconfig.cli.json",
     "lint": "vue-cli-service lint src/ viame-web-common/ platform/",
     "lint:templates": "vtc --workspace . --srcDir src/",
-    "test": "vue-cli-service test:unit src/ viame-web-common/",
+    "test": "vue-cli-service test:unit src/ viame-web-common/ platform/",
     "serialize": "ts-node --project tsconfig.cli.json platform/desktop/backend/serializers/cli.ts"
   },
   "resolutions": {
@@ -55,13 +55,17 @@
   },
   "devDependencies": {
     "@types/axios": "^0.14.0",
+    "@types/body-parser": "^1.19.0",
+    "@types/cors": "^2.8.9",
     "@types/csv-parse": "^1.2.2",
     "@types/d3": "^5.7.2",
     "@types/electron-devtools-installer": "^2.2.0",
+    "@types/express": "^4.17.9",
     "@types/geojson": "^7946.0.7",
     "@types/jest": "^25.2.3",
     "@types/lodash": "^4.14.151",
     "@types/mime-types": "^2.1.0",
+    "@types/mock-fs": "^4.13.0",
     "@types/node": "^14.0.5",
     "@types/pump": "^1.1.0",
     "@types/range-parser": "^1.2.3",
@@ -81,18 +85,22 @@
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.0.1",
     "babel-register": "^6.26.0",
+    "body-parser": "^1.19.0",
+    "cors": "^2.8.5",
     "csv-parse": "^4.13.1",
     "electron": "^10.1.3",
     "electron-devtools-installer": "^3.1.1",
     "eslint": "^6.7.2",
     "eslint-import-resolver-typescript": "^2.2.0",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-vue": "^6.2.2",
+    "express": "^4.17.1",
     "fs-extra": "^9.0.1",
     "git-describe": "^4.0.4",
     "jest": "^26.0.1",
     "jest-transform-stub": "^2.0.0",
     "mime-types": "^2.1.27",
+    "mock-fs": "^4.13.0",
     "pump": "^3.0.0",
     "range-parser": "^1.2.1",
     "request": "^2.88.2",
@@ -121,6 +129,7 @@
     "moduleNameMapper": {
       "^vue-media-annotator/(.*)$": "<rootDir>/src/$1",
       "^viame-web-common/(.*)$": "<rootDir>/viame-web-common/$1",
+      "^platform/(.*)$": "<rootDir>/platform/$1",
       "\\.css$": "<rootDir>/test/stub.js"
     },
     "transform": {

client/platform/desktop/App.vue

@@ -7,7 +7,7 @@
 <script lang="ts">
 import { defineComponent } from '@vue/composition-api';
 import { provideApi } from 'viame-web-common/apispec';
-import statefulApi from './store';
+import statefulApi from './frontend/store';
 
 export default defineComponent({
   name: 'App',

client/platform/desktop/backend/ipcService.ts

@@ -1,57 +1,60 @@
 import OS from 'os';
-
+import http from 'http';
 import { ipcMain } from 'electron';
-import { DesktopJobUpdate, RunPipeline, Settings } from '../constants';
 
-import server from './server';
-import linux from './platforms/linux';
-import win32 from './platforms/windows';
-import common from './platforms/common';
+import { DesktopJobUpdate, RunPipeline, Settings } from 'platform/desktop/constants';
 
-export default function register() {
-  ipcMain.handle('info', () => {
-    const addr = server.address();
-    return addr;
-  });
+import linux from './native/linux';
+import win32 from './native/windows';
+import common from './native/common';
+import settings from './state/settings';
+import { listen } from './server';
+
+// defaults to linux if win32 doesn't exist
+const currentPlatform = OS.platform() === 'win32' ? win32 : linux;
+if (OS.platform() === 'win32') {
+  win32.initialize();
+}
 
+export default function register() {
   /**
    * Platform-agnostic methods
    */
-
-  ipcMain.handle('get-pipeline-list', async (_, settings: Settings) => {
-    const ret = await common.getPipelineList(settings);
+  ipcMain.handle('server-info', async () => {
+    const server = await new Promise<http.Server>((resolve) => listen(resolve));
+    return server.address();
+  });
+  ipcMain.handle('get-pipeline-list', async () => {
+    const ret = await common.getPipelineList(settings.get());
     return ret;
   });
   ipcMain.handle('open-link-in-browser', (_, url: string) => {
     common.openLink(url);
   });
+  ipcMain.on('update-settings', async (_, s: Settings) => {
+    settings.set(s);
+  });
 
   /**
    * Platform-dependent methods
    */
 
-  // defaults to linux if win32 doesn't exist
-  const currentPlatform = OS.platform() === 'win32' ? win32 : linux;
-  if (OS.platform() === 'win32') {
-    win32.initialize();
-  }
   ipcMain.handle('nvidia-smi', async () => {
     const ret = await currentPlatform.nvidiaSmi();
     return ret;
   });
-
   ipcMain.handle('default-settings', async () => {
     const defaults = currentPlatform.DefaultSettings;
     return defaults;
   });
-  ipcMain.handle('validate-settings', async (_, settings: Settings) => {
-    const ret = await currentPlatform.validateViamePath(settings);
+  ipcMain.handle('validate-settings', async (_, s: Settings) => {
+    const ret = await currentPlatform.validateViamePath(s);
     return ret;
   });
   ipcMain.handle('run-pipeline', async (event, args: RunPipeline) => {
     const updater = (update: DesktopJobUpdate) => {
       event.sender.send('job-update', update);
     };
-    return currentPlatform.runPipeline(args, updater);
+    return currentPlatform.runPipeline(settings.get(), args, updater);
   });
 }