v1.1.0

Author: duckAxe

README.md

@@ -1,3 +1,3 @@
 ## Bassin widget API server for umbrelOS
 
-A simple HTTP server as a bridge between [Bassin](https://github.com/duckAxe/bassin) data and umbrelOS (widget).
+A simple HTTP server as a bridge between [Bassin](https://github.com/duckAxe/bassin) and umbrelOS (widget).

bun.lock

@@ -1,39 +1,32 @@
-import { serve } from "bun";
+import { serve } from 'bun';
 
-const REFRESH = "5s";
-
-type Pool = {
-  hashrate5m: string;
-  hashrate1h: string;
-  shares: number;
-  bestshare: number;
-};
+const REFRESH = '30s';
 
 const hashrateSuffix = (value: string): { value: string; unit: string } => {
   const match = value.match(/^([\d.]+)([KMGTPEZY])$/);
-  if (!match) return { value, unit: "" };
+  if (!match) return { value, unit: '' };
   const [, num, unit] = match;
   return { value: num.toString(), unit: `${unit}h/s` };
 };
 
 const abbreviateNumber = (value: number): { value: string; unit: string } => {
-  if (value >= 1e12) return { value: (value / 1e12).toFixed(2), unit: "T" };
-  if (value >= 1e9) return { value: (value / 1e9).toFixed(2), unit: "G" };
-  if (value >= 1e6) return { value: (value / 1e6).toFixed(2), unit: "M" };
-  if (value >= 1e3) return { value: (value / 1e3).toFixed(2), unit: "K" };
-  return { value: value.toFixed(2), unit: "" };
+  if (value >= 1e12) return { value: (value / 1e12).toFixed(2), unit: 'T' };
+  if (value >= 1e9) return { value: (value / 1e9).toFixed(2), unit: 'G' };
+  if (value >= 1e6) return { value: (value / 1e6).toFixed(2), unit: 'M' };
+  if (value >= 1e3) return { value: (value / 1e3).toFixed(2), unit: 'K' };
+  return { value: value.toFixed(2), unit: '' };
 };
 
 const errorResponse = () =>
   Response.json({
-    type: "four-stats",
+    type: 'four-stats',
     refresh: REFRESH,
-    link: "",
+    link: '',
     items: [
-      { title: "Hashrate", text: "-" },
-      { title: "Workers", text: "-" },
-      { title: "Best Share", text: "-" },
-      { title: "Total Shares", text: "-" },
+      { title: 'Hashrate', text: '-' },
+      { title: 'Workers', text: '-' },
+      { title: 'Best Share', text: '-' },
+      { title: 'Total Shares', text: '-' },
     ],
   });
 
@@ -43,18 +36,19 @@ serve({
     const url = new URL(req.url);
     const apiUrl = process.env.BASSIN_API_POOL_URL;
 
-    if (url.pathname !== "/widgets/pool") {
-      return new Response("Path not found", { status: 404 });
+    if (url.pathname !== '/widgets/pool') {
+      return new Response('Path not found', { status: 404 });
     }
     if (!apiUrl) {
-      return new Response("No API url provided", { status: 403 });
+      return new Response('No API url provided', { status: 403 });
     }
 
     try {
       const response = await fetch(`${apiUrl}?${Date.now()}`);
       if (!response.ok) throw new Error(`HTTP error: ${response.status}`);
-      const lines = (await response.text()).trim().split("\n").filter(Boolean);
-      if (lines.length < 3) throw new Error("Malformed pool response");
+      
+      const lines = (await response.text()).trim().split('\n').filter(Boolean);
+      if (lines.length < 3) throw new Error('Malformed pool response');
 
       const [pool, hashrate, shares] = lines.map((line) => JSON.parse(line));
 
@@ -64,18 +58,18 @@ serve({
       const accepted = abbreviateNumber(shares.accepted);
 
       return Response.json({
-        type: "four-stats",
+        type: 'four-stats',
         refresh: REFRESH,
-        link: "",
+        link: '',
         items: [
-          { title: "Hashrate", text: hashrate5m.value, subtext: hashrate5m.unit },
-          { title: "Workers", text: workers },
-          { title: "Best Share", text: bestshare.value, subtext: bestshare.unit },
-          { title: "Total Shares", text: accepted.value, subtext: accepted.unit },
+          { title: 'Hashrate', text: hashrate5m.value, subtext: hashrate5m.unit },
+          { title: `Worker${workers === '1' ? '' : 's'}`, text: workers },
+          { title: 'Best Share', text: bestshare.value, subtext: bestshare.unit },
+          { title: 'Total Shares', text: accepted.value, subtext: accepted.unit },
         ],
       });
     } catch (error) {
-      console.error("Error fetching data:", error);
+      console.error('Error fetching data', error);
       return errorResponse();
     }
   },

index.ts

@@ -1,6 +1,6 @@
 {
   "name": "umbrel-bassin-widget",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "module": "index.ts",
   "type": "module",
   "devDependencies": {