@stryke/http 0.11.10 → 0.12.0

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/fetch.cjs

@@ -4,36 +4,60 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetch = void 0;
+exports.fetchJSON = fetchJSON;
 exports.fetchRequest = fetchRequest;
-var _typeChecks = require("@stryke/type-checks");
+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 _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, {
+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;
+    }
+    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"
         }
-      }), t => {
-        if (t.statusCode !== 200) {
-          i(new Error(`Request failed: ${e.toString()} (status: ${t.statusCode})`));
+      }), e => {
+        if (e.statusCode !== 200) {
+          s(new Error(`Request failed: ${t.toString()} (status: ${e.statusCode})`));
           return;
         }
-        const p = [];
-        t.on("data", u => p.push(_nodeBuffer.Buffer.from(u))), t.on("end", () => m(_nodeBuffer.Buffer.concat(p)));
+        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);
+        });
       });
-    s && o.setTimeout(s, () => {
-      o.destroy(new Error(`Request timed out after ${s}ms`));
-    }), o.on("error", t => i(t)), o.end();
+    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;
+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();
+}

package/dist/fetch.d.ts

@@ -8,6 +8,21 @@ export interface FetchRequestOptions extends RequestOptions {
      */
     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.
  *
@@ -17,5 +32,19 @@ export interface FetchRequestOptions extends RequestOptions {
  * @param url - The URL to fetch.
  * @returns A promise that resolves to the response body as a Buffer.
  */
-export declare function fetchRequest(url: string | URL, options?: FetchRequestOptions): Promise<Buffer>;
+export declare function fetchRequest(url: string | URL, options?: FetchRequestOptions): Promise<FetchResponse>;
 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{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{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()}

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.0",
   "type": "module",
   "description": "A package containing HTTP communication utilities used by Storm Software.",
   "repository": {
@@ -9,7 +9,13 @@
     "directory": "packages/http"
   },
   "private": false,
-  "dependencies": { "defu": "^6.1.4", "@stryke/type-checks": "^0.4.0" },
+  "dependencies": {
+    "@stryke/convert": "^0.6.10",
+    "@stryke/type-checks": "^0.4.1",
+    "@stryke/url": "^0.3.1",
+    "defu": "^6.1.4",
+    "@stryke/json": "^0.9.13"
+  },
   "devDependencies": { "@types/node": "^24.10.1" },
   "publishConfig": { "access": "public" },
   "sideEffects": false,
@@ -176,5 +182,5 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "gitHead": "cd16bb3da577f7adb6f5c4ca6f12b90b17fe7061"
+  "gitHead": "bd066535c2758c8e05be32ad1e292cab7dcdf2d3"
 }