Merge pull request #148619 from microsoft/joh/uuidDebt

microsoft · May 3, 2022 · 497446d · 497446d
2 parents b802077 + c8699e5
commit 497446d
Showing 1 changed file with 62 additions and 51 deletions.
diff --git a/src/vs/base/common/uuid.ts b/src/vs/base/common/uuid.ts
@@ -10,61 +10,72 @@ export function isUUID(value: string): boolean {
 	return _UUIDPattern.test(value);
 }
 
-// prep-work
-const _data = new Uint8Array(16);
-const _hex: string[] = [];
-for (let i = 0; i < 256; i++) {
-	_hex.push(i.toString(16).padStart(2, '0'));
-}
+declare const crypto: undefined | {
+	//https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues#browser_compatibility
+	getRandomValues?(data: Uint8Array): Uint8Array;
+	//https://developer.mozilla.org/en-US/docs/Web/API/Crypto/randomUUID#browser_compatibility
+	randomUUID?(): string;
+};
 
-// todo@jrieken - with node@15 crypto#getRandomBytes is available everywhere, https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues#browser_compatibility
-let _fillRandomValues: (bucket: Uint8Array) => Uint8Array;
+export const generateUuid = (function (): () => string {
 
-declare const crypto: undefined | { getRandomValues(data: Uint8Array): Uint8Array };
+	// use `randomUUID` if possible
+	if (typeof crypto === 'object' && typeof crypto.randomUUID === 'function') {
+		return crypto.randomUUID.bind(crypto);
+	}
 
-if (typeof crypto === 'object' && typeof crypto.getRandomValues === 'function') {
-	// browser
-	_fillRandomValues = crypto.getRandomValues.bind(crypto);
+	// use `randomValues` if possible
+	let getRandomValues: (bucket: Uint8Array) => Uint8Array;
+	if (typeof crypto === 'object' && typeof crypto.getRandomValues === 'function') {
+		getRandomValues = crypto.getRandomValues.bind(crypto);
 
-} else {
-	_fillRandomValues = function (bucket: Uint8Array): Uint8Array {
-		for (let i = 0; i < bucket.length; i++) {
-			bucket[i] = Math.floor(Math.random() * 256);
-		}
-		return bucket;
-	};
-}
+	} else {
+		getRandomValues = function (bucket: Uint8Array): Uint8Array {
+			for (let i = 0; i < bucket.length; i++) {
+				bucket[i] = Math.floor(Math.random() * 256);
+			}
+			return bucket;
+		};
+	}
 
-export function generateUuid(): string {
-	// get data
-	_fillRandomValues(_data);
+	// prep-work
+	const _data = new Uint8Array(16);
+	const _hex: string[] = [];
+	for (let i = 0; i < 256; i++) {
+		_hex.push(i.toString(16).padStart(2, '0'));
+	}
 
-	// set version bits
-	_data[6] = (_data[6] & 0x0f) | 0x40;
-	_data[8] = (_data[8] & 0x3f) | 0x80;
+	return function generateUuid(): string {
+		// get data
+		getRandomValues(_data);
 
-	// print as string
-	let i = 0;
-	let result = '';
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += '-';
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += '-';
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += '-';
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += '-';
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	result += _hex[_data[i++]];
-	return result;
-}
+		// set version bits
+		_data[6] = (_data[6] & 0x0f) | 0x40;
+		_data[8] = (_data[8] & 0x3f) | 0x80;
+
+		// print as string
+		let i = 0;
+		let result = '';
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += '-';
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += '-';
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += '-';
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += '-';
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		return result;
+	};
+})();