merged with main

Author: Nikolas Haimerl

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @juliangruber @pyropy @NikolasHaimerl

.github/workflows/deploy.yml

@@ -2,9 +2,9 @@ name: Deploy Observable Dashboard to Cloudflare Pages
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   schedule:
-    - cron: "0 20 * * *"
+    - cron: '0 20 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -19,28 +19,28 @@ jobs:
     environment: default
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Install Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20
-        cache: npm
-
-    - name: Install dependencies
-      run: npm ci
-
-    - name: Build project
-      run: npm run build  # Assumes your project has a build script in package.json
-      env:
-        API_TOKEN: ${{ secrets.API_TOKEN }}
-
-    - name: Deploy to Cloudflare Pages
-      uses: cloudflare/pages-action@v1
-      with:
-        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-        accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-        projectName: spark-dashboard  # Replace with your Cloudflare Pages project name
-        directory: ./dist  # Replace with your output directory after build
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build project
+        run: npm run build # Assumes your project has a build script in package.json
+        env:
+          API_TOKEN: ${{ secrets.API_TOKEN }}
+
+      - name: Deploy to Cloudflare Pages
+        uses: cloudflare/pages-action@v1
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          projectName: spark-dashboard # Replace with your Cloudflare Pages project name
+          directory: ./dist # Replace with your output directory after build
 

.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Test Observable Dashboard
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    environment: default
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Test project
+        run: npm test

.prettierignore

@@ -0,0 +1 @@
+src/.observablehq

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "semi": false
+}

README.md

@@ -4,7 +4,7 @@ This is an [Observable Framework](https://observablehq.com/framework) app runnin
 
 ## Development
 
- To start the local preview server, run:
+To start the local preview server, run:
 
 ```
 npm run dev
@@ -47,11 +47,11 @@ A typical Framework project looks like this:
 
 ## Command reference
 
-| Command           | Description                                              |
-| ----------------- | -------------------------------------------------------- |
-| `npm install`            | Install or reinstall dependencies                        |
-| `npm run dev`        | Start local preview server                               |
-| `npm run build`      | Build your static site, generating `./dist`              |
-| `npm run deploy`     | Deploy your app to Observable                            |
-| `npm run clean`      | Clear the local data loader cache                        |
-| `npm run observable` | Run commands like `observable help`                      |
+| Command              | Description                                 |
+| -------------------- | ------------------------------------------- |
+| `npm install`        | Install or reinstall dependencies           |
+| `npm run dev`        | Start local preview server                  |
+| `npm run build`      | Build your static site, generating `./dist` |
+| `npm run deploy`     | Deploy your app to Observable               |
+| `npm run clean`      | Clear the local data loader cache           |
+| `npm run observable` | Run commands like `observable help`         |

observablehq.config.js

@@ -1,16 +1,18 @@
-import { jsonFetcher } from "./src/data/json-fetcher.js";
-import { getDateXDaysAgo } from "./src/utils/date-utils.js";
+import { jsonFetcher } from './src/data/json-fetcher.js'
+import { getDateXDaysAgo } from './src/utils/date-utils.js'
 
-const start = '2024-04-07';
-const end = getDateXDaysAgo(1);
+const start = '2024-04-07'
+const end = getDateXDaysAgo(1)
 
-const result = await jsonFetcher(`https://stats.filspark.com/miners/retrieval-success-rate/summary?from=${start}&to=${end}`)
-const providerPaths = result.map(provider => `/provider/${provider.miner_id}`);
+const result = await jsonFetcher(
+  `https://stats.filspark.com/miners/retrieval-success-rate/summary?from=${start}&to=${end}`,
+)
+const providerPaths = result.map((provider) => `/provider/${provider.miner_id}`)
 
 // See https://observablehq.com/framework/config for documentation.
 export default {
   // The app’s title; used in the sidebar and webpage titles.
-  title: "spark-dash",
+  title: 'Spark Dashboard',
 
   // The pages and sections in the sidebar. If you don’t specify this option,
   // all pages will be listed in alphabetical order. Listing pages explicitly
@@ -29,10 +31,10 @@ export default {
   head: '<link rel="icon" href="media/spark-with-bbox.png" type="image/png" sizes="32x32"><script defer data-domain="dashboard.filspark.com" src="https://plausible.io/js/script.js"></script>',
 
   // The path to the source root.
-  root: "src",
+  root: 'src',
 
   // Some additional configuration options and their defaults:
-  // theme: "default", // try "light", "dark", "slate", etc.
+  theme: 'dark', // try "light", "dark", "slate", etc.
   // header: "", // what to show in the header (HTML)
   // footer: "Built with Observable.", // what to show in the footer (HTML)
   sidebar: false, // whether to show the sidebar
@@ -44,4 +46,4 @@ export default {
   // typographer: false, // smart quotes and other typographic improvements
   // cleanUrls: true, // drop .html from URLs
   dynamicPaths: providerPaths,
-};
+}

package-lock.json

@@ -6,7 +6,8 @@
     "build": "observable build",
     "dev": "observable preview",
     "deploy": "observable deploy",
-    "observable": "observable"
+    "observable": "observable",
+    "test": "prettier --check ."
   },
   "dependencies": {
     "@observablehq/framework": "^1.12.0",
@@ -16,6 +17,7 @@
     "p-retry": "^6.2.1"
   },
   "devDependencies": {
+    "prettier": "^3.4.2",
     "rimraf": "^5.0.5"
   },
   "engines": {

package.json

@@ -1,58 +1,58 @@
 import * as Plot from 'npm:@observablehq/plot'
 import * as d3 from 'd3'
 
-export function Histogram (events, { width, title, thresholds }) {
-  const data = events.flatMap(d => {
-    let res = Array.from([ { type: 'HTTP or Graphsync', value: d.success_rate * 100 }]);
+export function Histogram(events, { width, title, thresholds }) {
+  const data = events.flatMap((d) => {
+    const res = Array.from([
+      { type: 'HTTP or Graphsync', value: d.success_rate * 100 },
+    ])
     // We only want to count the http success rate if it is not null
     // When querying the summary per miner, an http of null means that the miner has never been tested using http
-    // A value of 0 means that the miner has been tested at some point in time but has never been successful. 
+    // A value of 0 means that the miner has been tested at some point in time but has never been successful.
     if (d.success_rate_http != null) {
-        res.push({ type: 'HTTP only', value: d.success_rate_http * 100 })
+      res.push({ type: 'HTTP only', value: d.success_rate_http * 100 })
     }
     return res
-}
-  )
+  })
 
-  // We want to create a number of evenly spaced bins (thresholds) in which we can collect each success rate value into 
-  const binnedData = Array.from(new Set(data.map(item => item.type))).flatMap(type => {
-    const groupData = data.filter(d => d.type === type)
-    const bins = d3
-      .bin()
-      // The rates are percentage values, so the domain of the bins will be 0 to 100
-      .domain([0, 100])
-      .thresholds(thresholds)(groupData.map(d => d.value))
+  // We want to create a number of evenly spaced bins (thresholds) in which we can collect each success rate value into
+  const binnedData = Array.from(new Set(data.map((item) => item.type))).flatMap(
+    (type) => {
+      const groupData = data.filter((d) => d.type === type)
+      const bins = d3
+        .bin()
+        // The rates are percentage values, so the domain of the bins will be 0 to 100
+        .domain([0, 100])
+        .thresholds(thresholds)(groupData.map((d) => d.value))
 
-    return bins.map(bin => ({
-      type,
-      threshold: `${bin.x0}–${bin.x1}`,
-      count: bin.length
-    }))
-  })
+      return bins.map((bin) => ({
+        type,
+        threshold: `${bin.x0}–${bin.x1}`,
+        count: bin.length,
+      }))
+    },
+  )
 
   return Plot.plot({
     marks: [
-      Plot.barY(
-        binnedData,
-        {
-          fx: 'threshold',
-          y: 'count',
-          x: 'type',
-          fill: 'type'
-        }
-      )
+      Plot.barY(binnedData, {
+        fx: 'threshold',
+        y: 'count',
+        x: 'type',
+        fill: 'type',
+      }),
     ],
     y: { grid: true },
     x: {
       axis: null,
-      padding: 0.1
+      padding: 0.1,
     },
     color: {
       legend: true,
-      label: 'Type'
+      label: 'Type',
     },
     width,
     title,
-    facet: { label: 'Rate Ranges in %' }
+    facet: { label: 'Rate Ranges in %' },
   })
 }