@loadmill/universal 0.3.176 → 0.3.177

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.shouldBypassProxy = exports.patchAgentWithProxy = exports.applySuperAgentProxy = void 0;
4
4
  var tslib_1 = require("tslib");
5
5
  var superagent_1 = tslib_1.__importDefault(require("superagent"));
6
- var escapeRegExp_1 = tslib_1.__importDefault(require("lodash/escapeRegExp"));
6
+ var micromatch_1 = tslib_1.__importDefault(require("micromatch"));
7
7
  var proxy_server_1 = require("./proxy-server");
8
8
  var log_1 = tslib_1.__importDefault(require("./log"));
9
9
  var applySuperAgentProxy = function () {
@@ -53,13 +53,8 @@ var shouldBypassProxy = function (url) {
53
53
  .map(function (pattern) { return pattern.trim(); })
54
54
  .filter(function (pattern) { return pattern.length > 0; });
55
55
  var hostname = new URL(url).hostname;
56
- for (var _i = 0, patterns_1 = patterns; _i < patterns_1.length; _i++) {
57
- var pattern = patterns_1[_i];
58
- var regexPattern = '^' + pattern.split('*').map(escapeRegExp_1.default).join('.*') + '$';
59
- var regex = new RegExp(regexPattern);
60
- if (regex.test(hostname)) {
61
- return true;
62
- }
56
+ if (micromatch_1.default.isMatch(hostname, patterns)) {
57
+ return true;
63
58
  }
64
59
  return false;
65
60
  }
@@ -1 +1 @@
1
- {"version":3,"file":"super-agent-proxy-wrapper.js","sourceRoot":"","sources":["../src/super-agent-proxy-wrapper.ts"],"names":[],"mappings":";;;;AAAA,kEAAoC;AACpC,6EAA+C;AAE/C,+CAAqE;AACrE,sDAAwB;AAEjB,IAAM,oBAAoB,GAAG;IAClC,IAAI,IAAA,+BAAgB,GAAE,EAAE;QACtB,aAAG,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;QACxD,OAAO,CAAC,kBAAkB,CAAC,CAAC,oBAAU,CAAC,CAAC;QACxC,2BAA2B,EAAE,CAAC;QAC9B,aAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;KACvD;AACH,CAAC,CAAC;AAPW,QAAA,oBAAoB,wBAO/B;AAEK,IAAM,mBAAmB,GAAG,UACjC,KAAuE;IAEvE,aAAG,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;IAC7D,OAAO,KAAK,CAAC,GAAG,CAAC,UAAC,GAAQ,IAAK,OAAA,gBAAgB,CAAC,GAAG,CAAC,EAArB,CAAqB,CAAC,CAAC;AACxD,CAAC,CAAC;AALW,QAAA,mBAAmB,uBAK9B;AAEF,IAAM,2BAA2B,GAAG;IAClC,aAAG,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;IAC/D,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,UAAA,MAAM;QAC9D,IAAM,IAAI,GAAG,oBAAU,CAAC,MAAM,CAAC,CAAC;QAChC,oBAAU,CAAC,MAAM,CAAC,GAAG;YAAU,cAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,yBAAc;;YAC3C,IAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACnC,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,IAAM,gBAAgB,GAAG,UAAC,GAAsD;IAC9E,IAAM,QAAQ,GAAG,IAAA,gCAAiB,GAAY,CAAC;IAE/C,IAAI,IAAA,yBAAiB,EAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC9B,aAAG,CAAC,IAAI,CAAC,8BAAuB,GAAG,CAAC,GAAG,CAAE,CAAC,CAAC;QAC3C,OAAO,GAAG,CAAC;KACZ;IAED,aAAG,CAAC,IAAI,CAAC,0BAAmB,GAAG,CAAC,GAAG,4BAAkB,QAAQ,CAAE,CAAC,CAAC;IACjE,OAAO,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC7B,CAAC,CAAC;AAEK,IAAM,iBAAiB,GAAG,UAAC,GAAW;IAC3C,IAAI;QAEF,IAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,EAAE,CAAC;QAEhE,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,KAAK,CAAC;SACd;QAED,IAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC;aACnC,GAAG,CAAC,UAAA,OAAO,IAAI,OAAA,OAAO,CAAC,IAAI,EAAE,EAAd,CAAc,CAAC;aAC9B,MAAM,CAAC,UAAA,OAAO,IAAI,OAAA,OAAO,CAAC,MAAM,GAAG,CAAC,EAAlB,CAAkB,CAAC,CAAC;QAEzC,IAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;QAEvC,KAAsB,UAAQ,EAAR,qBAAQ,EAAR,sBAAQ,EAAR,IAAQ,EAAE;YAA3B,IAAM,OAAO,iBAAA;YAChB,IAAM,YAAY,GAAG,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,sBAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;YACjF,IAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;YAEvC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;gBACxB,OAAO,IAAI,CAAC;aACb;SACF;QAED,OAAO,KAAK,CAAC;KACd;IAAC,OAAO,KAAK,EAAE;QACd,aAAG,CAAC,IAAI,CAAC,sCAAsC,EAAE,EAAE,GAAG,KAAA,EAAE,KAAK,OAAA,EAAE,CAAC,CAAC;QACjE,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC;AA7BW,QAAA,iBAAiB,qBA6B5B"}
1
+ {"version":3,"file":"super-agent-proxy-wrapper.js","sourceRoot":"","sources":["../src/super-agent-proxy-wrapper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loadmill/universal",
3
- "version": "0.3.176",
3
+ "version": "0.3.177",
4
4
  "description": "Loadmill universal utilities",
5
5
  "main": "dist/",
6
6
  "types": "dist/index.d.ts",
@@ -20,6 +20,7 @@
20
20
  "license": "Apache-2.0",
21
21
  "devDependencies": {
22
22
  "@types/estree": "^0.0.50",
23
+ "@types/micromatch": "^4.0.10",
23
24
  "@types/source-map-support": "^0.4.0",
24
25
  "@types/stack-trace": "^0.0.29"
25
26
  },
@@ -35,6 +36,7 @@
35
36
  "globals": "^16.3.0",
36
37
  "lodash": "^4.17.21",
37
38
  "log4js": "6.4.0",
39
+ "micromatch": "^4.0.8",
38
40
  "quickselect": "^2.0.0",
39
41
  "source-map-support": "^0.5.0",
40
42
  "stack-trace": "^0.0.10",