smcgateway-sv 0.4.10 → 0.5.0

package/dist/Clock.svelte

@@ -7,9 +7,9 @@
 		errorText = 'Connection lost'
 	}: { class?: ClassValue, errorText?: string } = $props();
 
-	let classes = $derived(`${className} ${gtime.ok ? '' : className + '-error'}`);
+	let classes = $derived(`${className} ${$gtime.ok ? '' : className + '-error'}`);
 
-	let text = $derived(gtime.ok ? gtime.now.toLocaleString() : errorText);
+	let text = $derived($gtime.ok ? $gtime.now.toLocaleString() : errorText);
 </script>
 
 <div class={classes}>{text}</div>

package/dist/SelectChannel.svelte

@@ -9,7 +9,7 @@
 	}: { module?: string; id?: string; class?: string; allName?: string } = $props();
 
 	let channels = $derived.by(() => {
-		let v = settings.all['channels'];
+		let v = $settings.all['channels'];
 		if (v) {
 			return Object.keys(v).map((k) => {
 				return { module: k, name: v[k] };

package/dist/csv.d.ts

@@ -1,7 +1,2 @@
-declare function tableToCSV(tableId: string): string | undefined;
-declare function downloadTableAsCSV(tableId: string, filename: string): void;
-declare const _default: {
-    tableToCSV: typeof tableToCSV;
-    downloadTableAsCSV: typeof downloadTableAsCSV;
-};
-export default _default;
+export declare function tableToCSV(tableId: string): string | undefined;
+export declare function downloadTableAsCSV(tableId: string, filename: string): void;

package/dist/csv.js

@@ -1,5 +1,5 @@
 // Function to convert an HTML table to CSV
-function tableToCSV(tableId) {
+export function tableToCSV(tableId) {
     const table = document.getElementById(tableId); // Get the table element by its ID
     if (!table) {
         console.error(`Table with ID '${tableId}' not found.`);
@@ -18,7 +18,7 @@ function tableToCSV(tableId) {
     return csvContent;
 }
 // Function to download the CSV file
-function downloadTableAsCSV(tableId, filename) {
+export function downloadTableAsCSV(tableId, filename) {
     const csvContent = tableToCSV(tableId);
     if (!csvContent)
         return;
@@ -29,7 +29,3 @@ function downloadTableAsCSV(tableId, filename) {
     link.click();
     URL.revokeObjectURL(link.href); // Clean up
 }
-export default {
-    tableToCSV,
-    downloadTableAsCSV
-};

package/dist/gtime.svelte.d.ts

@@ -1,10 +1,10 @@
 /**
  * gtime provides access to the current date/time on the GW device.
  */
-declare let gtime: {
+declare let gtime: import("svelte/store").Readable<{
     now: Date;
     diff: number;
     ok: boolean;
-};
+}>;
 declare const syncTimeToBrowser: () => Promise<string>;
 export { gtime, syncTimeToBrowser };

package/dist/gtime.svelte.js

@@ -1,48 +1,77 @@
+import { readable } from "svelte/store";
 const fetchIntervalSecs = 10;
+let fetchTime = undefined;
 /**
  * gtime provides access to the current date/time on the GW device.
  */
-let gtime = $state({
+let gtime = readable({
     now: new Date(),
     diff: 0,
     ok: true,
-});
-let ticks = 0; // Number of ticks since last fetch
-let timer = 0;
-const fetchTime = () => {
-    const start = new Date().getTime();
-    fetch("/api/date", { signal: AbortSignal.timeout(2000) })
-        .then((resp) => {
-        gtime.ok = false;
-        if (resp.ok) {
-            const end = new Date().getTime();
-            resp.json().then((data) => {
-                let time = new Date(data.str);
-                gtime.now = time;
-                gtime.diff = time.getTime() - start - (end - start);
-                gtime.ok = true;
-            });
-        }
-    }).catch(e => {
-        console.log("fetch error", e);
-        gtime.ok = false;
+}, (set, update) => {
+    set({
+        now: new Date(),
+        diff: 0,
+        ok: true,
     });
-};
-fetchTime();
-setInterval(() => {
-    gtime.now = new Date(gtime.now.getTime() + 1000);
-    ticks++;
-    if (ticks > fetchIntervalSecs) {
-        ticks = 0;
-        timer = setTimeout(fetchTime, 0);
-    }
-}, 1000);
+    let ticks = 0; // Number of ticks since last fetch
+    const interval = setInterval(() => {
+        update((v) => {
+            v.now = new Date(v.now.getTime() + 1000);
+            return v;
+        });
+        ticks++;
+        if (ticks > fetchIntervalSecs) {
+            ticks = 0;
+            if (fetchTime)
+                fetchTime();
+        }
+    }, 1000);
+    fetchTime = () => {
+        const start = new Date().getTime();
+        fetch("/api/date", { signal: AbortSignal.timeout(2000) })
+            .then((resp) => {
+            if (resp.ok) {
+                const end = new Date().getTime();
+                resp.json().then((data) => {
+                    let time = new Date(data.str);
+                    update((v) => {
+                        v.now = time;
+                        v.diff = time.getTime() - start - (end - start);
+                        v.ok = true;
+                        return v;
+                    });
+                });
+            }
+            else {
+                update((v) => {
+                    v.ok = false;
+                    return v;
+                });
+            }
+        }).catch(e => {
+            console.log("fetch error", e);
+            update((v) => {
+                v.ok = false;
+                return v;
+            });
+        });
+    };
+    fetchTime();
+    return () => {
+        fetchTime = undefined;
+        clearInterval(interval);
+    };
+});
 const syncTimeToBrowser = async () => {
     const body = JSON.stringify({ "timestamp": Math.round(new Date().getTime() / 1000) });
     const resp = await fetch("/api/date", { method: "POST", body });
     if (resp.status === 200) {
-        clearTimeout(timer);
-        timer = setTimeout(fetchTime, 0);
+        if (fetchTime) {
+            fetchTime();
+        }
+        // clearTimeout(timer)
+        // timer = setTimeout(fetchTime, 0)
         return "ok";
     }
     throw new Error(resp.statusText);

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { auth, type User } from "./auth.svelte";
-import { gtime } from "./gtime.svelte.js";
+import { gtime, syncTimeToBrowser } from "./gtime.svelte.js";
 import { geofence, type GeoFence } from "./geofence.svelte.js";
 import { device, type Device } from "./devices.svelte.js";
 import { ghistory, type Log, type State } from "./ghistory.svelte.js";
@@ -11,8 +11,8 @@ import LoginForm from "./LoginForm.svelte";
 import { recording, type Recording } from "./recording.svelte.js";
 import AudioTimeLinePlayer from "./AudioTimeLinePlayer.svelte";
 import VoicePlayer from "./VoicePlayer.svelte";
-import csv from "./csv.js";
+import { downloadTableAsCSV } from "./csv.js";
 import settings from "./settings.svelte.js";
 import SelectChannel from "./SelectChannel.svelte";
-export { auth, gtime, geofence, device, ghistory, InputDate, InputDatetime, InputDebounced, InputIdentUri, LoginForm, recording, AudioTimeLinePlayer, VoicePlayer, csv, settings, SelectChannel, };
+export { auth, gtime, syncTimeToBrowser, geofence, device, ghistory, InputDate, InputDatetime, InputDebounced, InputIdentUri, LoginForm, recording, AudioTimeLinePlayer, VoicePlayer, downloadTableAsCSV, settings, SelectChannel, };
 export type { User, GeoFence, Device, Log, State, Recording };

package/dist/index.js

@@ -1,6 +1,6 @@
 // Reexport your entry components here
 import { auth } from "./auth.svelte";
-import { gtime } from "./gtime.svelte.js";
+import { gtime, syncTimeToBrowser } from "./gtime.svelte.js";
 import { geofence } from "./geofence.svelte.js";
 import { device } from "./devices.svelte.js";
 import { ghistory } from "./ghistory.svelte.js";
@@ -12,7 +12,7 @@ import LoginForm from "./LoginForm.svelte";
 import { recording } from "./recording.svelte.js";
 import AudioTimeLinePlayer from "./AudioTimeLinePlayer.svelte";
 import VoicePlayer from "./VoicePlayer.svelte";
-import csv from "./csv.js";
+import { downloadTableAsCSV } from "./csv.js";
 import settings from "./settings.svelte.js";
 import SelectChannel from "./SelectChannel.svelte";
-export { auth, gtime, geofence, device, ghistory, InputDate, InputDatetime, InputDebounced, InputIdentUri, LoginForm, recording, AudioTimeLinePlayer, VoicePlayer, csv, settings, SelectChannel, };
+export { auth, gtime, syncTimeToBrowser, geofence, device, ghistory, InputDate, InputDatetime, InputDebounced, InputIdentUri, LoginForm, recording, AudioTimeLinePlayer, VoicePlayer, downloadTableAsCSV, settings, SelectChannel, };

package/dist/settings.svelte.d.ts

@@ -1,13 +1,11 @@
-declare class Settings {
-    private _loaded;
+declare class Store {
     all: {
         [key: string]: any;
     };
-    constructor();
-    loaded(): Promise<boolean>;
-    getValue(path: string, defaultValue?: any): any;
+    getValue(path: string, _default?: any): any;
     getString(path: string, _default?: string): string;
     getNumber(path: string, _default?: number): number;
+    constructor(load?: boolean, onload?: (v: Store) => void);
 }
-declare const settings: Settings;
+declare let settings: import("svelte/store").Readable<Store>;
 export default settings;

package/dist/settings.svelte.js

@@ -1,11 +1,33 @@
-class Settings {
-    _loaded;
-    all = $state({});
-    constructor() {
-        let resolveLoaded;
-        this._loaded = new Promise((resolve) => {
-            resolveLoaded = resolve;
-        });
+import { readable } from "svelte/store";
+class Store {
+    all = {};
+    getValue(path, _default) {
+        return path.split('.').reduce((acc, key) => {
+            if (acc && typeof acc === 'object' && key in acc) {
+                return acc[key];
+            }
+            return _default;
+        }, this.all);
+    }
+    getString(path, _default = "") {
+        return path.split('.').reduce((acc, key) => {
+            if (acc && typeof acc === 'object' && key in acc) {
+                return acc[key];
+            }
+            return _default;
+        }, this.all).toString();
+    }
+    getNumber(path, _default = 0) {
+        const s = this.getString(path, "");
+        let v;
+        if (s.indexOf(".") > -1) {
+            return parseFloat(s) || _default;
+        }
+        return parseInt(s) || _default;
+    }
+    constructor(load = false, onload = (v) => { }) {
+        if (!load)
+            return;
         fetch("_settings", { signal: AbortSignal.timeout(5000) })
             .then(resp => {
             if (resp.status === 200) {
@@ -36,39 +58,16 @@ class Settings {
                             }
                         });
                     }
-                    resolveLoaded(true);
+                    onload(this);
                 });
             }
-            else {
-                resolveLoaded(true); // resolve even if non-200
-            }
         })
-            .catch(() => resolveLoaded(true)); // resolve even on fetch failure
-    }
-    async loaded() {
-        return this._loaded;
-    }
-    getValue(path, defaultValue) {
-        return path.split('.').reduce((acc, key) => {
-            if (acc && typeof acc === 'object' && key in acc) {
-                return acc[key];
-            }
-            return defaultValue;
-        }, this.all);
-    }
-    getString(path, _default = "") {
-        return path.split('.').reduce((acc, key) => {
-            if (acc && typeof acc === 'object' && key in acc) {
-                return acc[key];
-            }
-            return _default;
-        }, this.all).toString();
-    }
-    getNumber(path, _default = 0) {
-        const s = this.getString(path, "");
-        let v = parseFloat(s);
-        return v || _default;
+            .catch((err) => console.error(err));
     }
 }
-const settings = new Settings();
+let settings = readable(new Store(false), (set) => {
+    new Store(true, (s) => {
+        set(s);
+    });
+});
 export default settings;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "smcgateway-sv",
-	"version": "0.4.10",
+	"version": "0.5.0",
 	"author": "Kevin Golding <kevin.golding@smc-gateway.com> (https://smc-gateway.com)",
 	"license": "MIT",
 	"scripts": {