Fix: AudioPlayer startet jetzt korrekt bei startTime + Deployment-Version

- deploy.sh übergibt jetzt explizit APP_VERSION als Build-Argument
- AudioPlayer setzt startTime korrekt beim ersten manuellen Play
- Verbesserte Position-Logik in togglePlay() mit Timeout-Bestätigung
- Behebt Problem, dass Specials beim ersten Segment statt bei startTime starteten

Dockerfile

@@ -24,12 +24,12 @@ COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
 # Extract version: use build arg if provided, otherwise get from git, fallback to package.json
+# Only use tags that are reachable from the current commit to ensure version matches the code
 RUN if [ -n "$APP_VERSION" ]; then \
     echo "$APP_VERSION" > /tmp/version.txt; \
     else \
     (git describe --tags --exact-match 2>/dev/null || \
      git describe --tags --abbrev=0 2>/dev/null || \
-     git tag --sort=-version:refname | head -1 2>/dev/null || \
      (grep -o '"version": "[^"]*"' package.json 2>/dev/null | cut -d'"' -f4 | sed 's/^/v/') || \
      echo "dev") > /tmp/version.txt; \
     fi && \

components/AudioPlayer.tsx

@@ -22,8 +22,8 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
     const [progress, setProgress] = useState(0);
     const [hasPlayedOnce, setHasPlayedOnce] = useState(false);
 
-    const [processedSrc, setProcessedSrc] = useState(src);
-    const [processedUnlockedSeconds, setProcessedUnlockedSeconds] = useState(unlockedSeconds);
+    const [processedSrc, setProcessedSrc] = useState<string | null>(null);
+    const [processedUnlockedSeconds, setProcessedUnlockedSeconds] = useState<number | null>(null);
 
     useEffect(() => {
         console.log('[AudioPlayer] MOUNTED');
@@ -41,7 +41,7 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
                 let startPos = startTime;
 
                 // If same song but more time unlocked, start from where previous segment ended
-                if (src === processedSrc && unlockedSeconds > processedUnlockedSeconds) {
+                if (processedSrc !== null && src === processedSrc && processedUnlockedSeconds !== null && unlockedSeconds > processedUnlockedSeconds) {
                     startPos = startTime + processedUnlockedSeconds;
                 }
 
@@ -62,8 +62,11 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
                 const initialPercent = unlockedSeconds > 0 ? (initialElapsed / unlockedSeconds) * 100 : 0;
                 setProgress(Math.min(initialPercent, 100));
 
-                setHasPlayedOnce(false); // Reset for new segment
+                // Only reset hasPlayedOnce if the song changed, not if just more time was unlocked
+                if (processedSrc !== null && src !== processedSrc) {
+                    setHasPlayedOnce(false); // Reset for new song
                     onHasPlayedChange?.(false); // Notify parent
+                }
 
                 // Update processed state
                 setProcessedSrc(src);
@@ -72,7 +75,11 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
                 if (autoPlay) {
                     // Delay play slightly to ensure currentTime sticks
                     setTimeout(() => {
-                        const playPromise = audioRef.current?.play();
+                        if (audioRef.current) {
+                            // Use startPos (which may be startTime + processedUnlockedSeconds if more time was unlocked)
+                            // instead of always using startTime
+                            audioRef.current.currentTime = startPos;
+                            const playPromise = audioRef.current.play();
                             if (playPromise !== undefined) {
                                 playPromise
                                     .then(() => {
@@ -86,8 +93,16 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
                                         setIsPlaying(false);
                                     });
                             }
+                        }
                     }, 150);
                 }
+            } else if (startTime !== undefined && startTime > 0) {
+                // If startTime is set and we haven't processed changes, ensure currentTime is at least at startTime
+                // This handles the case where the audio element was reset or reloaded, or when manually playing for the first time
+                const current = audioRef.current.currentTime;
+                if (current < startTime) {
+                    audioRef.current.currentTime = startTime;
+                }
             }
         }
     }, [src, unlockedSeconds, startTime, autoPlay, processedSrc, processedUnlockedSeconds]);
@@ -97,6 +112,16 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
         play: () => {
             if (!audioRef.current) return;
 
+            // Check if we need to reset to startTime
+            const current = audioRef.current.currentTime;
+            const elapsed = current - startTime;
+            
+            // Reset if: never played before, current position is before startTime, or we've exceeded the unlocked segment
+            if (!hasPlayedOnce || current < startTime || elapsed >= unlockedSeconds) {
+                // Reset to start of segment
+                audioRef.current.currentTime = startTime;
+            }
+            
             const playPromise = audioRef.current.play();
             if (playPromise !== undefined) {
                 playPromise
@@ -121,8 +146,35 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
 
         if (isPlaying) {
             audioRef.current.pause();
+            setIsPlaying(false);
         } else {
+            // Ensure we're at the correct position before playing
+            const current = audioRef.current.currentTime;
+            const elapsed = current - startTime;
+            
+            // Determine target position
+            let targetPos = startTime;
+            
+            // If we've played before and we're within the unlocked segment, continue from current position
+            if (hasPlayedOnce && current >= startTime && elapsed < unlockedSeconds) {
+                targetPos = current; // Continue from current position
+            } else {
+                // Reset to start of segment if: never played, before startTime, or exceeded unlocked segment
+                targetPos = startTime;
+            }
+            
+            // Set position before playing
+            audioRef.current.currentTime = targetPos;
+            
+            // Ensure position sticks (browser might reset it)
+            setTimeout(() => {
+                if (audioRef.current && Math.abs(audioRef.current.currentTime - targetPos) > 0.5) {
+                    audioRef.current.currentTime = targetPos;
+                }
+            }, 50);
+            
             audioRef.current.play();
+            setIsPlaying(true);
             onPlay?.();
 
             if (hasPlayedOnce) {
@@ -132,7 +184,6 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
                 onHasPlayedChange?.(true); // Notify parent
             }
         }
-        setIsPlaying(!isPlaying);
     };
 
     const handleTimeUpdate = () => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoerdle",
-  "version": "0.1.6.34",
+  "version": "0.1.6.36",
   "private": true,
   "scripts": {
     "dev": "next dev",

scripts/deploy.sh

@@ -69,6 +69,38 @@ git fetch --prune --tags origin master
 git fetch --tags origin
 git reset --hard origin/master
 
+# Determine version: try git tag first, then package.json
+echo "🏷️  Determining version..."
+APP_VERSION=""
+# Try to get exact tag if we're on a tagged commit
+if git describe --tags --exact-match HEAD 2>/dev/null; then
+    APP_VERSION=$(git describe --tags --exact-match HEAD 2>/dev/null)
+    echo "   Found exact tag: $APP_VERSION"
+else
+    # Try to get latest tag
+    LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+    if [ -n "$LATEST_TAG" ]; then
+        APP_VERSION="$LATEST_TAG"
+        echo "   Using latest tag: $APP_VERSION"
+    else
+        # Fallback to package.json
+        if [ -f "package.json" ]; then
+            PACKAGE_VERSION=$(grep -o '"version": "[^"]*"' package.json 2>/dev/null | cut -d'"' -f4)
+            if [ -n "$PACKAGE_VERSION" ]; then
+                APP_VERSION="v${PACKAGE_VERSION}"
+                echo "   Using package.json version: $APP_VERSION"
+            fi
+        fi
+    fi
+fi
+
+if [ -z "$APP_VERSION" ]; then
+    echo "⚠️  Could not determine version, using 'dev'"
+    APP_VERSION="dev"
+fi
+
+echo "📦 Building with version: $APP_VERSION"
+
 # Prüfe und erstelle/repariere Netzwerk falls nötig
 echo "🌐 Prüfe Docker-Netzwerk..."
 if ! docker network ls | grep -q "hoerdle_default"; then
@@ -84,7 +116,7 @@ echo ""
 
 # Build new image in background (doesn't stop running container)
 echo "🔨 Building new Docker image (this runs while app is still online)..."
-docker compose build
+docker compose build --build-arg APP_VERSION="$APP_VERSION"
 
 # Quick restart with pre-built image
 echo "🔄 Restarting with new image (minimal downtime)..."