zephyr-agent 0.1.6-next.1 → 0.1.7-next.1

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.
@@ -4,7 +4,6 @@ exports.fetchWithRetries = fetchWithRetries;
4
4
  const tslib_1 = require("tslib");
5
5
  const axios_1 = tslib_1.__importStar(require("axios"));
6
6
  const axios_retry_1 = tslib_1.__importDefault(require("axios-retry"));
7
- const http_proxy_agent_1 = require("http-proxy-agent");
8
7
  const https_proxy_agent_1 = require("https-proxy-agent");
9
8
  const is_ci_1 = tslib_1.__importDefault(require("is-ci"));
10
9
  const errors_1 = require("../errors");
@@ -17,14 +16,12 @@ const RETRY_ERROR_CODES = [
17
16
  'EPIPE',
18
17
  ];
19
18
  /**
20
- * Gets proxy URL from environment variables.
21
- * Checks both uppercase and lowercase variants.
22
- * Returns undefined if no proxy is configured.
19
+ * Gets HTTPS proxy URL from environment variables. Checks both uppercase and lowercase
20
+ * variants. Falls back to HTTP_PROXY if HTTPS_PROXY is not set. Returns undefined if no
21
+ * proxy is configured.
23
22
  */
24
- function getProxyUrl(protocol) {
25
- const envVars = protocol === 'https'
26
- ? ['HTTPS_PROXY', 'https_proxy', 'HTTP_PROXY', 'http_proxy']
27
- : ['HTTP_PROXY', 'http_proxy'];
23
+ function getHttpsProxyUrl() {
24
+ const envVars = ['HTTPS_PROXY', 'https_proxy', 'HTTP_PROXY', 'http_proxy'];
28
25
  for (const envVar of envVars) {
29
26
  const value = process.env[envVar];
30
27
  if (value) {
@@ -55,20 +52,14 @@ function shouldBypassProxy(hostname) {
55
52
  return hostLower === noProxyHost || hostLower.endsWith(`.${noProxyHost}`);
56
53
  });
57
54
  }
58
- /**
59
- * Creates HTTP/HTTPS agents with proxy support if configured via environment variables.
60
- */
61
- function getProxyAgents(url) {
55
+ /** Creates HTTPS agent with proxy support if configured via environment variables. */
56
+ function getHttpsProxyAgent(url) {
62
57
  // Check if this host should bypass the proxy
63
58
  if (shouldBypassProxy(url.hostname)) {
64
- return {};
59
+ return undefined;
65
60
  }
66
- const httpProxyUrl = getProxyUrl('http');
67
- const httpsProxyUrl = getProxyUrl('https');
68
- return {
69
- httpAgent: httpProxyUrl ? new http_proxy_agent_1.HttpProxyAgent(httpProxyUrl) : undefined,
70
- httpsAgent: httpsProxyUrl ? new https_proxy_agent_1.HttpsProxyAgent(httpsProxyUrl) : undefined,
71
- };
61
+ const httpsProxyUrl = getHttpsProxyUrl();
62
+ return httpsProxyUrl ? new https_proxy_agent_1.HttpsProxyAgent(httpsProxyUrl) : undefined;
72
63
  }
73
64
  function shouldRetry(error) {
74
65
  // Retry on network errors (no response received)
@@ -85,16 +76,15 @@ function shouldRetry(error) {
85
76
  async function fetchWithRetries(url, options = {}, retries = 3) {
86
77
  var _a, _b, _c, _d, _e;
87
78
  try {
88
- // Get proxy agents if configured via environment variables
89
- const { httpAgent, httpsAgent } = getProxyAgents(url);
79
+ // Get HTTPS proxy agent if configured via environment variables
80
+ const httpsAgent = getHttpsProxyAgent(url);
90
81
  // Create a custom axios instance for this request with CI-friendly settings
91
82
  const axiosInstance = axios_1.default.create({
92
83
  // Force IPv4 in CI environments to avoid IPv6 connectivity issues
93
84
  // References: https://github.com/actions/runner/issues/3138
94
85
  // https://x.com/matteocollina/status/1640384245834055680
95
86
  family: is_ci_1.default ? IPV4_FAMILY : undefined,
96
- // Apply proxy agents if configured
97
- httpAgent,
87
+ // Apply HTTPS proxy agent if configured
98
88
  httpsAgent,
99
89
  });
100
90
  // Configure axios-retry
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-with-retries.js","sourceRoot":"","sources":["../../../src/lib/http/fetch-with-retries.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetch-with-retries.js","sourceRoot":"","sources":["../../../src/lib/http/fetch-with-retries.ts"],"names":[],"mappings":"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"}
@@ -48,17 +48,7 @@ function getSessionKey() {
48
48
  session: session.toString('base64url'),
49
49
  // If we are the holder of the lock, unlock it and clean up the lockfile
50
50
  [Symbol.dispose]() {
51
- if (unlock) {
52
- unlock();
53
- // TODO: Remove this in the future, once >=0.0.48 is the minimum version
54
- //
55
- // Removes the lockfile to prevent older plugin versions (<0.0.48) from crashing
56
- // because `node-persist#forgiveParseErrors` wasn't set to true yet.
57
- setTimeout(fs.unlink, UNLOCK_INTERVAL, storage_keys_1.ZE_SESSION_LOCK, () => {
58
- // no need to care about errors here, if the file is not there, it's fine
59
- logging_1.ze_log.misc('Lock released and lockfile removed');
60
- });
61
- }
51
+ unlock === null || unlock === void 0 ? void 0 : unlock();
62
52
  },
63
53
  };
64
54
  }
@@ -1 +1 @@
1
- {"version":3,"file":"session-lock.js","sourceRoot":"","sources":["../../../src/lib/node-persist/session-lock.ts"],"names":[],"mappings":";;AAqBA,sCA6CC;AAgCD,sCAQC;;AA1GD,6CAA0C;AAC1C,oDAA8B;AAC9B,mDAAmD;AACnD,qDAAsD;AACtD,mDAAwE;AACxE,wCAAoC;AACpC,iDAAiD;AAEjD,sEAAsE;AACtE,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,wFAAwF;AACxF,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ;AAE1C;;;;;;GAMG;AACH,SAAgB,aAAa;IAC3B,iFAAiF;IACjF,uFAAuF;IACvF,2BAA2B;IAC3B,IAAI,OAAO,GAAG,IAAA,yBAAW,EAAC,cAAc,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;IAE9B,kEAAkE;IAClE,+BAA+B;IAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,gBAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACnF,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,8BAAe,CAAC,CAAC;QAE3C,8EAA8E;QAC9E,0EAA0E;QAC1E,IAAI,OAAO,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;YACtC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,8BAAe,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,gBAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAC9D,iCAAiC;QACjC,EAAE,CAAC,aAAa,CAAC,8BAAe,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO;QACL,KAAK,EAAE,CAAC,CAAC,MAAM;QACf,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;QAEtC,wEAAwE;QACxE,CAAC,MAAM,CAAC,OAAO,CAAC;YACd,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,EAAE,CAAC;gBAET,wEAAwE;gBACxE,EAAE;gBACF,gFAAgF;gBAChF,oEAAoE;gBACpE,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,8BAAe,EAAE,GAAG,EAAE;oBAC3D,yEAAyE;oBACzE,gBAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;gBACpD,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAOD,8FAA8F;AAC9F,SAAS,YAAY,CAAC,iBAAiB,GAAG,IAAI;IAC5C,IAAI,CAAC;QACH,kGAAkG;QAClG,OAAO,IAAA,0BAAQ,EAAC,8BAAe,EAAE,EAAE,KAAK,EAAE,+CAAkC,EAAE,CAAC,CAAC;IAClF,CAAC;IAAC,OAAO,EAAW,EAAE,CAAC;QACrB,MAAM,KAAK,GAAG,EAAsB,CAAC;QACrC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wCAAwC;QACxC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,iBAAiB,EAAE,CAAC;YACjD,EAAE,CAAC,aAAa,CAAC,8BAAe,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;YAC9C,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,MAAoB;;;QACtD,6DAA6D;QAC7D,KAAsB,eAAA,KAAA,sBAAA,IAAA,sBAAW,EAAC,eAAe,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA,IAAA,sDAAE,CAAC;YAA7D,cAA0D;YAA1D,WAA0D;YAArE,MAAM,CAAC,KAAA,CAAA;YAChB,wCAAwC;YACxC,IAAI,CAAC,IAAA,2BAAS,EAAC,8BAAe,EAAE,EAAE,KAAK,EAAE,+CAAkC,EAAE,CAAC,EAAE,CAAC;gBAC/E,OAAO;YACT,CAAC;QACH,CAAC;;;;;;;;;AACH,CAAC"}
1
+ {"version":3,"file":"session-lock.js","sourceRoot":"","sources":["../../../src/lib/node-persist/session-lock.ts"],"names":[],"mappings":";;AAqBA,sCAkCC;AAgCD,sCAQC;;AA/FD,6CAA0C;AAC1C,oDAA8B;AAC9B,mDAAmD;AACnD,qDAAsD;AACtD,mDAAwE;AACxE,wCAAoC;AACpC,iDAAiD;AAEjD,sEAAsE;AACtE,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,wFAAwF;AACxF,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ;AAE1C;;;;;;GAMG;AACH,SAAgB,aAAa;IAC3B,iFAAiF;IACjF,uFAAuF;IACvF,2BAA2B;IAC3B,IAAI,OAAO,GAAG,IAAA,yBAAW,EAAC,cAAc,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;IAE9B,kEAAkE;IAClE,+BAA+B;IAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,gBAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACnF,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,8BAAe,CAAC,CAAC;QAE3C,8EAA8E;QAC9E,0EAA0E;QAC1E,IAAI,OAAO,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;YACtC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,8BAAe,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,gBAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAC9D,iCAAiC;QACjC,EAAE,CAAC,aAAa,CAAC,8BAAe,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO;QACL,KAAK,EAAE,CAAC,CAAC,MAAM;QACf,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;QAEtC,wEAAwE;QACxE,CAAC,MAAM,CAAC,OAAO,CAAC;YACd,MAAM,aAAN,MAAM,uBAAN,MAAM,EAAI,CAAC;QACb,CAAC;KACF,CAAC;AACJ,CAAC;AAOD,8FAA8F;AAC9F,SAAS,YAAY,CAAC,iBAAiB,GAAG,IAAI;IAC5C,IAAI,CAAC;QACH,kGAAkG;QAClG,OAAO,IAAA,0BAAQ,EAAC,8BAAe,EAAE,EAAE,KAAK,EAAE,+CAAkC,EAAE,CAAC,CAAC;IAClF,CAAC;IAAC,OAAO,EAAW,EAAE,CAAC;QACrB,MAAM,KAAK,GAAG,EAAsB,CAAC;QACrC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wCAAwC;QACxC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,iBAAiB,EAAE,CAAC;YACjD,EAAE,CAAC,aAAa,CAAC,8BAAe,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;YAC9C,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,MAAoB;;;QACtD,6DAA6D;QAC7D,KAAsB,eAAA,KAAA,sBAAA,IAAA,sBAAW,EAAC,eAAe,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA,IAAA,sDAAE,CAAC;YAA7D,cAA0D;YAA1D,WAA0D;YAArE,MAAM,CAAC,KAAA,CAAA;YAChB,wCAAwC;YACxC,IAAI,CAAC,IAAA,2BAAS,EAAC,8BAAe,EAAE,EAAE,KAAK,EAAE,+CAAkC,EAAE,CAAC,EAAE,CAAC;gBAC/E,OAAO;YACT,CAAC;QACH,CAAC;;;;;;;;;AACH,CAAC"}
@@ -1,4 +1,5 @@
1
1
  export declare const ZE_PATH: string;
2
+ export declare const ZE_STORAGE_PATH: string;
2
3
  export declare const ZE_SESSION_LOCK: string;
3
4
  export declare enum StorageKeys {
4
5
  ze_app_partial_asset_map = "ze_app_partial_asset_map",
@@ -1,18 +1,19 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.StorageKeys = exports.ZE_SESSION_LOCK = exports.ZE_PATH = void 0;
3
+ exports.StorageKeys = exports.ZE_SESSION_LOCK = exports.ZE_STORAGE_PATH = exports.ZE_PATH = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const fs = tslib_1.__importStar(require("node:fs"));
6
6
  const os = tslib_1.__importStar(require("node:os"));
7
7
  const path = tslib_1.__importStar(require("node:path"));
8
8
  exports.ZE_PATH = path.resolve(os.homedir(), '.zephyr');
9
+ exports.ZE_STORAGE_PATH = path.resolve(exports.ZE_PATH, 'storage');
9
10
  exports.ZE_SESSION_LOCK = path.resolve(exports.ZE_PATH, 'session');
10
11
  try {
11
- // Ensures that the directory exists and lockfile is writable
12
- fs.mkdirSync(exports.ZE_PATH, { recursive: true });
12
+ // Dedicated node-persist directory to avoid clashes with other .zephyr assets (logs, etc).
13
+ fs.mkdirSync(exports.ZE_STORAGE_PATH, { recursive: true });
13
14
  }
14
15
  catch (error) {
15
- console.error('error', `Could not create ~/.zephyr directory. Please check your permissions: ${error}`);
16
+ console.error('error', `Could not create ~/.zephyr/storage directory. Please check your permissions.`, error);
16
17
  }
17
18
  var StorageKeys;
18
19
  (function (StorageKeys) {
@@ -1 +1 @@
1
- {"version":3,"file":"storage-keys.js","sourceRoot":"","sources":["../../../src/lib/node-persist/storage-keys.ts"],"names":[],"mappings":";;;;AAAA,oDAA8B;AAC9B,oDAA8B;AAC9B,wDAAkC;AAErB,QAAA,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;AAChD,QAAA,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,eAAO,EAAE,SAAS,CAAC,CAAC;AAEhE,IAAI,CAAC;IACH,6DAA6D;IAC7D,EAAE,CAAC,SAAS,CAAC,eAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAC7C,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACf,OAAO,CAAC,KAAK,CACX,OAAO,EACP,wEAAwE,KAAK,EAAE,CAChF,CAAC;AACJ,CAAC;AAED,IAAY,WAUX;AAVD,WAAY,WAAW;IACrB,oEAAqD,CAAA;IACrD,mEAAoD,CAAA;IACpD,8CAA+B,CAAA;IAC/B,kDAAmC,CAAA;IACnC,0CAA2B,CAAA;IAC3B,8CAA+B,CAAA;IAC/B,4DAA6C,CAAA;IAC7C,kDAAmC,CAAA;IACnC,8CAA+B,CAAA;AACjC,CAAC,EAVW,WAAW,2BAAX,WAAW,QAUtB"}
1
+ {"version":3,"file":"storage-keys.js","sourceRoot":"","sources":["../../../src/lib/node-persist/storage-keys.ts"],"names":[],"mappings":";;;;AAAA,oDAA8B;AAC9B,oDAA8B;AAC9B,wDAAkC;AAErB,QAAA,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;AAChD,QAAA,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,eAAO,EAAE,SAAS,CAAC,CAAC;AACnD,QAAA,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,eAAO,EAAE,SAAS,CAAC,CAAC;AAEhE,IAAI,CAAC;IACH,2FAA2F;IAC3F,EAAE,CAAC,SAAS,CAAC,uBAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACf,OAAO,CAAC,KAAK,CACX,OAAO,EACP,8EAA8E,EAC9E,KAAK,CACN,CAAC;AACJ,CAAC;AAED,IAAY,WAUX;AAVD,WAAY,WAAW;IACrB,oEAAqD,CAAA;IACrD,mEAAoD,CAAA;IACpD,8CAA+B,CAAA;IAC/B,kDAAmC,CAAA;IACnC,0CAA2B,CAAA;IAC3B,8CAA+B,CAAA;IAC/B,4DAA6C,CAAA;IAC7C,kDAAmC,CAAA;IACnC,8CAA+B,CAAA;AACjC,CAAC,EAVW,WAAW,2BAAX,WAAW,QAUtB"}
@@ -5,9 +5,9 @@ const node_persist_1 = require("node-persist");
5
5
  const storage_keys_1 = require("./storage-keys");
6
6
  /** @internal */
7
7
  exports.storage = (0, node_persist_1.init)({
8
- dir: storage_keys_1.ZE_PATH,
9
- // node-persist thinks every file in .zephyr folder is a JSON valid file,
10
- // since we use that folder for other purposes too, we need to set this to true
8
+ dir: storage_keys_1.ZE_STORAGE_PATH,
9
+ // node-persist thinks every file in its folder is a JSON valid file,
10
+ // since we may colocate non-json files, we need to set this to true
11
11
  forgiveParseErrors: true,
12
12
  });
13
13
  //# sourceMappingURL=storage.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/lib/node-persist/storage.ts"],"names":[],"mappings":";;;AAAA,+CAAoC;AACpC,iDAAyC;AAEzC,gBAAgB;AACH,QAAA,OAAO,GAAG,IAAA,mBAAI,EAAC;IAC1B,GAAG,EAAE,sBAAO;IACZ,yEAAyE;IACzE,+EAA+E;IAC/E,kBAAkB,EAAE,IAAI;CACzB,CAAC,CAAC"}
1
+ {"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/lib/node-persist/storage.ts"],"names":[],"mappings":";;;AAAA,+CAAoC;AACpC,iDAAiD;AAEjD,gBAAgB;AACH,QAAA,OAAO,GAAG,IAAA,mBAAI,EAAC;IAC1B,GAAG,EAAE,8BAAe;IACpB,qEAAqE;IACrE,oEAAoE;IACpE,kBAAkB,EAAE,IAAI;CACzB,CAAC,CAAC"}
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zephyr-agent",
3
- "version": "0.1.6",
3
+ "version": "0.1.7",
4
4
  "description": "Zephyr plugin agent",
5
5
  "repository": {
6
6
  "type": "git",
@@ -60,7 +60,6 @@
60
60
  "ts-jest": "catalog:typescript"
61
61
  },
62
62
  "peerDependencies": {
63
- "http-proxy-agent": "^7.0.2",
64
63
  "https-proxy-agent": "^7.0.6"
65
64
  },
66
65
  "publishConfig": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zephyr-agent",
3
- "version": "0.1.6-next.1",
3
+ "version": "0.1.7-next.1",
4
4
  "description": "Zephyr plugin agent",
5
5
  "repository": {
6
6
  "type": "git",
@@ -40,7 +40,7 @@
40
40
  "open": "^10.1.0",
41
41
  "proper-lockfile": "^4.1.2",
42
42
  "tslib": "^2.8.1",
43
- "zephyr-edge-contract": "0.1.6-next.1"
43
+ "zephyr-edge-contract": "0.1.7-next.1"
44
44
  },
45
45
  "devDependencies": {
46
46
  "@jest/globals": "^29.7.0",
@@ -55,7 +55,6 @@
55
55
  "ts-jest": "^29.2.6"
56
56
  },
57
57
  "peerDependencies": {
58
- "http-proxy-agent": "^7.0.2",
59
58
  "https-proxy-agent": "^7.0.6"
60
59
  },
61
60
  "publishConfig": {