From 4a2f82f06490b7fb277dc6c7558d10c34503a495 Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Wed, 3 Jun 2026 01:38:53 -0700 Subject: add basic daily answer encryption --- .github/actions/build/action.yml | 18 ------------- .github/workflows/build_website.yml | 13 --------- .github/workflows/deploy_website.yml | 40 --------------------------- .husky/commit-msg | 4 --- server/index.ts | 51 +++++++++++++++++++++++++++++++++++ src/app.tsx | 15 ++++++++--- src/components/Footer/index.tsx | 9 ++----- src/constants/index.ts | 2 +- src/data/songs.ts | 4 +++ src/helpers/fetchSolution.ts | 52 ++++++++++++++++++++++++++++++++++++ src/helpers/fetchSongs.ts | 51 +++++++++++++++++++++++++++++++++++ 11 files changed, 172 insertions(+), 87 deletions(-) delete mode 100644 .github/actions/build/action.yml delete mode 100644 .github/workflows/build_website.yml delete mode 100644 .github/workflows/deploy_website.yml delete mode 100644 .husky/commit-msg create mode 100644 server/index.ts create mode 100644 src/data/songs.ts create mode 100644 src/helpers/fetchSolution.ts create mode 100644 src/helpers/fetchSongs.ts diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml deleted file mode 100644 index e4e161f..0000000 --- a/.github/actions/build/action.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Build Website -runs: - using: "composite" - steps: - - name: Enable Corepack - shell: bash - run: corepack enable - - name: Set Node.js - uses: actions/setup-node@v4 - with: - node-version: 20.x - cache: 'yarn' - - name: Install dependencies - shell: bash - run: yarn install --immutable - - name: Run build - shell: bash - run: yarn build diff --git a/.github/workflows/build_website.yml b/.github/workflows/build_website.yml deleted file mode 100644 index 56a2200..0000000 --- a/.github/workflows/build_website.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Build Website - -on: - pull_request: - branches: [ "master" ] - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/build diff --git a/.github/workflows/deploy_website.yml b/.github/workflows/deploy_website.yml deleted file mode 100644 index 7c0557e..0000000 --- a/.github/workflows/deploy_website.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Simple workflow for deploying static content to GitHub Pages -name: Deploy Website - -on: - # Runs on pushes targeting the default branch - push: - branches: ["master"] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages -permissions: - contents: read - pages: write - id-token: write - -# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. -# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. -concurrency: - group: "pages" - cancel-in-progress: false - -jobs: - # Single deploy job since we're just deploying - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/build - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: './build' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 diff --git a/.husky/commit-msg b/.husky/commit-msg deleted file mode 100644 index 617efbd..0000000 --- a/.husky/commit-msg +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npx --no-install commitlint --edit diff --git a/server/index.ts b/server/index.ts new file mode 100644 index 0000000..bf4cafd --- /dev/null +++ b/server/index.ts @@ -0,0 +1,51 @@ +import express from 'express'; +import path from 'path'; +import crypto from 'crypto'; +import { songs } from '../src/data/songs'; +import { startDate } from '../src/constants/startDate'; +import cors from 'cors'; + + +const app = express(); +app.use(cors()); +app.use(express.json()); + +const PORT = process.env.PORT || 3001; +const SALT = process.env.HEARDLE_SALT ?? 'changeme'; + +function getDailyKey(): Buffer { + const date = new Date().toISOString().split('T')[0]; + return crypto.pbkdf2Sync(date, SALT, 100_000, 32, 'sha256'); +} + +app.get('/today', (_req, res) => { + const msInDay = 86_400_000; + const index = Math.floor((Date.now() - startDate.getTime()) / msInDay); + const song = songs[index % songs.length]; + + const key = getDailyKey(); + const iv = crypto.randomBytes(12); + const cipher = crypto.createCipheriv('aes-256-gcm', key, iv); + const encrypted = Buffer.concat([ + cipher.update(JSON.stringify(song), 'utf8'), + cipher.final(), + ]); + res.json({ + iv: iv.toString('hex'), + tag: cipher.getAuthTag().toString('hex'), + data: encrypted.toString('hex'), + }); +}); + +app.get('/songs', (_req, res) => { + res.json(songs.map(({ artist, name }) => ({ artist, name }))); +}); + +if (process.env.NODE_ENV === 'production') { + app.use(express.static(path.join(__dirname, '../build'))); + app.get('*', (_req, res) => { + res.sendFile(path.join(__dirname, '../build', 'index.html')); + }); +} + +app.listen(PORT, () => console.log(`Server running on :${PORT}`)); diff --git a/src/app.tsx b/src/app.tsx index 7c4c81d..4eeccc8 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -3,8 +3,8 @@ import _ from "lodash"; import { Song } from "./types/song"; import { GuessState, GuessType } from "./types/guess"; +import { getDailySolution } from "./helpers/fetchSolution"; -import { todaysSolution } from "./helpers"; import { Header, InfoPopUp, Game, Footer } from "./components"; @@ -22,6 +22,7 @@ function App() { const [currentTry, setCurrentTry] = React.useState(0); const [selectedSong, setSelectedSong] = React.useState(); const [didGuess, setDidGuess] = React.useState(false); + const [todaysSolution, setTodaysSolution] = React.useState(null); const firstRun = localStorage.getItem("firstRun") === null; @@ -58,6 +59,10 @@ function App() { let stats = JSON.parse(localStorage.getItem("stats") || "{}"); let statsVersion = JSON.parse(localStorage.getItem("version") || "1"); + React.useEffect(() => { + getDailySolution().then(solution => setTodaysSolution(solution)); + }, []); + React.useEffect(() => { if (Array.isArray(stats)) { const visitedToday = _.isEqual( @@ -78,8 +83,6 @@ function App() { setDidGuess(didGuess); } } else { - // initialize stats - // useEffect below does rest stats = []; stats.push({ solution: todaysSolution, @@ -168,7 +171,7 @@ function App() { let state = GuessState.Incorrect; if (selectedSong === todaysSolution) { state = GuessState.Correct; - } else if (selectedSong?.artist === todaysSolution.artist) { + } else if (selectedSong?.artist === todaysSolution?.artist) { state = GuessState.PartiallyCorrect } @@ -195,6 +198,10 @@ function App() { } }, [guesses, selectedSong]); + if (todaysSolution === null) { + return null; + } + return (
diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx index e2747c3..3ba4c7c 100644 --- a/src/components/Footer/index.tsx +++ b/src/components/Footer/index.tsx @@ -20,13 +20,8 @@ export function Footer() { return (