added more actions

Author: vzakharchenko

lib/executeService.js

@@ -2,6 +2,7 @@ const { exec } = require('child_process');
 
 const { offDeviceFromSmartThings } = require('./smartthings');
 const { logger } = require('./logger');
+const { saveConfig } = require('./env');
 
 const lastMessage = {
 };
@@ -80,6 +81,36 @@ const actionToCommands = {
   reboot: () => 'reboot',
   halt: () => 'halt',
   upgrade: () => 'nohup npm i smartthings-phevctl -g >/dev/null 2>1 &',
+  shutdown2H: (readConfig) => {
+    // eslint-disable-next-line no-param-reassign
+    readConfig.upsMaxTimeHours = '2';
+    saveConfig(readConfig);
+    return null;
+  },
+  shutdown5H: (readConfig) => {
+    // eslint-disable-next-line no-param-reassign
+    readConfig.upsMaxTimeHours = '5';
+    saveConfig(readConfig);
+    return null;
+  },
+  shutdown8H: (readConfig) => {
+    // eslint-disable-next-line no-param-reassign
+    readConfig.upsMaxTimeHours = '8';
+    saveConfig(readConfig);
+    return null;
+  },
+  shutdown1D: (readConfig) => {
+    // eslint-disable-next-line no-param-reassign
+    readConfig.upsMaxTimeHours = '24';
+    saveConfig(readConfig);
+    return null;
+  },
+  shutdown2D: (readConfig) => {
+    // eslint-disable-next-line no-param-reassign
+    readConfig.upsMaxTimeHours = '48';
+    saveConfig(readConfig);
+    return null;
+  },
 };
 
 const transformResponse = {
@@ -135,6 +166,10 @@ function sleep(ms) {
 function execute0(device, readConfig) {
   return new Promise((resolve) => {
     const command = actionToCommands[device.actionId](readConfig, device);
+    if (!command) {
+      resolve({ code: 0, output: null });
+      return;
+    }
     logger.info(`run command ${command}`);
     let scriptOutput = '';
     const child = exec(command);

lib/shutdownService.js

@@ -40,12 +40,12 @@ function execute(command) {
         logger.info('halt force killed');
         resolve();
       }
-    }, 10000);
+    }, 40000);
   });
 }
 
 async function halt() {
-  await execute('halt');
+  await execute('sleep 30s &&halt');
 }
 
 async function data() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartthings-phevctl",
-  "version": "1.8.11",
+  "version": "1.9.0",
   "description": "smartthings remote ctrl",
   "main": "smartthings-phevctl.js",
   "scripts": {

remote-ctrl-ui/src/components/SmartthingsAddDevice.js

@@ -64,7 +64,7 @@ export class SmartthingsAddDevice extends React.Component {
             if (data.name === 'actionId') {
               return (
                 <Select
-                  style={{ width: 200 }}
+                  style={{ width: 600 }}
                   onChange={(event) => {
                     this.onActionChange(event);
                   }}
@@ -91,6 +91,13 @@ export class SmartthingsAddDevice extends React.Component {
                   <Select.Option value="evseSlow">{getLabels().evseSlow}</Select.Option>
                   <Select.Option value="evseFastCharge">{getLabels().evseFastCharge}</Select.Option>
                   <Select.Option value="evseDisableCharge">{getLabels().evseDisableCharge}</Select.Option>
+                  <Select.Option value="reboot">{getLabels().reboot}</Select.Option>
+                  <Select.Option value="halt">{getLabels().halt}</Select.Option>
+                  <Select.Option value="upgrade">{getLabels().upgrade}</Select.Option>
+                  <Select.Option value="shutdown2H">{getLabels().shutdown2H}</Select.Option>
+                  <Select.Option value="shutdown5H">{getLabels().shutdown5H}</Select.Option>
+                  <Select.Option value="shutdown1D">{getLabels().shutdown1D}</Select.Option>
+                  <Select.Option value="shutdown2D">{getLabels().shutdown2D}</Select.Option>
                 </Select>
               );
             }

remote-ctrl-ui/src/components/SmartthingsViewDevice.js

@@ -109,7 +109,7 @@ export class SmartthingsViewDevice extends React.Component {
               return (
                 <Select
                   defaultValue={this.state.actionId}
-                  style={{ width: 200 }}
+                  style={{ width: 600 }}
                   disabled={this.state.updatable}
                   onChange={(event) => {
                     this.onActionChange(event);
@@ -137,6 +137,13 @@ export class SmartthingsViewDevice extends React.Component {
                   <Select.Option value="evseSlow">{getLabels().evseSlow}</Select.Option>
                   <Select.Option value="evseFastCharge">{getLabels().evseFastCharge}</Select.Option>
                   <Select.Option value="evseDisableCharge">{getLabels().evseDisableCharge}</Select.Option>
+                  <Select.Option value="reboot">{getLabels().reboot}</Select.Option>
+                  <Select.Option value="halt">{getLabels().halt}</Select.Option>
+                  <Select.Option value="upgrade">{getLabels().upgrade}</Select.Option>
+                  <Select.Option value="shutdown2H">{getLabels().shutdown2H}</Select.Option>
+                  <Select.Option value="shutdown5H">{getLabels().shutdown5H}</Select.Option>
+                  <Select.Option value="shutdown1D">{getLabels().shutdown1D}</Select.Option>
+                  <Select.Option value="shutdown2D">{getLabels().shutdown2D}</Select.Option>
                 </Select>
               );
             }

remote-ctrl-ui/src/utils/Localization.js

@@ -127,6 +127,14 @@ const Labels = {
   pullUpDownShutdown: 'pull Up or Down',
   edgeShutdown: 'Edge',
   levelShutdown: 'Logic Level',
+  reboot: 'Reboot device',
+  halt: 'Shutdown device',
+  upgrade: 'upgrade smartthings phevctl',
+  shutdown2H: 'Shutdown device after 2 hours',
+  shutdown5H: 'Shutdown device after 5 hours',
+  shutdown8H: 'Shutdown device after 8 hours',
+  shutdown1D: 'Shutdown device after 1 day',
+  shutdown2D: 'Shutdown device after 2 days',
 };
 
 export function getLabels() {

remote-ctrl-ui/src/utils/RussianLanguage.js

@@ -106,4 +106,12 @@ export const RussianLabels = {
   ups1D: '1 день',
   ups2D: '2 дня',
   gpioMenu: 'GPIO',
+  reboot: 'Перезапустить устройство',
+  halt: 'Выключить устройство',
+  upgrade: 'Обновить приложение smartthings phevctl',
+  shutdown2H: 'Отключение устройство через 2 часа после включения ',
+  shutdown5H: 'Отключение устройство через 5 часов после включения',
+  shutdown8H: 'Отключение устройство через 8 часов после включения',
+  shutdown1D: 'Отключение устройство через 1 день после включения',
+  shutdown2D: 'Отключение устройство через 2 дня после включения',
 };

ui/asset-manifest.json

@@ -1,8 +1,8 @@
 {
   "files": {
     "main.css": "/static/css/main.32eb8335.chunk.css",
-    "main.js": "/static/js/main.3cbdbbd4.chunk.js",
-    "main.js.map": "/static/js/main.3cbdbbd4.chunk.js.map",
+    "main.js": "/static/js/main.88269063.chunk.js",
+    "main.js.map": "/static/js/main.88269063.chunk.js.map",
     "runtime-main.js": "/static/js/runtime-main.fd3c3b07.js",
     "runtime-main.js.map": "/static/js/runtime-main.fd3c3b07.js.map",
     "static/css/2.a95be28f.chunk.css": "/static/css/2.a95be28f.chunk.css",
@@ -20,6 +20,6 @@
     "static/css/2.a95be28f.chunk.css",
     "static/js/2.eebff65e.chunk.js",
     "static/css/main.32eb8335.chunk.css",
-    "static/js/main.3cbdbbd4.chunk.js"
+    "static/js/main.88269063.chunk.js"
   ]
 }

ui/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Outlander PHEV Smartthings server</title><link href="/static/css/2.a95be28f.chunk.css" rel="stylesheet"><link href="/static/css/main.32eb8335.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,i,a=r[0],c=r[1],l=r[2],s=0,p=[];s<a.length;s++)i=a[s],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&p.push(o[i][0]),o[i]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);p.length;)p.shift()();return u.push.apply(u,l||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var c=t[a];0!==o[c]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var u,a=document.createElement("script");a.charset="utf-8",a.timeout=120,i.nc&&a.setAttribute("nonce",i.nc),a.src=function(e){return i.p+"static/js/"+({}[e]||e)+"."+{3:"4c39a317"}[e]+".chunk.js"}(e);var c=new Error;u=function(r){a.onerror=a.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:a})}),12e4);a.onerror=a.onload=u,document.head.appendChild(a)}return Promise.all(r)},i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/",i.oe=function(e){throw console.error(e),e};var a=this["webpackJsonpremote-ctrl-ui"]=this["webpackJsonpremote-ctrl-ui"]||[],c=a.push.bind(a);a.push=r,a=a.slice();for(var l=0;l<a.length;l++)r(a[l]);var f=c;t()}([])</script><script src="/static/js/2.eebff65e.chunk.js"></script><script src="/static/js/main.3cbdbbd4.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Outlander PHEV Smartthings server</title><link href="/static/css/2.a95be28f.chunk.css" rel="stylesheet"><link href="/static/css/main.32eb8335.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,i,a=r[0],c=r[1],l=r[2],s=0,p=[];s<a.length;s++)i=a[s],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&p.push(o[i][0]),o[i]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);p.length;)p.shift()();return u.push.apply(u,l||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var c=t[a];0!==o[c]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var u,a=document.createElement("script");a.charset="utf-8",a.timeout=120,i.nc&&a.setAttribute("nonce",i.nc),a.src=function(e){return i.p+"static/js/"+({}[e]||e)+"."+{3:"4c39a317"}[e]+".chunk.js"}(e);var c=new Error;u=function(r){a.onerror=a.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:a})}),12e4);a.onerror=a.onload=u,document.head.appendChild(a)}return Promise.all(r)},i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/",i.oe=function(e){throw console.error(e),e};var a=this["webpackJsonpremote-ctrl-ui"]=this["webpackJsonpremote-ctrl-ui"]||[],c=a.push.bind(a);a.push=r,a=a.slice();for(var l=0;l<a.length;l++)r(a[l]);var f=c;t()}([])</script><script src="/static/js/2.eebff65e.chunk.js"></script><script src="/static/js/main.88269063.chunk.js"></script></body></html>