Compare commits
1
Commits
No files matched your search
+5
-6
@@ -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
@@ -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
|
||||
|
||||
@@ -488,7 +488,7 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
action: MediaAction
|
||||
) => Promise<void>
|
||||
}) {
|
||||
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
|
||||
const Row = Platform.OS === "ios" ? SongSwipeRow : Pressable
|
||||
const { config } = useServerConfig()
|
||||
return (
|
||||
<MediaContextMenu
|
||||
@@ -523,7 +523,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
group={swipeGroup}
|
||||
backgroundColor={palette.background}
|
||||
onPlayNext={() => void onAction(track, album, "play-next")}
|
||||
onAddToQueue={() => void onAction(track, album, "play-last")}
|
||||
style={styles.trackRow}
|
||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||
>
|
||||
|
||||
@@ -434,18 +434,11 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
palette={palette}
|
||||
inset
|
||||
swipe={
|
||||
Platform.OS !== "web"
|
||||
Platform.OS === "ios"
|
||||
? {
|
||||
group: swipeGroup,
|
||||
backgroundColor: palette.background,
|
||||
onPlayNext: () => onAction(song, "play-next"),
|
||||
onAddToQueue: () => onAction(song, "play-last"),
|
||||
onRemove:
|
||||
Platform.OS === "android" && removable
|
||||
? () => {
|
||||
void onRemove(song.id)
|
||||
}
|
||||
: undefined,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
@@ -454,7 +447,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
/>
|
||||
)
|
||||
|
||||
if (Platform.OS !== "web" || !removable) {
|
||||
if (Platform.OS === "ios" || !removable) {
|
||||
return row
|
||||
}
|
||||
|
||||
|
||||
@@ -45,8 +45,6 @@ export const SongRow = memo(function SongRow({
|
||||
swipe?: {
|
||||
group: SwipeRowGroup
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
/** Album/playlist layout: the divider starts at the title, not the artwork. */
|
||||
@@ -109,12 +107,10 @@ export const SongRow = memo(function SongRow({
|
||||
? styles.insetRow
|
||||
: [styles.row, { borderBottomColor: divider }]
|
||||
const row =
|
||||
swipe && Platform.OS !== "web" ? (
|
||||
swipe && Platform.OS === "ios" ? (
|
||||
<SongSwipeRow
|
||||
group={swipe.group}
|
||||
onPlayNext={swipe.onPlayNext}
|
||||
onAddToQueue={swipe.onAddToQueue}
|
||||
onRemove={swipe.onRemove}
|
||||
backgroundColor={swipe.backgroundColor}
|
||||
onPress={onPress}
|
||||
style={rowStyle}
|
||||
@@ -171,8 +167,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
swipe?: {
|
||||
group: SwipeRowGroup
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
onPlay: (song: BrowseSong) => void
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import * as Haptics from "expo-haptics"
|
||||
import { SymbolView } from "expo-symbols"
|
||||
import {
|
||||
@@ -9,7 +8,6 @@ import {
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import {
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
type StyleProp,
|
||||
@@ -28,10 +26,7 @@ import Animated, {
|
||||
import { scheduleOnRN } from "react-native-worklets"
|
||||
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
|
||||
const IS_ANDROID = Platform.OS === "android"
|
||||
|
||||
const ACTION_WIDTH = 82
|
||||
const LEADING_ACTION_WIDTH = 72
|
||||
const SPRING = { duration: 450, dampingRatio: 1 }
|
||||
|
||||
function impact() {
|
||||
@@ -46,8 +41,6 @@ export function SongSwipeRow({
|
||||
group,
|
||||
onPress,
|
||||
onPlayNext,
|
||||
onAddToQueue,
|
||||
onRemove,
|
||||
}: {
|
||||
children: ReactNode
|
||||
style?: StyleProp<ViewStyle>
|
||||
@@ -55,10 +48,7 @@ export function SongSwipeRow({
|
||||
group: SwipeRowGroup
|
||||
onPress?: () => void
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
}) {
|
||||
const hasRemove = IS_ANDROID && !!onRemove
|
||||
const x = useSharedValue(0)
|
||||
const startX = useSharedValue(0)
|
||||
const width = useSharedValue(0)
|
||||
@@ -88,10 +78,10 @@ export function SongSwipeRow({
|
||||
const activate = useCallback(
|
||||
(side: number) => {
|
||||
close()
|
||||
if (side > 0) onAddToQueue()
|
||||
if (side > 0) onPlayNext()
|
||||
// Download is intentionally a placeholder.
|
||||
},
|
||||
[close, onAddToQueue]
|
||||
[close, onPlayNext]
|
||||
)
|
||||
const tapRow = useCallback(() => {
|
||||
if (open) close()
|
||||
@@ -115,13 +105,7 @@ export function SongSwipeRow({
|
||||
Math.min(width.value, startX.value + event.translationX)
|
||||
)
|
||||
const commit =
|
||||
Math.abs(x.value) >
|
||||
Math.max(
|
||||
x.value > 0
|
||||
? LEADING_ACTION_WIDTH * 2
|
||||
: ACTION_WIDTH * (hasRemove ? 2 : 1),
|
||||
width.value * 0.55
|
||||
)
|
||||
Math.abs(x.value) > Math.max(ACTION_WIDTH, width.value * 0.55)
|
||||
if (commit !== committed.value) {
|
||||
committed.value = commit
|
||||
commitProgress.value = withSpring(commit ? 1 : 0, SPRING)
|
||||
@@ -140,16 +124,10 @@ export function SongSwipeRow({
|
||||
Math.abs(x.value) > 10 && projected * side > ACTION_WIDTH / 2
|
||||
? side
|
||||
: 0
|
||||
x.value = withSpring(
|
||||
target *
|
||||
(target > 0
|
||||
? LEADING_ACTION_WIDTH * 2
|
||||
: ACTION_WIDTH * (hasRemove ? 2 : 1)),
|
||||
{
|
||||
...SPRING,
|
||||
velocity: event.velocityX,
|
||||
}
|
||||
)
|
||||
x.value = withSpring(target * ACTION_WIDTH, {
|
||||
...SPRING,
|
||||
velocity: event.velocityX,
|
||||
})
|
||||
scheduleOnRN(settle, target)
|
||||
})
|
||||
.onFinalize((_event, success) => {
|
||||
@@ -167,7 +145,6 @@ export function SongSwipeRow({
|
||||
return Gesture.Exclusive(pan, tap)
|
||||
}, [
|
||||
activate,
|
||||
hasRemove,
|
||||
begin,
|
||||
close,
|
||||
commitProgress,
|
||||
@@ -181,14 +158,12 @@ export function SongSwipeRow({
|
||||
|
||||
const rowStyle = useAnimatedStyle(() => ({
|
||||
transform: [{ translateX: x.value }],
|
||||
borderRadius: IS_ANDROID
|
||||
? 0
|
||||
: interpolate(
|
||||
Math.abs(x.value),
|
||||
[0, 40],
|
||||
[0, height.value / 2],
|
||||
Extrapolation.CLAMP
|
||||
),
|
||||
borderRadius: interpolate(
|
||||
Math.abs(x.value),
|
||||
[0, 40],
|
||||
[0, height.value / 2],
|
||||
Extrapolation.CLAMP
|
||||
),
|
||||
}))
|
||||
const fillStyle = useAnimatedStyle(() => ({
|
||||
opacity: interpolate(
|
||||
@@ -215,37 +190,8 @@ export function SongSwipeRow({
|
||||
open={open === 1}
|
||||
onPress={() => activate(1)}
|
||||
/>
|
||||
<SwipeAction
|
||||
side={1}
|
||||
secondary
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === 1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onPlayNext()
|
||||
}}
|
||||
/>
|
||||
{hasRemove && (
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
secondary
|
||||
paired
|
||||
remove
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onRemove?.()
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
paired={hasRemove}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
@@ -258,23 +204,11 @@ export function SongSwipeRow({
|
||||
accessibilityRole="button"
|
||||
onAccessibilityTap={tapRow}
|
||||
accessibilityActions={[
|
||||
{ name: "addToQueue", label: "Add to Queue" },
|
||||
{ name: "playNext", label: "Play Next" },
|
||||
{ name: "download", label: "Download" },
|
||||
...(hasRemove
|
||||
? [{ name: "remove", label: "Remove from Playlist" }]
|
||||
: []),
|
||||
]}
|
||||
onAccessibilityAction={(event) => {
|
||||
if (event.nativeEvent.actionName === "remove" && hasRemove) {
|
||||
close()
|
||||
onRemove?.()
|
||||
}
|
||||
if (event.nativeEvent.actionName === "addToQueue") activate(1)
|
||||
if (event.nativeEvent.actionName === "playNext") {
|
||||
close()
|
||||
onPlayNext()
|
||||
}
|
||||
if (event.nativeEvent.actionName === "playNext") activate(1)
|
||||
}}
|
||||
style={[styles.row, { backgroundColor }, rowStyle]}
|
||||
>
|
||||
@@ -291,9 +225,6 @@ export function SongSwipeRow({
|
||||
|
||||
function SwipeAction({
|
||||
side,
|
||||
secondary = false,
|
||||
paired = side > 0,
|
||||
remove = false,
|
||||
x,
|
||||
height,
|
||||
progress,
|
||||
@@ -301,48 +232,22 @@ function SwipeAction({
|
||||
onPress,
|
||||
}: {
|
||||
side: 1 | -1
|
||||
secondary?: boolean
|
||||
paired?: boolean
|
||||
remove?: boolean
|
||||
x: SharedValue<number>
|
||||
height: SharedValue<number>
|
||||
progress: SharedValue<number>
|
||||
open: boolean
|
||||
onPress: () => void
|
||||
}) {
|
||||
const actionStyle = useAnimatedStyle(() => {
|
||||
const revealed = Math.max(0, x.value * side)
|
||||
const primaryWidth = (revealed * (1 + progress.value)) / 2
|
||||
return {
|
||||
width: !paired
|
||||
? revealed
|
||||
: secondary
|
||||
? revealed - primaryWidth
|
||||
: primaryWidth,
|
||||
...(secondary
|
||||
? side > 0
|
||||
? { left: primaryWidth }
|
||||
: { right: primaryWidth }
|
||||
: {}),
|
||||
}
|
||||
})
|
||||
const actionStyle = useAnimatedStyle(() => ({
|
||||
width: Math.max(0, x.value * side),
|
||||
}))
|
||||
const pillStyle = useAnimatedStyle(() => {
|
||||
const total = Math.max(0, x.value * side)
|
||||
const revealed = !paired
|
||||
? total
|
||||
: (total * (secondary ? 1 - progress.value : 1 + progress.value)) / 2
|
||||
if (IS_ANDROID) {
|
||||
return { width: revealed, height: height.value, borderRadius: 0 }
|
||||
}
|
||||
const revealed = Math.max(0, x.value * side)
|
||||
const resting = Math.max(
|
||||
0,
|
||||
Math.min(
|
||||
revealed - (side > 0 ? 10 : 20),
|
||||
interpolate(
|
||||
revealed,
|
||||
[24, side > 0 ? LEADING_ACTION_WIDTH : ACTION_WIDTH, 220],
|
||||
[0, 62, 200]
|
||||
)
|
||||
revealed - 20,
|
||||
interpolate(revealed, [24, ACTION_WIDTH, 220], [0, 62, 200])
|
||||
)
|
||||
)
|
||||
const pillWidth =
|
||||
@@ -387,61 +292,27 @@ function SwipeAction({
|
||||
>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={
|
||||
remove
|
||||
? "Remove from Playlist"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "Play Next"
|
||||
: "Add to Queue"
|
||||
: "Download"
|
||||
}
|
||||
accessibilityLabel={side > 0 ? "Play Next" : "Download"}
|
||||
onPress={onPress}
|
||||
style={styles.actionButton}
|
||||
>
|
||||
<Animated.View
|
||||
style={[
|
||||
styles.pill,
|
||||
{
|
||||
backgroundColor: remove
|
||||
? "#d32f2f"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "#6b5bff"
|
||||
: "#f29943"
|
||||
: "#008dff",
|
||||
},
|
||||
{ backgroundColor: side > 0 ? "#6b5bff" : "#008dff" },
|
||||
pillStyle,
|
||||
]}
|
||||
>
|
||||
<Animated.View style={iconStyle}>
|
||||
{IS_ANDROID ? (
|
||||
<Ionicons
|
||||
name={
|
||||
remove
|
||||
? "trash-outline"
|
||||
: side < 0
|
||||
? "arrow-down"
|
||||
: secondary
|
||||
? "play-forward"
|
||||
: "list"
|
||||
}
|
||||
size={22}
|
||||
color="white"
|
||||
/>
|
||||
) : (
|
||||
<SymbolView
|
||||
name={
|
||||
side > 0
|
||||
? secondary
|
||||
? "text.line.first.and.arrowtriangle.forward"
|
||||
: "text.line.last.and.arrowtriangle.forward"
|
||||
: "arrow.down"
|
||||
}
|
||||
size={22}
|
||||
tintColor="white"
|
||||
/>
|
||||
)}
|
||||
<SymbolView
|
||||
name={
|
||||
side > 0
|
||||
? "text.line.first.and.arrowtriangle.forward"
|
||||
: "arrow.down"
|
||||
}
|
||||
size={22}
|
||||
tintColor="white"
|
||||
/>
|
||||
</Animated.View>
|
||||
</Animated.View>
|
||||
</Pressable>
|
||||
|
||||
+27
-6
@@ -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
|
||||
) &
|
||||
|
||||
Reference in new issue
Block a user