release 3.3.5

Author: nonoroazoro

.vscode/launch.json

@@ -18,7 +18,7 @@
                 "DEBUG_SYNCING_EXTENSION": "true"
             },
             "outFiles": [
-                "${workspaceFolder}/out/**/*.js"
+                "${workspaceFolder}/dist/**/*.js"
             ],
             "osx": {
                 "preLaunchTask": "tsc-watch"

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelogs
 
+## 3.3.5 - October 12, 2023
+
+- Fixed: Fix version comparison.
+
+
 ## 3.3.4 - November 29, 2022
 
 - Fixed: Fix code version for code-server ([@achembarpu](https://github.com/achembarpu)).

package.json

@@ -2,7 +2,7 @@
     "name": "syncing",
     "displayName": "%displayName%",
     "description": "%description%",
-    "version": "3.3.4",
+    "version": "3.3.5",
     "publisher": "nonoroazoro",
     "author": {
         "email": "[email protected]",
@@ -120,48 +120,48 @@
         "test:cov": "npm run cleanCov && npm test -- --coverage"
     },
     "dependencies": {
-        "@octokit/rest": "^19.0.4",
+        "@octokit/rest": "^19.0.11",
         "chokidar": "^3.5.3",
-        "compare-versions": "^5.0.1",
-        "date-fns": "^2.29.3",
+        "date-fns": "^2.30.0",
         "extract-zip": "^2.0.1",
-        "fs-extra": "10.1.0",
-        "https-proxy-agent": "^5.0.1",
+        "fs-extra": "11.1.1",
+        "https-proxy-agent": "^7.0.2",
         "jsonc-parser": "^3.2.0",
-        "jsondiffpatch": "^0.4.1",
+        "jsondiffpatch": "^0.5.0",
         "junk": "^3.1.0",
         "lodash.debounce": "^4.0.8",
         "lodash.pick": "^4.4.0",
         "micromatch": "^4.0.5",
+        "semver": "^7.5.4",
         "tmp-promise": "^3.0.3",
-        "tslib": "^2.4.0"
+        "tslib": "^2.6.2"
     },
     "devDependencies": {
-        "@types/fs-extra": "^9.0.13",
-        "@types/jest": "^29.0.3",
+        "@types/fs-extra": "^11.0.2",
+        "@types/jest": "^29.5.5",
         "@types/lodash.debounce": "^4.0.7",
         "@types/lodash.pick": "^4.4.7",
-        "@types/micromatch": "^4.0.2",
+        "@types/micromatch": "^4.0.3",
         "@types/node": "^10.11.0",
         "@types/vscode": "^1.37.0",
-        "@typescript-eslint/eslint-plugin": "^5.38.0",
-        "@typescript-eslint/parser": "^5.38.0",
+        "@typescript-eslint/eslint-plugin": "^6.7.5",
+        "@typescript-eslint/parser": "^6.7.5",
         "cross-env": "^7.0.3",
-        "eslint": "^8.23.1",
-        "eslint-config-zoro": "^5.34.0",
+        "eslint": "^8.51.0",
+        "eslint-config-zoro": "^6.0.1",
         "eslint-plugin-node": "^11.1.0",
-        "eslint-webpack-plugin": "^3.2.0",
-        "fork-ts-checker-webpack-plugin": "^7.2.13",
-        "husky": "^8.0.1",
-        "jest": "^29.0.3",
-        "lint-staged": "^13.0.3",
+        "eslint-webpack-plugin": "^4.0.1",
+        "fork-ts-checker-webpack-plugin": "^9.0.0",
+        "husky": "^8.0.3",
+        "jest": "^29.7.0",
+        "lint-staged": "^14.0.1",
         "native-ext-loader": "^2.3.0",
-        "rimraf": "^3.0.2",
-        "ts-jest": "^29.0.1",
-        "ts-loader": "^9.4.1",
-        "typescript": "^4.8.3",
-        "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0",
+        "rimraf": "^5.0.5",
+        "ts-jest": "^29.1.1",
+        "ts-loader": "^9.5.0",
+        "typescript": "^5.2.2",
+        "webpack": "^5.88.2",
+        "webpack-cli": "^5.1.4",
         "webpackbar": "^5.0.2"
     }
 }

src/core/Environment.ts

@@ -57,10 +57,15 @@ export class Environment
     public readonly snippetsDirectory: string;
 
     /**
-     * Gets the full path of VSCode's `.obsolete file`.
+     * Gets the full path of VSCode's `.obsolete` file.
      */
     public readonly obsoleteFilePath: string;
 
+    /**
+     * Gets the full path of VSCode's `extensions.json` file.
+     */
+    public readonly extensionsFilePath: string;
+
     private static _instance: Environment;
 
     private constructor()
@@ -76,6 +81,7 @@ export class Environment
         this.userDirectory = path.join(this.dataDirectory, "User");
         this.snippetsDirectory = this.getSettingsFilePath("snippets");
         this.obsoleteFilePath = path.join(this.extensionsDirectory, ".obsolete");
+        this.extensionsFilePath = path.join(this.extensionsDirectory, "extensions.json");
     }
 
     /**

src/core/Extension.ts

@@ -151,7 +151,7 @@ export class Extension
         }
 
         // Added since VSCode v1.20.
-        await this.updateObsolete(added, updated, removed);
+        await this.removeVSCodeExtensionFiles();
 
         return result as ISyncedItem;
     }
@@ -233,52 +233,21 @@ export class Extension
     }
 
     /**
-     * Updates the VSCode `.obsolete` file.
+     * Removes VSCode `.obsolete` and `extensions.json` file.
      */
-    public async updateObsolete(
-        added: IExtension[] = [],
-        removed: IExtension[] = [],
-        updated: IExtension[] = []
-    ): Promise<void>
+    public async removeVSCodeExtensionFiles(): Promise<void>
     {
-        const filepath = this._env.obsoleteFilePath;
-        // Record<extensionFolderName, boolean>
-        let obsolete: Record<string, boolean> | undefined;
         try
         {
-            obsolete = await fs.readJson(filepath);
-        }
-        catch
-        {
+            await fs.remove(this._env.obsoleteFilePath);
         }
+        catch { }
 
-        if (obsolete != null)
+        try
         {
-            for (const ext of [...added, ...updated])
-            {
-                delete obsolete[this._env.getExtensionDirectoryName(ext)];
-            }
-
-            for (const ext of removed)
-            {
-                obsolete[this._env.getExtensionDirectoryName(ext)] = true;
-            }
-
-            try
-            {
-                if (Object.keys(obsolete).length > 0)
-                {
-                    await fs.outputJson(filepath, obsolete);
-                }
-                else
-                {
-                    await fs.remove(filepath);
-                }
-            }
-            catch
-            {
-            }
+            await fs.remove(this._env.extensionsFilePath);
         }
+        catch { }
     }
 
     /**

src/core/Gist.ts

@@ -1,5 +1,5 @@
 import { Octokit } from "@octokit/rest";
-import * as createHttpsProxyAgent from "https-proxy-agent";
+import { HttpsProxyAgent } from "https-proxy-agent";
 import pick = require("lodash.pick");
 
 import { clearSpinner, showConfirmBox, showSpinner, statusError } from "./Toast";
@@ -44,7 +44,7 @@ export class Gist
         const options: { auth?: any; request: { agent?: any; timeout?: number } } = { request: { timeout: 8000 } };
         if (proxy != null && !isEmptyString(proxy))
         {
-            options.request.agent = createHttpsProxyAgent(proxy);
+            options.request.agent = new HttpsProxyAgent(proxy);
         }
 
         this._token = token;

src/core/Syncing.ts

@@ -4,6 +4,7 @@ import { Environment } from "./Environment";
 import { Gist } from "./Gist";
 import { isEmptyString } from "../utils/lang";
 import { localize } from "../i18n";
+import { normalizeHttpProxy } from "../utils/normalizer";
 import { openFile } from "../utils/vscodeAPI";
 import * as Toast from "./Toast";
 import type { ISyncingSettings } from "../types";
@@ -202,7 +203,7 @@ export class Syncing
             proxy = process.env["http_proxy"] ?? process.env["https_proxy"];
         }
 
-        return { ...settings, http_proxy: proxy };
+        return { ...settings, http_proxy: normalizeHttpProxy(proxy) };
     }
 
     /**

src/utils/ajax.ts

@@ -1,4 +1,4 @@
-import * as createHttpsProxyAgent from "https-proxy-agent";
+import { HttpsProxyAgent } from "https-proxy-agent";
 import * as fs from "fs-extra";
 import * as https from "https";
 import * as zlib from "zlib";
@@ -28,7 +28,7 @@ export function post(api: string, data: any, headers: any, proxy?: string): Prom
         };
         if (proxy != null && !isEmptyString(proxy))
         {
-            options.agent = createHttpsProxyAgent(proxy);
+            options.agent = new HttpsProxyAgent(proxy);
         }
 
         const req = https.request(api, options, res =>
@@ -74,7 +74,7 @@ export function downloadFile(uri: string, savepath: string, proxy?: string): Pro
         const options: https.RequestOptions = {};
         if (proxy != null && !isEmptyString(proxy))
         {
-            options.agent = createHttpsProxyAgent(proxy);
+            options.agent = new HttpsProxyAgent(proxy);
         }
 
         const file = fs.createWriteStream(savepath);

src/utils/normalizer.ts

@@ -0,0 +1,18 @@
+import { isEmptyString } from "./lang";
+
+// Matches schema, colon and two slashes.
+const URL_PREFIX_REGEX = /^(([^:/?#]+):)?\/\//i;
+
+/**
+ * Normalizes the Http proxy, fixing protocol.
+ */
+export function normalizeHttpProxy(proxy: string | undefined)
+{
+    if (proxy == null || isEmptyString(proxy) || URL_PREFIX_REGEX.test(proxy))
+    {
+        return proxy;
+    }
+
+    // Add HTTP scheme.
+    return `http://${proxy}`;
+}

src/utils/vscodeWebAPI.ts

@@ -1,4 +1,4 @@
-import { satisfies } from "compare-versions";
+import { coerce, satisfies } from "semver";
 import * as vscode from "vscode";
 
 import { CaseInsensitiveMap } from "../collections";
@@ -101,10 +101,10 @@ export function isVSIXSupported(version: ExtensionVersion, includePreRelease: bo
         }
     }
 
-    const requiredVersion = version.properties?.find(p => p.key === ExtensionPropertyType.ENGINE)?.value;
+    const requiredVersion = coerce(version.properties?.find(p => p.key === ExtensionPropertyType.ENGINE)?.value)?.version;
     try
     {
-        return requiredVersion == null ? true : satisfies(vscode.version, requiredVersion);
+        return requiredVersion == null ? true : satisfies(vscode.version, `^${requiredVersion}`);
     }
     catch
     {