Merge branch 'master' into master

Author: sumneko

.github/workflows/build.yml

@@ -26,8 +26,8 @@ jobs:
         include:
           - { os: ubuntu-20.04,   target: linux,   platform: linux-x64    }
           - { os: ubuntu-20.04,   target: linux,   platform: linux-arm64  }
-          - { os: macos-11,       target: darwin,  platform: darwin-x64   }
-          - { os: macos-11,       target: darwin,  platform: darwin-arm64 }
+          - { os: macos-latest,   target: darwin,  platform: darwin-x64   }
+          - { os: macos-latest,   target: darwin,  platform: darwin-arm64 }
           #- { os: windows-latest, target: windows, platform: win32-ia32   } # 不再支持32位
           - { os: windows-latest, target: windows, platform: win32-x64    }
     runs-on: ${{ matrix.os }}

client/package-lock.json

@@ -14,7 +14,7 @@
 		"url": "https://github.com/Microsoft/vscode-extension-samples"
 	},
 	"engines": {
-		"vscode": "^1.70.0"
+		"vscode": "^1.85.0"
 	},
 	"dependencies": {
 		"axios": "^1.2.1",
@@ -25,8 +25,8 @@
 		"winston": "^3.8.2"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.35",
-		"@types/vscode": "^1.70.0",
-		"typescript": "^5.4.5"
+		"@types/node": "^18.19.18",
+		"@types/vscode": "1.85.0",
+		"typescript": "^5.5.0"
 	}
 }

client/package.json

@@ -15,6 +15,10 @@ 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) {
@@ -35,7 +39,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) {

client/src/addon_manager/commands/disable.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/enable.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/uninstall.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/commands/update.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/models/addon.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/panels/WebVue.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 });