@stryke/http 0.10.0 → 0.11.1

package/dist/agent.cjs

@@ -26,7 +26,7 @@ class Agent extends u.Agent {
       stack: e
     } = new Error(" ");
     return (0, _typeChecks.isString)(e) ? e.split(`
-`).some(s => s.includes("(https.js:") || s.includes("node:https:")) : !1;
+`).some(r => r.includes("(https.js:") || r.includes("node:https:")) : !1;
   }
   incrementSockets(t) {
     if (this.maxSockets === 1 / 0 && this.maxTotalSockets === 1 / 0) return null;
@@ -38,29 +38,29 @@ class Agent extends u.Agent {
   }
   decrementSockets(t, e) {
     if (!this.sockets[t] || e === null) return;
-    const s = this.sockets[t],
-      o = s.indexOf(e);
-    o !== -1 && (s.splice(o, 1), this.totalSocketCount--, s.length === 0 && delete this.sockets[t]);
+    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, s) {
+  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(r => {
-      if (this.decrementSockets(c, i), r instanceof u.Agent) try {
-        return r.addRequest(t, o);
+    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 s(l);
+        return r(l);
       }
-      this[n].currentSocket = r, super.createSocket(t, e, s);
-    }, r => {
-      this.decrementSockets(c, i), s(r);
+      this[n].currentSocket = s, super.createSocket(t, e, r);
+    }, s => {
+      this.decrementSockets(c, i), r(s);
     });
   }
   createConnection() {

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(`
-`).some(s=>s.includes("(https.js:")||s.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 s=this.sockets[t],o=s.indexOf(e);o!==-1&&(s.splice(o,1),this.totalSocketCount--,s.length===0&&delete this.sockets[t])}getName(t){return this.isSecureEndpoint(t)?HttpsAgent.prototype.getName.call(this,t):super.getName(t)}createSocket(t,e,s){const o={...e,secureEndpoint:this.isSecureEndpoint(e)},c=this.getName(o),i=this.incrementSockets(c);Promise.resolve().then(async()=>this.connect(t,o)).then(r=>{if(this.decrementSockets(c,i),r instanceof u.Agent)try{return r.addRequest(t,o)}catch(l){return s(l)}this[n].currentSocket=r,super.createSocket(t,e,s)},r=>{this.decrementSockets(c,i),s(r)})}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)}}
+`).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

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

package/dist/fetch.d.ts

@@ -1,19 +1,21 @@
 import { Buffer } from "node:buffer";
-export interface FetchRequestOptions {
-    isDev?: boolean;
+import type { RequestOptions } from "node:https";
+export interface FetchRequestOptions extends RequestOptions {
+    /**
+     * Timeout in milliseconds
+     *
+     * @defaultValue 3000
+     */
+    timeout?: number;
 }
 /**
  * Fetches a resource from a URL.
  *
  * @remarks
- * Makes a simple GET request and returns the entire response as a Buffer.
- *
- * Features:
- * - Throws if the response status is not 200.
- * - Applies a 3000 ms timeout when `isDev` is `true`.
+ * 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.
  */
-export declare function $fetch(url: string, options?: FetchRequestOptions): Promise<Buffer>;
-export declare const fetch: typeof $fetch;
+export declare function fetchRequest(url: string | URL, options?: FetchRequestOptions): Promise<Buffer>;
+export declare const fetch: typeof fetchRequest;

package/dist/fetch.mjs

@@ -1 +1 @@
-import{Buffer as i}from"node:buffer";import p from"node:http";import h from"node:https";import{getProxyAgent as d}from"./proxy-agent";export async function $fetch(o,f={}){return new Promise((c,n)=>{const{protocol:a}=new URL(o),u=a==="https:"?h:p,r=f.isDev?3e3:void 0,e=u.request(o,{agent:d(),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){n(new Error(`Request failed: ${o} (status: ${t.statusCode})`));return}const s=[];t.on("data",m=>s.push(i.from(m))),t.on("end",()=>c(i.concat(s)))});r&&e.setTimeout(r,()=>{e.destroy(new Error(`Request timed out after ${r}ms`))}),e.on("error",t=>n(t)),e.end()})}export const fetch=$fetch;
+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;

package/dist/format-data-uri.d.ts

@@ -40,9 +40,7 @@ export interface BufferConversionsInterface {
  * ```
  *
  * @param convert - Conversion functions
- * @param uri - Data URI to turn into a Buffer instance
+ * @returns An object containing the parsed data URI properties and the decoded data as a Buffer instance.
  * @throws `TypeError` if `uri` is not a valid Data URI
- * @returns An object containing the parsed data URI properties
- *   and the decoded data as a Buffer instance.
  */
 export declare const makeDataUriToBuffer: (convert: BufferConversionsInterface) => (uri: string | URL) => ParsedDataURI;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/http",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "type": "module",
   "description": "A package containing HTTP communication utilities used by Storm Software.",
   "repository": {
@@ -9,9 +9,9 @@
     "directory": "packages/http"
   },
   "private": false,
-  "devDependencies": { "@types/node": "^22.14.0" },
+  "dependencies": { "defu": "^6.1.4", "@stryke/type-checks": "^0.3.10" },
+  "devDependencies": { "@types/node": "^22.18.13" },
   "publishConfig": { "access": "public" },
-  "dependencies": { "@stryke/type-checks": "^0.3.10" },
   "sideEffects": false,
   "files": ["dist/**/*"],
   "homepage": "https://stormsoftware.com",
@@ -176,5 +176,5 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "gitHead": "4074c4a56f6e2c42ca4c39c30df5309c19024c7b"
+  "gitHead": "1764a8373c1db0b1c11bed7439292236edfd9e4e"
 }