Added support for other rclone providers

Author: 3aa49ec6bfc910647fa1c5a013e48eef

deploy/install-website.sh

@@ -44,6 +44,8 @@ EOF
 cd /bin/node-teslausb/build/website
 npm i --omit=dev
 
+echo "Configuring website service..."
+
 # Enable the service
 systemctl enable node-teslausb-www.service
 
@@ -52,3 +54,5 @@ systemctl restart node-teslausb-www
 
 # Refresh the systemd daemon
 systemctl daemon-reload
+
+echo "Website service configured"

deploy/install-worker.sh

@@ -46,11 +46,15 @@ Restart=always
 WantedBy=multi-user.target
 EOF
 
+echo "Configuring worker service..."
+
 # Enable the service
 systemctl enable node-teslausb.service
 
 # Restart website (need to test whether this will just start if not running)
 systemctl restart node-teslausb
 
 # Refresh the systemd daemon
-systemctl daemon-reload
+systemctl daemon-reload
+
+echo "Worker service configured"

src/worker/src/index.ts

@@ -44,7 +44,7 @@ const processInterval = async () => {
         return;
     }
 
-    const archiveReachable = await checkIfArchiveIsReachable(config.archive.server);
+    const archiveReachable = await checkIfArchiveIsReachable();
     if (archiveReachable === false) {
         await restartWifi();
     } else if (state.lastCopyDate === undefined || ((new Date()).getTime() > (new Date(state.lastCopyDate)).getTime() + config.delayBetweenCopyRetryInSeconds * 1000)) {

src/worker/src/modules/network.ts

@@ -1,24 +1,70 @@
 import { logWithTimestamp, errorWithTimestamp } from "./log.js";
 import ping from "ping";
 import { executeBashCommand } from "./bash.js";
+import { getRcloneConfig } from "./rclone.js";
 
 export const restartWifi = async () => {
     logWithTimestamp("Restarting wifi")
     await executeBashCommand("ifconfig wlan0 down && ifconfig wlan0 up")
 }
 
-export const checkIfArchiveIsReachable = async (archiveServer) => {
+export const checkIfArchiveIsReachable = async () => {
 
+    const config = getRcloneConfig()
+    const connectivityTestType = getConnectivityTestType(config)
+
+    if (connectivityTestType === ConnectivityTestType.internetConnected) {
+        return await testInternetConnected()
+    }
+
+    if (connectivityTestType === ConnectivityTestType.pingHost) {
+        return await testPingHost(config.host)
+    }
+
+};
+
+const testPingHost = async (host: string) => {
+    try {
+        const res = await ping.promise.probe(host, {
+            timeout: 5,  // Timeout in seconds
+            extra: ["-c", "1"],  // Sends only 1 packet
+        });
+
+        logWithTimestamp(`${host} is ${res.alive ? 'reachable' : 'not reachable'}`);
+        return res.alive;
+    } catch (error) {
+        errorWithTimestamp('Error pinging host:', error);
+        return false;
+    }
+}
+
+const testInternetConnected = async () => {
     try {
-        const res = await ping.promise.probe(archiveServer, {
+        const res = await ping.promise.probe("google.com", {
             timeout: 5,  // Timeout in seconds
             extra: ["-c", "1"],  // Sends only 1 packet
         });
 
-        logWithTimestamp(`${archiveServer} is ${res.alive ? 'reachable' : 'not reachable'}`);
+        logWithTimestamp(`Internet is ${res.alive ? 'reachable' : 'not reachable'}`);
         return res.alive;
     } catch (error) {
-        errorWithTimestamp('Error pinging archive server:', error);
+        errorWithTimestamp('Error pinging google.com:', error);
         return false;
     }
-};
+}
+
+enum ConnectivityTestType {
+    pingHost = "pingHost",
+    internetConnected = "internetConnected",
+}
+
+const getConnectivityTestType = (config: any) => {
+    let connectivityTestType: ConnectivityTestType;
+    switch (config.type) {
+        case "smb":
+            connectivityTestType = ConnectivityTestType.pingHost
+        default:
+            connectivityTestType = ConnectivityTestType.internetConnected
+    }
+    return connectivityTestType
+}