Rearm timer for the next time

app.go

@@ -84,6 +84,10 @@ func (app *App) ResetTimer() {
 		app.nextAlarm = time.AfterFunc(time.Until(*na), func() {
 			app.nextAlarm = nil
 			reveil.RemoveOldAlarmsSingle(app.db)
+
+			// Rearm timer for the next time
+			app.ResetTimer()
+
 			err := player.WakeUp(app.cfg, routines)
 			if err != nil {
 				log.Println(err.Error())

ui/package.json

@@ -12,9 +12,8 @@
     "format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. ."
   },
   "devDependencies": {
-    "@sveltejs/adapter-auto": "^1.0.0-next.18",
+    "@sveltejs/adapter-static": "^1.0.0",
-    "@sveltejs/adapter-static": "^1.0.0-next.26",
+    "@sveltejs/kit": "^1.0.0",
-    "@sveltejs/kit": "^1.0.0-next.260",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "bootstrap": "^5.1.3",

ui/src/lib/alarmrepeated.js

@@ -9,11 +9,15 @@ export class AlarmRepeated {
     this.id = id;
     this.weekday = weekday;
     this.time = time;
-    this.routines = routines;
+    this.routines = routines == null ? [] : routines;
     this.ignore_exceptions = ignore_exceptions;
     this.comment = comment;
     this.excepts = excepts;
     this.next_time = next_time;
+
+    if (this.routines.length < 1) {
+      this.routines.push("");
+    }
   }
 
   async delete() {

ui/src/lib/alarmsingle.js

@@ -8,8 +8,12 @@ export class AlarmSingle {
   update({ id, time, routines, comment }) {
     this.id = id;
     this.time = new Date(time);
-    this.routines = routines;
+    this.routines = routines == null ? [] : routines;
     this.comment = comment;
+
+    if (this.routines.length < 1) {
+      this.routines.push("");
+    }
   }
 
   async delete() {

ui/src/service-worker.ts

@@ -1,80 +0,0 @@
-/// <reference lib="webworker" />
-
-import { build, files, timestamp } from '$service-worker';
-
-const worker = (self as unknown) as ServiceWorkerGlobalScope;
-const FILES = `cache${timestamp}`;
-
-// `build` is an array of all the files generated by the bundler,
-// `files` is an array of everything in the `static` directory
-const to_cache = build.concat(files);
-const staticAssets = new Set(to_cache);
-
-worker.addEventListener('install', (event) => {
-	event.waitUntil(
-		caches
-			.open(FILES)
-			.then((cache) => cache.addAll(to_cache))
-			.then(() => {
-				worker.skipWaiting();
-			})
-	);
-});
-
-worker.addEventListener('activate', (event) => {
-	event.waitUntil(
-		caches.keys().then(async (keys) => {
-			// delete old caches
-			for (const key of keys) {
-				if (key !== FILES) await caches.delete(key);
-			}
-
-			worker.clients.claim();
-		})
-	);
-});
-
-/**
- * Fetch the asset from the network and store it in the cache.
- * Fall back to the cache if the user is offline.
- */
-async function fetchAndCache(request: Request) {
-	const cache = await caches.open(`offline${timestamp}`);
-
-	try {
-		const response = await fetch(request);
-		cache.put(request, response.clone());
-		return response;
-	} catch (err) {
-		const response = await cache.match(request);
-		if (response) return response;
-
-		throw err;
-	}
-}
-
-worker.addEventListener('fetch', (event) => {
-	if (event.request.method !== 'GET' || event.request.headers.has('range')) return;
-
-	const url = new URL(event.request.url);
-
-	// don't try to handle e.g. data: URIs
-	const isHttp = url.protocol.startsWith('http');
-	const isDevServerRequest =
-		url.hostname === self.location.hostname && url.port !== self.location.port;
-	const isStaticAsset = url.host === self.location.host && staticAssets.has(url.pathname);
-	const skipBecauseUncached = event.request.cache === 'only-if-cached' && !isStaticAsset;
-
-	if (isHttp && !isDevServerRequest && !skipBecauseUncached) {
-		event.respondWith(
-			(async () => {
-				// always serve static files and bundler-generated assets from cache.
-				// if your application has other URLs with data that will never change,
-				// set this variable to true for them and they will only be fetched once.
-				const cachedAsset = isStaticAsset && (await caches.match(event.request));
-
-				return cachedAsset || fetchAndCache(event.request);
-			})()
-		);
-	}
-});

ui/svelte.config.js

@@ -11,9 +11,6 @@ const config = {
 		adapter: adapter({
 			fallback: '404.html'
 		}),
-		paths: {
-		        // base: '{{.urlbase}}',
-		}
 	}
 };