Compare commits

...
9 changed files with 248 additions and 16 deletions

No files matched your search

+5 -6
View File
@@ -54,12 +54,11 @@ playwright.config.*
*~
*.log
# Environment variables (only commit template files)
.env
.env*.local
.env.development
.env.test
.env.production.local
# Environment variables, in any workspace. Next.js inlines NEXT_PUBLIC_* values
# into the bundle and the Convex CLI reads .env.local on deploy.
**/.env
**/.env.*
!**/.env.example
# Docker configuration files (not needed inside build context)
Dockerfile*
+6 -1
View File
@@ -195,7 +195,12 @@ RUN node --version \
&& ldd /convex/generate_key \
&& ! ldd /convex/convex-local-backend /convex/generate_key | grep -q 'not found'
RUN useradd --system --user-group --home-dir /app --shell /usr/sbin/nologin otunes
# The backend gets its own user so the web server cannot read the database or
# instance secret. It joins the otunes group to clean up the web server's HLS
# cache in /tmp/otunes.
RUN useradd --system --user-group --home-dir /app --shell /usr/sbin/nologin otunes \
&& useradd --system --user-group --groups otunes --create-home --home-dir /home/convex \
--shell /usr/sbin/nologin convex
COPY --from=convex-functions /app /opt/otunes/convex
COPY docker/generate-auth-keys.mjs /opt/otunes/generate-auth-keys.mjs
@@ -489,8 +489,21 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
) => Promise<void>
}) {
const Row = Platform.OS === "ios" ? SongSwipeRow : Pressable
const { config } = useServerConfig()
return (
<MediaContextMenu
preview={
config
? {
kind: "song",
title: track.title,
artist: album.artist.name,
album: album.title,
artworkUrl: albumCoverUrl(config.serverUrl, album.id),
hasArtwork: album.cover != null,
}
: undefined
}
stationArtistId={album.artist.id}
favorited={favorited}
navigation={{
@@ -141,6 +141,12 @@ const ArtistRow = memo(function ArtistRow({
return (
<MediaContextMenu
preview={{
kind: "artist",
title: artist.name,
artworkUrl: artistCoverUrl(serverUrl, artist.id),
hasArtwork: artist.photo != null,
}}
favorited={favorited}
share={{ type: "artist", artistId: artist.id, title: artist.name }}
onAction={(action) => void onAction(artist, action)}
@@ -160,7 +166,11 @@ const ArtistRow = memo(function ArtistRow({
>
{artist.name}
</Text>
<Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
<Ionicons
name="chevron-forward"
size={16}
color={colors.mutedForeground}
/>
</Pressable>
</MediaContextMenu>
)
+13
View File
@@ -94,6 +94,13 @@ export const AlbumCard = memo(function AlbumCard({
return (
<MediaContextMenu
preview={{
kind: "album",
title: album.title,
artist: album.artist.name,
artworkUrl: albumCoverUrl(config.serverUrl, album.id),
hasArtwork: album.cover != null,
}}
favorited={isAlbumFavorite(album.id)}
stationArtistId={album.artist.id}
navigation={{ artist: { id: album.artist.id } }}
@@ -149,6 +156,12 @@ export const ArtistCard = memo(function ArtistCard({
return (
<MediaContextMenu
preview={{
kind: "artist",
title: artist.name,
artworkUrl: artistCoverUrl(config.serverUrl, artist.id),
hasArtwork: artist.photo != null,
}}
favorited={isArtistFavorite(artist.id)}
share={{ type: "artist", artistId: artist.id, title: artist.name }}
onAction={(action) => void handleArtistAction(artist, action)}
+117 -2
View File
@@ -4,12 +4,19 @@ import { requireNativeView } from "expo"
import type { ComponentType, ReactNode } from "react"
import {
Platform,
Text,
useWindowDimensions,
View,
type StyleProp,
type ViewProps,
type ViewStyle,
} from "react-native"
import { Ionicons } from "@expo/vector-icons"
import { CoverImage } from "@/components/cover-image"
import { useThemeColors } from "@/lib/theme"
import { useAppNavigation } from "@/lib/app-navigation"
import { useServerConfig } from "@/contexts/server-config"
import type { MediaShareContext } from "@/lib/media-links"
import { shouldShowShare } from "@/lib/media-links"
@@ -32,7 +39,17 @@ export type MediaNavigation = {
album?: { id: string }
}
export type MediaMenuPreview = {
title: string
artist?: string
album?: string
artworkUrl: string
hasArtwork: boolean
kind: "album" | "artist" | "song"
}
export type MediaMenuConfig = {
preview?: MediaMenuPreview
selectedCount?: number
playlistLabel?: string
favorited?: boolean
@@ -214,10 +231,95 @@ function MediaMenuBase({
const NativeContextMenuView =
Platform.OS === "ios"
? requireNativeView<
ViewProps & { disableForceFlatten?: boolean; children: ReactNode }
ViewProps & {
disableForceFlatten?: boolean
children: ReactNode
onPreviewTappedAnimationCompleted?: () => void
}
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewView")
: null
const NativeContextMenuPreview =
Platform.OS === "ios"
? requireNativeView<
ViewProps & {
preferredContentSize: { width: number; height: number }
children: ReactNode
}
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewContentView")
: null
function MediaPreview({ preview }: { preview: MediaMenuPreview }) {
const colors = useThemeColors()
const { width: windowWidth, fontScale } = useWindowDimensions()
if (!NativeContextMenuPreview) return null
const width = Math.min(360, windowWidth - 32)
const height = Math.max(124, 32 + 76 * fontScale)
const isArtist = preview.kind === "artist"
return (
// Match Expo Router's preview wrapper: UIKit mounts this separately, but
// Yoga must also keep it out of the trigger's normal layout.
<NativeContextMenuPreview
preferredContentSize={{ width, height }}
style={{ position: "absolute", top: 0, left: 0 }}
>
<View
style={{
width,
height,
padding: 16,
flexDirection: "row",
alignItems: "center",
gap: 16,
backgroundColor: colors.card,
}}
>
<CoverImage
uri={preview.artworkUrl}
hasCover={preview.hasArtwork}
style={{ width: 88, height: 88, borderRadius: isArtist ? 44 : 12 }}
/>
<View style={{ flex: 1, gap: 2 }}>
<Text
numberOfLines={2}
style={{
color: colors.foreground,
fontSize: 17,
fontWeight: "600",
}}
>
{preview.title}
</Text>
{preview.artist ? (
<Text
numberOfLines={1}
style={{ color: colors.mutedForeground, fontSize: 15 }}
>
{preview.artist}
</Text>
) : null}
{preview.album ? (
<Text
numberOfLines={1}
style={{ color: colors.mutedForeground, fontSize: 14 }}
>
{preview.album}
</Text>
) : null}
</View>
{preview.kind !== "song" ? (
<Ionicons
name="chevron-forward"
size={20}
color={colors.mutedForeground}
/>
) : null}
</View>
</NativeContextMenuPreview>
)
}
const NativeContextMenuAction: ComponentType<{
identifier: string
title: string
@@ -233,11 +335,13 @@ const NativeContextMenuAction: ComponentType<{
function NativeMediaContextMenu({
children,
preview,
onAction,
share,
...actionConfig
}: MediaMenuWrapperProps) {
const { config } = useServerConfig()
const { push } = useAppNavigation()
if (!NativeContextMenuView || !NativeContextMenuAction) {
return children
@@ -252,10 +356,21 @@ function NativeMediaContextMenu({
}
return (
<NativeContextMenuView style={{ display: "contents" }} disableForceFlatten>
<NativeContextMenuView
style={{ display: "contents" }}
disableForceFlatten
onPreviewTappedAnimationCompleted={() => {
if (share?.type === "artist") push(`/artist/${share.artistId}`)
else if (share?.type === "album" || share?.type === "song")
push(`/album/${share.albumId}`)
}}
>
{/* The native menu retains its first trigger. Keep that view mounted when
focus changes replace the Siri entity wrapper inside it. */}
<View collapsable={false}>{children}</View>
{preview && (actionConfig.selectedCount ?? 1) === 1 ? (
<MediaPreview preview={preview} />
) : null}
{buildMediaMenuActions({ ...actionConfig, share }).map((action) => (
<NativeContextMenuAction
key={action.id}
+45
View File
@@ -0,0 +1,45 @@
import type { MenuComponentProps } from "@expo/ui/community/menu"
import { Button, Host, Menu, RNHostView } from "@expo/ui/swift-ui"
import { disabled, menuOrder } from "@expo/ui/swift-ui/modifiers"
// SwiftUI's automatic order reverses menus that open upward in the player.
// Keep the same top-to-bottom order as the UIKit long-press menus.
export function MenuView({
actions,
children,
style,
testID,
onPressAction,
}: MenuComponentProps) {
return (
<Host matchContents style={style} testID={testID} ignoreSafeArea="all">
<Menu
modifiers={[menuOrder("fixed")]}
label={
<RNHostView matchContents>
<>{children}</>
</RNHostView>
}
>
{actions
.filter((action) => !action.attributes?.hidden)
.map((action) => (
<Button
key={action.id ?? action.title}
label={action.title}
systemImage={
typeof action.image === "string" ? action.image : undefined
}
role={action.attributes?.destructive ? "destructive" : undefined}
modifiers={[disabled(action.attributes?.disabled ?? false)]}
onPress={() =>
onPressAction?.({
nativeEvent: { event: action.id ?? action.title },
})
}
/>
))}
</Menu>
</Host>
)
}
+11
View File
@@ -172,6 +172,7 @@ export const SongListRow = memo(function SongListRow({
onPlay: (song: BrowseSong) => void
onAction: (song: BrowseSong, action: MediaAction) => void
}) {
const { config } = useServerConfig()
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
return (
@@ -182,6 +183,16 @@ export const SongListRow = memo(function SongListRow({
swipe={swipe}
onPress={handlePress}
contextMenu={{
preview: config
? {
kind: "song",
title: song.title,
artist: song.artist.name,
album: song.album.title,
artworkUrl: albumCoverUrl(config.serverUrl, song.album.id),
hasArtwork: song.album.cover != null,
}
: undefined,
stationArtistId: song.artist.id,
favorited,
playlistLabel,
+27 -6
View File
@@ -46,22 +46,34 @@ stop() {
}
trap 'stop; exit 0' TERM INT
as_convex=(setpriv --reuid=convex --regid=convex --init-groups env HOME=/home/convex)
convex_cli() {
(
cd "$FUNCTIONS_DIR"
unset CONVEX_DEPLOYMENT CONVEX_DEPLOY_KEY
CONVEX_SELF_HOSTED_URL="$BACKEND_URL" \
CONVEX_SELF_HOSTED_ADMIN_KEY="$admin_key" \
"$NODE" node_modules/convex/bin/main.js "$@"
"${as_convex[@]}" "$NODE" node_modules/convex/bin/main.js "$@"
)
}
# Only root (the backend) may read the database and instance secret.
# Only the convex user may read the database and instance secret. Volumes from
# images that ran the backend as root are still owned by root, and
# read_credentials.sh generates a new instance secret if it cannot read the old one.
mkdir -p "$CONVEX_DATA_DIR"
find "$CONVEX_DATA_DIR" \( ! -user convex -o ! -group convex \) \
-exec chown -h convex:convex {} +
chmod 700 "$CONVEX_DATA_DIR"
# The web server writes HLS streams here and a Convex cron deletes stale ones.
mkdir -p /tmp/otunes
chown otunes:otunes /tmp/otunes
chmod -R g+rwX /tmp/otunes
chmod g+s,o-rwx /tmp/otunes
log "Starting Convex backend"
(cd /convex && umask 077 && exec ./run_backend.sh) &
(cd /convex && umask 077 && exec "${as_convex[@]}" ./run_backend.sh) &
backend_pid=$!
for _ in $(seq 1 120); do
@@ -80,17 +92,24 @@ if ! curl -fsS "$BACKEND_URL/version" >/dev/null 2>&1; then
exit 1
fi
admin_key=$(cd /convex && ./generate_admin_key.sh)
admin_key=$(cd /convex && umask 077 && "${as_convex[@]}" ./generate_admin_key.sh)
log "Deploying Convex functions"
convex_cli deploy --typecheck disable --codegen disable
if [ -z "$(convex_cli env get JWKS 2>/dev/null || true)" ]; then
# `env get` exits 0 with no output when the variable is unset. Any other failure
# must not be read as "no keys": regenerating them signs every user out.
if ! jwks=$(convex_cli env get JWKS); then
log "Could not read Convex Auth signing keys"
stop
exit 1
fi
if [ -z "$jwks" ]; then
log "Generating Convex Auth signing keys"
"$NODE" /opt/otunes/generate-auth-keys.mjs | convex_cli env set --force
fi
unset admin_key
unset admin_key jwks
log "Starting web server"
(
@@ -100,6 +119,8 @@ log "Starting web server"
# Server-side Convex helpers fall back to this at runtime. The browser bundle
# is built without it, so browsers still derive their own URL.
export NEXT_PUBLIC_CONVEX_URL="$BACKEND_URL"
# Lets the convex group member delete stale HLS streams.
umask 0002
exec setpriv --reuid=otunes --regid=otunes --init-groups \
"$NODE" apps/web/server.js
) &