@stryke/http 0.12.0 → 0.12.1

package/dist/agent.cjs

@@ -9,7 +9,7 @@ var u = _interopRequireWildcard(require("node:http"));
 var h = _interopRequireWildcard(require("node:net"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const n = Symbol("AgentBaseInternalState");
+const n = Symbol("Agent");
 class Agent extends u.Agent {
   [n];
   options;

package/dist/agent.mjs

@@ -1,2 +1,2 @@
-import{isBoolean as a,isString as p}from"@stryke/type-checks";import*as u from"node:http";import*as h from"node:net";const n=Symbol("AgentBaseInternalState");export class Agent extends u.Agent{[n];options;keepAlive;constructor(t){super(t),this[n]={}}isSecureEndpoint(t){if(t){if(a(t.secureEndpoint))return t.secureEndpoint;if(p(t.protocol))return t.protocol==="https:"}const{stack:e}=new Error(" ");return p(e)?e.split(`
+import{isBoolean as a,isString as p}from"@stryke/type-checks";import*as u from"node:http";import*as h from"node:net";const n=Symbol("Agent");export class Agent extends u.Agent{[n];options;keepAlive;constructor(t){super(t),this[n]={}}isSecureEndpoint(t){if(t){if(a(t.secureEndpoint))return t.secureEndpoint;if(p(t.protocol))return t.protocol==="https:"}const{stack:e}=new Error(" ");return p(e)?e.split(`
 `).some(r=>r.includes("(https.js:")||r.includes("node:https:")):!1}incrementSockets(t){if(this.maxSockets===1/0&&this.maxTotalSockets===1/0)return null;this.sockets[t]??=[];const e=new h.Socket({writable:!1});return this.sockets[t].push(e),this.totalSocketCount++,e}decrementSockets(t,e){if(!this.sockets[t]||e===null)return;const r=this.sockets[t],o=r.indexOf(e);o!==-1&&(r.splice(o,1),this.totalSocketCount--,r.length===0&&delete this.sockets[t])}getName(t){return this.isSecureEndpoint(t)?HttpsAgent.prototype.getName.call(this,t):super.getName(t)}createSocket(t,e,r){const o={...e,secureEndpoint:this.isSecureEndpoint(e)},c=this.getName(o),i=this.incrementSockets(c);Promise.resolve().then(async()=>this.connect(t,o)).then(s=>{if(this.decrementSockets(c,i),s instanceof u.Agent)try{return s.addRequest(t,o)}catch(l){return r(l)}this[n].currentSocket=s,super.createSocket(t,e,r)},s=>{this.decrementSockets(c,i),r(s)})}createConnection(){const t=this[n].currentSocket;if(this[n].currentSocket=void 0,!t)throw new Error("No socket was returned in the `connect()` function");return t}get defaultPort(){return this[n].defaultPort??(this.protocol==="https:"?443:80)}set defaultPort(t){this[n]&&(this[n].defaultPort=t)}get protocol(){return this[n].protocol??(this.isSecureEndpoint()?"https:":"http:")}set protocol(t){this[n]&&(this[n].protocol=t)}}

package/dist/fetch.cjs

@@ -4,60 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetch = void 0;
-exports.fetchJSON = fetchJSON;
 exports.fetchRequest = fetchRequest;
-exports.fetchString = fetchString;
-var _bufferToString = require("@stryke/convert/buffer-to-string");
-var _stormJson = require("@stryke/json/storm-json");
 var _isSetString = require("@stryke/type-checks/is-set-string");
 var _isUrl = require("@stryke/type-checks/is-url");
 var _helpers = require("@stryke/url/helpers");
 var _defu = require("defu");
-var _nodeBuffer = require("node:buffer");
-var _nodeHttp = _interopRequireDefault(require("node:http"));
-var _nodeHttps = _interopRequireDefault(require("node:https"));
+var _undici = require("undici");
 var _proxyAgent = require("./proxy-agent.cjs");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-async function fetchRequest(t, r = {}) {
-  return new Promise((i, s) => {
-    let p = "http:";
-    if ((0, _isSetString.isSetString)(t)) {
-      if (!(0, _helpers.isValidURL)(t)) {
-        s(new Error(`Invalid URL format provided: ${t}`));
-        return;
-      }
-      p = new URL(t).protocol;
-    } else if ((0, _isUrl.isURL)(t)) p = t.protocol;else {
-      s(new Error("Invalid URL provided to fetch"));
-      return;
+async function fetchRequest(t, e = {}) {
+  if ((0, _isSetString.isSetString)(t)) {
+    if (!(0, _helpers.isValidURL)(t)) throw new Error(`Invalid URL format provided: ${t}`);
+  } else if (!(0, _isUrl.isURL)(t)) throw new Error("Invalid URL provided to fetch");
+  const r = new AbortController();
+  return setTimeout(() => r.abort(), e.timeout ?? 5e3), (0, _undici.request)(t, (0, _defu.defu)(e, {
+    agent: (0, _proxyAgent.getProxyAgent)(),
+    signal: r.signal,
+    headers: {
+      "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36"
     }
-    const m = p === "https:" ? _nodeHttps.default : _nodeHttp.default,
-      c = r.timeout ?? 3e3,
-      n = m.request(t, (0, _defu.defu)(r, {
-        agent: (0, _proxyAgent.getProxyAgent)(),
-        headers: {
-          "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36"
-        }
-      }), e => {
-        if (e.statusCode !== 200) {
-          s(new Error(`Request failed: ${t.toString()} (status: ${e.statusCode})`));
-          return;
-        }
-        const f = [];
-        e.on("data", o => f.push(_nodeBuffer.Buffer.from(o))), e.on("end", () => {
-          const o = _nodeBuffer.Buffer.concat(f);
-          o.text = () => (0, _bufferToString.bufferToString)(o), o.json = () => _stormJson.StormJSON.parse(o.text()), i(o);
-        });
-      });
-    c && n.setTimeout(c, () => {
-      n.destroy(new Error(`Request timed out after ${c}ms`));
-    }), n.on("error", e => s(e)), n.end();
-  });
+  }));
 }
-const fetch = exports.fetch = fetchRequest;
-async function fetchString(t, r = {}) {
-  return (await fetchRequest(t, r)).text();
-}
-async function fetchJSON(t, r = {}) {
-  return (await fetchRequest(t, r)).json();
-}
+const fetch = exports.fetch = fetchRequest;

package/dist/fetch.d.ts

@@ -1,50 +1,20 @@
-import { Buffer } from "node:buffer";
-import type { RequestOptions } from "node:https";
-export interface FetchRequestOptions extends RequestOptions {
+import type { UrlObject } from "node:url";
+import type { Dispatcher } from "undici";
+export type FetchRequestOptions<T = null> = {
+    dispatcher?: Dispatcher;
+} & Omit<Dispatcher.RequestOptions<T>, "origin" | "path" | "method"> & Partial<Pick<Dispatcher.RequestOptions, "method">> & {
     /**
      * Timeout in milliseconds
      *
-     * @defaultValue 3000
+     * @defaultValue 5000
      */
     timeout?: number;
-}
-export interface FetchResponse extends Buffer {
-    /**
-     * Parses the response body as JSON.
-     *
-     * @typeParam T - The type to parse the JSON as.
-     * @returns The parsed JSON object.
-     */
-    json: <T extends object = Record<string, any>>() => T;
-    /**
-     * Converts the response body to a string.
-     *
-     * @returns The response body as a string.
-     */
-    text: () => string;
-}
+};
 /**
  * Fetches a resource from a URL.
  *
- * @remarks
- * Makes a simple GET request and returns the entire response as a Buffer. Throws if the response status is not 200.
- *
  * @param url - The URL to fetch.
- * @returns A promise that resolves to the response body as a Buffer.
+ * @returns A promise that resolves to the response.
  */
-export declare function fetchRequest(url: string | URL, options?: FetchRequestOptions): Promise<FetchResponse>;
+export declare function fetchRequest<T = null>(url: string | URL | UrlObject, options?: FetchRequestOptions<T>): Promise<Dispatcher.ResponseData<T>>;
 export declare const fetch: typeof fetchRequest;
-/**
- * Fetches a string resource from a URL.
- *
- * @param url - The URL to fetch.
- * @returns A promise that resolves to the response body as a Buffer.
- */
-export declare function fetchString(url: string | URL, options?: FetchRequestOptions): Promise<string>;
-/**
- * Fetches a JSON resource from a URL.
- *
- * @param url - The URL to fetch.
- * @returns A promise that resolves to the response body as a Buffer.
- */
-export declare function fetchJSON<T extends object = Record<string, any>>(url: string | URL, options?: FetchRequestOptions): Promise<T>;

package/dist/fetch.mjs

@@ -1 +1 @@
-import{bufferToString as d}from"@stryke/convert/buffer-to-string";import{StormJSON as u}from"@stryke/json/storm-json";import{isSetString as R}from"@stryke/type-checks/is-set-string";import{isURL as h}from"@stryke/type-checks/is-url";import{isValidURL as g}from"@stryke/url/helpers";import{defu as x}from"defu";import{Buffer as a}from"node:buffer";import l from"node:http";import q from"node:https";import{getProxyAgent as y}from"./proxy-agent";export async function fetchRequest(t,r={}){return new Promise((i,s)=>{let p="http:";if(R(t)){if(!g(t)){s(new Error(`Invalid URL format provided: ${t}`));return}p=new URL(t).protocol}else if(h(t))p=t.protocol;else{s(new Error("Invalid URL provided to fetch"));return}const m=p==="https:"?q:l,c=r.timeout??3e3,n=m.request(t,x(r,{agent:y(),headers:{"User-Agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36"}}),e=>{if(e.statusCode!==200){s(new Error(`Request failed: ${t.toString()} (status: ${e.statusCode})`));return}const f=[];e.on("data",o=>f.push(a.from(o))),e.on("end",()=>{const o=a.concat(f);o.text=()=>d(o),o.json=()=>u.parse(o.text()),i(o)})});c&&n.setTimeout(c,()=>{n.destroy(new Error(`Request timed out after ${c}ms`))}),n.on("error",e=>s(e)),n.end()})}export const fetch=fetchRequest;export async function fetchString(t,r={}){return(await fetchRequest(t,r)).text()}export async function fetchJSON(t,r={}){return(await fetchRequest(t,r)).json()}
+import{isSetString as o}from"@stryke/type-checks/is-set-string";import{isURL as i}from"@stryke/type-checks/is-url";import{isValidURL as n}from"@stryke/url/helpers";import{defu as s}from"defu";import{request as p}from"undici";import{getProxyAgent as m}from"./proxy-agent";export async function fetchRequest(t,e={}){if(o(t)){if(!n(t))throw new Error(`Invalid URL format provided: ${t}`)}else if(!i(t))throw new Error("Invalid URL provided to fetch");const r=new AbortController;return setTimeout(()=>r.abort(),e.timeout??5e3),p(t,s(e,{agent:m(),signal:r.signal,headers:{"User-Agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36"}}))}export const fetch=fetchRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/http",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "type": "module",
   "description": "A package containing HTTP communication utilities used by Storm Software.",
   "repository": {
@@ -10,13 +10,12 @@
   },
   "private": false,
   "dependencies": {
-    "@stryke/convert": "^0.6.10",
-    "@stryke/type-checks": "^0.4.1",
-    "@stryke/url": "^0.3.1",
+    "@stryke/type-checks": "^0.4.2",
+    "@stryke/url": "^0.3.2",
     "defu": "^6.1.4",
-    "@stryke/json": "^0.9.13"
+    "undici": "^7.16.0"
   },
-  "devDependencies": { "@types/node": "^24.10.1" },
+  "devDependencies": { "@types/node": "^24.10.1", "undici-types": "^7.16.0" },
   "publishConfig": { "access": "public" },
   "sideEffects": false,
   "files": ["dist/**/*"],
@@ -182,5 +181,5 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "gitHead": "bd066535c2758c8e05be32ad1e292cab7dcdf2d3"
+  "gitHead": "4f9ec36edfefa375090353856bca8d00e4e778e2"
 }