Switch to a simpler module for reading from registry (#2410)

The @vscode/windows-registry module is maintained by Microsoft and is described like so:

This module only has what is needed to support VS Code and is intended to be a lightweight module.

Seems like a great fit for our purposes.

Author: jennybc

extensions/positron-r/package.json

@@ -516,11 +516,11 @@
     "vsce": "^2.11.0"
   },
   "dependencies": {
+    "@vscode/windows-registry": "^1.1.0",
     "p-queue": "^6.6.2",
     "split2": "^4.2.0",
     "vscode-languageclient": "^9.0.1",
-    "web-tree-sitter": "^0.20.8",
-    "winreg": "^1.2.5"
+    "web-tree-sitter": "^0.20.8"
   },
   "repository": {
     "type": "git",

extensions/positron-r/src/provider.ts

@@ -10,13 +10,13 @@ import * as vscode from 'vscode';
 import * as which from 'which';
 import * as positron from 'positron';
 import * as crypto from 'crypto';
-import * as winreg from 'winreg';
 
 import { RInstallation, getRHomePath } from './r-installation';
 import { RRuntime, createJupyterKernelExtra, createJupyterKernelSpec } from './runtime';
 import { RRuntimeManager } from './runtime-manager';
 import { Logger } from './extension';
 import { readLines } from './util';
+import { HKEY } from '@vscode/windows-registry';
 
 const initialDynState = {
 	inputPrompt: '>',
@@ -362,8 +362,8 @@ async function findCurrentRBinary(): Promise<string | undefined> {
 }
 
 async function findCurrentRBinaryFromRegistry(): Promise<string | undefined> {
-	const userPath = await getRegistryInstallPath(winreg.HKCU);
-	const machinePath = await getRegistryInstallPath(winreg.HKLM);
+	const userPath = await getRegistryInstallPath('HKEY_CURRENT_USER');
+	const machinePath = await getRegistryInstallPath('HKEY_LOCAL_MACHINE');
 	if (!userPath && !machinePath) {
 		return undefined;
 	}
@@ -378,34 +378,17 @@ async function findCurrentRBinaryFromRegistry(): Promise<string | undefined> {
 	return binPath;
 }
 
-async function getRegistryInstallPath(hive: string): Promise<string | undefined> {
-	try {
-		const key = new winreg({
-			hive: hive as keyof typeof winreg,
-			// 'R64' here is another place where we explicitly ignore 32-bit R
-			key: '\\Software\\R-Core\\R64',
-		});
-
-		Logger.info(`Checking for 'InstallPath' in registry key ${key.key} for hive ${key.hive}`);
+async function getRegistryInstallPath(hive: 'HKEY_CURRENT_USER' | 'HKEY_LOCAL_MACHINE'): Promise<string | undefined> {
+	// 'R64' here is another place where we explicitly ignore 32-bit R
+	const R64_KEY: string = 'Software\\R-Core\\R64';
+	const registry = await import('@vscode/windows-registry');
 
-		const result = await new Promise<{ value: string }>((resolve, reject) => {
-			key.get('InstallPath', (error, result) => {
-				if (error) {
-					reject(error);
-				} else {
-					resolve(result);
-				}
-			});
-		});
-
-		if (!result || typeof result.value !== 'string') {
-			Logger.info(`Invalid value of 'InstallPath'`);
-			return undefined;
-		}
-
-		return result.value;
-	} catch (error: any) {
-		Logger.info(`Unable to get value of 'InstallPath': ${error.message}`);
+	try {
+		Logger.info(`Checking for 'InstallPath' in registry key ${R64_KEY} for hive ${hive}`);
+		const pth = registry.GetStringRegKey(hive as HKEY, R64_KEY, 'InstallPath') || '';
+		return pth;
+	} catch (err) {
+		Logger.info(err as string);
 		return undefined;
 	}
 }

extensions/positron-r/yarn.lock

@@ -244,6 +244,11 @@
     rimraf "^3.0.2"
     unzipper "^0.10.11"
 
+"@vscode/windows-registry@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9"
+  integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==
+
 acorn-jsx@^5.3.1:
   version "5.3.2"
   resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
@@ -2285,11 +2290,6 @@ [email protected], which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-winreg@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.5.tgz#b650383e89278952494b5d113ba049a5a4fa96d8"
-  integrity sha512-uf7tHf+tw0B1y+x+mKTLHkykBgK2KMs3g+KlzmyMbLvICSHQyB/xOFjTT8qZ3oeTFyU7Bbj4FzXitGG6jvKhYw==
-
 word-wrap@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"