@faasjs/request 0.0.4-beta.16 → 0.0.4-beta.17

package/dist/index.d.mts

@@ -118,4 +118,4 @@ declare class ResponseError extends Error {
  */
 declare function request<T = any>(url: string, { headers, method, query, body, timeout, auth, file, downloadStream, downloadFile, pfx, passphrase, agent, parse, logger, }?: RequestOptions): Promise<Response<T>>;
 
-export { Request, RequestOptions, Response, ResponseError, querystringify, request, setMock };
+export { type Request, type RequestOptions, type Response, ResponseError, querystringify, request, setMock };

package/dist/index.d.ts

@@ -118,4 +118,4 @@ declare class ResponseError extends Error {
  */
 declare function request<T = any>(url: string, { headers, method, query, body, timeout, auth, file, downloadStream, downloadFile, pfx, passphrase, agent, parse, logger, }?: RequestOptions): Promise<Response<T>>;
 
-export { Request, RequestOptions, Response, ResponseError, querystringify, request, setMock };
+export { type Request, type RequestOptions, type Response, ResponseError, querystringify, request, setMock };

package/dist/index.js

@@ -7,6 +7,7 @@ var fs = require('fs');
 var path = require('path');
 var logger = require('@faasjs/logger');
 var zlib = require('zlib');
+var crypto = require('crypto');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -133,6 +134,7 @@ async function request(url$1, {
       body = JSON.stringify(body);
   if (body && !options.headers["Content-Length"])
     options.headers["Content-Length"] = Buffer.byteLength(body);
+  const requestId = crypto.randomUUID();
   return await new Promise((resolve, reject) => {
     logger$1.debug("request %j", {
       ...options,
@@ -189,7 +191,7 @@ async function request(url$1, {
       stream.on("end", () => {
         const data = Buffer.concat(raw).toString();
         logger$1.timeEnd(
-          url$1,
+          requestId,
           "response %s %s %s %j",
           res.statusCode,
           res.headers["content-type"],
@@ -224,7 +226,7 @@ async function request(url$1, {
         }
       });
       stream.on("error", (e) => {
-        logger$1.timeEnd(url$1, "response.error %j", e);
+        logger$1.timeEnd(requestId, "response.error %j", e);
         reject(e);
       });
     });
@@ -249,15 +251,15 @@ async function request(url$1, {
       req.write(multipartBody);
     }
     req.on("error", (e) => {
-      logger$1.timeEnd(url$1, "response.error %j", e);
+      logger$1.timeEnd(requestId, "response.error %j", e);
       reject(e);
     });
     req.on("timeout", () => {
-      logger$1.timeEnd(url$1, "response.timeout");
+      logger$1.timeEnd(requestId, "response.timeout");
       req.destroy();
-      reject(Error("timeout"));
+      reject(Error(`Timeout ${url$1}`));
     });
-    logger$1.time(url$1);
+    logger$1.time(requestId);
     req.end();
   });
 }

package/dist/index.mjs

@@ -1,10 +1,11 @@
 import * as http from 'node:http';
 import * as https from 'node:https';
-import { URL } from 'url';
-import { createWriteStream, readFileSync } from 'fs';
-import { basename } from 'path';
+import { URL } from 'node:url';
+import { createWriteStream, readFileSync } from 'node:fs';
+import { basename } from 'node:path';
 import { Logger } from '@faasjs/logger';
-import { createGunzip, createBrotliDecompress } from 'zlib';
+import { createGunzip, createBrotliDecompress } from 'node:zlib';
+import { randomUUID } from 'node:crypto';
 
 // src/index.ts
 var mock = null;
@@ -110,6 +111,7 @@ async function request(url, {
       body = JSON.stringify(body);
   if (body && !options.headers["Content-Length"])
     options.headers["Content-Length"] = Buffer.byteLength(body);
+  const requestId = randomUUID();
   return await new Promise((resolve, reject) => {
     logger.debug("request %j", {
       ...options,
@@ -166,7 +168,7 @@ async function request(url, {
       stream.on("end", () => {
         const data = Buffer.concat(raw).toString();
         logger.timeEnd(
-          url,
+          requestId,
           "response %s %s %s %j",
           res.statusCode,
           res.headers["content-type"],
@@ -201,7 +203,7 @@ async function request(url, {
         }
       });
       stream.on("error", (e) => {
-        logger.timeEnd(url, "response.error %j", e);
+        logger.timeEnd(requestId, "response.error %j", e);
         reject(e);
       });
     });
@@ -226,15 +228,15 @@ async function request(url, {
       req.write(multipartBody);
     }
     req.on("error", (e) => {
-      logger.timeEnd(url, "response.error %j", e);
+      logger.timeEnd(requestId, "response.error %j", e);
       reject(e);
     });
     req.on("timeout", () => {
-      logger.timeEnd(url, "response.timeout");
+      logger.timeEnd(requestId, "response.timeout");
       req.destroy();
-      reject(Error("timeout"));
+      reject(Error(`Timeout ${url}`));
     });
-    logger.time(url);
+    logger.time(requestId);
     req.end();
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/request",
-  "version": "0.0.4-beta.16",
+  "version": "0.0.4-beta.17",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,10 +21,10 @@
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/logger": "0.0.4-beta.16"
+    "@faasjs/logger": "0.0.4-beta.17"
   },
   "devDependencies": {
-    "@faasjs/logger": "0.0.4-beta.16"
+    "@faasjs/logger": "0.0.4-beta.17"
   },
   "engines": {
     "npm": ">=9.0.0",