Merge pull request #26 from vzakharchenko/fixed_mikrotik_scripts

update Mikrotik Scripts

Author: vzakharchenko

.github/workflows/docker.yml

@@ -33,5 +33,5 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7
           push: true
           tags: |
-            vassio/smartthings-phevctl:1.3.10
+            vassio/smartthings-phevctl:1.4.0
             vassio/smartthings-phevctl:latest

Dockerfile

@@ -22,7 +22,7 @@ RUN cd /opt/phevctl/phevcore && mkdir build && cd build && cmake .. && make && m
 RUN cd /opt/phevctl/phevctl && mkdir -p build && cd build && cmake .. && make
 RUN ln -sf /opt/phevctl/phevctl/build/phevctl /usr/bin/phevctl
 # Bundle APP files
-RUN npm i smartthings-phevctl@1.3.10 -g
+RUN npm i smartthings-phevctl@1.4.0 -g
 # Install app dependencies
 ENV NPM_CONFIG_LOGLEVEL warn
 

package.json

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

remote-ctrl-ui/public/mikrotikSMS.script

@@ -18,26 +18,29 @@ foreach i in=[/tool sms inbox find where phone=$phone] do={
         :set encodedMessage ($encodedMessage . $char)
     }
     :local appUrl "$applicationHost/$applicationId/$applicationSecret/sms\?command=$encodedMessage"
- 	/tool fetch url=$appUrl dst-path="sms.txt"
- 	:local response [/file get "sms.txt" contents]
- 	/file remove sms.txt;
- 	:if ([:len $response] >0) do={
-       /tool sms send lte1 $phone message $response
-    }
+ 	:local result [/tool fetch output=user url="$appUrl" as-value ];
+ 	:if ($result->"status" = "finished") do={
+ 	  :if ( $result->"data" !="" ) do={
+ 	     /log info "SMS Service response: $[($result->"data")]"
+         /tool sms send lte1 $phone message "$[($result->"data")]"
+ 	  }
+ 	}
 }
 
 :local appUrl1 "$applicationHost/$applicationId/$applicationSecret/message1"
-/tool fetch url=$appUrl1 dst-path="message1.txt"
-:local message1 [/file get "message1.txt" contents]
-/file remove message1.txt;
-:if ([:len $message1] >0) do={
-   /tool sms send lte1 $phone message $message1
+:local result1 [/tool fetch output=user url=$appUrl1 as-value];
+:if ($result1->"status" = "finished") do={
+  :if ($result1->"data" != "" ) do={
+     /log error "SMS Service error: $[($result1->"data")]"
+     /tool sms send lte1 $phone message "$[($result1->"data")]"
+  }
 }
 
 :local appUrl2 "$applicationHost/$applicationId/$applicationSecret/message2"
-/tool fetch url=$appUrl2 dst-path="message2.txt"
-:local message2 [/file get "message2.txt" contents]
-/file remove message2.txt;
-:if ([:len $message2] >0) do={
-   /tool sms send lte1 $phone message $message2
+:local result2 [/tool fetch url=$appUrl2 as-value output=user];
+:if ($result2->"status" = "finished") do={
+  :if ($result2->"data" != "" ) do={
+     /log error "SMS Service error: $[($result2->"data")]"
+     /tool sms send lte1 $phone message "$[($result2->"data")]"
+  }
 }

ui/mikrotikSMS.script

@@ -18,26 +18,29 @@ foreach i in=[/tool sms inbox find where phone=$phone] do={
         :set encodedMessage ($encodedMessage . $char)
     }
     :local appUrl "$applicationHost/$applicationId/$applicationSecret/sms\?command=$encodedMessage"
- 	/tool fetch url=$appUrl dst-path="sms.txt"
- 	:local response [/file get "sms.txt" contents]
- 	/file remove sms.txt;
- 	:if ([:len $response] >0) do={
-       /tool sms send lte1 $phone message $response
-    }
+ 	:local result [/tool fetch output=user url="$appUrl" as-value ];
+ 	:if ($result->"status" = "finished") do={
+ 	  :if ( $result->"data" !="" ) do={
+ 	     /log info "SMS Service response: $[($result->"data")]"
+         /tool sms send lte1 $phone message "$[($result->"data")]"
+ 	  }
+ 	}
 }
 
 :local appUrl1 "$applicationHost/$applicationId/$applicationSecret/message1"
-/tool fetch url=$appUrl1 dst-path="message1.txt"
-:local message1 [/file get "message1.txt" contents]
-/file remove message1.txt;
-:if ([:len $message1] >0) do={
-   /tool sms send lte1 $phone message $message1
+:local result1 [/tool fetch output=user url=$appUrl1 as-value];
+:if ($result1->"status" = "finished") do={
+  :if ($result1->"data" != "" ) do={
+     /log error "SMS Service error: $[($result1->"data")]"
+     /tool sms send lte1 $phone message "$[($result1->"data")]"
+  }
 }
 
 :local appUrl2 "$applicationHost/$applicationId/$applicationSecret/message2"
-/tool fetch url=$appUrl2 dst-path="message2.txt"
-:local message2 [/file get "message2.txt" contents]
-/file remove message2.txt;
-:if ([:len $message2] >0) do={
-   /tool sms send lte1 $phone message $message2
+:local result2 [/tool fetch url=$appUrl2 as-value output=user];
+:if ($result2->"status" = "finished") do={
+  :if ($result2->"data" != "" ) do={
+     /log error "SMS Service error: $[($result2->"data")]"
+     /tool sms send lte1 $phone message "$[($result2->"data")]"
+  }
 }