update

ts/core/index.ts

@@ -1,4 +1,4 @@
 // Core exports
 export * from './types.js';
 export * from './response.js';
-export { request, coreRequest, isUnixSocket, parseUnixSocketUrl } from './request.js';
+export { SmartRequest, request, coreRequest, isUnixSocket, parseUnixSocketUrl } from './request.js';

ts/core/plugins.ts

@@ -13,7 +13,8 @@ import * as smarturl from '@push.rocks/smarturl';
 export { smartpromise, smarturl };
 
 // third party scope
-import agentkeepalive from 'agentkeepalive';
+import { HttpAgent, HttpsAgent } from 'agentkeepalive';
+const agentkeepalive = { HttpAgent, HttpsAgent };
 import formData from 'form-data';
 
 export { agentkeepalive, formData };

ts/core/request.ts

@@ -3,14 +3,14 @@ import * as types from './types.js';
 import { SmartResponse } from './response.js';
 
 // Keep-alive agents for connection pooling
-const httpAgent = new plugins.agentkeepalive({
+const httpAgent = new plugins.agentkeepalive.HttpAgent({
   keepAlive: true,
   maxFreeSockets: 10,
   maxSockets: 100,
   maxTotalSockets: 1000,
 });
 
-const httpAgentKeepAliveFalse = new plugins.agentkeepalive({
+const httpAgentKeepAliveFalse = new plugins.agentkeepalive.HttpAgent({
   keepAlive: false,
 });
 
@@ -26,125 +26,168 @@ const httpsAgentKeepAliveFalse = new plugins.agentkeepalive.HttpsAgent({
 });
 
 /**
- * Tests if a URL is a unix socket
+ * Modern Request class that handles all HTTP/HTTPS requests
  */
-export const isUnixSocket = (url: string): boolean => {
-  const unixRegex = /^(http:\/\/|https:\/\/|)unix:/;
-  return unixRegex.test(url);
-};
+export class SmartRequest {
+  /**
+   * Tests if a URL is a unix socket
+   */
+  static isUnixSocket(url: string): boolean {
+    const unixRegex = /^(http:\/\/|https:\/\/|)unix:/;
+    return unixRegex.test(url);
+  }
 
-/**
- * Parses socket path and route from unix socket URL
- */
-export const parseUnixSocketUrl = (url: string): { socketPath: string; path: string } => {
-  const parseRegex = /(.*):(.*)/;
-  const result = parseRegex.exec(url);
-  return {
-    socketPath: result[1],
-    path: result[2],
-  };
-};
+  /**
+   * Parses socket path and route from unix socket URL
+   */
+  static parseUnixSocketUrl(url: string): { socketPath: string; path: string } {
+    const parseRegex = /(.*):(.*)/;
+    const result = parseRegex.exec(url);
+    return {
+      socketPath: result[1],
+      path: result[2],
+    };
+  }
+  private url: string;
+  private options: types.ICoreRequestOptions;
+  private requestDataFunc: ((req: plugins.http.ClientRequest) => void) | null;
 
+  constructor(
+    url: string,
+    options: types.ICoreRequestOptions = {},
+    requestDataFunc: ((req: plugins.http.ClientRequest) => void) | null = null
+  ) {
+    this.url = url;
+    this.options = options;
+    this.requestDataFunc = requestDataFunc;
+  }
+
+  /**
+   * Execute the request and return a SmartResponse
+   */
+  async execute(): Promise<SmartResponse> {
+    const incomingMessage = await this.executeCore();
+    return new SmartResponse(incomingMessage, this.url);
+  }
+
+  /**
+   * Execute the request and return the raw IncomingMessage
+   */
+  async executeCore(): Promise<plugins.http.IncomingMessage> {
+    const done = plugins.smartpromise.defer<plugins.http.IncomingMessage>();
+
+    // Parse URL
+    const parsedUrl = plugins.smarturl.Smarturl.createFromUrl(this.url, {
+      searchParams: this.options.queryParams || {},
+    });
+    
+    this.options.hostname = parsedUrl.hostname;
+    if (parsedUrl.port) {
+      this.options.port = parseInt(parsedUrl.port, 10);
+    }
+    this.options.path = parsedUrl.path;
+
+    // Handle unix socket URLs
+    if (SmartRequest.isUnixSocket(this.url)) {
+      const { socketPath, path } = SmartRequest.parseUnixSocketUrl(this.options.path);
+      this.options.socketPath = socketPath;
+      this.options.path = path;
+    }
+
+    // Determine agent based on protocol and keep-alive setting
+    if (!this.options.agent) {
+      // Only use keep-alive agents if explicitly requested
+      if (this.options.keepAlive === true) {
+        this.options.agent = parsedUrl.protocol === 'https:' ? httpsAgent : httpAgent;
+      } else if (this.options.keepAlive === false) {
+        this.options.agent = parsedUrl.protocol === 'https:' ? httpsAgentKeepAliveFalse : httpAgentKeepAliveFalse;
+      }
+      // If keepAlive is undefined, don't set any agent (more fetch-like behavior)
+    }
+
+    // Determine request module
+    const requestModule = parsedUrl.protocol === 'https:' ? plugins.https : plugins.http;
+
+    if (!requestModule) {
+      throw new Error(`The request to ${this.url} is missing a viable protocol. Must be http or https`);
+    }
+
+    // Perform the request
+    const request = requestModule.request(this.options, async (response) => {
+      // Handle hard timeout
+      if (this.options.hardDataCuttingTimeout) {
+        setTimeout(() => {
+          response.destroy();
+          done.reject(new Error('Request timed out'));
+        }, this.options.hardDataCuttingTimeout);
+      }
+
+      // Always return the raw stream
+      done.resolve(response);
+    });
+
+    // Write request body
+    if (this.options.requestBody) {
+      if (this.options.requestBody instanceof plugins.formData) {
+        this.options.requestBody.pipe(request).on('finish', () => {
+          request.end();
+        });
+      } else {
+        // Write body as-is - caller is responsible for serialization
+        const bodyData = typeof this.options.requestBody === 'string' 
+          ? this.options.requestBody 
+          : this.options.requestBody instanceof Buffer 
+            ? this.options.requestBody
+            : JSON.stringify(this.options.requestBody); // Still stringify for backward compatibility
+        request.write(bodyData);
+        request.end();
+      }
+    } else if (this.requestDataFunc) {
+      this.requestDataFunc(request);
+    } else {
+      request.end();
+    }
+
+    // Handle request errors
+    request.on('error', (e) => {
+      console.error(e);
+      request.destroy();
+      done.reject(e);
+    });
+
+    // Get response and handle response errors
+    const response = await done.promise;
+    response.on('error', (err) => {
+      console.error(err);
+      response.destroy();
+    });
+
+    return response;
+  }
+
+  /**
+   * Static factory method to create and execute a request
+   */
+  static async create(
+    url: string,
+    options: types.ICoreRequestOptions = {}
+  ): Promise<SmartResponse> {
+    const request = new SmartRequest(url, options);
+    return request.execute();
+  }
+}
 
 /**
  * Core request function that handles all HTTP/HTTPS requests
+ * @deprecated Use SmartRequest class instead
  */
 export async function coreRequest(
   urlArg: string,
   optionsArg: types.ICoreRequestOptions = {},
   requestDataFunc: ((req: plugins.http.ClientRequest) => void) | null = null
 ): Promise<plugins.http.IncomingMessage> {
-  const done = plugins.smartpromise.defer<plugins.http.IncomingMessage>();
-
-  // No defaults - let users explicitly set options to match fetch behavior
-
-  // Parse URL
-  const parsedUrl = plugins.smarturl.Smarturl.createFromUrl(urlArg, {
-    searchParams: optionsArg.queryParams || {},
-  });
-  
-  optionsArg.hostname = parsedUrl.hostname;
-  if (parsedUrl.port) {
-    optionsArg.port = parseInt(parsedUrl.port, 10);
-  }
-  optionsArg.path = parsedUrl.path;
-
-  // Handle unix socket URLs
-  if (isUnixSocket(urlArg)) {
-    const { socketPath, path } = parseUnixSocketUrl(optionsArg.path);
-    optionsArg.socketPath = socketPath;
-    optionsArg.path = path;
-  }
-
-  // Determine agent based on protocol and keep-alive setting
-  if (!optionsArg.agent) {
-    // Only use keep-alive agents if explicitly requested
-    if (optionsArg.keepAlive === true) {
-      optionsArg.agent = parsedUrl.protocol === 'https:' ? httpsAgent : httpAgent;
-    } else if (optionsArg.keepAlive === false) {
-      optionsArg.agent = parsedUrl.protocol === 'https:' ? httpsAgentKeepAliveFalse : httpAgentKeepAliveFalse;
-    }
-    // If keepAlive is undefined, don't set any agent (more fetch-like behavior)
-  }
-
-  // Determine request module
-  const requestModule = parsedUrl.protocol === 'https:' ? plugins.https : plugins.http;
-
-  if (!requestModule) {
-    throw new Error(`The request to ${urlArg} is missing a viable protocol. Must be http or https`);
-  }
-
-  // Perform the request
-  const request = requestModule.request(optionsArg, async (response) => {
-    // Handle hard timeout
-    if (optionsArg.hardDataCuttingTimeout) {
-      setTimeout(() => {
-        response.destroy();
-        done.reject(new Error('Request timed out'));
-      }, optionsArg.hardDataCuttingTimeout);
-    }
-
-    // Always return the raw stream
-    done.resolve(response);
-  });
-
-  // Write request body
-  if (optionsArg.requestBody) {
-    if (optionsArg.requestBody instanceof plugins.formData) {
-      optionsArg.requestBody.pipe(request).on('finish', () => {
-        request.end();
-      });
-    } else {
-      // Write body as-is - caller is responsible for serialization
-      const bodyData = typeof optionsArg.requestBody === 'string' 
-        ? optionsArg.requestBody 
-        : optionsArg.requestBody instanceof Buffer 
-          ? optionsArg.requestBody
-          : JSON.stringify(optionsArg.requestBody); // Still stringify for backward compatibility
-      request.write(bodyData);
-      request.end();
-    }
-  } else if (requestDataFunc) {
-    requestDataFunc(request);
-  } else {
-    request.end();
-  }
-
-  // Handle request errors
-  request.on('error', (e) => {
-    console.error(e);
-    request.destroy();
-    done.reject(e);
-  });
-
-  // Get response and handle response errors
-  const response = await done.promise;
-  response.on('error', (err) => {
-    console.error(err);
-    response.destroy();
-  });
-
-  return response;
+  const request = new SmartRequest(urlArg, optionsArg, requestDataFunc);
+  return request.executeCore();
 }
 
 /**
@@ -154,6 +197,11 @@ export async function request(
   urlArg: string,
   optionsArg: types.ICoreRequestOptions = {}
 ): Promise<SmartResponse> {
-  const response = await coreRequest(urlArg, optionsArg);
-  return new SmartResponse(response, urlArg);
-}
+  return SmartRequest.create(urlArg, optionsArg);
+}
+
+/**
+ * Convenience exports for backward compatibility
+ */
+export const isUnixSocket = SmartRequest.isUnixSocket;
+export const parseUnixSocketUrl = SmartRequest.parseUnixSocketUrl;