[chore] Use regedit-rs instead of node-regedit

Zagrios · Dec 15, 2023 · c2ff4fe · c2ff4fe
1 parent 04f811f
commit c2ff4fe
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 174 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -264,7 +264,6 @@
         "react-virtualized-auto-sizer": "^1.0.12",
         "react-window": "^1.8.8",
         "recursive-readdir": "^2.2.3",
-        "regedit": "^5.1.2",
         "rfdc": "^1.3.0",
         "rxjs": "^7.8.0",
         "sanitize-filename": "^1.6.3",

diff --git a/release/app/package-lock.json b/release/app/package-lock.json
diff --git a/release/app/package.json b/release/app/package.json
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "ps-list": "^7.2.0",
+    "regedit-rs": "^1.0.1",
     "sharp": "^0.32.6"
   },
   "license": "MIT"

diff --git a/src/main/services/liv/liv.service.ts b/src/main/services/liv/liv.service.ts
@@ -1,6 +1,6 @@
 import { execOnOs } from "../../helpers/env.helpers";
+import { list, createKey, putValue, deleteKey, RegSzValue } from "regedit-rs";
 import path from "path";
-import regedit from "regedit";
 
 export class LivService {
 
@@ -23,8 +23,8 @@ export class LivService {
     public async isLivInstalled(): Promise<boolean> {
         return execOnOs({
             win32: async () => {
-                const regRes = await regedit.promisified.list([this.livRegeditKey]).then(res => res[this.livRegeditKey]);
-                return regRes?.exists;
+                const regRes = await list(this.livRegeditKey).then(res => res[this.livRegeditKey]);
+                return regRes.exists;
             },
         }, true);
     }
@@ -33,25 +33,13 @@ export class LivService {
         return execOnOs({
             win32: async () => {
                 const livExternalAppRegeditKey = path.join(this.livExternalAppsRegeditKey, entry.id);
-                await regedit.promisified.createKey([livExternalAppRegeditKey]);
-                await regedit.promisified.putValue({
+                await createKey(livExternalAppRegeditKey);
+                await putValue({
                     [livExternalAppRegeditKey]: {
-                        "InstallPath": {
-                            value: entry.installPath,
-                            type: "REG_SZ"
-                        },
-                        "Executable": {
-                            value: entry.executable,
-                            type: "REG_SZ"
-                        },
-                        "Arguments": {
-                            value: entry.arguments,
-                            type: "REG_SZ"
-                        },
-                        "Name": {
-                            value: entry.name,
-                            type: "REG_SZ"
-                        }
+                        InstallPath: new RegSzValue(entry.installPath),
+                        Executable: new RegSzValue(entry.executable),
+                        Arguments: new RegSzValue(entry.arguments),
+                        Name: new RegSzValue(entry.name)
                     }
                 });
             }
@@ -62,23 +50,23 @@ export class LivService {
         return execOnOs({
             win32: async () => {
                 const shotcutsKeys = ids.map(id => path.join(this.livExternalAppsRegeditKey, id));
-                return regedit.promisified.deleteKey(shotcutsKeys);
+                return deleteKey(shotcutsKeys);
             }
         })
     }
 
     public getLivShortcuts(): Promise<LivEntry[]> {
         return execOnOs({
             win32: async () => {
-                const regRes = await regedit.promisified.list([this.livExternalAppsRegeditKey]).then(res => res[this.livExternalAppsRegeditKey]);
+                const regRes = await list(this.livExternalAppsRegeditKey).then(res => res[this.livExternalAppsRegeditKey]);
 
                 if(!regRes.exists){
                     return [];
                 }
 
                 const promises = regRes.keys.map(async key => {
                     const shortcutKey = path.join(this.livExternalAppsRegeditKey, key);
-                    const entries = await regedit.promisified.list([shortcutKey]).then(res => res[shortcutKey]);
+                    const entries = await list(shortcutKey).then(res => res[shortcutKey]);
 
                     if(!entries.exists){
                         return undefined;