Use built-in UUID

Author: chrmarti

esbuild.js

@@ -57,7 +57,7 @@ const watch = process.argv.indexOf('--watch') !== -1;
 		minify,
 		watch,
 		platform: 'node',
-		target: 'node14.14.0',
+		target: 'node14.17.0',
 		external: ['vscode-dev-containers'],
 		mainFields: ['module', 'main'],
 		outdir: 'dist',

package.json

@@ -15,7 +15,7 @@
 	},
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"engines": {
-		"node": ">=14.14.0"
+		"node": ">=14.17.0"
 	},
 	"scripts": {
 		"compile": "npm-run-all clean-dist definitions compile-dev",

src/spec-common/injectHeadless.ts

@@ -7,7 +7,6 @@ import * as path from 'path';
 import * as fs from 'fs';
 import { StringDecoder } from 'string_decoder';
 import * as crypto from 'crypto';
-import { promisify } from 'util';
 
 import { ContainerError, toErrorText, toWarningText } from './errors';
 import { launch, ShellServer } from './shellServer';
@@ -740,8 +739,7 @@ async function runUserEnvProbe(userEnvProbe: UserEnvProbe, params: { allowSystem
 	try {
 		// From VS Code's shellEnv.ts
 
-		const buffer = await promisify(crypto.randomBytes)(16);
-		const mark = buffer.toString('hex');
+		const mark = crypto.randomUUID();
 		const regex = new RegExp(mark + '([^]*)' + mark);
 		const systemShellUnix = containerProperties.shell;
 		params.output.write(`userEnvProbe shell: ${systemShellUnix}`);

src/spec-configuration/editableFiles.ts

@@ -5,7 +5,6 @@
 
 import * as crypto from 'crypto';
 import * as jsonc from 'jsonc-parser';
-import { promisify } from 'util';
 import { URI } from 'vscode-uri';
 import { uriToFsPath, FileHost } from './configurationCommonUtils';
 import { readLocalFile, writeLocalFile } from '../spec-utils/pfs';
@@ -108,8 +107,7 @@ export class RemoteDocuments implements Documents {
 			case RemoteDocuments.scheme:
 				try {
 					if (!RemoteDocuments.nonce) {
-						const buffer = await promisify(crypto.randomBytes)(20);
-						RemoteDocuments.nonce = buffer.toString('hex');
+						RemoteDocuments.nonce = crypto.randomUUID();
 					}
 					const result = jsonc.applyEdits(content, edits);
 					const eof = `EOF-${RemoteDocuments.nonce}`;

src/spec-node/devContainers.ts

@@ -12,7 +12,6 @@ import { createNullPostCreate, finishBackgroundTasks, ResolverParameters, UserEn
 import { getCLIHost, loadNativeModule } from '../spec-common/commonUtils';
 import { resolve } from './configContainer';
 import { URI } from 'vscode-uri';
-import { promisify } from 'util';
 import { LogLevel, LogDimensions, toErrorText, createCombinedLog, createTerminalLog, Log, makeLog, LogFormat, createJSONLog, createPlainLog } from '../spec-utils/log';
 import { dockerComposeCLIConfig } from './dockerCompose';
 import { Mount } from '../spec-configuration/containerFeaturesConfiguration';
@@ -103,7 +102,7 @@ export async function createDockerParams(options: ProvisionOptions, disposables:
 	const appRoot = undefined;
 	const cwd = options.workspaceFolder || process.cwd();
 	const cliHost = await getCLIHost(cwd, loadNativeModule);
-	const sessionId = (await promisify(crypto.randomBytes)(20)).toString('hex'); // TODO: Somehow enable correlation.
+	const sessionId = crypto.randomUUID();
 
 	const common: ResolverParameters = {
 		prebuild: options.prebuild,