整理代码

Author: sumneko

client/src/addon_manager/commands/enable.ts

@@ -16,6 +16,11 @@ const localLogger = createChildLogger("Enable Addon");
 export default async (context: vscode.ExtensionContext, message: Message) => {
     const addon = addonManager.addons.get(message.data.name);
     const workspaceFolders = vscode.workspace.workspaceFolders;
+
+    if (!addon || !workspaceFolders) {
+        return;
+    }
+    
     let selectedFolders: vscode.WorkspaceFolder[];
 
     if (workspaceFolders && workspaceFolders.length === 1) {
@@ -37,7 +42,7 @@ export default async (context: vscode.ExtensionContext, message: Message) => {
             return workspaceFolders.find(
                 (folder) => folder.name === selection.label
             );
-        });
+        }).filter((folder) => !!folder);
     }
 
     for (const folder of selectedFolders) {
@@ -46,7 +51,7 @@ export default async (context: vscode.ExtensionContext, message: Message) => {
         } catch (e) {
             const message = `Failed to enable ${addon.name}!`;
             localLogger.error(message, { report: false });
-            localLogger.error(e, { report: false });
+            localLogger.error(String(e), { report: false });
             WebVue.sendNotification({
                 level: NotificationLevels.error,
                 message,

client/src/addon_manager/commands/uninstall.ts

@@ -6,5 +6,5 @@ export default async (
     message: { data: { name: string } }
 ) => {
     const addon = addonManagerService.addons.get(message.data.name);
-    addon.uninstall();
+    addon?.uninstall();
 };

client/src/addon_manager/commands/update.ts

@@ -16,12 +16,15 @@ type Message = {
 
 export default async (context: vscode.ExtensionContext, message: Message) => {
     const addon = addonManager.addons.get(message.data.name);
+    if (!addon) {
+        return;
+    }
     try {
         await addon.update();
     } catch (e) {
         const message = `Failed to update ${addon.name}`;
         localLogger.error(message, { report: false });
-        localLogger.error(e, { report: false });
+        localLogger.error(String(e), { report: false });
         WebVue.sendNotification({
             level: NotificationLevels.error,
             message,

client/src/addon_manager/models/addon.ts

@@ -117,8 +117,7 @@ export class Addon {
         const moduleURI = vscode.Uri.joinPath(this.uri, "module");
         this.#installed =
             (await filesystem.exists(moduleURI)) &&
-            (await filesystem.readDirectory(moduleURI, { recursive: false }))
-                .length > 0;
+            ((await filesystem.readDirectory(moduleURI, { recursive: false }))?.length ?? 0) > 0;
 
         return folderStates;
     }
@@ -237,7 +236,7 @@ export class Addon {
     }
 
     public async uninstall() {
-        for (const folder of vscode.workspace.workspaceFolders) {
+        for (const folder of vscode.workspace.workspaceFolders ?? []) {
             await this.disable(folder, true);
         }
         const moduleURI = vscode.Uri.joinPath(this.uri, "module");
@@ -256,7 +255,7 @@ export class Addon {
 
         const { name, description, size, hasPlugin } = await this.fetchInfo();
         const enabled = this.#enabled;
-        const installTimestamp = (await git.log()).latest.date;
+        const installTimestamp = (await git.log()).latest?.date;
         const hasUpdate = this.#hasUpdate;
 
         return {

client/src/addon_manager/panels/WebVue.ts

@@ -48,7 +48,7 @@ export class WebVue {
         command: string,
         data: { [index: string]: unknown } | unknown
     ) {
-        WebVue.currentPanel._panel.webview.postMessage({ command, data });
+        WebVue.currentPanel?._panel.webview.postMessage({ command, data });
     }
 
     public static sendNotification(message: Notification) {
@@ -255,7 +255,7 @@ export class WebVue {
             );
 
             try {
-                commands[command](context, message);
+                (commands as any)[command](context, message);
             } catch (e) {
                 commandLogger.error(e);
             }

client/src/addon_manager/registration.ts

@@ -84,7 +84,7 @@ export async function activate(context: vscode.ExtensionContext) {
             // Set up git repository for fetching addons
             try {
                 setupGit(context);
-            } catch (e) {
+            } catch (e: any) {
                 const message =
                     "Failed to set up Git repository. Please check your connection to GitHub.";
                 logger.error(message, { report: false });

client/src/addon_manager/services/addonManager.service.ts

@@ -20,7 +20,7 @@ class AddonManager {
         try {
             await git.fetch();
             await git.pull();
-        } catch (e) {
+        } catch (e: any) {
             const message =
                 "Failed to fetch addons! Please check your connection to GitHub.";
             localLogger.error(message, { report: false });
@@ -33,7 +33,7 @@ class AddonManager {
 
         const addons = await filesystem.readDirectory(installLocation);
 
-        for (const addon of addons) {
+        for (const addon of addons ?? []) {
             this.addons.set(addon.name, new Addon(addon.name, addon.uri));
             localLogger.verbose(`Found ${addon.name}`);
         }
@@ -50,7 +50,7 @@ class AddonManager {
 
     public unlockAddon(name: string) {
         const addon = this.addons.get(name);
-        return addon.setLock(false);
+        return addon?.setLock(false);
     }
 }
 

client/src/addon_manager/services/filesystem.service.ts

@@ -153,7 +153,7 @@ namespace filesystem {
                             recursive: true,
                             maxDepth: options.maxDepth,
                             depth: options.depth + 1,
-                        }))
+                        })) ?? []
                     );
                     break;
                 default:
@@ -175,7 +175,7 @@ namespace filesystem {
         });
 
         const promises = [] as Promise<number>[];
-        for (const node of tree) {
+        for (const node of tree ?? []) {
             if (node.type !== vscode.FileType.File) continue;
 
             promises.push(

client/src/addon_manager/services/logging/vsCodeLogFileTransport.ts

@@ -13,7 +13,7 @@ export default class VSCodeLogFileTransport extends Transport {
 
     private logDir: vscode.Uri;
 
-    private stream: fs.WriteStream;
+    private stream?: fs.WriteStream;
 
     constructor(logDir: vscode.Uri, opts?: Transport.TransportStreamOptions) {
         super(opts);
@@ -37,13 +37,13 @@ export default class VSCodeLogFileTransport extends Transport {
             flags: "a",
         });
         this.initialized = true;
-        return new vscode.Disposable(() => this.stream.close);
+        return new vscode.Disposable(() => this.stream?.close);
     }
 
     /** Mark the start of the addon manager in the log */
     public logStart() {
         return new Promise((resolve, reject) => {
-            this.stream.write(
+            this.stream?.write(
                 stringToByteArray("#### STARTUP ####\n"),
                 (err) => {
                     if (err) reject(err);
@@ -62,7 +62,7 @@ export default class VSCodeLogFileTransport extends Transport {
             this.emit("logged", info);
         });
 
-        this.stream.write(
+        this.stream?.write(
             stringToByteArray(info[MESSAGE as unknown as string] + "\n")
         );