mirror of
https://github.com/kennethnym/freya
synced 2026-06-19 08:01:17 +01:00
Compare commits
5 Commits
feat/agent
...
fix/expo-5
| Author | SHA1 | Date | |
|---|---|---|---|
dc91a048c9
|
|||
| 63e71fb828 | |||
| e9f97d6f02 | |||
| e52e057548 | |||
| d3d9def260 |
11
AGENTS.md
11
AGENTS.md
@@ -39,4 +39,13 @@ Use Bun exclusively. Do not use npm or yarn.
|
||||
|
||||
- Branch: `feat/<task>`, `fix/<task>`, `ci/<task>`, etc.
|
||||
- Commits: conventional commit format, title <= 50 chars
|
||||
- Signing: If `GPG_PRIVATE_KEY_PASSPHRASE` env var is available, use it to sign commits with `git commit -S`
|
||||
|
||||
## Nix
|
||||
|
||||
Use the Nix dev shell for project commands by default.
|
||||
|
||||
- Run repo tooling through `nix develop -c`, e.g. `nix develop -c bun test`.
|
||||
- Use Bun exclusively inside the Nix shell.
|
||||
- Do not use host `bun`, `node`, `tsc`, or package binaries for project tasks unless explicitly checking host behavior.
|
||||
- Simple inspection commands like `rg`, `sed`, `ls`, and `git status` may run outside Nix.
|
||||
- While `flake.nix` is untracked, use `nix develop path:. -c <command>`.
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
"lucide-react": "^0.577.0",
|
||||
"next-themes": "^0.4.6",
|
||||
"radix-ui": "^1.4.3",
|
||||
"react": "^19.2.0",
|
||||
"react-dom": "^19.2.0",
|
||||
"react": "19.2.3",
|
||||
"react-dom": "19.2.3",
|
||||
"shadcn": "^4.0.8",
|
||||
"sonner": "^2.0.7",
|
||||
"tailwind-merge": "^3.5.0",
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
{
|
||||
"expo": {
|
||||
"name": "Freya",
|
||||
"slug": "freya-client",
|
||||
"slug": "freya",
|
||||
"version": "1.0.0",
|
||||
"orientation": "portrait",
|
||||
"icon": "./assets/images/icon.png",
|
||||
"scheme": "freya",
|
||||
"userInterfaceStyle": "automatic",
|
||||
"newArchEnabled": true,
|
||||
"ios": {
|
||||
"infoPlist": {
|
||||
"NSAppTransportSecurity": {
|
||||
@@ -24,7 +23,6 @@
|
||||
"backgroundImage": "./assets/images/android-icon-background.png",
|
||||
"monochromeImage": "./assets/images/android-icon-monochrome.png"
|
||||
},
|
||||
"edgeToEdgeEnabled": true,
|
||||
"predictiveBackGestureEnabled": false,
|
||||
"package": "sh.nym.freya"
|
||||
},
|
||||
@@ -54,55 +52,82 @@
|
||||
{
|
||||
"fontFamily": "Inter",
|
||||
"fontDefinitions": [
|
||||
{ "path": "./assets/fonts/Inter_100Thin.ttf", "weight": 100 },
|
||||
{
|
||||
"path": "./assets/fonts/Inter_100Thin.ttf",
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/Inter_100Thin_Italic.ttf",
|
||||
"weight": 100,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/Inter_200ExtraLight.ttf", "weight": 200 },
|
||||
{
|
||||
"path": "./assets/fonts/Inter_200ExtraLight.ttf",
|
||||
"weight": 200
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/Inter_200ExtraLight_Italic.ttf",
|
||||
"weight": 200,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/Inter_300Light.ttf", "weight": 300 },
|
||||
{
|
||||
"path": "./assets/fonts/Inter_300Light.ttf",
|
||||
"weight": 300
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/Inter_300Light_Italic.ttf",
|
||||
"weight": 300,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/Inter_400Regular.ttf", "weight": 400 },
|
||||
{
|
||||
"path": "./assets/fonts/Inter_400Regular.ttf",
|
||||
"weight": 400
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/Inter_400Regular_Italic.ttf",
|
||||
"weight": 400,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/Inter_500Medium.ttf", "weight": 500 },
|
||||
{
|
||||
"path": "./assets/fonts/Inter_500Medium.ttf",
|
||||
"weight": 500
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/Inter_500Medium_Italic.ttf",
|
||||
"weight": 500,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/Inter_600SemiBold.ttf", "weight": 600 },
|
||||
{
|
||||
"path": "./assets/fonts/Inter_600SemiBold.ttf",
|
||||
"weight": 600
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/Inter_600SemiBold_Italic.ttf",
|
||||
"weight": 600,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/Inter_700Bold.ttf", "weight": 700 },
|
||||
{
|
||||
"path": "./assets/fonts/Inter_700Bold.ttf",
|
||||
"weight": 700
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/Inter_700Bold_Italic.ttf",
|
||||
"weight": 700,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/Inter_800ExtraBold.ttf", "weight": 800 },
|
||||
{
|
||||
"path": "./assets/fonts/Inter_800ExtraBold.ttf",
|
||||
"weight": 800
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/Inter_800ExtraBold_Italic.ttf",
|
||||
"weight": 800,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/Inter_900Black.ttf", "weight": 900 },
|
||||
{
|
||||
"path": "./assets/fonts/Inter_900Black.ttf",
|
||||
"weight": 900
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/Inter_900Black_Italic.ttf",
|
||||
"weight": 900,
|
||||
@@ -113,49 +138,73 @@
|
||||
{
|
||||
"fontFamily": "Source Serif 4",
|
||||
"fontDefinitions": [
|
||||
{ "path": "./assets/fonts/SourceSerif4_200ExtraLight.ttf", "weight": 200 },
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_200ExtraLight.ttf",
|
||||
"weight": 200
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf",
|
||||
"weight": 200,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/SourceSerif4_300Light.ttf", "weight": 300 },
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_300Light.ttf",
|
||||
"weight": 300
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_300Light_Italic.ttf",
|
||||
"weight": 300,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/SourceSerif4_400Regular.ttf", "weight": 400 },
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_400Regular.ttf",
|
||||
"weight": 400
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_400Regular_Italic.ttf",
|
||||
"weight": 400,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/SourceSerif4_500Medium.ttf", "weight": 500 },
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_500Medium.ttf",
|
||||
"weight": 500
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_500Medium_Italic.ttf",
|
||||
"weight": 500,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/SourceSerif4_600SemiBold.ttf", "weight": 600 },
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_600SemiBold.ttf",
|
||||
"weight": 600
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_600SemiBold_Italic.ttf",
|
||||
"weight": 600,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/SourceSerif4_700Bold.ttf", "weight": 700 },
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_700Bold.ttf",
|
||||
"weight": 700
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_700Bold_Italic.ttf",
|
||||
"weight": 700,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/SourceSerif4_800ExtraBold.ttf", "weight": 800 },
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_800ExtraBold.ttf",
|
||||
"weight": 800
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf",
|
||||
"weight": 800,
|
||||
"style": "italic"
|
||||
},
|
||||
{ "path": "./assets/fonts/SourceSerif4_900Black.ttf", "weight": 900 },
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_900Black.ttf",
|
||||
"weight": 900
|
||||
},
|
||||
{
|
||||
"path": "./assets/fonts/SourceSerif4_900Black_Italic.ttf",
|
||||
"weight": 900,
|
||||
@@ -204,7 +253,9 @@
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
],
|
||||
"expo-web-browser",
|
||||
"expo-image"
|
||||
],
|
||||
"experiments": {
|
||||
"typedRoutes": true,
|
||||
@@ -213,7 +264,7 @@
|
||||
"extra": {
|
||||
"router": {},
|
||||
"eas": {
|
||||
"projectId": "61092d23-36aa-418e-929d-ea40dc912e8f"
|
||||
"projectId": "c54ea4e5-27da-4066-b081-db8005ecf70a"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
"ios": "expo start --ios",
|
||||
"web": "expo start --web",
|
||||
"lint": "expo lint",
|
||||
"build:ios": "eas build --profile development --platform ios --non-interactive",
|
||||
"build:ios-simulator": "eas build --profile development-simulator --platform ios --non-interactive",
|
||||
"build:ios": "bunx eas-cli build --profile development --platform ios --non-interactive",
|
||||
"build:ios-simulator": "bunx eas-cli build --profile development-simulator --platform ios --non-interactive",
|
||||
"debugger": "bun run scripts/open-debugger.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
@@ -19,42 +19,38 @@
|
||||
"@expo-google-fonts/source-serif-4": "^0.4.1",
|
||||
"@expo/vector-icons": "^15.0.3",
|
||||
"@json-render/react-native": "^0.13.0",
|
||||
"@react-navigation/bottom-tabs": "^7.4.0",
|
||||
"@react-navigation/elements": "^2.6.3",
|
||||
"@react-navigation/native": "^7.1.8",
|
||||
"@tanstack/react-query": "^5.90.21",
|
||||
"expo": "~54.0.33",
|
||||
"expo-constants": "~18.0.13",
|
||||
"expo-dev-client": "~6.0.20",
|
||||
"expo-font": "~14.0.11",
|
||||
"expo-haptics": "~15.0.8",
|
||||
"expo-image": "~3.0.11",
|
||||
"expo-linking": "~8.0.11",
|
||||
"expo-location": "~19.0.8",
|
||||
"expo-router": "~6.0.23",
|
||||
"expo-splash-screen": "~31.0.13",
|
||||
"expo-status-bar": "~3.0.9",
|
||||
"expo-symbols": "~1.0.8",
|
||||
"expo-system-ui": "~6.0.9",
|
||||
"expo-web-browser": "~15.0.10",
|
||||
"react": "19.1.0",
|
||||
"react-dom": "19.1.0",
|
||||
"react-native": "0.81.5",
|
||||
"react-native-gesture-handler": "~2.28.0",
|
||||
"react-native-reanimated": "~4.1.1",
|
||||
"react-native-safe-area-context": "~5.6.0",
|
||||
"react-native-screens": "~4.16.0",
|
||||
"react-native-svg": "15.12.1",
|
||||
"expo": "^56.0.0",
|
||||
"expo-constants": "~56.0.18",
|
||||
"expo-dev-client": "~56.0.20",
|
||||
"expo-font": "~56.0.7",
|
||||
"expo-haptics": "~56.0.3",
|
||||
"expo-image": "~56.0.11",
|
||||
"expo-linking": "~56.0.14",
|
||||
"expo-location": "~56.0.18",
|
||||
"expo-router": "~56.2.11",
|
||||
"expo-splash-screen": "~56.0.10",
|
||||
"expo-status-bar": "~56.0.4",
|
||||
"expo-symbols": "~56.0.6",
|
||||
"expo-system-ui": "~56.0.5",
|
||||
"expo-web-browser": "~56.0.5",
|
||||
"react": "19.2.3",
|
||||
"react-dom": "19.2.3",
|
||||
"react-native": "0.85.3",
|
||||
"react-native-gesture-handler": "~2.31.1",
|
||||
"react-native-reanimated": "4.3.1",
|
||||
"react-native-safe-area-context": "~5.7.0",
|
||||
"react-native-screens": "4.25.2",
|
||||
"react-native-svg": "15.15.4",
|
||||
"react-native-web": "~0.21.0",
|
||||
"react-native-worklets": "0.5.1",
|
||||
"react-native-worklets": "0.8.3",
|
||||
"twrnc": "^4.16.0",
|
||||
"zod": "^4.3.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "~19.1.0",
|
||||
"eas-cli": "^18.0.1",
|
||||
"@types/react": "~19.2.10",
|
||||
"eslint": "^9.25.0",
|
||||
"eslint-config-expo": "~10.0.0",
|
||||
"typescript": "^6"
|
||||
"eslint-config-expo": "~56.0.4",
|
||||
"typescript": "~6.0.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,14 +8,16 @@ import type { ServerWebSocket } from "bun"
|
||||
|
||||
const PROXY_PORT = parseInt(process.env.PROXY_PORT || "8080", 10)
|
||||
const PROXY_HOST = process.env.PROXY_HOST || "0.0.0.0"
|
||||
const METRO_HOST = process.env.METRO_HOST || "localhost"
|
||||
const METRO_PORT = parseInt(process.env.METRO_PORT || "8081", 10)
|
||||
const METRO_BASE = `http://127.0.0.1:${METRO_PORT}`
|
||||
const METRO_BASE = `http://${METRO_HOST}:${METRO_PORT}`
|
||||
const METRO_WS_BASE = `ws://${METRO_HOST}:${METRO_PORT}`
|
||||
|
||||
function forwardHeaders(headers: Headers): Headers {
|
||||
const result = new Headers(headers)
|
||||
result.delete("origin")
|
||||
result.delete("referer")
|
||||
result.set("host", `127.0.0.1:${METRO_PORT}`)
|
||||
result.set("host", `${METRO_HOST}:${METRO_PORT}`)
|
||||
return result
|
||||
}
|
||||
|
||||
@@ -40,7 +42,7 @@ Bun.serve<WsData>({
|
||||
|
||||
// WebSocket upgrade — bridge to Metro's ws endpoint
|
||||
if (req.headers.get("upgrade")?.toLowerCase() === "websocket") {
|
||||
const wsUrl = `ws://127.0.0.1:${METRO_PORT}${url.pathname}${url.search}`
|
||||
const wsUrl = `${METRO_WS_BASE}${url.pathname}${url.search}`
|
||||
const upstream = new WebSocket(wsUrl)
|
||||
|
||||
// Wait for upstream to connect before upgrading the client
|
||||
@@ -65,12 +67,12 @@ Bun.serve<WsData>({
|
||||
// HTTP proxy
|
||||
const upstream = `${METRO_BASE}${url.pathname}${url.search}`
|
||||
const body = req.body ? await req.arrayBuffer() : undefined
|
||||
const res = await fetch(upstream, {
|
||||
method: req.method,
|
||||
headers: forwardHeaders(req.headers),
|
||||
body,
|
||||
redirect: "manual",
|
||||
})
|
||||
const res = await fetchUpstream(upstream, req.method, forwardHeaders(req.headers), body)
|
||||
if (res == null) {
|
||||
return new Response(`Metro is not reachable on ${METRO_HOST}. Restart the Expo dev server.`, {
|
||||
status: 502,
|
||||
})
|
||||
}
|
||||
|
||||
return new Response(res.body, {
|
||||
status: res.status,
|
||||
@@ -121,9 +123,7 @@ async function printDebuggerUrl() {
|
||||
const target = targets.find((t) => t.reactNative?.capabilities?.prefersFuseboxFrontend)
|
||||
if (!target) return
|
||||
|
||||
const wsPath = target.webSocketDebuggerUrl
|
||||
.replace(/^ws:\/\//, "")
|
||||
.replace(`127.0.0.1:${METRO_PORT}`, `${tsIp}:${PROXY_PORT}`)
|
||||
const wsPath = getProxyWebSocketPath(target.webSocketDebuggerUrl)
|
||||
|
||||
console.log(
|
||||
`\n React Native DevTools:\n ${base}/debugger-frontend/rn_fusebox.html?ws=${encodeURIComponent(wsPath)}&sources.hide_add_folder=true&unstable_enableNetworkPanel=true\n`,
|
||||
@@ -131,9 +131,28 @@ async function printDebuggerUrl() {
|
||||
}
|
||||
|
||||
console.log(
|
||||
`[proxy] listening on ${PROXY_HOST}:${PROXY_PORT}, forwarding to 127.0.0.1:${METRO_PORT}`,
|
||||
`[proxy] listening on ${PROXY_HOST}:${PROXY_PORT}, forwarding to ${METRO_HOST}:${METRO_PORT}`,
|
||||
)
|
||||
|
||||
async function fetchUpstream(
|
||||
upstream: string,
|
||||
method: string,
|
||||
headers: Headers,
|
||||
body: ArrayBuffer | undefined,
|
||||
) {
|
||||
try {
|
||||
return await fetch(upstream, {
|
||||
method,
|
||||
headers,
|
||||
body,
|
||||
redirect: "manual",
|
||||
})
|
||||
} catch {
|
||||
console.error(`[proxy] ${method} ${upstream} failed; Metro is not reachable`)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
function isDebugTarget(value: unknown): value is DebugTarget {
|
||||
if (!isRecord(value) || typeof value.webSocketDebuggerUrl !== "string") return false
|
||||
|
||||
@@ -149,6 +168,11 @@ function isDebugTarget(value: unknown): value is DebugTarget {
|
||||
return prefersFuseboxFrontend === undefined || typeof prefersFuseboxFrontend === "boolean"
|
||||
}
|
||||
|
||||
function getProxyWebSocketPath(webSocketDebuggerUrl: string) {
|
||||
const url = new URL(webSocketDebuggerUrl)
|
||||
return `${tsIp}:${PROXY_PORT}${url.pathname}${url.search}`
|
||||
}
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return typeof value === "object" && value !== null
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
import { $ } from "bun"
|
||||
|
||||
const PROXY_PORT = process.env.PROXY_PORT || "8080"
|
||||
const METRO_PORT = process.env.METRO_PORT || "8081"
|
||||
const tsIp = (await $`tailscale ip -4`.text()).trim()
|
||||
const base = `http://${tsIp}:${PROXY_PORT}`
|
||||
|
||||
@@ -37,9 +36,7 @@ if (!target) {
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
const wsUrl = target.webSocketDebuggerUrl
|
||||
.replace(/^ws:\/\//, "")
|
||||
.replace(`127.0.0.1:${METRO_PORT}`, `${tsIp}:${PROXY_PORT}`)
|
||||
const wsUrl = getProxyWebSocketPath(target.webSocketDebuggerUrl)
|
||||
|
||||
const url = `${base}/debugger-frontend/rn_fusebox.html?ws=${encodeURIComponent(wsUrl)}&sources.hide_add_folder=true&unstable_enableNetworkPanel=true`
|
||||
|
||||
@@ -71,6 +68,11 @@ function isDebugTarget(value: unknown): value is DebugTarget {
|
||||
return prefersFuseboxFrontend === undefined || typeof prefersFuseboxFrontend === "boolean"
|
||||
}
|
||||
|
||||
function getProxyWebSocketPath(webSocketDebuggerUrl: string) {
|
||||
const url = new URL(webSocketDebuggerUrl)
|
||||
return `${tsIp}:${PROXY_PORT}${url.pathname}${url.search}`
|
||||
}
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return typeof value === "object" && value !== null
|
||||
}
|
||||
|
||||
@@ -1,14 +1,47 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
PROXY_PORT=8080
|
||||
METRO_PORT=8081
|
||||
PROXY_PORT=${PROXY_PORT:-8080}
|
||||
METRO_HOST=${METRO_HOST:-localhost}
|
||||
METRO_PORT=${METRO_PORT:-8081}
|
||||
TS_IP=$(tailscale ip -4)
|
||||
|
||||
# Start a reverse proxy so Metro sees all requests as loopback.
|
||||
# This makes debugger endpoints (/debugger-frontend, /json, /open-debugger)
|
||||
# accessible through the Tailscale IP.
|
||||
PROXY_PORT=$PROXY_PORT METRO_PORT=$METRO_PORT bun run scripts/dev-proxy.ts &
|
||||
port_is_open() {
|
||||
(: >"/dev/tcp/$1/$2") >/dev/null 2>&1
|
||||
}
|
||||
|
||||
ensure_port_available() {
|
||||
local port=$1
|
||||
local name=$2
|
||||
|
||||
if port_is_open localhost "$port"; then
|
||||
echo "$name port $port is already in use." >&2
|
||||
echo "Stop the existing process or set ${name}_PORT to another value." >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
wait_for_metro() {
|
||||
for _ in {1..120}; do
|
||||
if port_is_open "$METRO_HOST" "$METRO_PORT"; then
|
||||
return 0
|
||||
fi
|
||||
sleep 0.5
|
||||
done
|
||||
|
||||
echo "Metro did not start on ${METRO_HOST}:${METRO_PORT}." >&2
|
||||
return 1
|
||||
}
|
||||
|
||||
ensure_port_available "$PROXY_PORT" PROXY
|
||||
ensure_port_available "$METRO_PORT" METRO
|
||||
|
||||
# Start the proxy only after Metro is listening. Otherwise an iOS client can hit
|
||||
# the proxy during Expo startup and get a misleading upstream connection error.
|
||||
(
|
||||
wait_for_metro
|
||||
exec env PROXY_PORT=$PROXY_PORT METRO_HOST=$METRO_HOST METRO_PORT=$METRO_PORT bun run scripts/dev-proxy.ts
|
||||
) &
|
||||
PROXY_PID=$!
|
||||
trap "kill $PROXY_PID 2>/dev/null" EXIT
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import Feather from "@expo/vector-icons/Feather"
|
||||
import { type PressableProps, Pressable, View } from "react-native"
|
||||
import { type PressableProps, Pressable, type StyleProp, View, type ViewStyle } from "react-native"
|
||||
import tw from "twrnc"
|
||||
|
||||
import { SansSerifText } from "./sans-serif-text"
|
||||
@@ -14,9 +14,10 @@ function ButtonIcon({ name }: ButtonIconProps) {
|
||||
return <Feather name={name} size={18} color={tw.color("text-stone-100 dark:text-stone-200")} />
|
||||
}
|
||||
|
||||
type ButtonProps = Omit<PressableProps, "children"> & {
|
||||
type ButtonProps = Omit<PressableProps, "children" | "style"> & {
|
||||
label: string
|
||||
leadingIcon?: React.ReactNode
|
||||
style?: StyleProp<ViewStyle>
|
||||
trailingIcon?: React.ReactNode
|
||||
}
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
"lottie-react": "^2.4.1",
|
||||
"lucide-react": "^0.577.0",
|
||||
"motion": "^12.35.0",
|
||||
"react": "^19.2.4",
|
||||
"react": "19.2.3",
|
||||
"react-aria-components": "^1.16.0",
|
||||
"react-dom": "^19.2.4",
|
||||
"react-dom": "19.2.3",
|
||||
"react-router": "7.12.0",
|
||||
"resend": "^6.9.3",
|
||||
"streamdown": "^2.4.0"
|
||||
|
||||
2
bunfig.toml
Normal file
2
bunfig.toml
Normal file
@@ -0,0 +1,2 @@
|
||||
[install]
|
||||
linker = "hoisted"
|
||||
27
flake.lock
generated
Normal file
27
flake.lock
generated
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1781577229,
|
||||
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
282
flake.nix
Normal file
282
flake.nix
Normal file
@@ -0,0 +1,282 @@
|
||||
{
|
||||
description = "FREYA development shell";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ nixpkgs, ... }:
|
||||
let
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
|
||||
lib = nixpkgs.lib;
|
||||
forEachSystem = lib.genAttrs systems;
|
||||
pkgsFor = forEachSystem (system: import nixpkgs { inherit system; });
|
||||
|
||||
# App outputs are for long-running local tools and dev servers.
|
||||
appScripts = {
|
||||
expo = "expo";
|
||||
drizzle-studio = "drizzle-studio";
|
||||
freya-backend = "freya-backend";
|
||||
admin-dashboard = "admin-dashboard";
|
||||
agent-test-cli = "agent-test-cli";
|
||||
};
|
||||
|
||||
# Check outputs are the CI-like validation commands run by `nix flake check`.
|
||||
checkCommands = {
|
||||
format-check = "bun run format:check";
|
||||
lint = "bun run lint";
|
||||
test = "bun run test";
|
||||
};
|
||||
|
||||
# Dev-shell conveniences mirror the common app/check commands.
|
||||
shellScripts = appScripts // {
|
||||
freya-test = "test";
|
||||
lint = "lint";
|
||||
format-check = "format:check";
|
||||
};
|
||||
|
||||
# node_modules is content-addressed. If bun.lock or package manifests
|
||||
# change, Nix will report the new hash to put here.
|
||||
nodeModulesHashes = {
|
||||
x86_64-linux = "sha256-8uhlaQAFfCgGdUlrz8sqhtIkC/WfdasbTCi3p/NkU/w=";
|
||||
};
|
||||
checkSystems = lib.attrNames nodeModulesHashes;
|
||||
|
||||
# Dependency derivations only need the lockfile and workspace manifests,
|
||||
# so source-only edits do not force Bun to reinstall.
|
||||
dependencySource = lib.fileset.toSource {
|
||||
root = ./.;
|
||||
fileset = lib.fileset.fileFilter (
|
||||
file: file.name == "bun.lock" || file.name == "package.json" || file.name == "bunfig.toml"
|
||||
) ./.;
|
||||
};
|
||||
|
||||
# Checks run against a clean source tree, even when using `path:.`.
|
||||
# Without this filter, local node_modules can sneak into the Nix sandbox.
|
||||
projectSource = builtins.path {
|
||||
name = "freya-source";
|
||||
path = ./.;
|
||||
filter =
|
||||
path: type:
|
||||
let
|
||||
name = builtins.baseNameOf path;
|
||||
in
|
||||
!(type == "directory" && (name == ".git" || name == "node_modules")) && name != "result";
|
||||
};
|
||||
|
||||
mkBunScriptCommands =
|
||||
pkgs: scripts:
|
||||
let
|
||||
mkBunScript =
|
||||
name: script:
|
||||
pkgs.writeShellApplication {
|
||||
inherit name;
|
||||
runtimeInputs = with pkgs; [
|
||||
bun
|
||||
git
|
||||
];
|
||||
text = ''
|
||||
repo_root="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
|
||||
cd "$repo_root"
|
||||
exec bun run ${lib.escapeShellArg script} "$@"
|
||||
'';
|
||||
};
|
||||
in
|
||||
lib.mapAttrs mkBunScript scripts;
|
||||
mkBunApps =
|
||||
commands:
|
||||
lib.mapAttrs (name: command: {
|
||||
type = "app";
|
||||
program = "${command}/bin/${name}";
|
||||
}) commands;
|
||||
mkBunNodeModules =
|
||||
system: pkgs:
|
||||
pkgs.stdenvNoCC.mkDerivation {
|
||||
pname = "freya-node-modules";
|
||||
version = "1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = dependencySource;
|
||||
nativeBuildInputs = with pkgs; [
|
||||
bun
|
||||
cacert
|
||||
nodejs
|
||||
];
|
||||
|
||||
SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = nodeModulesHashes.${system};
|
||||
|
||||
# `patchShebangs` embeds Nix store interpreters in package bins. The
|
||||
# check derivations also depend on bun/node, so this dependency blob
|
||||
# can safely drop those references after its hash is verified.
|
||||
unsafeDiscardReferences.out = true;
|
||||
|
||||
dontConfigure = true;
|
||||
# Workspace package links are completed inside each check's source tree,
|
||||
# so they are intentionally dangling in this dependency-only output.
|
||||
dontFixup = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME="$TMPDIR/home"
|
||||
mkdir -p "$HOME"
|
||||
|
||||
# Keep the real workspace manifest for `--frozen-lockfile`, but
|
||||
# filter out frontend workspaces that do not participate in checks.
|
||||
# `--force` matters in the Nix sandbox: without it, Bun can accept
|
||||
# manifest-only cached packages and leave tool binaries missing.
|
||||
bun install \
|
||||
--force \
|
||||
--frozen-lockfile \
|
||||
--ignore-scripts \
|
||||
--backend copyfile \
|
||||
--filter freya \
|
||||
--filter '@freya/*' \
|
||||
--filter '@freya/backend' \
|
||||
--no-progress
|
||||
|
||||
patchShebangs node_modules
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out"
|
||||
|
||||
# Keep the root install in the store; checks symlink this directly.
|
||||
cp -a node_modules "$out/node_modules"
|
||||
|
||||
# Bun also creates per-workspace node_modules directories. These are
|
||||
# mostly relative symlinks, so checks copy the symlink entries into
|
||||
# their writable source tree instead of symlinking the directory.
|
||||
find apps packages -mindepth 2 -maxdepth 2 -type d -name node_modules -print |
|
||||
while IFS= read -r node_modules_dir; do
|
||||
mkdir -p "$out/$(dirname "$node_modules_dir")"
|
||||
cp -a "$node_modules_dir" "$out/$node_modules_dir"
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
mkBunCheck =
|
||||
pkgs: nodeModules: name: command:
|
||||
pkgs.stdenvNoCC.mkDerivation {
|
||||
pname = "freya-${name}";
|
||||
version = "1";
|
||||
|
||||
src = projectSource;
|
||||
nativeBuildInputs = with pkgs; [
|
||||
bun
|
||||
nodejs
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME="$TMPDIR/home"
|
||||
mkdir -p "$HOME"
|
||||
|
||||
# Root dependencies are read-only and shared across checks.
|
||||
ln -s "${nodeModules}/node_modules" node_modules
|
||||
|
||||
# Workspace node_modules contain relative symlinks back to packages/
|
||||
# and apps/, so copy just those symlink entries into this source tree.
|
||||
for node_modules_dir in "${nodeModules}"/apps/*/node_modules "${nodeModules}"/packages/*/node_modules; do
|
||||
if [ -d "$node_modules_dir" ]; then
|
||||
relative_path="''${node_modules_dir#"${nodeModules}/"}"
|
||||
mkdir -p "$relative_path"
|
||||
cp -a "$node_modules_dir/." "$relative_path/"
|
||||
fi
|
||||
done
|
||||
|
||||
${command}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out"
|
||||
touch "$out/${name}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
apps = forEachSystem (
|
||||
system:
|
||||
let
|
||||
pkgs = pkgsFor.${system};
|
||||
in
|
||||
mkBunApps (mkBunScriptCommands pkgs appScripts)
|
||||
);
|
||||
|
||||
checks = lib.genAttrs checkSystems (
|
||||
system:
|
||||
let
|
||||
pkgs = pkgsFor.${system};
|
||||
nodeModules = mkBunNodeModules system pkgs;
|
||||
in
|
||||
lib.mapAttrs (mkBunCheck pkgs nodeModules) checkCommands
|
||||
);
|
||||
|
||||
devShells = forEachSystem (
|
||||
system:
|
||||
let
|
||||
pkgs = pkgsFor.${system};
|
||||
bunScriptCommands = lib.attrValues (mkBunScriptCommands pkgs shellScripts);
|
||||
commonPackages = with pkgs; [
|
||||
bun
|
||||
eas-cli
|
||||
git
|
||||
gh
|
||||
gnumake
|
||||
nixfmt
|
||||
nodejs
|
||||
openssl
|
||||
pkg-config
|
||||
postgresql
|
||||
python3
|
||||
watchman
|
||||
];
|
||||
linuxPackages = with pkgs; [
|
||||
gcc
|
||||
inotify-tools
|
||||
tailscale
|
||||
];
|
||||
in
|
||||
{
|
||||
default = pkgs.mkShell {
|
||||
packages =
|
||||
commonPackages ++ bunScriptCommands ++ pkgs.lib.optionals pkgs.stdenv.isLinux linuxPackages;
|
||||
|
||||
SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
shellHook = ''
|
||||
export PATH="$PWD/node_modules/.bin:$PATH"
|
||||
'';
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
formatter = forEachSystem (system: pkgsFor.${system}.nixfmt);
|
||||
};
|
||||
}
|
||||
@@ -10,6 +10,7 @@
|
||||
"expo": "cd apps/freya-client && bun run start",
|
||||
"drizzle-studio": "TS_IP=$(tailscale ip -4); echo \"Drizzle Studio: https://local.drizzle.studio/?host=${TS_IP}&port=4983\"; cd apps/freya-backend && bunx drizzle-kit studio --host 0.0.0.0 --port 4983",
|
||||
"freya-backend": "TS_IP=$(tailscale ip -4); echo \"Freya Backend: http://${TS_IP}:3000\"; echo \"\"; echo \"------------------ Bun Debugger ------------------\"; echo \"https://debug.bun.sh/#${TS_IP}:6499\"; echo \"------------------ Bun Debugger ------------------\"; echo \"\"; cd apps/freya-backend && bun run dev",
|
||||
"client": "bun run --elide-lines=0 --filter freya-client start",
|
||||
"admin-dashboard": "TS_IP=$(tailscale ip -4); echo \"Admin Dashboard: http://${TS_IP}:5174\"; cd apps/admin-dashboard && bun run dev --host 0.0.0.0",
|
||||
"agent-test-cli": "cd apps/agent-test-cli && bun run start",
|
||||
"test": "bun run --filter '*' test",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { describe, expect, test } from "bun:test"
|
||||
import { describe, expect, spyOn, test } from "bun:test"
|
||||
|
||||
import type { ActionDefinition, ContextEntry, ContextKey, FeedItem, FeedSource } from "./index"
|
||||
|
||||
@@ -145,6 +145,16 @@ function createAlertSource(): FeedSource<AlertFeedItem> {
|
||||
}
|
||||
}
|
||||
|
||||
async function waitForCondition(predicate: () => boolean, timeoutMs = 2_000): Promise<void> {
|
||||
const deadline = Date.now() + timeoutMs
|
||||
while (!predicate()) {
|
||||
if (Date.now() > deadline) {
|
||||
throw new Error("Timed out waiting for condition")
|
||||
}
|
||||
await new Promise((resolve) => setTimeout(resolve, 10))
|
||||
}
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// TESTS
|
||||
// =============================================================================
|
||||
@@ -807,28 +817,35 @@ describe("FeedEngine", () => {
|
||||
})
|
||||
|
||||
test("TTL resets after reactive update", async () => {
|
||||
let now = 1_000
|
||||
const nowSpy = spyOn(Date, "now").mockImplementation(() => now)
|
||||
const location = createLocationSource()
|
||||
const weather = createWeatherSource()
|
||||
|
||||
const engine = new FeedEngine({ cacheTtlMs: 100 }).register(location).register(weather)
|
||||
|
||||
engine.start()
|
||||
try {
|
||||
engine.start()
|
||||
|
||||
// Initial reactive update
|
||||
location.simulateUpdate({ lat: 51.5, lng: -0.1 })
|
||||
await new Promise((resolve) => setTimeout(resolve, 50))
|
||||
// Initial reactive update
|
||||
location.simulateUpdate({ lat: 51.5, lng: -0.1 })
|
||||
await new Promise((resolve) => setTimeout(resolve, 50))
|
||||
|
||||
expect(engine.lastFeed()).not.toBeNull()
|
||||
expect(engine.lastFeed()).not.toBeNull()
|
||||
|
||||
// Wait 70ms (total 120ms from first update, past original TTL)
|
||||
// but trigger another update at 50ms to reset TTL
|
||||
location.simulateUpdate({ lat: 52.0, lng: -0.2 })
|
||||
await new Promise((resolve) => setTimeout(resolve, 50))
|
||||
// Move past the original TTL, then trigger another update to reset it.
|
||||
now += 120
|
||||
location.simulateUpdate({ lat: 52.0, lng: -0.2 })
|
||||
await new Promise((resolve) => setTimeout(resolve, 50))
|
||||
|
||||
// Should still be cached because TTL was reset by second update
|
||||
expect(engine.lastFeed()).not.toBeNull()
|
||||
// Should still be cached because TTL was reset by second update.
|
||||
expect(engine.lastFeed()).not.toBeNull()
|
||||
|
||||
engine.stop()
|
||||
engine.stop()
|
||||
} finally {
|
||||
engine.stop()
|
||||
nowSpy.mockRestore()
|
||||
}
|
||||
})
|
||||
|
||||
test("cacheTtlMs is configurable", async () => {
|
||||
@@ -869,17 +886,21 @@ describe("FeedEngine", () => {
|
||||
},
|
||||
}
|
||||
|
||||
const engine = new FeedEngine({ cacheTtlMs: 50 }).register(source)
|
||||
engine.start()
|
||||
const engine = new FeedEngine({ cacheTtlMs: 20 }).register(source)
|
||||
await engine.refresh()
|
||||
|
||||
// Wait for two TTL intervals to elapse
|
||||
await new Promise((resolve) => setTimeout(resolve, 120))
|
||||
expect(fetchCount).toBe(1)
|
||||
|
||||
// Should have auto-refreshed at least twice
|
||||
expect(fetchCount).toBeGreaterThanOrEqual(2)
|
||||
expect(engine.lastFeed()).not.toBeNull()
|
||||
try {
|
||||
engine.start()
|
||||
|
||||
engine.stop()
|
||||
await waitForCondition(() => fetchCount >= 2)
|
||||
|
||||
expect(fetchCount).toBeGreaterThanOrEqual(2)
|
||||
expect(engine.lastFeed()).not.toBeNull()
|
||||
} finally {
|
||||
engine.stop()
|
||||
}
|
||||
})
|
||||
|
||||
test("stop cancels periodic refresh", async () => {
|
||||
@@ -935,28 +956,25 @@ describe("FeedEngine", () => {
|
||||
},
|
||||
}
|
||||
|
||||
const engine = new FeedEngine({ cacheTtlMs: 100 })
|
||||
const engine = new FeedEngine({ cacheTtlMs: 10_000 })
|
||||
.register(location)
|
||||
.register(countingWeather)
|
||||
const clearTimeoutSpy = spyOn(globalThis, "clearTimeout")
|
||||
|
||||
engine.start()
|
||||
try {
|
||||
engine.start()
|
||||
|
||||
// At 40ms, push a reactive update — this resets the timer
|
||||
await new Promise((resolve) => setTimeout(resolve, 40))
|
||||
const countBeforeUpdate = fetchCount
|
||||
location.simulateUpdate({ lat: 51.5, lng: -0.1 })
|
||||
await new Promise((resolve) => setTimeout(resolve, 20))
|
||||
const countBeforeUpdate = fetchCount
|
||||
location.simulateUpdate({ lat: 51.5, lng: -0.1 })
|
||||
await waitForCondition(() => fetchCount > countBeforeUpdate && engine.lastFeed() !== null)
|
||||
|
||||
// Reactive update triggered a fetch
|
||||
expect(fetchCount).toBeGreaterThan(countBeforeUpdate)
|
||||
const countAfterUpdate = fetchCount
|
||||
|
||||
// At 100ms from start (60ms after reactive update), the original
|
||||
// timer would have fired, but it was reset. No extra fetch yet.
|
||||
await new Promise((resolve) => setTimeout(resolve, 40))
|
||||
expect(fetchCount).toBe(countAfterUpdate)
|
||||
|
||||
engine.stop()
|
||||
// Reactive updates refresh the cache and reset the pending periodic timer.
|
||||
expect(fetchCount).toBeGreaterThan(countBeforeUpdate)
|
||||
expect(clearTimeoutSpy).toHaveBeenCalled()
|
||||
} finally {
|
||||
engine.stop()
|
||||
clearTimeoutSpy.mockRestore()
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user