@openfn/language-common 3.1.0 → 3.1.2

package/dist/index.cjs

@@ -25,7 +25,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.js
 var src_exports = {};
 __export(src_exports, {
-  _: () => import_lodash2.default,
+  _: () => import_lodash3.default,
   alterState: () => alterState,
   arrayToString: () => arrayToString,
   as: () => as,
@@ -72,7 +72,7 @@ module.exports = __toCommonJS(src_exports);
 // src/Adaptor.js
 var Adaptor_exports = {};
 __export(Adaptor_exports, {
-  _: () => import_lodash2.default,
+  _: () => import_lodash3.default,
   alterState: () => alterState,
   arrayToString: () => arrayToString,
   as: () => as,
@@ -114,7 +114,7 @@ var import_csv_parse = require("csv-parse");
 var import_node_stream3 = require("stream");
 var import_undici2 = require("undici");
 var import_date_fns2 = __toESM(require("date-fns"), 1);
-var import_lodash2 = __toESM(require("lodash"), 1);
+var import_lodash3 = __toESM(require("lodash"), 1);
 
 // src/util/index.js
 var util_exports = {};
@@ -127,6 +127,7 @@ __export(util_exports, {
   enableMockClient: () => enableMockClient,
   encode: () => encode,
   expandReferences: () => expandReferences,
+  generateAgentKey: () => generateAgentKey,
   get: () => get,
   logResponse: () => logResponse,
   makeBasicAuthHeader: () => makeBasicAuthHeader,
@@ -141,7 +142,6 @@ __export(util_exports, {
 });
 
 // src/util/http.js
-var import_undici = require("undici");
 var import_http_status_codes = require("http-status-codes");
 var import_node_stream = require("stream");
 var import_node_querystring = __toESM(require("querystring"), 1);
@@ -190,6 +190,8 @@ var decode = (base64Data, options2 = { parseJson: true }) => {
 };
 
 // src/util/http.js
+var import_undici = require("undici");
+var import_lodash2 = __toESM(require("lodash"), 1);
 var agents = /* @__PURE__ */ new Map();
 var makeBasicAuthHeader = (username, password) => {
   const buff = Buffer.from(`${username}:${password}`);
@@ -211,59 +213,93 @@ var logResponse = (response) => {
   }
   return response;
 };
-var getAgent = (origin, { tls = {}, ...agentOpts } = {}) => {
-  if (!agents.has(origin)) {
+var sortObject = (obj) => (0, import_lodash2.default)(obj).toPairs().filter(([_k, v]) => v !== void 0).sortBy(0).map(([k, v]) => {
+  if (v && typeof v === "object") {
+    if (!Object.keys(v).length) {
+      return "";
+    }
+    v = `${"{"}${sortObject(v)}${"}"}`;
+  }
+  return [k, v].join(":");
+}).join("|");
+var generateAgentKey = (baseUrl, agentOpts = {}) => {
+  if (Object.keys(agentOpts).length) {
+    const sortedSerializedOptions = sortObject(agentOpts);
+    if (sortedSerializedOptions.length) {
+      return `${baseUrl}+${sortedSerializedOptions}`;
+    }
+  }
+  return baseUrl;
+};
+var getDispatcher = (origin, options2 = {}) => {
+  const { tls = {}, defaultContentType, ...agentOpts } = options2;
+  const key = generateAgentKey(origin, options2);
+  if (!agents.has(key)) {
     const agent = new import_undici.Agent({
       connect: tls,
       ...agentOpts
-    });
-    agents.set(origin, agent);
+    }).compose(
+      import_undici.interceptors.redirect({
+        maxRedirections: agentOpts.maxRedirections
+      }),
+      import_undici.interceptors.decompress()
+    );
+    agents.set(key, agent);
   }
-  return agents.get(origin);
+  return agents.get(key);
 };
 var enableMockClient = (baseUrl, options2 = {}) => {
-  const { defaultContentType = "application/json" } = options2;
+  const {
+    defaultContentType = "application/json",
+    tls = {},
+    ...agentOpts
+  } = options2;
   const mockAgent = new import_undici.MockAgent({ connections: 1 });
   mockAgent.disableNetConnect();
-  const client = mockAgent.get(baseUrl);
-  if (!agents.has(baseUrl)) {
-    if (defaultContentType) {
-      const _intercept = client.intercept;
-      client.intercept = (...args) => {
-        const interceptor = _intercept.apply(client, args);
-        const _reply = interceptor.reply;
-        const ensureJsonHeader = (headers = {}) => {
-          const hasJsonHeader = Object.keys(headers).find(
-            (k) => /content-type/i.test(k)
-          );
-          if (!hasJsonHeader) {
-            headers["content-type"] = defaultContentType;
+  const key = generateAgentKey(baseUrl, {
+    ...agentOpts,
+    tls
+  });
+  console.log("Creating mock client for key:", key);
+  const dispatcher = mockAgent.get(baseUrl);
+  if (defaultContentType) {
+    const _intercept = dispatcher.intercept;
+    dispatcher.intercept = (...args) => {
+      const interceptor = _intercept.apply(dispatcher, args);
+      const _reply = interceptor.reply;
+      const ensureJsonHeader = (headers = {}) => {
+        const hasJsonHeader = Object.keys(headers).find(
+          (k) => /content-type/i.test(k)
+        );
+        if (!hasJsonHeader) {
+          headers["content-type"] = defaultContentType;
+        }
+      };
+      const reply = (...args2) => {
+        if (typeof args2[0] === "function") {
+          const response = _reply.apply(interceptor, args2);
+          if (response.body) {
+            response.headers ?? (response.headers = {});
+            ensureJsonHeader(response.headers);
           }
-        };
-        const reply = (...args2) => {
-          if (typeof args2[0] === "function") {
-            const response = _reply.apply(interceptor, args2);
-            if (response.body) {
-              response.headers ?? (response.headers = {});
-              ensureJsonHeader(response.headers);
-            }
-            return response;
-          } else {
-            const [code, data, options3 = {}] = args2;
-            if (data) {
-              options3.headers ?? (options3.headers = {});
-              ensureJsonHeader(options3.headers);
-            }
-            return _reply.call(interceptor, code, data, options3);
+          return response;
+        } else {
+          const [code, data, options3 = {}] = args2;
+          if (data) {
+            options3.headers ?? (options3.headers = {});
+            ensureJsonHeader(options3.headers);
           }
-        };
-        interceptor.reply = reply;
-        return interceptor;
+          return _reply.call(interceptor, code, data, options3);
+        }
       };
-    }
-    agents.set(baseUrl, client);
+      interceptor.reply = reply;
+      return interceptor;
+    };
+  }
+  if (!agents.has(key)) {
+    agents.set(key, mockAgent);
   }
-  return client;
+  return dispatcher;
 };
 var assertOK = async (response, errorMap, fullUrl, method, startTime) => {
   if (errorMap === false) {
@@ -346,7 +382,7 @@ async function request(method, fullUrlOrPath, options2 = {}) {
     parseAs = "auto",
     maxRedirections
   } = options2;
-  const dispatcher = getAgent(baseUrl, { tls });
+  const dispatcher = getDispatcher(baseUrl, { tls, maxRedirections });
   const queryParams = {
     ...optionQuery,
     ...urlQuery
@@ -357,8 +393,6 @@ async function request(method, fullUrlOrPath, options2 = {}) {
     method,
     headers,
     body: encodeRequestBody(body),
-    throwOnError: false,
-    maxRedirections,
     bodyTimeout: timeout,
     headersTimeout: timeout,
     origin: baseUrl
@@ -630,7 +664,7 @@ function field(key, value) {
   return [key, value];
 }
 function fields(...fields2) {
-  return import_lodash2.default.fromPairs(fields2);
+  return import_lodash3.default.fromPairs(fields2);
 }
 function merge(dataSource, fields2) {
   return (state) => {
@@ -648,11 +682,11 @@ function group(arrayOfObjects, keyPath, callback = (s) => s) {
       arrayOfObjects,
       keyPath
     );
-    const results = import_lodash2.default.groupBy(
+    const results = import_lodash3.default.groupBy(
       resolvedArray,
-      (item) => import_lodash2.default.get(item, resolvedKeyPath)
+      (item) => import_lodash3.default.get(item, resolvedKeyPath)
     );
-    return callback({ ...state, data: import_lodash2.default.omit(results, [void 0]) });
+    return callback({ ...state, data: import_lodash3.default.omit(results, [void 0]) });
   };
 }
 function index() {
@@ -961,8 +995,9 @@ __export(http_exports, {
   post: () => post2,
   request: () => req
 });
-var import_lodash3 = __toESM(require("lodash"), 1);
-var { set } = import_lodash3.default;
+var import_lodash4 = __toESM(require("lodash"), 1);
+var { request: request3, expandReferences: expandReferences2 } = util_exports;
+var { set } = import_lodash4.default;
 var helpers = {
   json: function() {
     set(this, "headers.Content-Type", "application/json");
@@ -994,13 +1029,13 @@ function options(opts = {}) {
 }
 var req = function(method, url, options2) {
   return async (state) => {
-    const [resolvedMethod, resolvedUrl, resolvedOptions] = expandReferences(
+    const [resolvedMethod, resolvedUrl, resolvedOptions] = expandReferences2(
       state,
       method,
       url,
       options2
     );
-    const { body, ...responseWithoutBody } = await request(
+    const { body, ...responseWithoutBody } = await request3(
       resolvedMethod,
       resolvedUrl,
       resolvedOptions

package/dist/index.js

@@ -7,7 +7,7 @@ var __export = (target, all) => {
 // src/Adaptor.js
 var Adaptor_exports = {};
 __export(Adaptor_exports, {
-  _: () => _2,
+  _: () => _3,
   alterState: () => alterState,
   arrayToString: () => arrayToString,
   as: () => as,
@@ -49,7 +49,7 @@ import { parse } from "csv-parse";
 import { Readable as Readable3 } from "stream";
 import { request as request2 } from "undici";
 import dateFns from "date-fns";
-import _2 from "lodash";
+import _3 from "lodash";
 
 // src/util/index.js
 var util_exports = {};
@@ -62,6 +62,7 @@ __export(util_exports, {
   enableMockClient: () => enableMockClient,
   encode: () => encode,
   expandReferences: () => expandReferences,
+  generateAgentKey: () => generateAgentKey,
   get: () => get,
   logResponse: () => logResponse,
   makeBasicAuthHeader: () => makeBasicAuthHeader,
@@ -76,7 +77,6 @@ __export(util_exports, {
 });
 
 // src/util/http.js
-import { MockAgent, Agent } from "undici";
 import { getReasonPhrase } from "http-status-codes";
 import { Readable } from "stream";
 import querystring from "querystring";
@@ -125,6 +125,8 @@ var decode = (base64Data, options2 = { parseJson: true }) => {
 };
 
 // src/util/http.js
+import { MockAgent, Agent, interceptors } from "undici";
+import _2 from "lodash";
 var agents = /* @__PURE__ */ new Map();
 var makeBasicAuthHeader = (username, password) => {
   const buff = Buffer.from(`${username}:${password}`);
@@ -146,59 +148,93 @@ var logResponse = (response) => {
   }
   return response;
 };
-var getAgent = (origin, { tls = {}, ...agentOpts } = {}) => {
-  if (!agents.has(origin)) {
+var sortObject = (obj) => _2(obj).toPairs().filter(([_k, v]) => v !== void 0).sortBy(0).map(([k, v]) => {
+  if (v && typeof v === "object") {
+    if (!Object.keys(v).length) {
+      return "";
+    }
+    v = `${"{"}${sortObject(v)}${"}"}`;
+  }
+  return [k, v].join(":");
+}).join("|");
+var generateAgentKey = (baseUrl, agentOpts = {}) => {
+  if (Object.keys(agentOpts).length) {
+    const sortedSerializedOptions = sortObject(agentOpts);
+    if (sortedSerializedOptions.length) {
+      return `${baseUrl}+${sortedSerializedOptions}`;
+    }
+  }
+  return baseUrl;
+};
+var getDispatcher = (origin, options2 = {}) => {
+  const { tls = {}, defaultContentType, ...agentOpts } = options2;
+  const key = generateAgentKey(origin, options2);
+  if (!agents.has(key)) {
     const agent = new Agent({
       connect: tls,
       ...agentOpts
-    });
-    agents.set(origin, agent);
+    }).compose(
+      interceptors.redirect({
+        maxRedirections: agentOpts.maxRedirections
+      }),
+      interceptors.decompress()
+    );
+    agents.set(key, agent);
   }
-  return agents.get(origin);
+  return agents.get(key);
 };
 var enableMockClient = (baseUrl, options2 = {}) => {
-  const { defaultContentType = "application/json" } = options2;
+  const {
+    defaultContentType = "application/json",
+    tls = {},
+    ...agentOpts
+  } = options2;
   const mockAgent = new MockAgent({ connections: 1 });
   mockAgent.disableNetConnect();
-  const client = mockAgent.get(baseUrl);
-  if (!agents.has(baseUrl)) {
-    if (defaultContentType) {
-      const _intercept = client.intercept;
-      client.intercept = (...args) => {
-        const interceptor = _intercept.apply(client, args);
-        const _reply = interceptor.reply;
-        const ensureJsonHeader = (headers = {}) => {
-          const hasJsonHeader = Object.keys(headers).find(
-            (k) => /content-type/i.test(k)
-          );
-          if (!hasJsonHeader) {
-            headers["content-type"] = defaultContentType;
+  const key = generateAgentKey(baseUrl, {
+    ...agentOpts,
+    tls
+  });
+  console.log("Creating mock client for key:", key);
+  const dispatcher = mockAgent.get(baseUrl);
+  if (defaultContentType) {
+    const _intercept = dispatcher.intercept;
+    dispatcher.intercept = (...args) => {
+      const interceptor = _intercept.apply(dispatcher, args);
+      const _reply = interceptor.reply;
+      const ensureJsonHeader = (headers = {}) => {
+        const hasJsonHeader = Object.keys(headers).find(
+          (k) => /content-type/i.test(k)
+        );
+        if (!hasJsonHeader) {
+          headers["content-type"] = defaultContentType;
+        }
+      };
+      const reply = (...args2) => {
+        if (typeof args2[0] === "function") {
+          const response = _reply.apply(interceptor, args2);
+          if (response.body) {
+            response.headers ?? (response.headers = {});
+            ensureJsonHeader(response.headers);
           }
-        };
-        const reply = (...args2) => {
-          if (typeof args2[0] === "function") {
-            const response = _reply.apply(interceptor, args2);
-            if (response.body) {
-              response.headers ?? (response.headers = {});
-              ensureJsonHeader(response.headers);
-            }
-            return response;
-          } else {
-            const [code, data, options3 = {}] = args2;
-            if (data) {
-              options3.headers ?? (options3.headers = {});
-              ensureJsonHeader(options3.headers);
-            }
-            return _reply.call(interceptor, code, data, options3);
+          return response;
+        } else {
+          const [code, data, options3 = {}] = args2;
+          if (data) {
+            options3.headers ?? (options3.headers = {});
+            ensureJsonHeader(options3.headers);
           }
-        };
-        interceptor.reply = reply;
-        return interceptor;
+          return _reply.call(interceptor, code, data, options3);
+        }
       };
-    }
-    agents.set(baseUrl, client);
+      interceptor.reply = reply;
+      return interceptor;
+    };
   }
-  return client;
+  if (!agents.has(key)) {
+    agents.set(key, mockAgent);
+  }
+  return dispatcher;
 };
 var assertOK = async (response, errorMap, fullUrl, method, startTime) => {
   if (errorMap === false) {
@@ -281,7 +317,7 @@ async function request(method, fullUrlOrPath, options2 = {}) {
     parseAs = "auto",
     maxRedirections
   } = options2;
-  const dispatcher = getAgent(baseUrl, { tls });
+  const dispatcher = getDispatcher(baseUrl, { tls, maxRedirections });
   const queryParams = {
     ...optionQuery,
     ...urlQuery
@@ -292,8 +328,6 @@ async function request(method, fullUrlOrPath, options2 = {}) {
     method,
     headers,
     body: encodeRequestBody(body),
-    throwOnError: false,
-    maxRedirections,
     bodyTimeout: timeout,
     headersTimeout: timeout,
     origin: baseUrl
@@ -565,7 +599,7 @@ function field(key, value) {
   return [key, value];
 }
 function fields(...fields2) {
-  return _2.fromPairs(fields2);
+  return _3.fromPairs(fields2);
 }
 function merge(dataSource, fields2) {
   return (state) => {
@@ -583,11 +617,11 @@ function group(arrayOfObjects, keyPath, callback = (s) => s) {
       arrayOfObjects,
       keyPath
     );
-    const results = _2.groupBy(
+    const results = _3.groupBy(
       resolvedArray,
-      (item) => _2.get(item, resolvedKeyPath)
+      (item) => _3.get(item, resolvedKeyPath)
     );
-    return callback({ ...state, data: _2.omit(results, [void 0]) });
+    return callback({ ...state, data: _3.omit(results, [void 0]) });
   };
 }
 function index() {
@@ -896,8 +930,9 @@ __export(http_exports, {
   post: () => post2,
   request: () => req
 });
-import _3 from "lodash";
-var { set } = _3;
+import _4 from "lodash";
+var { request: request3, expandReferences: expandReferences2 } = util_exports;
+var { set } = _4;
 var helpers = {
   json: function() {
     set(this, "headers.Content-Type", "application/json");
@@ -929,13 +964,13 @@ function options(opts = {}) {
 }
 var req = function(method, url, options2) {
   return async (state) => {
-    const [resolvedMethod, resolvedUrl, resolvedOptions] = expandReferences(
+    const [resolvedMethod, resolvedUrl, resolvedOptions] = expandReferences2(
       state,
       method,
       url,
       options2
     );
-    const { body, ...responseWithoutBody } = await request(
+    const { body, ...responseWithoutBody } = await request3(
       resolvedMethod,
       resolvedUrl,
       resolvedOptions
@@ -968,7 +1003,7 @@ import {
 // src/index.js
 var src_default = Adaptor_exports;
 export {
-  _2 as _,
+  _3 as _,
   alterState,
   arrayToString,
   as,

package/dist/util.cjs

@@ -33,6 +33,7 @@ __export(util_exports, {
   enableMockClient: () => enableMockClient,
   encode: () => encode,
   expandReferences: () => expandReferences,
+  generateAgentKey: () => generateAgentKey,
   get: () => get,
   logResponse: () => logResponse,
   makeBasicAuthHeader: () => makeBasicAuthHeader,
@@ -48,7 +49,6 @@ __export(util_exports, {
 module.exports = __toCommonJS(util_exports);
 
 // src/util/http.js
-var import_undici = require("undici");
 var import_http_status_codes = require("http-status-codes");
 var import_node_stream = require("stream");
 var import_node_querystring = __toESM(require("querystring"), 1);
@@ -97,6 +97,8 @@ var decode = (base64Data, options = { parseJson: true }) => {
 };
 
 // src/util/http.js
+var import_undici = require("undici");
+var import_lodash2 = __toESM(require("lodash"), 1);
 var agents = /* @__PURE__ */ new Map();
 var makeBasicAuthHeader = (username, password) => {
   const buff = Buffer.from(`${username}:${password}`);
@@ -118,59 +120,93 @@ var logResponse = (response) => {
   }
   return response;
 };
-var getAgent = (origin, { tls = {}, ...agentOpts } = {}) => {
-  if (!agents.has(origin)) {
+var sortObject = (obj) => (0, import_lodash2.default)(obj).toPairs().filter(([_k, v]) => v !== void 0).sortBy(0).map(([k, v]) => {
+  if (v && typeof v === "object") {
+    if (!Object.keys(v).length) {
+      return "";
+    }
+    v = `${"{"}${sortObject(v)}${"}"}`;
+  }
+  return [k, v].join(":");
+}).join("|");
+var generateAgentKey = (baseUrl, agentOpts = {}) => {
+  if (Object.keys(agentOpts).length) {
+    const sortedSerializedOptions = sortObject(agentOpts);
+    if (sortedSerializedOptions.length) {
+      return `${baseUrl}+${sortedSerializedOptions}`;
+    }
+  }
+  return baseUrl;
+};
+var getDispatcher = (origin, options = {}) => {
+  const { tls = {}, defaultContentType, ...agentOpts } = options;
+  const key = generateAgentKey(origin, options);
+  if (!agents.has(key)) {
     const agent = new import_undici.Agent({
       connect: tls,
       ...agentOpts
-    });
-    agents.set(origin, agent);
+    }).compose(
+      import_undici.interceptors.redirect({
+        maxRedirections: agentOpts.maxRedirections
+      }),
+      import_undici.interceptors.decompress()
+    );
+    agents.set(key, agent);
   }
-  return agents.get(origin);
+  return agents.get(key);
 };
 var enableMockClient = (baseUrl, options = {}) => {
-  const { defaultContentType = "application/json" } = options;
+  const {
+    defaultContentType = "application/json",
+    tls = {},
+    ...agentOpts
+  } = options;
   const mockAgent = new import_undici.MockAgent({ connections: 1 });
   mockAgent.disableNetConnect();
-  const client = mockAgent.get(baseUrl);
-  if (!agents.has(baseUrl)) {
-    if (defaultContentType) {
-      const _intercept = client.intercept;
-      client.intercept = (...args) => {
-        const interceptor = _intercept.apply(client, args);
-        const _reply = interceptor.reply;
-        const ensureJsonHeader = (headers = {}) => {
-          const hasJsonHeader = Object.keys(headers).find(
-            (k) => /content-type/i.test(k)
-          );
-          if (!hasJsonHeader) {
-            headers["content-type"] = defaultContentType;
+  const key = generateAgentKey(baseUrl, {
+    ...agentOpts,
+    tls
+  });
+  console.log("Creating mock client for key:", key);
+  const dispatcher = mockAgent.get(baseUrl);
+  if (defaultContentType) {
+    const _intercept = dispatcher.intercept;
+    dispatcher.intercept = (...args) => {
+      const interceptor = _intercept.apply(dispatcher, args);
+      const _reply = interceptor.reply;
+      const ensureJsonHeader = (headers = {}) => {
+        const hasJsonHeader = Object.keys(headers).find(
+          (k) => /content-type/i.test(k)
+        );
+        if (!hasJsonHeader) {
+          headers["content-type"] = defaultContentType;
+        }
+      };
+      const reply = (...args2) => {
+        if (typeof args2[0] === "function") {
+          const response = _reply.apply(interceptor, args2);
+          if (response.body) {
+            response.headers ?? (response.headers = {});
+            ensureJsonHeader(response.headers);
           }
-        };
-        const reply = (...args2) => {
-          if (typeof args2[0] === "function") {
-            const response = _reply.apply(interceptor, args2);
-            if (response.body) {
-              response.headers ?? (response.headers = {});
-              ensureJsonHeader(response.headers);
-            }
-            return response;
-          } else {
-            const [code, data, options2 = {}] = args2;
-            if (data) {
-              options2.headers ?? (options2.headers = {});
-              ensureJsonHeader(options2.headers);
-            }
-            return _reply.call(interceptor, code, data, options2);
+          return response;
+        } else {
+          const [code, data, options2 = {}] = args2;
+          if (data) {
+            options2.headers ?? (options2.headers = {});
+            ensureJsonHeader(options2.headers);
           }
-        };
-        interceptor.reply = reply;
-        return interceptor;
+          return _reply.call(interceptor, code, data, options2);
+        }
       };
-    }
-    agents.set(baseUrl, client);
+      interceptor.reply = reply;
+      return interceptor;
+    };
+  }
+  if (!agents.has(key)) {
+    agents.set(key, mockAgent);
   }
-  return client;
+  return dispatcher;
 };
 var assertOK = async (response, errorMap, fullUrl, method, startTime) => {
   if (errorMap === false) {
@@ -253,7 +289,7 @@ async function request(method, fullUrlOrPath, options = {}) {
     parseAs = "auto",
     maxRedirections
   } = options;
-  const dispatcher = getAgent(baseUrl, { tls });
+  const dispatcher = getDispatcher(baseUrl, { tls, maxRedirections });
   const queryParams = {
     ...optionQuery,
     ...urlQuery
@@ -264,8 +300,6 @@ async function request(method, fullUrlOrPath, options = {}) {
     method,
     headers,
     body: encodeRequestBody(body),
-    throwOnError: false,
-    maxRedirections,
     bodyTimeout: timeout,
     headersTimeout: timeout,
     origin: baseUrl
@@ -432,6 +466,7 @@ var uuid = () => (0, import_node_crypto.randomUUID)();
   enableMockClient,
   encode,
   expandReferences,
+  generateAgentKey,
   get,
   logResponse,
   makeBasicAuthHeader,

package/dist/util.js

@@ -1,5 +1,4 @@
 // src/util/http.js
-import { MockAgent, Agent } from "undici";
 import { getReasonPhrase } from "http-status-codes";
 import { Readable } from "stream";
 import querystring from "querystring";
@@ -48,6 +47,8 @@ var decode = (base64Data, options = { parseJson: true }) => {
 };
 
 // src/util/http.js
+import { MockAgent, Agent, interceptors } from "undici";
+import _2 from "lodash";
 var agents = /* @__PURE__ */ new Map();
 var makeBasicAuthHeader = (username, password) => {
   const buff = Buffer.from(`${username}:${password}`);
@@ -69,59 +70,93 @@ var logResponse = (response) => {
   }
   return response;
 };
-var getAgent = (origin, { tls = {}, ...agentOpts } = {}) => {
-  if (!agents.has(origin)) {
+var sortObject = (obj) => _2(obj).toPairs().filter(([_k, v]) => v !== void 0).sortBy(0).map(([k, v]) => {
+  if (v && typeof v === "object") {
+    if (!Object.keys(v).length) {
+      return "";
+    }
+    v = `${"{"}${sortObject(v)}${"}"}`;
+  }
+  return [k, v].join(":");
+}).join("|");
+var generateAgentKey = (baseUrl, agentOpts = {}) => {
+  if (Object.keys(agentOpts).length) {
+    const sortedSerializedOptions = sortObject(agentOpts);
+    if (sortedSerializedOptions.length) {
+      return `${baseUrl}+${sortedSerializedOptions}`;
+    }
+  }
+  return baseUrl;
+};
+var getDispatcher = (origin, options = {}) => {
+  const { tls = {}, defaultContentType, ...agentOpts } = options;
+  const key = generateAgentKey(origin, options);
+  if (!agents.has(key)) {
     const agent = new Agent({
       connect: tls,
       ...agentOpts
-    });
-    agents.set(origin, agent);
+    }).compose(
+      interceptors.redirect({
+        maxRedirections: agentOpts.maxRedirections
+      }),
+      interceptors.decompress()
+    );
+    agents.set(key, agent);
   }
-  return agents.get(origin);
+  return agents.get(key);
 };
 var enableMockClient = (baseUrl, options = {}) => {
-  const { defaultContentType = "application/json" } = options;
+  const {
+    defaultContentType = "application/json",
+    tls = {},
+    ...agentOpts
+  } = options;
   const mockAgent = new MockAgent({ connections: 1 });
   mockAgent.disableNetConnect();
-  const client = mockAgent.get(baseUrl);
-  if (!agents.has(baseUrl)) {
-    if (defaultContentType) {
-      const _intercept = client.intercept;
-      client.intercept = (...args) => {
-        const interceptor = _intercept.apply(client, args);
-        const _reply = interceptor.reply;
-        const ensureJsonHeader = (headers = {}) => {
-          const hasJsonHeader = Object.keys(headers).find(
-            (k) => /content-type/i.test(k)
-          );
-          if (!hasJsonHeader) {
-            headers["content-type"] = defaultContentType;
+  const key = generateAgentKey(baseUrl, {
+    ...agentOpts,
+    tls
+  });
+  console.log("Creating mock client for key:", key);
+  const dispatcher = mockAgent.get(baseUrl);
+  if (defaultContentType) {
+    const _intercept = dispatcher.intercept;
+    dispatcher.intercept = (...args) => {
+      const interceptor = _intercept.apply(dispatcher, args);
+      const _reply = interceptor.reply;
+      const ensureJsonHeader = (headers = {}) => {
+        const hasJsonHeader = Object.keys(headers).find(
+          (k) => /content-type/i.test(k)
+        );
+        if (!hasJsonHeader) {
+          headers["content-type"] = defaultContentType;
+        }
+      };
+      const reply = (...args2) => {
+        if (typeof args2[0] === "function") {
+          const response = _reply.apply(interceptor, args2);
+          if (response.body) {
+            response.headers ?? (response.headers = {});
+            ensureJsonHeader(response.headers);
           }
-        };
-        const reply = (...args2) => {
-          if (typeof args2[0] === "function") {
-            const response = _reply.apply(interceptor, args2);
-            if (response.body) {
-              response.headers ?? (response.headers = {});
-              ensureJsonHeader(response.headers);
-            }
-            return response;
-          } else {
-            const [code, data, options2 = {}] = args2;
-            if (data) {
-              options2.headers ?? (options2.headers = {});
-              ensureJsonHeader(options2.headers);
-            }
-            return _reply.call(interceptor, code, data, options2);
+          return response;
+        } else {
+          const [code, data, options2 = {}] = args2;
+          if (data) {
+            options2.headers ?? (options2.headers = {});
+            ensureJsonHeader(options2.headers);
           }
-        };
-        interceptor.reply = reply;
-        return interceptor;
+          return _reply.call(interceptor, code, data, options2);
+        }
       };
-    }
-    agents.set(baseUrl, client);
+      interceptor.reply = reply;
+      return interceptor;
+    };
+  }
+  if (!agents.has(key)) {
+    agents.set(key, mockAgent);
   }
-  return client;
+  return dispatcher;
 };
 var assertOK = async (response, errorMap, fullUrl, method, startTime) => {
   if (errorMap === false) {
@@ -204,7 +239,7 @@ async function request(method, fullUrlOrPath, options = {}) {
     parseAs = "auto",
     maxRedirections
   } = options;
-  const dispatcher = getAgent(baseUrl, { tls });
+  const dispatcher = getDispatcher(baseUrl, { tls, maxRedirections });
   const queryParams = {
     ...optionQuery,
     ...urlQuery
@@ -215,8 +250,6 @@ async function request(method, fullUrlOrPath, options = {}) {
     method,
     headers,
     body: encodeRequestBody(body),
-    throwOnError: false,
-    maxRedirections,
     bodyTimeout: timeout,
     headersTimeout: timeout,
     origin: baseUrl
@@ -382,6 +415,7 @@ export {
   enableMockClient,
   encode,
   expandReferences,
+  generateAgentKey,
   get,
   logResponse,
   makeBasicAuthHeader,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openfn/language-common",
   "label": "Common",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "Common Expressions for OpenFn",
   "homepage": "https://docs.openfn.org",
   "repository": {
@@ -42,13 +42,16 @@
     "http-status-codes": "^2.3.0",
     "jsonpath-plus": "^10.3.0",
     "lodash": "^4.17.21",
-    "undici": "^5.29.0"
+    "undici": "^7.15.0"
   },
   "devDependencies": {
     "chai": "4.3.6",
     "deep-eql": "4.1.1",
+    "koa": "^3.0.3",
+    "koa-compress": "^5.1.1",
     "nock": "13.2.9",
-    "rimraf": "^3.0.2"
+    "rimraf": "^3.0.2",
+    "zlib": "^1.0.5"
   },
   "main": "dist/index.cjs",
   "scripts": {

package/types/util/http.d.ts

@@ -28,7 +28,8 @@ export function makeBasicAuthHeader(username: any, password: any): {
     Authorization: string;
 };
 export function logResponse(response: any): any;
-export function enableMockClient(baseUrl: any, options?: {}): import("undici/types/mock-interceptor").Interceptable;
+export function generateAgentKey(baseUrl: any, agentOpts?: {}): any;
+export function enableMockClient(baseUrl: any, options?: {}): import("undici/types/mock-interceptor.js").Interceptable;
 export const ERROR_ABSOLUTE_URL: "Absolute URLs not supported";
 export function assertRelativeUrl(path: any): void;
 export const ERROR_URL_MISMATCH: "Target origin does not match baseUrl origin";

package/types/util/index.d.ts

@@ -1,6 +1,6 @@
-export * from "./http";
-export * from "./references";
-export { default as parseDate } from "./parse-date";
-export { default as throwError } from "./throw-error";
-export { uuid } from "./uuid";
-export { encode, decode } from "./base64";
+export * from "./http.js";
+export * from "./references.js";
+export { default as parseDate } from "./parse-date.js";
+export { default as throwError } from "./throw-error.js";
+export { uuid } from "./uuid.js";
+export { encode, decode } from "./base64.js";