Moved to config json, added config editor

Author: 3aa49ec6bfc910647fa1c5a013e48eef

README.md

@@ -37,7 +37,8 @@ sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/3aa49ec6bfc910647fa
 - [x] Fix project structure
 - [x] Clean up the install process
 - [x] Clean up the configuration process
-- [x] Package the project properly
+- [x] Package the project
+- [ ] Package the project properly
 - [ ] Add lifecycle management for destination (retention policy etc)
 - [ ] Add web server for configuration (managing rclone, network settings), status (system, network, copy, usb host) and statistics (uptime, copy, storage)
 - [ ] Add functionality to handle scenarios such as keeping car awake for transfers

deploy/install.sh

@@ -34,6 +34,25 @@ sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/3aa49ec6bfc910647fa
 # Create log directory
 mkdir /logs
 
+# Create config directory
+mkdir /config
+
+# Set default config
+cat << EOF > /config/node-teslausb.json
+{
+  "archive": {
+    "rcloneConfig": "node-teslausb",
+    "destinationPath": "teslausb/TeslaCam"
+  },
+  "paths": {
+    "sentryClips": "/mnt/TeslaCam/TeslaCam/SentryClips",
+    "savedClips": "/mnt/TeslaCam/TeslaCam/SavedClips"
+  },
+  "delayBetweenCopyRetryInSeconds": 3600,
+  "mainLoopIntervalInSeconds": 120
+}
+EOF
+
 # Clean unused packages
 # sudo apt-get autoremove --purge
 

website/package-lock.json

@@ -22,6 +22,7 @@
 		"@typescript-eslint/eslint-plugin": "^6.0.0",
 		"@typescript-eslint/parser": "^6.0.0",
 		"autoprefixer": "^10.4.16",
+		"cl-editor": "^2.3.0",
 		"eslint": "^8.28.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-svelte": "^2.30.0",

website/package.json

@@ -5,4 +5,9 @@ export const logNameToPathMapping: { [key: string]: string } = {
     'worker': '/logs/worker.log',
     'website': '/logs/website.log',
     'resources': '/logs/resources.log',
+};
+
+export const configNameToPathMapping: { [key: string]: string } = {
+    'rclone': isDevMode ? '/Users/blake/logs/rclone.log' : '/root/.config/rclone/rclone.conf',
+    'node-teslausb': isDevMode ? '/Users/blake/config/node-teslausb.json' : '/config/node-teslausb.json',
 };

website/src/lib/constants.ts

@@ -5,6 +5,7 @@
 	let b = 0;
 	let total = 0;
 	let logFiles: string[] = [];
+	let configFiles: string[] = [];
 	let finishedApiCalls = false;
 	let lockChimes: any[] = [];
 	let selectedUrl = '';
@@ -35,6 +36,20 @@
 		return logFiles.logFiles;
 	}
 
+	async function listConfigFiles() {
+		const response = await fetch('/api/configFiles', {
+			method: 'GET',
+			headers: {
+				'content-type': 'application/json'
+			}
+		});
+
+		const configFiles = await response.json();
+		console.log(configFiles.configFiles);
+
+		return configFiles.configFiles;
+	}
+
 	async function getLockChimes() {
 		const response = await fetch('/api/lockChimes', {
 			method: 'GET',
@@ -64,6 +79,7 @@
 
 	onMount(async () => {
 		logFiles = await listLogFiles();
+		configFiles = await listConfigFiles();
 		lockChimes = await getLockChimes();
 		console.log(logFiles);
 		finishedApiCalls = true;
@@ -86,6 +102,21 @@
 		<p>Loading...</p>
 	{/if}
 
+	<h2>Config Files</h2>
+	{#if finishedApiCalls == true}
+		{#if configFiles.length == 0}
+			<p>No log files found.</p>
+		{:else}
+			<ul class="list-disc">
+				{#each configFiles as configFile}
+					<li><a href={`/editConfig/${configFile}`}>{configFile}</a></li>
+				{/each}
+			</ul>
+		{/if}
+	{:else}
+		<p>Loading...</p>
+	{/if}
+
 	{#if finishedApiCalls}
 		<h2>Lock Chimes</h2>
 		{#if lockChimes.length == 0}

website/src/routes/+page.svelte

@@ -0,0 +1,7 @@
+import { json } from '@sveltejs/kit';
+import { configNameToPathMapping } from '$lib/constants';
+
+export async function GET({ request }) {
+	const configNames = Object.keys(configNameToPathMapping);
+	return json({ configFiles: configNames });
+}

website/src/routes/api/configFiles/+server.ts

@@ -0,0 +1,46 @@
+import type { RequestEvent, RequestHandler } from '@sveltejs/kit';
+import { readFileSync, existsSync, unlinkSync } from 'fs';
+import fs from 'fs';
+import { configNameToPathMapping } from '$lib/constants';
+
+const getConfigContent = (configName: string): string => {
+    const configPath = configNameToPathMapping[configName];
+    if (!configPath || !existsSync(configPath)) {
+        return '';
+    }
+
+    try {
+        return readFileSync(configPath, 'utf8');
+    } catch (err) {
+        console.error(`Error reading file: ${err}`);
+        return '';
+    }
+};
+
+export const GET: RequestHandler = async (event: RequestEvent) => {
+    const configName = event.params.configName;
+	const configContent = configName !== undefined ? getConfigContent(configName) : "";
+
+    console.log("configName:",configName, configContent)
+
+    return new Response(JSON.stringify({ message: `Config name is: ${configName}`, content: configContent }), {
+        status: 200,
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    });
+};
+
+export const PUT: RequestHandler = async (event: RequestEvent) => {
+    // const logName = event.params.logName ?? "";
+    // const logPath = logNameToPathMapping[logName];
+
+    // clearLogFile(logPath);
+
+    return new Response(JSON.stringify({ message: `OK` }), {
+        status: 200,
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    });
+}

website/src/routes/api/configFiles/[configName]/+server.ts

@@ -0,0 +1,60 @@
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import Editor from 'cl-editor/src/Editor.svelte';
+	import { page } from '$app/stores';
+
+	let isLoading = true;
+
+	$: configName = $page.params.configName;
+
+	async function getConfig(configName: string) {
+		isLoading = true;
+		const response = await fetch(`/api/configFiles/${configName}`, {
+			method: 'GET',
+			headers: {
+				'content-type': 'application/text'
+			}
+		});
+
+		const configContent = await response.json();
+		// console.log(configContent);
+		isLoading = false;
+		return configContent.content;
+	}
+
+	// let json: string = ""
+
+	let html = 'Loading content...';
+
+	let actions = ['removeFormat'];
+	let height = 'auto';
+
+	const save = () => {
+		console.log(html);
+	};
+
+	const revert = () => {
+		console.log('revert');
+	};
+
+	const load = async () => {
+		console.log('load');
+	};
+
+	onMount(async () => {
+		console.log('onMount');
+		let json = await getConfig(configName);
+		html = json;
+	});
+</script>
+
+<div class="p-2">
+	{#if html !== 'Loading content...'}
+		<Editor {html} on:change={(evt) => (html = evt.detail)} {actions} {height} />
+	{:else}
+		<p>Loading config...</p>
+	{/if}
+
+	<button class="mt-2 mr-2" on:click={save}>Save</button>
+	<button class="mt-2 bg-gray-500" on:click={revert}>Revert</button>
+</div>

website/src/routes/editConfig/[configName]/+page.svelte

@@ -20,6 +20,7 @@
     "sqlite3": "^5.1.6"
   },
   "devDependencies": {
+    "@types/node": "^20.10.5",
     "@types/ping": "^0.4.4",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3"

worker/package-lock.json

@@ -5,20 +5,10 @@ import { logWithTimestamp, errorWithTimestamp } from './modules/log.js';
 import { restartWifi, checkIfArchiveIsReachable } from './modules/network.js';
 import { mountTeslaCamAsReadOnly, unmountTeslaCam } from './modules/storage.js';
 import { checkLockChime } from './modules/lockChimes.js';
+import { readConfigFile } from './modules/config.js';
 
-const config = {
-    archive: {
-        server: (getRcloneConfig()).host,
-        rcloneConfig: "node-teslausb",
-        destinationPath: "teslausb/TeslaCam"
-    },
-    paths: {
-        sentryClips: "/mnt/TeslaCam/TeslaCam/SentryClips",
-        savedClips: "/mnt/TeslaCam/TeslaCam/SavedClips",
-    },
-    delayBetweenCopyRetryInSeconds: 3600,
-    mainLoopIntervalInSeconds: 120,
-}
+const configFilePath = '/config/node-teslausb.json';
+const config = await readConfigFile(configFilePath);
 
 interface WorkerState {
     errorCount: number;
@@ -39,7 +29,7 @@ const processInterval = async () => {
 
     await checkLockChime();
 
-    if (config.archive.server === false) {
+    if (getRcloneConfig() === false) {
         errorWithTimestamp(`rclone config file not found at '/root/.config/rclone/rclone.conf', run 'rclone config' to set up.`);
         return;
     }