umedia 0.4.0 → 0.4.1

package/README.md

@@ -88,7 +88,7 @@ trailers, social posts with official embeds. `previewKind: "none"` beats a fake
 | **X** | — | ✅ | ✅ | syndication token + guest GraphQL: photos/videos/gifs at real bitrates |
 | **Facebook** | — | ✅ | ✅ | reels/watch/videos/shares/fb.watch via the web player JSON |
 | **Threads** | — | ✅ | ✅ | post SSR state + og media (Meta gates some networks — typed honest error) |
-| **Snapchat** | — | ✅ best-effort | ✅ best-effort | spotlight + story snap lists (edge-gated on datacenter IPs) |
+| **Snapchat** | — | ✅ | ✅ | spotlight videos (direct sc-cdn mp4) + public stories/highlights — ALL snaps in order |
 | **Rumble** | — | ✅ best-effort | ✅ best-effort | embed API direct mp4s (site blocks datacenter IPs) |
 | **Tumblr** | — | ✅ | ✅ | mobile API: video/audio/photo posts + reblog trails, all in order |
 | **iTunes** | ✅ | — | ✅ previews | real 30s clips, rock solid |

package/lib/providers/snapchat.js

@@ -1,15 +1,17 @@
-import { fetchJson, fetchText, hostMatches } from "../util.js";
+import { fetchText, hostMatches } from "../util.js";
 import { Codes, UMediaError } from "../errors.js";
 
 /**
- * Snapchat — Spotlight videos (preload link on the page) and public stories
- * (the page's __NEXT_DATA__ snap list — ALL snaps, in order).
- * Reference: cobalt snapchat service.
+ * Snapchat — Spotlight videos and public story snap lists.
+ * Primary: the page's __NEXT_DATA__ -> spotlightFeed.spotlightStories, matched
+ * by storyId (the exact structure yt-dlp's snapchat extractor reads) ->
+ * videoMetadata.contentUrl (direct sc-cdn mp4). Fallback: the preload video
+ * link (cobalt). Stories: pageProps.story.snapList — ALL snaps, in order.
  */
 export const name = "snapchat";
 
-const SPOTLIGHT_PRELOAD = /<link data-react-helmet="true" rel="preload" href="([^"]+)" as="video"\/>/;
 const NEXT_DATA = /<script id="__NEXT_DATA__" type="application\/json">({.+?})<\/script>/;
+const PRELOAD_VIDEO = /<link data-react-helmet="true" rel="preload" href="([^"]+)" as="video"\/>/;
 
 export function canHandle(url) {
   try {
@@ -17,6 +19,32 @@ export function canHandle(url) {
   } catch { return false; }
 }
 
+export function spotlightId(url) {
+  const m = String(url).match(/\/spotlight\/([\w-]{10,120})/);
+  return m ? m[1] : null;
+}
+
+function nextData(html) {
+  const m = html.match(NEXT_DATA);
+  if (!m) return null;
+  try { return JSON.parse(m[1]); } catch { return null; }
+}
+
+function pushStorySnap(snap, media) {
+  const isPhoto = snap.snapMediaType === 0;
+  const u = snap.snapUrls?.mediaUrl;
+  if (!u) return;
+  media.push({
+    type: isPhoto ? "image" : "video", index: media.length, url: u,
+    thumbnail: snap.snapUrls?.mediaPreviewUrl?.value || u,
+    mimeType: isPhoto ? "image/jpeg" : "video/mp4",
+    width: null, height: null,
+    duration: snap.durationInMs ? Math.round(snap.durationInMs / 1000) : (snap.duration ? Math.round(snap.duration / 1000) : null),
+    size: null, quality: null,
+    hasAudio: !isPhoto, hasVideo: !isPhoto, source: name, variants: [],
+  });
+}
+
 export async function resolve(url, ctx = {}) {
   const attempt = { provider: name, status: "skipped" };
   ctx.attempts?.push(attempt);
@@ -33,53 +61,92 @@ export async function resolve(url, ctx = {}) {
   const media = [];
   let title = null;
   let author = null;
+  let duration = null;
 
-  const spotlight = target.match(/\/spotlight\/([\w-]+)/i);
+  const sid = spotlightId(target);
   const story = target.match(/\/add\/([\w.-]+)(?:\/([\w-]+))?/i);
 
-  if (spotlight) {
-    const r = await fetchText(`https://www.snapchat.com/spotlight/${spotlight[1]}`, { headers: { "user-agent": "Mozilla/5.0" } }, 18_000).catch(() => null);
-    const v = r?.text?.match(SPOTLIGHT_PRELOAD)?.[1];
-    if (v && new URL(v).hostname.endsWith("sc-cdn.net")) {
+  if (sid) {
+    const r = await fetchText(`https://www.snapchat.com/spotlight/${sid}`, { headers: { "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0 Safari/537.36" } }, 20_000).catch(() => null);
+    const html = r?.text || "";
+
+    // primary: __NEXT_DATA__ spotlight feed entry matched by storyId (yt-dlp structure)
+    const d = nextData(html);
+    const stories = d?.props?.pageProps?.spotlightFeed?.spotlightStories || [];
+    const entry = stories.find((s) => s?.story?.storyId?.value === sid);
+    const vm = entry?.metadata?.videoMetadata;
+    if (vm?.contentUrl) {
       media.push({
-        type: "video", index: 0, url: v, thumbnail: null,
-        mimeType: "video/mp4", width: null, height: null, duration: null, size: null,
-        quality: null, hasAudio: true, hasVideo: true, source: name, variants: [],
+        type: "video", index: 0, url: vm.contentUrl,
+        thumbnail: vm.thumbnailUrl || null,
+        mimeType: "video/mp4",
+        width: vm.width ?? null, height: vm.height ?? null,
+        duration: vm.durationMs ? Math.round(vm.durationMs / 1000) : null,
+        size: null, quality: vm.height ? `${vm.height}p` : null,
+        hasAudio: true, hasVideo: true, source: name, variants: [],
       });
-      title = (r.text.match(/"title":"([^"]{1,120})"/) || r.text.match(/<title[^>]*>([^<]*)/i) || [])[1] || null;
+      title = vm.name || null;
+      author = vm.creator?.personCreator?.username || vm.creator?.username || null;
+      duration = vm.durationMs ? Math.round(vm.durationMs / 1000) : null;
     }
-  } else if (story) {
-    const r = await fetchText(`https://www.snapchat.com/add/${story[1]}${story[2] ? "/" + story[2] : ""}`,
-      { headers: { "user-agent": "Mozilla/5.0" } }, 18_000).catch(() => null);
-    const raw = r?.text?.match(NEXT_DATA)?.[1];
-    if (raw) {
-      const data = JSON.parse(raw);
-      author = story[1];
-      const snaps = data?.props?.pageProps?.story?.snapList
-        || data?.props?.pageProps?.curatedHighlights?.[0]?.snapList
-        || [];
-      snaps.forEach((snap) => {
-        const isPhoto = snap.snapMediaType === 0;
-        const u = snap.snapUrls?.mediaUrl;
-        if (!u) return;
+
+    // fallback: the preload video link (cobalt's route)
+    if (!media.length) {
+      const v = html.match(PRELOAD_VIDEO)?.[1];
+      if (v && /^https?:/.test(v) && new URL(v).hostname.endsWith("sc-cdn.net")) {
         media.push({
-          type: isPhoto ? "image" : "video", index: media.length, url: u,
-          thumbnail: snap.snapUrls?.mediaPreviewUrl?.value || u,
-          mimeType: isPhoto ? "image/jpeg" : "video/mp4",
-          width: null, height: null,
-          duration: snap.duration ? Math.round(snap.duration / 1000) : null,
-          size: null, quality: null,
-          hasAudio: !isPhoto, hasVideo: !isPhoto, source: name, variants: [],
+          type: "video", index: 0, url: v, thumbnail: null,
+          mimeType: "video/mp4", width: null, height: null,
+          duration: null, size: null, quality: null,
+          hasAudio: true, hasVideo: true, source: name, variants: [],
         });
-      });
+      }
+    }
+  } else if (story) {
+    const r = await fetchText(`https://www.snapchat.com/add/${story[1]}${story[2] ? "/" + story[2] : ""}`,
+      { headers: { "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0 Safari/537.36" } }, 20_000).catch(() => null);
+    const d = nextData(r?.text || "");
+    const pp = d?.props?.pageProps || {};
+    author = story[1];
+
+    const activeStory = pp.story?.snapList || [];
+    const highlights = pp.spotlightHighlights || [];
+    const curated = pp.curatedHighlights || [];
+
+    if (story[2]) {
+      // a single snap (by snapId) or one highlight reel (by storyId/highlightId)
+      const wanted = story[2];
+      const allLists = [activeStory, ...curated.map((c) => c.snapList || []), ...highlights.map((h) => h.snapList || [])];
+      for (const list of allLists) {
+        const snap = list.find((s) => s.snapId?.value === wanted || s.snapId === wanted);
+        if (snap) { pushStorySnap(snap, media); break; }
+      }
+      if (!media.length) {
+        const hl = highlights.find((h) => h.storyId === wanted || h.highlightId === wanted || h.storyShareId === wanted);
+        if (hl) {
+          title = hl.storyTitle || null;
+          (hl.snapList || []).forEach((snap) => pushStorySnap(snap, media));
+        }
+      }
+    }
+    if (!media.length) {
+      // bare /add/{user}: the current story if it exists, else their public
+      // highlight reels — ALL snaps, in order, nothing silently dropped
+      const list = activeStory.length
+        ? activeStory
+        : (curated[0]?.snapList?.length ? curated[0].snapList : highlights.flatMap((h) => h.snapList || []));
+      if (!activeStory.length && highlights.length && !curated[0]?.snapList?.length) {
+        title = `${author} — ${highlights.length} public highlight${highlights.length > 1 ? "s" : ""}`;
+      }
+      list.forEach((snap) => pushStorySnap(snap, media));
     }
   }
 
   if (!media.length) {
     attempt.status = "failed";
-    attempt.error = "no snap media exposed (removed, private, or login-gated)";
+    attempt.error = "no snap media exposed (removed, private, or an expired spotlight)";
     throw new UMediaError(Codes.MEDIA_NOT_FOUND,
-      `Snapchat exposes no media for this URL (${attempt.error}) — the yt-dlp tier covers gated stories.`, { attempts: [attempt] });
+      `Snapchat exposes no media for this URL (${attempt.error}) — public spotlight links and stories work; removed snaps are gone from Snapchat itself.`, { attempts: [attempt] });
   }
 
   attempt.status = "success";
@@ -92,7 +159,11 @@ export async function resolve(url, ctx = {}) {
       author,
       thumbnail: media[0].thumbnail,
       itemCount: media.length,
-      counts: { images: media.filter((m) => m.type === "image").length, videos: media.filter((m) => m.type === "video").length, audios: 0, other: 0 },
+      counts: {
+        images: media.filter((m) => m.type === "image").length,
+        videos: media.filter((m) => m.type === "video").length,
+        audios: 0, other: 0,
+      },
       truncated: false,
       media,
       streamUrlsAvailable: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umedia",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Standalone media engine — search, resolve and download media from YouTube, TikTok, Instagram, Reddit, X, iTunes (and 1800+ sites via the yt-dlp tier) entirely on your machine. No hosted API, no keys, no server bills. Honest quality labels, complete galleries, typed errors.",
   "type": "module",
   "main": "./index.js",