bars

backend/index.ts

@@ -36,6 +36,27 @@ app.get('/battery/history', async c => {
   return c.jsonT(Object.fromEntries(battery || []))
 })
 
+app.get('/battery/ranges', async c => {
+  const beats = await c.env.RESTFUL.get<Heartbeat[]>('heartbeat', 'json')
+  const battery = beats?.map(beat => [beat.beat,beat.data.device.battery] as const).reverse().filter(beat => typeof beat[1] == 'object')!
+
+  type status = Heartbeat['data']['device']['battery']['status']
+
+  let constructed: Partial<Record<status,[number][]>> = {}
+  let prevStatus: status = battery[0][1].status = battery[0][1].status
+  constructed[prevStatus] = [[battery[0][0]]]
+
+  battery.forEach(([timestamp,{status}],i) => {
+    if (!constructed[status]) constructed[status] = []
+    if (status != prevStatus) {
+      constructed[prevStatus]![constructed[prevStatus]!.length-1].push(battery[i-1][0])
+      constructed[status]?.push([timestamp])
+      prevStatus = status
+    }
+  })
+  return c.jsonT(constructed)
+})
+
 app.get('/music', async c => {
   return c.jsonT((await getHeartbeat(c.env))?.data.music)
 })

src/routes/(main)/(tech)/battery.tsx

@@ -1,5 +1,6 @@
-import { useRouteData } from "solid-start";
-import { createServerData$ } from "solid-start/server";
+import { createResource, For } from "solid-js";
+import { createRouteData, useRouteData } from "solid-start";
+import server$, { createServerData$ } from "solid-start/server";
 import Schema from "~/components/schema";
 
 export function routeData() {
@@ -15,14 +16,21 @@ export function routeData() {
                 return beat
             })
             return forSvg
-        })
+        }),
+        ranges: createRouteData(
+            async () => {
+                return Object.entries(await (await server$.fetch('/api/battery/ranges')).json())
+                    .map(([k, v]) => [k, v.map((arr: number[]) => arr.map(n => Math.round((Date.now() - n) / 1000 / 60 / 5)))])
+                    .flatMap(([k, v]) => v.map(v => [k, ...v]))
+            })
     }
 }
 
 export default function Main() {
-    const { battery } = useRouteData<typeof routeData>()
+    const { battery, ranges } = useRouteData<typeof routeData>()
     const computedPoints = () => battery()?.map(b => b.join(',')).join(' ')
     return <>
+        {JSON.stringify(ranges())}
         <main>
             <p>
                 My laptop's current battery level is <b>{102 - (battery() || [[0, 100]])[0][1]}%</b>.
@@ -31,7 +39,7 @@ export default function Main() {
             <svg viewBox="0 0 288 102" class="chart">
                 <defs>
                     <linearGradient id="bg" x1="0" x2="0" y1="0" y2="1">
-                        <stop offset="0%" stop-color="rgba(180, 40, 180, 50%)"/>
+                        <stop offset="0%" stop-color="rgba(180, 40, 180, 50%)" />
                         <stop offset="100%" stop-color="rgba(180, 40, 180, 0%)" />
                     </linearGradient>
                 </defs>
@@ -43,11 +51,14 @@ export default function Main() {
                 <polyline
                     fill="url(#bg)"
                     points={`288,102 ${computedPoints()} 0,102`} />
+                <For each={ranges()}>
+                    {range => <line x1={288-range[1]} x2={288 - range[2] || 288} y1="102" y2="102" stroke-width={2} stroke={range[0] == 'charging' ? '#28b449' : '#b42834'}/>}
+                </For>
             </svg>
         </main>
         <Schema routes={[
-            ["GET","battery", "Get my current battery level", "Level%"],
-            ["GET","battery/history", "Get the list of the battery things", "{ [timestamp: string]: { level: number, status: 'unknown' | 'charging' | 'discharging' | 'empty' | 'full' }"]
-        ]}/>
+            ["GET", "battery", "Get my current battery level", "Level%"],
+            ["GET", "battery/history", "Get the list of the battery things", "{ [timestamp: string]: { level: number, status: 'unknown' | 'charging' | 'discharging' | 'empty' | 'full' }"]
+        ]} />
     </>
 }