@stryke/http 0.11.10 → 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.d.ts

@@ -12,9 +12,9 @@ interface HttpsConnectOpts extends tls.ConnectionOptions {
     port: number;
 }
 export type AgentConnectOpts = HttpConnectOpts | HttpsConnectOpts;
-declare const INTERNAL: unique symbol;
+declare const SYMBOL_INTERNAL: unique symbol;
 export declare abstract class Agent extends http.Agent {
-    private [INTERNAL];
+    private [SYMBOL_INTERNAL];
     options: Partial<net.TcpNetConnectOpts & tls.ConnectionOptions>;
     keepAlive: boolean;
     constructor(opts?: http.AgentOptions);

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

@@ -5,35 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.fetch = void 0;
 exports.fetchRequest = fetchRequest;
-var _typeChecks = require("@stryke/type-checks");
+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(e, n = {}) {
-  return new Promise((m, i) => {
-    let r = "http:";
-    (0, _typeChecks.isString)(e) ? r = new URL(e).protocol : r = e.protocol;
-    const c = r === "https:" ? _nodeHttps.default : _nodeHttp.default,
-      s = n.timeout ?? 3e3,
-      o = c.request(e, (0, _defu.defu)(n, {
-        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"
-        }
-      }), t => {
-        if (t.statusCode !== 200) {
-          i(new Error(`Request failed: ${e.toString()} (status: ${t.statusCode})`));
-          return;
-        }
-        const p = [];
-        t.on("data", u => p.push(_nodeBuffer.Buffer.from(u))), t.on("end", () => m(_nodeBuffer.Buffer.concat(p)));
-      });
-    s && o.setTimeout(s, () => {
-      o.destroy(new Error(`Request timed out after ${s}ms`));
-    }), o.on("error", t => i(t)), o.end();
-  });
+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 fetch = exports.fetch = fetchRequest;

package/dist/fetch.d.ts

@@ -1,21 +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;
-}
+};
 /**
  * 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<Buffer>;
+export declare function fetchRequest<T = null>(url: string | URL | UrlObject, options?: FetchRequestOptions<T>): Promise<Dispatcher.ResponseData<T>>;
 export declare const fetch: typeof fetchRequest;

package/dist/fetch.mjs

@@ -1 +1 @@
-import{isString as a}from"@stryke/type-checks";import{defu as d}from"defu";import{Buffer as f}from"node:buffer";import h from"node:http";import l from"node:https";import{getProxyAgent as q}from"./proxy-agent";export async function fetchRequest(e,n={}){return new Promise((m,i)=>{let r="http:";a(e)?r=new URL(e).protocol:r=e.protocol;const c=r==="https:"?l:h,s=n.timeout??3e3,o=c.request(e,d(n,{agent:q(),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"}}),t=>{if(t.statusCode!==200){i(new Error(`Request failed: ${e.toString()} (status: ${t.statusCode})`));return}const p=[];t.on("data",u=>p.push(f.from(u))),t.on("end",()=>m(f.concat(p)))});s&&o.setTimeout(s,()=>{o.destroy(new Error(`Request timed out after ${s}ms`))}),o.on("error",t=>i(t)),o.end()})}export const fetch=fetchRequest;
+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/dist/get-free-port.cjs

@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFreePort = void 0;
+exports.getFreePort = getFreePort;
 var _nodeHttp = require("node:http");
-const getFreePort = async () => new Promise((s, o) => {
-  const r = (0, _nodeHttp.createServer)(() => {});
-  r.listen(0, () => {
-    const e = r.address();
-    r.close(), e && typeof e == "object" ? s(e.port) : o(new Error(`invalid address from server: ${e?.toString()}`));
+async function getFreePort() {
+  return new Promise((o, s) => {
+    const r = (0, _nodeHttp.createServer)(() => {});
+    r.listen(0, () => {
+      const e = r.address();
+      r.close(), e && typeof e == "object" ? o(e.port) : s(new Error(`invalid address from server: ${e?.toString()}`));
+    });
   });
-});
-exports.getFreePort = getFreePort;
+}

package/dist/get-free-port.d.ts

@@ -3,4 +3,4 @@
  *
  * @returns A promise that resolves to a free port number.
  */
-export declare const getFreePort: () => Promise<number>;
+export declare function getFreePort(): Promise<number>;

package/dist/get-free-port.mjs

@@ -1 +1 @@
-import{createServer as t}from"node:http";export const getFreePort=async()=>new Promise((s,o)=>{const r=t(()=>{});r.listen(0,()=>{const e=r.address();r.close(),e&&typeof e=="object"?s(e.port):o(new Error(`invalid address from server: ${e?.toString()}`))})});
+import{createServer as t}from"node:http";export async function getFreePort(){return new Promise((o,s)=>{const r=t(()=>{});r.listen(0,()=>{const e=r.address();r.close(),e&&typeof e=="object"?o(e.port):s(new Error(`invalid address from server: ${e?.toString()}`))})})}

package/dist/http-proxy.d.ts

@@ -23,8 +23,7 @@ interface HttpProxyAgentClientRequest extends ClientRequest {
     _implicitHeader: () => void;
 }
 /**
- * The `HttpProxyAgent` implements an HTTP Agent subclass that connects
- * to the specified "HTTP proxy server" in order to proxy HTTP requests.
+ * The `HttpProxyAgent` implements an HTTP Agent subclass that connects to the specified "HTTP proxy server" in order to proxy HTTP requests.
  */
 export declare class HttpProxyAgent<Uri extends string> extends Agent {
     static protocols: readonly ["http", "https"];

package/dist/https-proxy.d.ts

@@ -35,8 +35,7 @@ export declare class HttpsProxyAgent<Uri extends string> extends Agent {
     connectOpts: net.TcpNetConnectOpts & tls.ConnectionOptions;
     constructor(proxy: Uri | URL, opts?: HttpsProxyAgentOptions<Uri>);
     /**
-     * Called when the node-core HTTP client library is creating a
-     * new HTTP request.
+     * Called when the node-core HTTP client library is creating a new HTTP request.
      */
     connect(req: http.ClientRequest, opts: AgentConnectOpts): Promise<net.Socket>;
 }

package/dist/parse-response.d.ts

@@ -6,6 +6,12 @@ export interface ConnectResponse {
     statusText: string;
     headers: IncomingHttpHeaders;
 }
+/**
+ * Parses the proxy CONNECT response from the given socket.
+ *
+ * @param socket - The socket to read the response from.
+ * @returns A promise that resolves to the CONNECT response and any buffered data.
+ */
 export declare function parseProxyResponse(socket: Readable): Promise<{
     connect: ConnectResponse;
     buffered: Buffer;

package/dist/proxy-agent.d.ts

@@ -1,5 +1,7 @@
 import type { Agent } from "node:https";
 /**
  * If the http(s)_proxy environment variables is set, return a proxy agent.
+ *
+ * @returns The proxy agent or undefined if no proxy is set.
  */
 export declare function getProxyAgent(): Agent | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/http",
-  "version": "0.11.10",
+  "version": "0.12.1",
   "type": "module",
   "description": "A package containing HTTP communication utilities used by Storm Software.",
   "repository": {
@@ -9,8 +9,13 @@
     "directory": "packages/http"
   },
   "private": false,
-  "dependencies": { "defu": "^6.1.4", "@stryke/type-checks": "^0.4.0" },
-  "devDependencies": { "@types/node": "^24.10.1" },
+  "dependencies": {
+    "@stryke/type-checks": "^0.4.2",
+    "@stryke/url": "^0.3.2",
+    "defu": "^6.1.4",
+    "undici": "^7.16.0"
+  },
+  "devDependencies": { "@types/node": "^24.10.1", "undici-types": "^7.16.0" },
   "publishConfig": { "access": "public" },
   "sideEffects": false,
   "files": ["dist/**/*"],
@@ -176,5 +181,5 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "gitHead": "cd16bb3da577f7adb6f5c4ca6f12b90b17fe7061"
+  "gitHead": "4f9ec36edfefa375090353856bca8d00e4e778e2"
 }