@postfetch/core 0.13.2 → 0.13.4

package/dist/index.js

@@ -409,13 +409,13 @@ async function instagramUnavailable(net, code, pageReason) {
   url.searchParams.set("url", `https://www.instagram.com/p/${code}/`);
   const response = await net(url.href, { headers: mobileHeaders() }, 1).catch(() => null);
   const body = response ? await response.text().catch(() => "") : "";
-  const reason = pageReason ?? instagramUnavailableReason(response?.status ?? 0, body);
+  const reason = pageReason ?? instagramUnavailableReason(response?.status ?? 0, body, code);
   const probe = response ? `oembed ${response.status}` : "oembed unreachable";
   return new PostfetchError(reasonStatus(reason), `Instagram post unavailable: ${reason} (${probe})`, reason);
 }
-function instagramUnavailableReason(status, body) {
+function instagramUnavailableReason(status, body, code) {
   if (status === 404) {
-    return "notFound";
+    return code && isPrivateShortcode(code) ? "private" : "notFound";
   }
   if (status === 429) {
     return "rateLimited";
@@ -434,6 +434,9 @@ function instagramUnavailableReason(status, body) {
   }
   return "unavailable";
 }
+function isPrivateShortcode(code) {
+  return code.length > 11;
+}
 function reasonStatus(reason) {
   switch (reason) {
     case "ageRestricted":
@@ -1642,14 +1645,17 @@ async function appToken(net) {
   return token;
 }
 async function fetchPost(net, token, id) {
-  const response = await net(`https://oauth.reddit.com/comments/${id}?raw_json=1&limit=1`, {
-    headers: { authorization: `Bearer ${token}`, "user-agent": browserUserAgent() }
-  });
+  const headers = { authorization: `Bearer ${token}`, "user-agent": browserUserAgent() };
+  let response = await net(`https://oauth.reddit.com/comments/${id}?raw_json=1&limit=1`, { headers });
+  if (response.status === 403) {
+    await response.body?.cancel();
+    response = await net(`https://oauth.reddit.com/by_id/t3_${id}?raw_json=1`, { headers });
+  }
   if (!response.ok) {
     throw new Error(`Reddit post failed: ${response.status}`);
   }
   const payload = await response.json().catch(() => null);
-  const listing = Array.isArray(payload) ? payload[0] : null;
+  const listing = Array.isArray(payload) ? payload[0] : payload;
   const children = object(listing) && object(listing.data) && Array.isArray(listing.data.children) ? listing.data.children : [];
   const first = children[0];
   const post = object(first) && object(first.data) ? first.data : null;

package/dist/instagram.d.ts

@@ -1,6 +1,6 @@
 import { type InstagramExtra, type PostMetadata, type PostfetchReason, type ResolveContext, type Json, type PostfetchResult } from "./internal";
 export declare function resolveInstagram(input: ResolveContext): Promise<PostfetchResult>;
-export declare function instagramUnavailableReason(status: number, body: string): PostfetchReason;
+export declare function instagramUnavailableReason(status: number, body: string, code?: string): PostfetchReason;
 export declare function instagramMetadata(media: Json): PostMetadata & {
     extra?: InstagramExtra;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postfetch/core",
-  "version": "0.13.2",
+  "version": "0.13.4",
   "description": "Zero-dependency typed core that turns Facebook, Instagram, LinkedIn, Pinterest, Reddit, SoundCloud, Spotify, TikTok, X and YouTube post URLs into media files.",
   "license": "MIT",
   "type": "module",

package/src/instagram.ts

@@ -91,7 +91,7 @@ async function instagramUnavailable(net: Net, code: string, pageReason?: Postfet
   const body = response ? await response.text().catch(() => "") : "";
   // The page can identify an age gate even when oembed only reports a generic
   // geoblock_required error with no MIN_AGE_ACCOUNT marker.
-  const reason = pageReason ?? instagramUnavailableReason(response?.status ?? 0, body);
+  const reason = pageReason ?? instagramUnavailableReason(response?.status ?? 0, body, code);
   // Carry the oembed status so an unclassified failure still leaves a raw clue
   // (200 = post is public but no media could be parsed; 429 = throttled; …).
   const probe = response ? `oembed ${response.status}` : "oembed unreachable";
@@ -101,10 +101,11 @@ async function instagramUnavailable(net: Net, code: string, pageReason?: Postfet
 // Classifies why the post is gone from the oembed endpoint, which returns a
 // telling status and body (404 when removed; 429 when throttled; 400 with a
 // MIN_AGE_ACCOUNT block for 18+ accounts) while the media endpoints just come
-// back empty.
-export function instagramUnavailableReason(status: number, body: string): PostfetchReason {
+// back empty. Share links to posts from private accounts carry a long
+// shortcode, and oembed answers those with the same 404 as a removed post.
+export function instagramUnavailableReason(status: number, body: string, code?: string): PostfetchReason {
   if (status === 404) {
-    return "notFound";
+    return code && isPrivateShortcode(code) ? "private" : "notFound";
   }
   if (status === 429) {
     return "rateLimited";
@@ -124,6 +125,12 @@ export function instagramUnavailableReason(status: number, body: string): Postfe
   return "unavailable";
 }
 
+// Public shortcodes are at most 11 characters; private share links append an
+// owner-scoped suffix (for example 39 characters in total).
+function isPrivateShortcode(code: string): boolean {
+  return code.length > 11;
+}
+
 function reasonStatus(reason: PostfetchReason): number {
   switch (reason) {
     case "ageRestricted":

package/src/reddit.ts

@@ -100,14 +100,19 @@ async function appToken(net: Net): Promise<string> {
 }
 
 async function fetchPost(net: Net, token: string, id: string): Promise<Json> {
-  const response = await net(`https://oauth.reddit.com/comments/${id}?raw_json=1&limit=1`, {
-    headers: { authorization: `Bearer ${token}`, "user-agent": browserUserAgent() },
-  });
+  const headers = { authorization: `Bearer ${token}`, "user-agent": browserUserAgent() };
+  let response = await net(`https://oauth.reddit.com/comments/${id}?raw_json=1&limit=1`, { headers });
+  // Reddit can block the comments route while still allowing direct post
+  // listings with the same token. This route returns the post, not its replies.
+  if (response.status === 403) {
+    await response.body?.cancel();
+    response = await net(`https://oauth.reddit.com/by_id/t3_${id}?raw_json=1`, { headers });
+  }
   if (!response.ok) {
     throw new Error(`Reddit post failed: ${response.status}`);
   }
   const payload = await response.json().catch(() => null);
-  const listing = Array.isArray(payload) ? payload[0] : null;
+  const listing = Array.isArray(payload) ? payload[0] : payload;
   const children = object(listing) && object(listing.data) && Array.isArray(listing.data.children) ? listing.data.children : [];
   const first = children[0];
   const post = object(first) && object(first.data) ? first.data : null;