@cloudpss/fetch 0.4.18 → 0.4.20

package/README.md

@@ -1,3 +1,3 @@
 # @cloudpss/fetch
 
-Provides `fetch` for node.js, and a simple wrapper of [proxy-agent](https://github.com/TooTallNate/node-proxy-agent), use conditional exports to export instance of `ProxyAgent` in node environment, `undefined` in browsers.
+Provides `fetch` for node.js, a simple wrapper of [node-fetch](https://github.com/node-fetch/node-fetch).

package/dist/index-browser.d.ts

@@ -1,17 +1,17 @@
-export declare const fetch: typeof globalThis.fetch;
-export declare const Headers: {
+declare const _fetch: typeof fetch;
+declare const _Headers: {
     new (init?: HeadersInit | undefined): Headers;
     prototype: Headers;
 };
-export declare const Response: {
+declare const _Response: {
     new (body?: BodyInit | null | undefined, init?: ResponseInit | undefined): Response;
     prototype: Response;
     error(): Response;
     redirect(url: string | URL, status?: number | undefined): Response;
 };
-export declare const Request: {
+declare const _Request: {
     new (input: RequestInfo | URL, init?: RequestInit | undefined): Request;
     prototype: Request;
 };
-export declare const agent: unknown;
+export { _fetch as fetch, _Headers as Headers, _Response as Response, _Request as Request };
 export default fetch;

package/dist/index-browser.js

@@ -1,10 +1,10 @@
-if (typeof globalThis == 'undefined' || typeof globalThis.fetch != 'function') {
-    throw new TypeError(`fetch is not defined on the global object, you should load polyfill of globalThis and fetch.`);
+if (typeof fetch != 'function') {
+    throw new TypeError(`fetch is not defined on the global object, you should load polyfill of fetch.`);
 }
-export const fetch = globalThis.fetch;
-export const Headers = globalThis.Headers;
-export const Response = globalThis.Response;
-export const Request = globalThis.Request;
-export const agent = undefined;
+const _fetch = fetch;
+const _Headers = Headers;
+const _Response = Response;
+const _Request = Request;
+export { _fetch as fetch, _Headers as Headers, _Response as Response, _Request as Request };
 export default fetch;
 //# sourceMappingURL=index-browser.js.map

package/dist/index-browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"index-browser.js","sourceRoot":"","sources":["../src/index-browser.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,UAAU,IAAI,WAAW,IAAI,OAAO,UAAU,CAAC,KAAK,IAAI,UAAU,EAAE;IAC3E,MAAM,IAAI,SAAS,CAAC,8FAA8F,CAAC,CAAC;CACvH;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;AACtC,MAAM,CAAC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;AAC1C,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;AAC5C,MAAM,CAAC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;AAC1C,MAAM,CAAC,MAAM,KAAK,GAAY,SAAS,CAAC;AAExC,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index-browser.js","sourceRoot":"","sources":["../src/index-browser.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,KAAK,IAAI,UAAU,EAAE;IAC5B,MAAM,IAAI,SAAS,CAAC,+EAA+E,CAAC,CAAC;CACxG;AAED,MAAM,MAAM,GAAG,KAAK,CAAC;AACrB,MAAM,QAAQ,GAAG,OAAO,CAAC;AACzB,MAAM,SAAS,GAAG,QAAQ,CAAC;AAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC;AACzB,OAAO,EAAE,MAAM,IAAI,KAAK,EAAE,QAAQ,IAAI,OAAO,EAAE,SAAS,IAAI,QAAQ,EAAE,QAAQ,IAAI,OAAO,EAAE,CAAC;AAE5F,eAAe,KAAK,CAAC"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export declare const fetch: typeof globalThis.fetch, agent: unknown;
+export declare const fetch: typeof globalThis.fetch;
 export declare const Headers: {
     new (init?: HeadersInit | undefined): Headers;
     prototype: Headers;

package/dist/index.js

@@ -1,27 +1,15 @@
-import ProxyAgent from 'proxy-agent';
 import nodeFetch, { Headers as NodeHeaders, Response as NodeResponse, Request as NodeRequest } from 'node-fetch';
+import { agent } from '@cloudpss/proxy-agent';
 /** 生成 fetch */
 function makeFetch() {
-    const hasProxy = !!process.env['HTTP_PROXY'] ||
-        !!process.env['http_proxy'] ||
-        !!process.env['HTTPS_PROXY'] ||
-        !!process.env['https_proxy'] ||
-        !!process.env['ALL_PROXY'] ||
-        !!process.env['all_proxy'];
-    if (hasProxy) {
-        const agent = new ProxyAgent();
-        return [
-            function fetch(url, init) {
-                return nodeFetch(url, { ...init, agent });
-            },
-            agent,
-        ];
-    }
-    else {
-        return [nodeFetch, undefined];
+    if (agent) {
+        return function fetch(url, init) {
+            return nodeFetch(url, { ...init, agent });
+        };
     }
+    return nodeFetch;
 }
-export const [fetch, agent] = makeFetch();
+export const fetch = makeFetch();
 export const Headers = NodeHeaders;
 export const Response = NodeResponse;
 export const Request = NodeRequest;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,OAAO,SAAS,EAAE,EAAE,OAAO,IAAI,WAAW,EAAE,QAAQ,IAAI,YAAY,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,YAAY,CAAC;AAEjH,eAAe;AACf,SAAS,SAAS;IACd,MAAM,QAAQ,GACV,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;QAC3B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;QAC3B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAC5B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAC5B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QAC1B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC/B,IAAI,QAAQ,EAAE;QACV,MAAM,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC;QAC/B,OAAO;YACH,SAAS,KAAK,CAAC,GAAsB,EAAE,IAAkB;gBACrD,OAAO,SAAS,CAAC,GAAsB,EAAE,EAAE,GAAG,IAAI,EAAE,KAAK,EAAqB,CAAsB,CAAC;YACzG,CAAC;YACD,KAAK;SACR,CAAC;KACL;SAAM;QACH,OAAO,CAAC,SAAoC,EAAE,SAAS,CAAC,CAAC;KAC5D;AACL,CAAC;AAED,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,SAAS,EAAE,CAAC;AAC1C,MAAM,CAAC,MAAM,OAAO,GAAG,WAAmD,CAAC;AAC3E,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAqD,CAAC;AAC9E,MAAM,CAAC,MAAM,OAAO,GAAG,WAAmD,CAAC;AAE3E,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,EAAE,EAAE,OAAO,IAAI,WAAW,EAAE,QAAQ,IAAI,YAAY,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,YAAY,CAAC;AACjH,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C,eAAe;AACf,SAAS,SAAS;IACd,IAAI,KAAK,EAAE;QACP,OAAO,SAAS,KAAK,CAAC,GAAsB,EAAE,IAAkB;YAC5D,OAAO,SAAS,CAAC,GAAsB,EAAE,EAAE,GAAG,IAAI,EAAE,KAAK,EAAqB,CAAsB,CAAC;QACzG,CAAC,CAAC;KACL;IACD,OAAO,SAAyB,CAAC;AACrC,CAAC;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;AACjC,MAAM,CAAC,MAAM,OAAO,GAAG,WAAmD,CAAC;AAC3E,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAqD,CAAC;AAC9E,MAAM,CAAC,MAAM,OAAO,GAAG,WAAmD,CAAC;AAE3E,eAAe,KAAK,CAAC"}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@cloudpss/fetch",
-  "version": "0.4.18",
+  "version": "0.4.20",
   "author": "CloudPSS",
   "license": "MIT",
   "type": "module",
+  "sideEffects": false,
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,7 +21,7 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "node-fetch": "^3.3.1",
-    "proxy-agent": "^5.0.0"
+    "@cloudpss/proxy-agent": "~0.4.20",
+    "node-fetch": "^3.3.1"
   }
 }

package/src/index-browser.ts

@@ -1,11 +1,11 @@
-if (typeof globalThis == 'undefined' || typeof globalThis.fetch != 'function') {
-    throw new TypeError(`fetch is not defined on the global object, you should load polyfill of globalThis and fetch.`);
+if (typeof fetch != 'function') {
+    throw new TypeError(`fetch is not defined on the global object, you should load polyfill of fetch.`);
 }
 
-export const fetch = globalThis.fetch;
-export const Headers = globalThis.Headers;
-export const Response = globalThis.Response;
-export const Request = globalThis.Request;
-export const agent: unknown = undefined;
+const _fetch = fetch;
+const _Headers = Headers;
+const _Response = Response;
+const _Request = Request;
+export { _fetch as fetch, _Headers as Headers, _Response as Response, _Request as Request };
 
 export default fetch;

package/src/index.ts

@@ -1,30 +1,18 @@
-import ProxyAgent from 'proxy-agent';
 import type { RequestInfo as NodeRequestInfo, RequestInit as NodeRequestInit } from 'node-fetch';
 import nodeFetch, { Headers as NodeHeaders, Response as NodeResponse, Request as NodeRequest } from 'node-fetch';
+import { agent } from '@cloudpss/proxy-agent';
 
 /** 生成 fetch */
-function makeFetch(): [typeof globalThis.fetch, unknown] {
-    const hasProxy =
-        !!process.env['HTTP_PROXY'] ||
-        !!process.env['http_proxy'] ||
-        !!process.env['HTTPS_PROXY'] ||
-        !!process.env['https_proxy'] ||
-        !!process.env['ALL_PROXY'] ||
-        !!process.env['all_proxy'];
-    if (hasProxy) {
-        const agent = new ProxyAgent();
-        return [
-            function fetch(url: RequestInfo | URL, init?: RequestInit): Promise<Response> {
-                return nodeFetch(url as NodeRequestInfo, { ...init, agent } as NodeRequestInit) as Promise<Response>;
-            },
-            agent,
-        ];
-    } else {
-        return [nodeFetch as typeof globalThis.fetch, undefined];
+function makeFetch(): typeof globalThis.fetch {
+    if (agent) {
+        return function fetch(url: RequestInfo | URL, init?: RequestInit): Promise<Response> {
+            return nodeFetch(url as NodeRequestInfo, { ...init, agent } as NodeRequestInit) as Promise<Response>;
+        };
     }
+    return nodeFetch as typeof fetch;
 }
 
-export const [fetch, agent] = makeFetch();
+export const fetch = makeFetch();
 export const Headers = NodeHeaders as unknown as typeof globalThis.Headers;
 export const Response = NodeResponse as unknown as typeof globalThis.Response;
 export const Request = NodeRequest as unknown as typeof globalThis.Request;