update: 清理文件锁相关内容 (#568)

Author: shalldie

package-lock.json

@@ -316,7 +316,6 @@
   },
   "devDependencies": {
     "@ianvs/prettier-plugin-sort-imports": "^4.7.0",
-    "@types/lockfile": "^1.0.4",
     "@types/node": "^24",
     "@types/stylis": "^4.2.7",
     "@types/uglify-js": "^3.17.5",
@@ -334,7 +333,6 @@
   "dependencies": {
     "@vscode/sudo-prompt": "^9.3.1",
     "fast-glob": "^3.3.3",
-    "lockfile": "^1.0.4",
     "stylis": "^4.3.6",
     "uglify-js": "^3.19.3"
   }

package.json

@@ -177,7 +177,6 @@ export class CssFile {
      */
     public async uninstall(): Promise<boolean> {
         try {
-            await _.lock();
             let content = await this.getContent();
             content = this.clearContent(content);
             // 异常case return
@@ -188,8 +187,6 @@ export class CssFile {
         } catch (ex) {
             console.log(ex);
             return false;
-        } finally {
-            await _.unlock();
         }
     }
 }

src/background/CssFile.ts

@@ -146,14 +146,11 @@ export abstract class AbsPatchFile {
 
     public async restore() {
         try {
-            await _.lock();
             let content = await this.getContent();
             content = this.cleanPatches(content);
             return await this.write(content);
         } catch {
             return false;
-        } finally {
-            await _.unlock();
         }
     }
 }

src/background/PatchFile/PatchFile.base.ts

@@ -1,4 +1,3 @@
-import { _ } from '../../utils';
 import { BACKGROUND_VER, VERSION } from '../../utils/constants';
 import { AbsPatchFile } from './PatchFile.base';
 
@@ -15,7 +14,6 @@ import { AbsPatchFile } from './PatchFile.base';
 export class JsPatchFile extends AbsPatchFile {
     public async applyPatches(patchContent: string): Promise<boolean> {
         try {
-            await _.lock();
             const curContent = await this.getContent();
             let content = this.cleanPatches(curContent);
             content += [
@@ -33,8 +31,6 @@ export class JsPatchFile extends AbsPatchFile {
             return await this.write(content);
         } catch {
             return false;
-        } finally {
-            await _.unlock();
         }
     }
 

src/background/PatchFile/PatchFile.javascript.ts

@@ -20,8 +20,5 @@ export const EXTENSION_NAME: string = pkg.name;
 /** 扩展ID */
 export const EXTENSION_ID = `${PUBLISHER}.${EXTENSION_NAME}`;
 
-/** 文件锁路径 */
-export const LOCK_PATH = path.join(__dirname, '../../', `${EXTENSION_ID}.lock`);
-
 /** 版本临时文件，存放js路径、标识初次安装 */
 export const TOUCH_JSFILE_PATH = path.join(__dirname, `../../vscb.${VERSION}.js.touch`);

src/utils/constants.ts

@@ -1,7 +1,5 @@
 import sudo from '@vscode/sudo-prompt';
-import lockfile from 'lockfile';
 
-import { LOCK_PATH } from './constants';
 import { vsc } from './vsc';
 
 export namespace _ {
@@ -32,48 +30,6 @@ export namespace _ {
         });
     }
 
-    /**
-     * 添加文件锁
-     *
-     * @export
-     * @return {*}
-     */
-    export function lock() {
-        return new Promise<void>((resolve, reject) => {
-            lockfile.lock(
-                LOCK_PATH,
-                {
-                    // When multiple VSCode instances are running, all instances' commands need to be executed within the `wait` time
-                    // 在打开了多个vscode实例时，需要所有实例的命令在`wait`时间内执行完毕
-                    wait: 1000 * 30
-                },
-                err => {
-                    if (err) {
-                        return reject(err);
-                    }
-                    resolve();
-                }
-            );
-        });
-    }
-
-    /**
-     * 取消文件锁
-     *
-     * @export
-     * @return {*}
-     */
-    export function unlock() {
-        return new Promise<void>((resolve, reject) => {
-            lockfile.unlock(LOCK_PATH, err => {
-                if (err) {
-                    return reject(err);
-                }
-                resolve();
-            });
-        });
-    }
-
     /**
      * 提权运行
      *