@chilfish/gallery-dl-instagram 0.1.0 → 0.2.0

package/dist/storage-77hqz5Fi.mjs

@@ -0,0 +1,24 @@
+import { access, mkdir, writeFile } from "node:fs/promises";
+import { dirname } from "node:path";
+//#region src/cli/storage.ts
+function createStorage() {
+	return {
+		async exists(path) {
+			try {
+				await access(path);
+				return true;
+			} catch {
+				return false;
+			}
+		},
+		async write(path, data) {
+			await mkdir(dirname(path), { recursive: true });
+			await writeFile(path, data);
+		},
+		async mkdir(path) {
+			await mkdir(path, { recursive: true });
+		}
+	};
+}
+//#endregion
+export { createStorage };

package/dist/storage-BwGaT6XO.cjs

@@ -0,0 +1,24 @@
+let node_fs_promises = require("node:fs/promises");
+let node_path = require("node:path");
+//#region src/cli/storage.ts
+function createStorage() {
+	return {
+		async exists(path) {
+			try {
+				await (0, node_fs_promises.access)(path);
+				return true;
+			} catch {
+				return false;
+			}
+		},
+		async write(path, data) {
+			await (0, node_fs_promises.mkdir)((0, node_path.dirname)(path), { recursive: true });
+			await (0, node_fs_promises.writeFile)(path, data);
+		},
+		async mkdir(path) {
+			await (0, node_fs_promises.mkdir)(path, { recursive: true });
+		}
+	};
+}
+//#endregion
+exports.createStorage = createStorage;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chilfish/gallery-dl-instagram",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Instagram extraction pipeline — platform-agnostic SDK + CLI",
   "license": "GPL-2.0-only",
   "keywords": [
@@ -11,28 +11,28 @@
     "gallery-dl",
     "cli"
   ],
+  "sideEffects": false,
   "exports": {
-    ".": "./dist/index.mjs",
-    "./cli": "./dist/cli/index.mjs",
-    "./sdk": "./dist/sdk.mjs",
+    ".": {
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
+    },
+    "./node": {
+      "import": "./dist/node.mjs",
+      "require": "./dist/node.cjs"
+    },
     "./package.json": "./package.json"
   },
-  "types": "./dist/index.d.mts",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.cts",
   "bin": {
-    "gallery-dl-instagram": "./dist/cli/index.mjs"
+    "dl-ins": "./dist/dl-ins.mjs"
   },
   "files": [
-    "!*.log",
-    "!node_modules",
-    "cli/",
-    "config.ts",
-    "core/",
-    "dist/",
-    "index.ts",
-    "instagram/",
-    "message.ts",
-    "types.ts",
-    "utils/"
+    "LICENSE",
+    "README.md",
+    "dist"
   ],
   "engines": {
     "node": ">=18"
@@ -40,7 +40,7 @@
   "scripts": {
     "build": "tsdown",
     "typecheck": "tsc --noEmit -p tsconfig.json",
-    "cli": "bun cli/index.ts",
+    "cli": "bun src/cli/index.ts",
     "lint": "eslint . --fix",
     "test": "vitest run",
     "test:watch": "vitest",
@@ -48,21 +48,28 @@
     "test:unit": "vitest run tests/unit",
     "test:integration": "vitest run tests/integration"
   },
-  "dependencies": {
-    "axios": "^1.16.1"
+  "peerDependencies": {
+    "axios": "^1.0.0"
   },
+  "peerDependenciesMeta": {
+    "axios": {
+      "optional": true
+    }
+  },
+  "dependencies": {},
   "devDependencies": {
     "@antfu/eslint-config": "^9.0.0",
     "@types/node": "^25.9.1",
-    "commander": "^14.0.3",
+    "axios": "^1.16.1",
+    "commander": "^15.0.0",
     "dotenv": "^17.4.2",
-    "eslint": "^10.4.0",
-    "lefthook": "^2.1.8",
-    "tsdown": "^0.22.0",
+    "eslint": "^10.4.1",
+    "lefthook": "^2.1.9",
+    "tsdown": "^0.22.1",
     "typescript": "^6.0.3",
     "vitest": "^4.1.7"
   },
   "inlinedDependencies": {
-    "commander": "14.0.3"
+    "commander": "15.0.0"
   }
 }

package/cli/adapter.ts

@@ -1,284 +0,0 @@
-/**
- * Node.js adapter — HttpClient + Storage + Logger implementations.
- *
- * These bind the platform-agnostic SDK interfaces to Node.js primitives:
- * axios for HTTP, fs/promises for file I/O, console for logging.
- */
-
-import type { AxiosInstance } from 'axios'
-import type { Logger } from '../core/extractor'
-import type { HttpClient, HttpResponse, Storage } from '../types'
-import { access, mkdir, writeFile } from 'node:fs/promises'
-import { dirname } from 'node:path'
-import axios from 'axios'
-import { createCookieJar } from './cookies'
-
-/** NodeHttpClient — axios wrapper */
-
-/**
- * Extract csrftoken value from a Cookie header string.
- */
-export function extractCsrfFromCookies(cookies: string): string {
-  const m = cookies.match(/(?:^|;\s*)csrftoken=([^;]+)/)
-  return m?.[1] ?? ''
-}
-
-export function createHttpClient(
-  sessionId?: string,
-  fullCookies?: string,
-  logger?: Logger,
-): HttpClient {
-  const instance: AxiosInstance = axios.create({
-    timeout: 30000,
-    maxRedirects: 20,
-    validateStatus: () => true, // don't throw on non-2xx
-    headers: {
-      'User-Agent':
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-    },
-  })
-
-  // Build base Cookie string
-  // Priority: full cookies string > sessionid-only
-  const baseCookie = fullCookies
-    || (sessionId ? `sessionid=${sessionId}` : null)
-
-  return {
-    async request<T = unknown>(config: {
-      url: string
-      method?: string
-      headers?: Record<string, string>
-      params?: Record<string, string | number | null | undefined>
-      data?: unknown
-      signal?: AbortSignal
-      timeout?: number
-      responseType?: 'arraybuffer' | 'text' | 'json'
-    }): Promise<HttpResponse<T>> {
-      const method = config.method ?? 'GET'
-      logger?.debug(`${method} ${config.url}`)
-
-      // Merge base cookie with per-request headers (Cookie values are joined)
-      const mergedHeaders: Record<string, string> = {}
-      if (baseCookie) {
-        mergedHeaders.Cookie = baseCookie
-      }
-      if (config.headers) {
-        for (const [k, v] of Object.entries(config.headers)) {
-          if (k.toLowerCase() === 'cookie' && mergedHeaders.Cookie) {
-            // Append instead of overriding: sessionid=xxx + csrftoken=yyy → sessionid=xxx; csrftoken=yyy
-            mergedHeaders.Cookie = `${mergedHeaders.Cookie}; ${v}`
-          }
-          else {
-            mergedHeaders[k] = v
-          }
-        }
-      }
-
-      if (mergedHeaders.Cookie) {
-        logger?.debug(`  Cookie: ${mergedHeaders.Cookie.slice(0, 200)}`)
-      }
-
-      try {
-        const resp = await instance.request<T>({
-          url: config.url,
-          method,
-          headers: mergedHeaders,
-          params: cleanupParams(config.params),
-          data: config.data,
-          signal: config.signal,
-          timeout: config.timeout,
-          responseType: config.responseType ?? 'json',
-        })
-
-        const finalUrl = resp.request?.res?.responseUrl ?? config.url
-        logger?.debug(`  ← ${resp.status} ${resp.status >= 400 ? '⚠️' : ''} (${finalUrl.slice(0, 100)})`)
-
-        return {
-          status: resp.status,
-          data: resp.data,
-          headers: resp.headers as Record<string, string>,
-          url: finalUrl,
-        }
-      }
-      catch (err) {
-        const msg = String(err)
-        if (msg.includes('TOO_MANY_REDIRECTS') || msg.includes('too many redirects')) {
-          throw new Error(
-            'Too many redirects — sessionid may be expired or invalid. '
-            + 'Export a fresh sessionid from your browser.',
-          )
-        }
-        throw err
-      }
-    },
-  }
-}
-
-/** WebClient — anonymous cookie-jar HTTP client */
-
-/**
- * Create an HTTP client with an in-memory cookie jar.
- *
- * Use this when you don't have a sessionid — the client first seeds its
- * cookie jar by visiting ``instagram.com``, then uses those anonymous
- * cookies for subsequent API calls.  This is how incognito browsing works.
- *
- * Returns the client + the initial CSRF token extracted from cookies.
- */
-export async function createWebClient(
-  logger?: Logger,
-): Promise<{ http: HttpClient, csrfToken: string }> {
-  const jar = createCookieJar()
-
-  // Seed the cookie jar by visiting Instagram's homepage
-  logger?.info('Seeding anonymous session (visiting instagram.com)…')
-  const seedResp = await axios.get('https://www.instagram.com/', {
-    headers: {
-      'User-Agent':
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-      'Accept':
-        'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-    },
-    maxRedirects: 20,
-    validateStatus: () => true,
-  })
-  jar.setFromResponse(seedResp.headers as Record<string, string>)
-  logger?.debug(`  ← ${seedResp.status} — got ${jar.getCookieHeader().split(';').length} cookies`)
-
-  // Extract csrftoken from jar
-  const cookieStr = jar.getCookieHeader()
-  const csrfMatch = cookieStr.match(/(?:^|;\s*)csrftoken=([^;]+)/)
-  const csrfToken = csrfMatch?.[1] ?? ''
-
-  // Build the wrapper
-  const http: HttpClient = {
-    async request<T = unknown>(config: {
-      url: string
-      method?: string
-      headers?: Record<string, string>
-      params?: Record<string, string | number | null | undefined>
-      data?: unknown
-      signal?: AbortSignal
-      timeout?: number
-      responseType?: 'arraybuffer' | 'text' | 'json'
-    }): Promise<HttpResponse<T>> {
-      const method = config.method ?? 'GET'
-      logger?.debug(`${method} ${config.url}`)
-
-      // Merge jar cookies with per-request headers (Cookie values are joined)
-      const jarCookie = jar.getCookieHeader()
-      const mergedHeaders: Record<string, string> = {}
-      if (jarCookie) {
-        mergedHeaders.Cookie = jarCookie
-      }
-      if (config.headers) {
-        for (const [k, v] of Object.entries(config.headers)) {
-          if (k.toLowerCase() === 'cookie' && mergedHeaders.Cookie) {
-            mergedHeaders.Cookie = `${mergedHeaders.Cookie}; ${v}`
-          }
-          else {
-            mergedHeaders[k] = v
-          }
-        }
-      }
-
-      try {
-        const resp = await axios.request<T>({
-          url: config.url,
-          method,
-          headers: mergedHeaders,
-          params: cleanupParams(config.params),
-          data: config.data,
-          signal: config.signal,
-          timeout: config.timeout ?? 30000,
-          maxRedirects: 20,
-          validateStatus: () => true,
-          responseType: config.responseType ?? 'json',
-        })
-
-        // Update jar with response cookies
-        jar.setFromResponse(resp.headers as Record<string, string>)
-
-        const finalUrl = resp.request?.res?.responseUrl ?? config.url
-        logger?.debug(`  ← ${resp.status} ${resp.status >= 400 ? '⚠️' : ''} (${finalUrl.slice(0, 100)})`)
-
-        return {
-          status: resp.status,
-          data: resp.data,
-          headers: resp.headers as Record<string, string>,
-          url: finalUrl,
-        }
-      }
-      catch (err) {
-        const msg = String(err)
-        if (msg.includes('TOO_MANY_REDIRECTS') || msg.includes('too many redirects')) {
-          throw new Error(
-            'Too many redirects — Instagram may be blocking the request. Try again later or use --sessionid.',
-          )
-        }
-        throw err
-      }
-    },
-  }
-
-  return { http, csrfToken }
-}
-
-function cleanupParams(
-  params?: Record<string, string | number | null | undefined>,
-): Record<string, string> | undefined {
-  if (!params)
-    return undefined
-  const cleaned: Record<string, string> = {}
-  for (const [k, v] of Object.entries(params)) {
-    if (v != null)
-      cleaned[k] = String(v)
-  }
-  return cleaned
-}
-
-/** NodeStorage — fs/promises wrapper */
-
-export function createStorage(): Storage {
-  return {
-    async exists(path: string): Promise<boolean> {
-      try {
-        await access(path)
-        return true
-      }
-      catch {
-        return false
-      }
-    },
-
-    async write(path: string, data: Uint8Array | string): Promise<void> {
-      // Ensure parent directory
-      await mkdir(dirname(path), { recursive: true })
-      await writeFile(path, data)
-    },
-
-    async mkdir(path: string): Promise<void> {
-      await mkdir(path, { recursive: true })
-    },
-  }
-}
-
-/** NodeLogger — console wrapper */
-
-export function createLogger(verbose: boolean): Logger {
-  return {
-    debug(message: string, ...args: unknown[]): void {
-      if (verbose)
-        console.debug(`[debug] ${message}`, ...args)
-    },
-    info(message: string, ...args: unknown[]): void {
-      console.info(`[info] ${message}`, ...args)
-    },
-    warn(message: string, ...args: unknown[]): void {
-      console.warn(`[warn] ${message}`, ...args)
-    },
-    error(message: string, ...args: unknown[]): void {
-      console.error(`[error] ${message}`, ...args)
-    },
-  }
-}

package/cli/cookies.ts

@@ -1,59 +0,0 @@
-/**
- * Simple in-memory cookie jar for Node.js HTTP clients.
- *
- * Tracks Set-Cookie headers across requests and injects stored cookies
- * into subsequent requests to the same domain.  This is enough for
- * Instagram's anonymous session flow: visit homepage → get cookies →
- * use those cookies for API calls.
- */
-
-export interface CookieJar {
-  /** Record cookies from a response's Set-Cookie header(s). */
-  setFromResponse: (headers: Record<string, string>) => void
-  /** Get the Cookie header value for the next request. */
-  getCookieHeader: () => string
-}
-
-export function createCookieJar(): CookieJar {
-  const cookies = new Map<string, string>()
-  let cookieString = ''
-
-  return {
-    setFromResponse(headers: Record<string, string>): void {
-      const raw = headers['set-cookie']
-      if (!raw)
-        return
-
-      const cookieHeaders = Array.isArray(raw) ? raw : [raw]
-      for (const header of cookieHeaders) {
-        const parts = header.split(';')
-        if (parts.length === 0)
-          continue
-
-        const [nameValue] = parts
-        const eqIdx = nameValue!.indexOf('=')
-        if (eqIdx <= 0)
-          continue
-
-        const name = nameValue!.slice(0, eqIdx).trim()
-        const value = nameValue!.slice(eqIdx + 1).trim()
-
-        // Skip expiration by checking Max-Age=0 or Expires=epoch
-        const rest = parts.slice(1).map((s: string) => s.trim().toLowerCase())
-        if (rest.includes('max-age=0'))
-          continue
-
-        cookies.set(name, value)
-      }
-
-      // Rebuild cookie string
-      cookieString = Array.from(cookies.entries())
-        .map(([k, v]) => `${k}=${v}`)
-        .join('; ')
-    },
-
-    getCookieHeader(): string {
-      return cookieString
-    },
-  }
-}