Switch to websockets

angular.json

@@ -18,7 +18,6 @@
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "aot": true,
-            "allowedCommonJsDependencies": ["angular-svg-round-progressbar", "lodash", "ajv"],
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",

helper/config.js

@@ -0,0 +1,56 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+
+const Store = require('electron-store');
+const Ajv = require('ajv');
+const configSchema = require('./config.schema');
+
+let store;
+const ajv = new Ajv({ allErrors: true });
+const validate = ajv.compile(configSchema);
+
+function readConfig(window) {
+  try {
+    if (!store) {
+      store = new Store();
+    }
+    const config = store.get('config');
+    window.webContents.send('configRead', config);
+  } catch {
+    window.webContents.send('configError', "Can't read config file.");
+  }
+}
+
+function saveConfig(window, config) {
+  if (validate(config)) {
+    try {
+      store.set('config', config);
+      window.webContents.send('configSaved', config);
+    } catch {
+      window.webContents.send('configError', "Can't save config file.");
+    }
+  } else {
+    window.webContents.send('configSaveFail', getConfigErrors());
+  }
+}
+
+function checkConfig(window, config) {
+  if (!validate(config)) {
+    window.webContents.send('configFail', getConfigErrors());
+  } else {
+    window.webContents.send('configPass');
+  }
+}
+
+function getConfigErrors() {
+  const errors = [];
+  validate.errors?.forEach(error => {
+    if (error.keyword === 'type') {
+      errors.push(`${error.dataPath} ${error.message}`);
+    } else {
+      errors.push(`${error.dataPath === '' ? '.' : error.dataPath} ${error.message}`);
+    }
+  });
+  return errors;
+}
+
+module.exports = { readConfig, saveConfig, checkConfig };

src/app/config/config.schema.ts → helper/config.schema.js

@@ -1,4 +1,4 @@
-export const configSchema = {
+const configSchema = {
   definitions: {},
   $schema: 'http://json-schema.org/draft-07/schema#',
   $id: 'http://example.com/root.json',
@@ -322,3 +322,5 @@ export const configSchema = {
     },
   },
 };
+
+module.exports = configSchema;

helper/discover.js

@@ -16,7 +16,7 @@ function discoverNodes(window) {
       id: service.addresses[0] + service.port,
       name: service.name,
       version: service.txt.version,
-      url: `http://${service.host.replace(/\.$/, '')}:${service.port}${service.txt.path}api/`,
+      url: `http://${service.host.replace(/\.$/, '')}:${service.port}${service.txt.path}`,
       disable: compareVersions(minimumVersion, service.txt.version) === -1,
     });
     sendNodes(window);

helper/listener.js

@@ -1,22 +1,20 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable import/no-commonjs */
 const exec = require('child_process').exec;
-const waitPort = require('wait-port');
 
 const sendCustomStyles = require('./styles');
 const { downloadUpdate, sendVersionInfo } = require('./update');
 const { discoverNodes, stopDiscovery } = require('./discover');
+const { readConfig, saveConfig, checkConfig } = require('./config');
 
 function activateScreenSleepListener(ipcMain) {
-  ipcMain.on('screenControl', (_, screenCommand) => {
-    exec(screenCommand.command);
-  });
+  ipcMain.on('screenControl', (_, screenCommand) => exec(screenCommand.command));
 }
 
 function activateReloadListener(ipcMain, window, dev) {
   ipcMain.on('reload', () => {
     if (dev) {
-      window.reload();
+      window.loadURL('http://localhost:4200');
     } else {
       window.loadURL('app://.');
     }
@@ -31,42 +29,23 @@ function activateAppInfoListener(ipcMain, window, app) {
 }
 
 function activateUpdateListener(ipcMain, window) {
-  ipcMain.on('update', (_, updateInfo) => {
-    downloadUpdate(updateInfo, window);
-  });
+  ipcMain.on('update', (_, updateInfo) => downloadUpdate(updateInfo, window));
 }
 
 function activateDiscoverListener(ipcMain, window) {
-  ipcMain.on('discover', () => {
-    discoverNodes(window);
-  });
+  ipcMain.on('discover', () => discoverNodes(window));
 
-  ipcMain.on('stopDiscover', () => {
-    stopDiscovery();
-  });
+  ipcMain.on('stopDiscover', () => stopDiscovery());
 }
 
-function activatePortListener(ipcMain, window) {
-  ipcMain.on('checkOctoPrintPort', (_, hostInfo) => {
-    const waitPortParams = {
-      host: hostInfo.host,
-      port: hostInfo.port,
-      output: 'silent',
-      timeout: 60000,
-    };
-
-    waitPort(waitPortParams)
-      .then(open => {
-        window.webContents.send('octoprintReady', open);
-      })
-      .catch(error => {
-        window.webContents.send('waitPortError', error);
-      });
-  });
+function activateConfigListener(ipcMain, window) {
+  ipcMain.on('readConfig', () => readConfig(window));
+  ipcMain.on('saveConfig', (_, config) => saveConfig(window, config));
+  ipcMain.on('checkConfig', (_, config) => checkConfig(window, config));
 }
 
 function activateListeners(ipcMain, window, app, dev) {
-  activatePortListener(ipcMain, window);
+  activateConfigListener(ipcMain, window);
   activateAppInfoListener(ipcMain, window, app);
   activateScreenSleepListener(ipcMain);
   activateReloadListener(ipcMain, window, dev);

main.js

@@ -10,21 +10,24 @@ const Store = require('electron-store');
 const args = process.argv.slice(1);
 const big = args.some(val => val === '--big');
 const dev = args.some(val => val === '--serve');
-const scheme = 'app';
 
 const activateListeners = require('./helper/listener');
-const createProtocol = require('./helper/protocol');
 
-protocol.registerSchemesAsPrivileged([{ scheme: scheme, privileges: { standard: true } }]);
-createProtocol(scheme, path.join(__dirname, 'dist'));
+if (!dev) {
+  const createProtocol = require('./helper/protocol');
+  const scheme = 'app';
 
-app.commandLine.appendSwitch('touch-events', 'enabled');
+  protocol.registerSchemesAsPrivileged([{ scheme: scheme, privileges: { standard: true } }]);
+  createProtocol(scheme, path.join(__dirname, 'dist'));
+}
 
-const store = new Store();
+app.commandLine.appendSwitch('touch-events', 'enabled');
 
 let window;
 
 function createWindow() {
+  const _store = new Store();
+
   if (!dev) {
     session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
       callback({