.eslintrc.js

@@ -13,4 +13,20 @@ module.exports = {
 		'plugin:@typescript-eslint/eslint-recommended',
 		'plugin:@typescript-eslint/recommended',
 	],
+	overrides: [
+		{
+			files: ['packages/{pac-proxy,proxy,socks-proxy}-agent/**/*'],
+			rules: {
+				'no-restricted-globals': [
+					'error',
+					// https://github.com/TooTallNate/proxy-agents/pull/242
+					{
+						name: 'URL',
+						message:
+							'Use `URL` from the Node.js "url" module instead.',
+					},
+				],
+			},
+		},
+	],
 };

packages/agent-base/LICENSE

@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/agent-base/README.md

@@ -62,32 +62,6 @@ http.get('http://nodejs.org/api/', { agent }, (res) => {
 });
 ```
 
-License
--------
-
-(The MIT License)
-
-Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 [http-proxy-agent]: ../http-proxy-agent
 [https-proxy-agent]: ../https-proxy-agent
 [pac-proxy-agent]: ../pac-proxy-agent

packages/data-uri-to-buffer/CHANGELOG.md

@@ -1,5 +1,34 @@
 # data-uri-to-buffer
 
+## 6.0.2
+
+### Patch Changes
+
+- c881a18: Use native Buffer decoding in Node.js
+
+## 6.0.1
+
+### Patch Changes
+
+- 1d146e8: Ensure `<reference types="node" />` is not present in generated types
+
+## 6.0.0
+
+### Major Changes
+
+- 52b458f: Refactor to return an `ArrayBuffer` instead of a Node.js `Buffer`.
+
+  This change is being made to make the package platform-agnostic, and work in web browsers or other non-Node.js environments without polyfills.
+
+  For Node.js users of this package, you can get a Node.js `Buffer` instance from an `ArrayBuffer` like so:
+
+  ```typescript
+  const uri = 'data:,Hello%2C%20World!';
+  const parsed = dataUriToBuffer(uri);
+  const buffer = Buffer.from(parsed.buffer);
+  // `buffer` is a Node.js Buffer
+  ```
+
 ## 5.0.1
 
 ### Patch Changes

packages/data-uri-to-buffer/LICENSE

@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/data-uri-to-buffer/README.md

@@ -1,76 +1,61 @@
 data-uri-to-buffer
 ==================
-### Generate a Buffer instance from a [Data URI][rfc] string
+### Create an ArrayBuffer instance from a [Data URI][rfc] string
 
-This module accepts a ["data" URI][rfc] String of data, and returns a
-node.js `Buffer` instance with the decoded data.
+This module accepts a ["data" URI][rfc] String of data, and returns
+an `ArrayBuffer` instance with the decoded data.
+
+This module is intended to work on a large variety of JavaScript
+runtimes, including Node.js and web browsers.
 
 Example
 -------
 
-``` js
+```typescript
 import { dataUriToBuffer } from 'data-uri-to-buffer';
 
 // plain-text data is supported
 let uri = 'data:,Hello%2C%20World!';
-let decoded = dataUriToBuffer(uri);
-console.log(decoded.toString());
+let parsed = dataUriToBuffer(uri);
+console.log(new TextDecoder().decode(parsed.buffer));
 // 'Hello, World!'
 
 // base64-encoded data is supported
 uri = 'data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D';
-decoded = dataUriToBuffer(uri);
-console.log(decoded.toString());
+parsed = dataUriToBuffer(uri);
+console.log(new TextDecoder().decode(parsed.buffer));
 // 'Hello, World!'
 ```
 
 
 API
 ---
 
-### dataUriToBuffer(String uri) → Buffer
+```typescript
+export interface ParsedDataURI {
+	type: string;
+	typeFull: string;
+	charset: string;
+	buffer: ArrayBuffer;
+}
+```
+
+### dataUriToBuffer(uri: string | URL) → ParsedDataURI
 
-The `type` property on the Buffer instance gets set to the main type portion of
+The `type` property gets set to the main type portion of
 the "mediatype" portion of the "data" URI, or defaults to `"text/plain"` if not
 specified.
 
-The `typeFull` property on the Buffer instance gets set to the entire
+The `typeFull` property gets set to the entire
 "mediatype" portion of the "data" URI (including all parameters), or defaults
 to `"text/plain;charset=US-ASCII"` if not specified.
 
-The `charset` property on the Buffer instance gets set to the Charset portion of
+The `charset` property gets set to the Charset portion of
 the "mediatype" portion of the "data" URI, or defaults to `"US-ASCII"` if the
 entire type is not specified, or defaults to `""` otherwise.
 
-*Note*: If the only the main type is specified but not the charset, e.g.
+*Note*: If only the main type is specified but not the charset, e.g.
 `"data:text/plain,abc"`, the charset is set to the empty string. The spec only
 defaults to US-ASCII as charset if the entire type is not specified.
 
-
-License
--------
-
-(The MIT License)
-
-Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 [rfc]: http://tools.ietf.org/html/rfc2397

packages/data-uri-to-buffer/package.json

@@ -1,9 +1,13 @@
 {
   "name": "data-uri-to-buffer",
-  "version": "5.0.1",
-  "description": "Generate a Buffer instance from a Data URI string",
+  "version": "6.0.2",
+  "description": "Create an ArrayBuffer instance from a Data URI string",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "exports": {
+    "node": "./dist/node.js",
+    "default": "./dist/index.js"
+  },
   "files": [
     "dist"
   ],

packages/data-uri-to-buffer/src/common.ts

@@ -0,0 +1,69 @@
+export interface ParsedDataURI {
+	type: string;
+	typeFull: string;
+	charset: string;
+	buffer: ArrayBuffer;
+}
+
+export interface IBufferConversions {
+	base64ToArrayBuffer(base64: string): ArrayBuffer;
+	stringToBuffer(str: string): ArrayBuffer;
+}
+
+/**
+ * Returns a `Buffer` instance from the given data URI `uri`.
+ *
+ * @param {String} uri Data URI to turn into a Buffer instance
+ */
+export const makeDataUriToBuffer = (convert: IBufferConversions) => (uri: string | URL): ParsedDataURI => {
+	uri = String(uri);
+
+	if (!/^data:/i.test(uri)) {
+		throw new TypeError(
+			'`uri` does not appear to be a Data URI (must begin with "data:")'
+		);
+	}
+
+	// strip newlines
+	uri = uri.replace(/\r?\n/g, '');
+
+	// split the URI up into the "metadata" and the "data" portions
+	const firstComma = uri.indexOf(',');
+	if (firstComma === -1 || firstComma <= 4) {
+		throw new TypeError('malformed data: URI');
+	}
+
+	// remove the "data:" scheme and parse the metadata
+	const meta = uri.substring(5, firstComma).split(';');
+
+	let charset = '';
+	let base64 = false;
+	const type = meta[0] || 'text/plain';
+	let typeFull = type;
+	for (let i = 1; i < meta.length; i++) {
+		if (meta[i] === 'base64') {
+			base64 = true;
+		} else if (meta[i]) {
+			typeFull += `;${meta[i]}`;
+			if (meta[i].indexOf('charset=') === 0) {
+				charset = meta[i].substring(8);
+			}
+		}
+	}
+	// defaults to US-ASCII only if type is not provided
+	if (!meta[0] && !charset.length) {
+		typeFull += ';charset=US-ASCII';
+		charset = 'US-ASCII';
+	}
+
+	// get the encoded data portion and decode URI-encoded chars
+	const data = unescape(uri.substring(firstComma + 1));
+	const buffer = base64 ? convert.base64ToArrayBuffer(data) : convert.stringToBuffer(data);
+
+	return {
+		type,
+		typeFull,
+		charset,
+		buffer,
+	};
+}