graceful-updater 1.1.1-beta.0 → 1.1.1-beta.1

package/build/app-updator.js

@@ -13,6 +13,7 @@ class AppUpdator extends eventemitter3_1.EventEmitter {
         this.state = constants_1.StateType.Idle;
         this.options = options;
         this.logger = this._wrapLogger(options.logger);
+        this._windowHelperExeDir = this.options.getWindowsHelperExeDir?.();
         this.app = app || new elelctron_app_adapter_1.ElectronAppAdapter();
         this.startUuid = this._getStartUuid();
         this.logger.info('constructor');

package/build/utils/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestUpdateInfo = exports.existFile = exports.cleanOldArchive = exports.spawnAsync = exports.waitUntil = exports.sleep = exports.getMacOSAppPath = exports.sudoPrompt = exports.existsSync = exports.createWriteStream = exports.isMac = exports.isWin = exports.execAsync = exports.rimrafAsync = exports.readdirAsync = exports.existsAsync = exports.renameAsync = void 0;
+exports.getExecuteFile = exports.requestUpdateInfo = exports.existFile = exports.cleanOldArchive = exports.spawnAsync = exports.waitUntil = exports.sleep = exports.getMacOSAppPath = exports.sudoPrompt = exports.existsSync = exports.createWriteStream = exports.isMac = exports.isWin = exports.execAsync = exports.rimrafAsync = exports.readdirAsync = exports.existsAsync = exports.renameAsync = void 0;
 const path_1 = __importDefault(require("path"));
 const util_1 = __importDefault(require("util"));
 const urllib_1 = __importDefault(require("urllib"));
@@ -115,4 +115,8 @@ const requestUpdateInfo = async (options) => {
     return res.data;
 };
 exports.requestUpdateInfo = requestUpdateInfo;
+const getExecuteFile = (helperExeFileDir, file) => {
+    return path_1.default.join(helperExeFileDir, file);
+};
+exports.getExecuteFile = getExecuteFile;
 //# sourceMappingURL=index.js.map

package/build/windows-updator.js

@@ -36,10 +36,10 @@ class WindowsUpdator extends app_updator_1.AppUpdator {
         const { downloadTargetDir, resourcePath, latestAsarPath } = this.availableUpdate;
         this.logger.info('WindowsUpdator#doUnzip:start');
         try {
-            const unzipExe = graceful_updater_windows_helper_1.unzipExeFilePath;
+            const unzipExe = (0, utils_1.getExecuteFile)(this._windowHelperExeDir, graceful_updater_windows_helper_1.unzipExeFileName);
             const executeCommand = `"${unzipExe}" -o "${downloadTargetDir}" -d "${resourcePath}"`;
             await (0, utils_1.execAsync)(executeCommand);
-            if (!await (0, utils_1.existsAsync)(latestAsarPath)) {
+            if (!(await (0, utils_1.existsAsync)(latestAsarPath))) {
                 const zipInfoCommand = `"${unzipExe}" -Z -1 "${downloadTargetDir}"`;
                 const zipInfo = await (0, utils_1.execAsync)(zipInfoCommand, {
                     cwd: resourcePath,
@@ -85,7 +85,7 @@ class WindowsUpdator extends app_updator_1.AppUpdator {
         const productName = this.options?.productName;
         const { resourcePath } = this.availableUpdate;
         const exePath = this.app.exePath;
-        const updateExePath = graceful_updater_windows_helper_1.installerExeFilePath;
+        const updateExePath = (0, utils_1.getExecuteFile)(this._windowHelperExeDir, graceful_updater_windows_helper_1.installerExeFileName);
         const targetPath = path_1.default.resolve(exePath, '..', 'resources');
         const executeCommand = `"${updateExePath}" "${targetPath}" "${resourcePath}" "${productName}.exe" "${exePath}"`;
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graceful-updater",
-  "version": "1.1.1-beta.0",
+  "version": "1.1.1-beta.1",
   "description": "graceful-updater is a software updator management solution for Electron applications, It is convenient to complete full software update and dynamic update.",
   "scripts": {
     "build": "sh ./build.sh",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "eventemitter3": "^4.0.0",
-    "graceful-updater-windows-helper": "1.0.3-beta.0",
+    "graceful-updater-windows-helper": "1.0.3-beta.1",
     "lodash": "4",
     "moment": "2",
     "nanoid": "^3.3.4",

package/build/utils/install-macos-dmg/347/232/204/345/211/257/346/234/254.js

@@ -1,143 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const _1 = require(".");
-const index_1 = require("./index");
-const _log = (logger, e) => {
-    const message = (e.stack || e).toString();
-    logger.error?.(message);
-};
-exports.default = async (updatorOptions, logger, availableUpdate, updateInfo, preCheck = false) => {
-    const { productName } = updatorOptions || {};
-    const { downloadTargetDir } = availableUpdate || {};
-    const appPath = (0, _1.getMacOSAppPath)();
-    const tmpPath = path_1.default.join(os_1.default.tmpdir(), String(new Date().getTime())); // 本地临时文件使用的目录
-    const volumesPath = path_1.default.join('/Volumes', updatorOptions.dmgTitleFormatter ? updatorOptions.dmgTitleFormatter(updatorOptions, updateInfo) : productName);
-    const volumesAppPath = path_1.default.join(volumesPath, `${productName}.app`);
-    // step 1: 检测是否支持 hdiutil;
-    try {
-        const res = (await (0, index_1.spawnAsync)('which', ['hdiutil']));
-        if (!res.includes('/bin/hdiutil')) {
-            throw new Error('hdiutil not found');
-        }
-    }
-    catch (error) {
-        if (preCheck) {
-            _log(logger, error);
-        }
-        return {
-            success: false,
-            error,
-        };
-    }
-    // step 2: eject 一次 volume 下的 app，兜底，避免上一次结束时执行失败
-    try {
-        await (0, index_1.spawnAsync)('hdiutil', ['eject', volumesPath]);
-    }
-    catch (e) {
-        // 如果前一次更新时 eject 成功，这里文件不存在会报错，是个正常的 case，不用处理上报
-    }
-    const volumeAppNotExist = await (0, _1.waitUntil)(() => !(0, index_1.existsSync)(volumesAppPath), {
-        ms: 300,
-        retryTime: 5,
-    });
-    if (!volumeAppNotExist) {
-        const error = new Error('volume not exists');
-        if (preCheck) {
-            _log(logger, error);
-        }
-        return {
-            success: false,
-            error,
-        };
-    }
-    // step 3: 执行 hdiutil attach，挂载 dmg
-    try {
-        await (0, index_1.spawnAsync)('hdiutil', ['attach', downloadTargetDir]);
-    }
-    catch (error) {
-        _log(logger, error);
-    }
-    // 判断有没有新的 dmg 文件，没有的话提示用户重新下载
-    const volumeAppExist = await (0, _1.waitUntil)(() => (0, index_1.existsSync)(volumesAppPath), {
-        ms: 300,
-        retryTime: 5,
-    });
-    if (!volumeAppExist) {
-        const error = new Error('attach fail');
-        if (preCheck) {
-            _log(logger, error);
-        }
-        return {
-            success: false,
-            error,
-        };
-    }
-    if (preCheck) {
-        // 如果是预检查，直接返回
-        try {
-            await (0, index_1.spawnAsync)('hdiutil', ['eject', volumesPath]);
-        }
-        catch (error) {
-            _log(logger, error);
-        }
-        return {
-            success: true,
-        };
-    }
-    // step 4: 将当前目录下的 app 移到临时目录，如果后续操作失败了兜底用
-    try {
-        await (0, index_1.spawnAsync)('mv', [appPath, tmpPath]);
-    }
-    catch (error) {
-        error.customMessage = 'step4 mv to tmp path error';
-        _log(logger, error);
-    }
-    // 看临时目录文件是否移动成功
-    const tmpPathExist = await (0, _1.waitUntil)(() => (0, index_1.existsSync)(tmpPath), {
-        ms: 300,
-        retryTime: 5,
-    });
-    if (!tmpPathExist) {
-        const error = new Error('cp to tmp path fail');
-        return {
-            success: false,
-            error,
-        };
-    }
-    // step 5: 将新的 app 文件移动到 Applications 目录下，如果失败 or 查不到移入文件，将临时目录下的文件移动回来
-    try {
-        await (0, index_1.spawnAsync)('cp', ['-R', volumesAppPath, appPath]);
-    }
-    catch (error) {
-        _log(logger, error);
-    }
-    const appExist = await (0, _1.waitUntil)(() => (0, index_1.existsSync)(appPath), {
-        ms: 300,
-        retryTime: 5,
-    });
-    // 查不到新移入的 dmg，将原 dmg 再移动回来
-    if (!appExist) {
-        const error = new Error('cp to app fail');
-        await (0, index_1.spawnAsync)('mv', [tmpPath, appPath]);
-        return {
-            success: false,
-            error,
-        };
-    }
-    // step 6: 执行 hdiutil eject，推出
-    try {
-        await (0, index_1.spawnAsync)('hdiutil', ['eject', volumesPath]);
-    }
-    catch (error) {
-        _log(logger, error);
-    }
-    return {
-        success: true,
-    };
-};
-//# sourceMappingURL=install-macos-dmg%E7%9A%84%E5%89%AF%E6%9C%AC.js.map