website-api 1.0.2 → 1.0.3

package/dist/src/base-adapter.js

@@ -1 +1 @@
-const e={buildCookieString:e=>e.map(e=>`${e.name}=${e.value}`).join("; "),resolveUserAgent:e=>e.userAgent||process.env.userAgent||process.env.USER_AGENT||"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36",async fetchJson(e,t){const n=await fetch(e,t);if(!n.ok)throw new Error(`HTTP ${n.status}: ${n.statusText}`);const s=await n.text();try{return JSON.parse(s)}catch{return{response:s}}}};async function t(e,t){if(!this.endpoints||0===this.endpoints.length)throw new Error(`Adapter "${this.id}" has no endpoints defined and no fetchData override`);const n=this.endpoints[0],s=this.buildCookieString(e),o=this.resolveUserAgent(t);return this.fetchJson(n.url,{method:n.method||"GET",headers:{Cookie:s,"User-Agent":o,Accept:"application/json, text/plain, */*",...n.headers}})}export function defineAdapter(n){const s={...n,...e,fetchData:n.fetchData??t};return s.fetchData=s.fetchData.bind(s),s}
+const t={buildCookieString:t=>t.map(t=>`${t.name}=${t.value}`).join("; "),resolveUserAgent:t=>t.userAgent||process.env.userAgent||process.env.USER_AGENT||"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36",async fetchJson(t,e){const n=await fetch(t,e);if(!n.ok)throw new Error(`HTTP ${n.status}: ${n.statusText}`);const r=await n.text();try{return JSON.parse(r)}catch{return{response:r}}},async fetchText(t,e){const n=await fetch(t,e);if(!n.ok)throw new Error(`HTTP ${n.status}: ${n.statusText}`);return n.text()},async fetchHtml(t,e){return this.fetchText(t,e)}};async function e(t,e){if(!this.endpoints||0===this.endpoints.length)throw new Error(`Adapter "${this.id}" has no endpoints defined and no fetchData override`);const n=this.endpoints[0],r=this.buildCookieString(t),s=this.resolveUserAgent(e),o=await async function(t,e,n){const r=await fetch(t.url,{method:t.method||"GET",headers:{Cookie:e,"User-Agent":n,Accept:"html"===t.responseType?"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8":"text"===t.responseType?"text/plain,*/*;q=0.8":"application/json, text/plain, */*",...t.headers}});if(!r.ok)throw new Error(`HTTP ${r.status}: ${r.statusText}`);const s=await r.text(),o=r.headers.get("content-type")?.toLowerCase()??"";if("json"===t.responseType||"text"!==t.responseType&&"html"!==t.responseType&&(o.includes("application/json")||o.includes("+json")))try{return JSON.parse(s)}catch(e){throw new Error(`Expected JSON from ${t.url}, but received invalid JSON: ${e instanceof Error?e.message:String(e)}`)}return s}(n,r,s);return n.transform?n.transform.call(this,o,t,e):o}export function defineAdapter(n){const r={...n,...t,fetchData:n.fetchData??e};return r.fetchData=r.fetchData.bind(r),r}

package/dist/src/types.d.ts

@@ -9,6 +9,13 @@ export interface Endpoint {
     method?: string;
     /** Additional headers to include in the request. */
     headers?: Record<string, string>;
+    /**
+     * Expected response body type. Defaults to auto-detect from content-type.
+     * Use "html" for text/html responses that need parsing.
+     */
+    responseType?: "auto" | "json" | "text" | "html";
+    /** Optional post-processing step for the parsed response body. */
+    transform?: (this: WebsiteAdapter, body: unknown, cookies: CookieEntry[], options: QueryOptions) => Promise<unknown> | unknown;
 }
 /**
  * Configuration for defining a website adapter.
@@ -39,6 +46,10 @@ export interface WebsiteAdapter extends AdapterConfig {
     resolveUserAgent(options: QueryOptions): string;
     /** Fetches a URL and returns parsed JSON, with error handling. */
     fetchJson(url: string, init?: RequestInit): Promise<any>;
+    /** Fetches a URL and returns the raw response text, with error handling. */
+    fetchText(url: string, init?: RequestInit): Promise<string>;
+    /** Fetches an HTML document as text, with error handling. */
+    fetchHtml(url: string, init?: RequestInit): Promise<string>;
 }
 /**
  * Options passed when querying a website API.

package/dist/src/website/ollama.com/ollama-adapter.js

@@ -1 +1 @@
-import{defineAdapter as e}from"../../base-adapter.js";export default e({id:"ollama-usage",name:"Ollama Usage",domain:"ollama.com",description:"Fetches Ollama plan and usage details from the authenticated settings page.",async fetchData(e,a){const n=this.buildCookieString(e),i=this.resolveUserAgent(a),o=await fetch("https://ollama.com/settings",{method:"GET",headers:{Cookie:n,"User-Agent":i,Accept:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"}});if(!o.ok)throw new Error(`HTTP ${o.status}: ${o.statusText}`);const r=await o.text(),l=s(r,"Session usage"),m=s(r,"Weekly usage");return{time:(new Date).toISOString(),Plan:t(r),"Session Usage":l.usage,"Session Reset":l.reset,"Weekly Usage":m.usage,"Weekly Reset":m.reset}}});function t(e){const t=e.match(/Cloud Usage[\s\S]*?<\/span>[\s\S]*?<span[^>]*>([\s\S]*?)<\/span/i);return t?.[1]?.trim()??"unknown"}function s(e,t){const s=t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&");const a=new RegExp(`<div[\\s\\S]*?<span[^>]*>\\s*${s}\\s*<\\/span>[\\s\\S]*?aria-label="${s}\\s+([^"]+)"[\\s\\S]*?data-time="([^"]+)"`,"i"),n=e.match(a);return{usage:n?.[1]?.replace(/\s+used$/i,"").trim()??"unknown",reset:n?.[2]?.trim()??"unknown"}}
+import{defineAdapter as e}from"../../base-adapter.js";export default e({id:"ollama-usage",name:"Ollama Usage",domain:"ollama.com",description:"Fetches Ollama plan and usage details from the authenticated settings page.",endpoints:[{url:"https://ollama.com/settings",responseType:"html",headers:{Accept:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"},transform(e){const t="string"==typeof e?e:String(e),n=a(t,"Session usage"),i=a(t,"Weekly usage");return{time:(new Date).toISOString(),Plan:s(t),"Session Usage":n.usage,"Session Reset":n.reset,"Weekly Usage":i.usage,"Weekly Reset":i.reset}}}]});function s(e){const s=e.match(/Cloud Usage[\s\S]*?<\/span>[\s\S]*?<span[^>]*>([\s\S]*?)<\/span/i);return s?.[1]?.trim()??"unknown"}function a(e,s){const a=s.replace(/[.*+?^${}()|[\]\\]/g,"\\$&");const t=new RegExp(`<div[\\s\\S]*?<span[^>]*>\\s*${a}\\s*<\\/span>[\\s\\S]*?aria-label="${a}\\s+([^"]+)"[\\s\\S]*?data-time="([^"]+)"`,"i"),n=e.match(t);return{usage:n?.[1]?.replace(/\s+used$/i,"").trim()??"unknown",reset:n?.[2]?.trim()??"unknown"}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "website-api",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "CLI and library to fetch website API data",
   "main": "./dist/src/website-api.js",
   "type": "module",