From 738187d1d43b69d8a99dd887a289a5a4aad66f3b Mon Sep 17 00:00:00 2001
From: jmartin <jmartin@jmartgraphix.com>
Date: Fri, 24 Jul 2026 12:24:47 -0400
Subject: [PATCH] Always embed Vimeo first; link out only on player error

Prefer on-site player.vimeo.com embeds. Use the Vimeo Player API to
detect privacy blocks and fall back to Watch on Vimeo only then.
---
 client/src/components/VimeoEmbed.tsx | 120 +++++++++++++++++++++++++++
 client/src/pages/ProjectPage.tsx     |  50 ++++++-----
 server/src/services/vimeo-import.ts  |  30 +++----
 3 files changed, 161 insertions(+), 39 deletions(-)
 create mode 100644 client/src/components/VimeoEmbed.tsx

diff --git a/client/src/components/VimeoEmbed.tsx b/client/src/components/VimeoEmbed.tsx
new file mode 100644
index 0000000..450f93e
--- /dev/null
+++ b/client/src/components/VimeoEmbed.tsx
@@ -0,0 +1,120 @@
+import { useEffect, useRef, useState } from "react";
+import { mediaSrc } from "../lib/api";
+
+type Props = {
+  videoId: string;
+  title: string;
+  watchUrl: string;
+  poster?: string;
+};
+
+declare global {
+  interface Window {
+    Vimeo?: {
+      Player: new (
+        el: HTMLIFrameElement | HTMLElement,
+        opts?: { id?: string | number; url?: string }
+      ) => {
+        on: (event: string, cb: (data?: unknown) => void) => void;
+        destroy: () => void;
+      };
+    };
+  }
+}
+
+let playerSdkPromise: Promise<void> | null = null;
+
+function loadVimeoSdk(): Promise<void> {
+  if (window.Vimeo?.Player) return Promise.resolve();
+  if (playerSdkPromise) return playerSdkPromise;
+  playerSdkPromise = new Promise((resolve, reject) => {
+    const existing = document.querySelector<HTMLScriptElement>(
+      'script[src="https://player.vimeo.com/api/player.js"]'
+    );
+    if (existing) {
+      existing.addEventListener("load", () => resolve());
+      existing.addEventListener("error", () => reject(new Error("Vimeo SDK failed")));
+      if (window.Vimeo?.Player) resolve();
+      return;
+    }
+    const s = document.createElement("script");
+    s.src = "https://player.vimeo.com/api/player.js";
+    s.async = true;
+    s.onload = () => resolve();
+    s.onerror = () => reject(new Error("Vimeo SDK failed"));
+    document.body.appendChild(s);
+  });
+  return playerSdkPromise;
+}
+
+/**
+ * Always embeds first. Only if Vimeo reports a privacy/error does the UI
+ * fall back to opening the video on vimeo.com (last resort).
+ */
+export function VimeoEmbed({ videoId, title, watchUrl, poster }: Props) {
+  const iframeRef = useRef<HTMLIFrameElement>(null);
+  const [blocked, setBlocked] = useState(false);
+  const embedSrc = `https://player.vimeo.com/video/${videoId}?title=0&byline=0&portrait=0`;
+
+  useEffect(() => {
+    let player: { destroy: () => void } | null = null;
+    let cancelled = false;
+
+    setBlocked(false);
+
+    loadVimeoSdk()
+      .then(() => {
+        if (cancelled || !iframeRef.current || !window.Vimeo?.Player) return;
+        player = new window.Vimeo.Player(iframeRef.current);
+        player.on("error", (data: unknown) => {
+          // Privacy / password / unavailable — leave site only as last resort
+          console.warn("Vimeo player error", data);
+          if (!cancelled) setBlocked(true);
+        });
+      })
+      .catch(() => {
+        // SDK load failure still keep iframe; browser may still play
+      });
+
+    return () => {
+      cancelled = true;
+      try {
+        player?.destroy();
+      } catch {
+        /* ignore */
+      }
+    };
+  }, [videoId]);
+
+  if (blocked) {
+    return (
+      <a href={watchUrl} target="_blank" rel="noreferrer" className="project-page__video-link">
+        {poster ? (
+          <img src={mediaSrc(poster)} alt="" className="project-page__video-poster" />
+        ) : (
+          <div className="project-page__video-poster project-page__video-poster--empty" />
+        )}
+        <span className="project-page__video-cta">
+          <span className="project-page__play" aria-hidden>
+            ▶
+          </span>
+          Watch on Vimeo ↗
+          <span className="project-page__video-note">
+            This video can’t be embedded here (Vimeo privacy). Opens on Vimeo as a last resort.
+          </span>
+        </span>
+      </a>
+    );
+  }
+
+  return (
+    <iframe
+      ref={iframeRef}
+      src={embedSrc}
+      title={title}
+      allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; fullscreen"
+      allowFullScreen
+      referrerPolicy="strict-origin-when-cross-origin"
+    />
+  );
+}
diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index e4922ba..26d782a 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -4,6 +4,7 @@ import Lightbox from "yet-another-react-lightbox";
 import "yet-another-react-lightbox/styles.css";
 import { api, type Project, mediaSrc } from "../lib/api";
 import { usePageTitle } from "../lib/pageTitle";
+import { VimeoEmbed } from "../components/VimeoEmbed";
 import "./ProjectPage.scss";
 
 export function ProjectPage() {
@@ -101,24 +102,39 @@ export function ProjectPage() {
         {videos.length > 0 && (
           <div className="project-page__videos">
             {videos.map((v) => {
-              const watchUrl = v.externalUrl || v.url;
-              // Vimeo "nowhere" privacy stores watch-page URL (no player.vimeo.com) → link card
-              const showEmbed =
-                v.videoSource === "youtube" ||
-                (v.videoSource === "vimeo" && v.url.includes("player.vimeo.com"));
+              const watchUrl =
+                v.externalUrl ||
+                (v.videoSource === "vimeo" && v.videoId
+                  ? `https://vimeo.com/${v.videoId}`
+                  : v.url);
+              const vimeoId =
+                v.videoId ||
+                (v.url.match(/vimeo\.com\/(?:video\/)?(\d+)/)?.[1] ?? null);
 
               return (
                 <div key={v.id} className="project-page__video">
-                  {showEmbed ? (
+                  {v.videoSource === "vimeo" && vimeoId ? (
+                    <VimeoEmbed
+                      videoId={vimeoId}
+                      title={v.caption || project.title}
+                      watchUrl={watchUrl}
+                      poster={poster}
+                    />
+                  ) : v.videoSource === "youtube" ? (
                     <iframe
                       src={mediaSrc(v.url)}
                       title={v.caption || project.title}
-                      allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+                      allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; fullscreen"
                       allowFullScreen
                       referrerPolicy="strict-origin-when-cross-origin"
                     />
                   ) : v.videoSource === "self_hosted" ? (
-                    <video src={mediaSrc(v.url)} controls playsInline poster={poster || undefined} />
+                    <video
+                      src={mediaSrc(v.url)}
+                      controls
+                      playsInline
+                      poster={poster || undefined}
+                    />
                   ) : (
                     <a
                       href={watchUrl}
@@ -135,21 +151,15 @@ export function ProjectPage() {
                         <span className="project-page__play" aria-hidden>
                           ▶
                         </span>
-                        Watch on {v.videoSource === "vimeo" || watchUrl.includes("vimeo.com")
-                          ? "Vimeo"
-                          : v.videoSource === "youtube" || watchUrl.includes("youtu")
-                            ? "YouTube"
-                            : "external site"}{" "}
-                        ↗
+                        Watch video ↗
                       </span>
-                      {(v.videoSource === "vimeo" || watchUrl.includes("vimeo.com")) && (
-                        <span className="project-page__video-note">
-                          This clip’s Vimeo privacy settings block on-site embedding
-                        </span>
-                      )}
                     </a>
                   )}
-                  {v.caption && <p>{v.caption}</p>}
+                  {v.caption &&
+                    !String(v.caption).includes("opens on Vimeo") &&
+                    !String(v.caption).includes("embedding disabled") && (
+                      <p>{v.caption}</p>
+                    )}
                 </div>
               );
             })}
diff --git a/server/src/services/vimeo-import.ts b/server/src/services/vimeo-import.ts
index 39bdb30..f9b9f0b 100644
--- a/server/src/services/vimeo-import.ts
+++ b/server/src/services/vimeo-import.ts
@@ -273,38 +273,30 @@ export async function runVimeoImport(
         }
       }
 
-      // Embed only when Vimeo allows it (embed_privacy: anywhere / whitelist)
-      const canEmbed =
-        !video.embed_privacy ||
-        video.embed_privacy === "anywhere" ||
-        video.embed_privacy === "whitelist";
+      // Always store player embed URL — UI embeds first; falls back to Vimeo
+      // only if the player reports a privacy/error at runtime.
+      if (video.embed_privacy && video.embed_privacy !== "anywhere") {
+        log(
+          lines,
+          onLog,
+          `    note: Vimeo embed_privacy is “${video.embed_privacy}” — player will embed if allowed, else last-resort link`
+        );
+      }
 
       await prisma.media.create({
         data: {
           projectId: project.id,
           type: "video",
-          // Non-embeddable clips use the watch page URL (no player.vimeo.com iframe)
-          url: canEmbed
-            ? `https://player.vimeo.com/video/${video.id}`
-            : sourceUrl,
+          url: `https://player.vimeo.com/video/${video.id}`,
           externalUrl: sourceUrl,
           videoSource: "vimeo",
           videoId: String(video.id),
-          caption: canEmbed
-            ? title
-            : `${title} (opens on Vimeo — embedding disabled by privacy settings)`,
+          caption: title,
           sortOrder: 1,
           width: video.width,
           height: video.height,
         },
       });
-      if (!canEmbed) {
-        log(
-          lines,
-          onLog,
-          `    note: embed privacy “${video.embed_privacy}” — link-out card instead of iframe`
-        );
-      }
 
       if (thumbnailId) {
         await prisma.project.update({