From 1fa563b5143cc9228b38c6eb439c3ce324b6ec77 Mon Sep 17 00:00:00 2001
From: Oj <oj@oojmed.com>
Date: Fri, 28 Jan 2022 20:45:04 +0000
Subject: [PATCH] [Updater > App] Self rewrite

---
 src/splash/{splashScreen.js => index.js} |  0
 src/updater/appUpdater.js                | 84 +++++++-----------------
 2 files changed, 23 insertions(+), 61 deletions(-)
 rename src/splash/{splashScreen.js => index.js} (100%)

diff --git a/src/splash/splashScreen.js b/src/splash/index.js
similarity index 100%
rename from src/splash/splashScreen.js
rename to src/splash/index.js
diff --git a/src/updater/appUpdater.js b/src/updater/appUpdater.js
index 211af4b..ffdf99f 100644
--- a/src/updater/appUpdater.js
+++ b/src/updater/appUpdater.js
@@ -1,73 +1,35 @@
-"use strict";
+const { init: moduleInit } = require('./moduleUpdater');
+const updater = require('./updater');
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.update = update;
-exports.focusSplash = focusSplash;
+const settings = require('../appSettings').getSettings();
+const buildInfo = require('../utils/buildInfo');
+const { UPDATE_ENDPOINT, NEW_UPDATE_ENDPOINT } = require('../Constants');
 
-var _fs = _interopRequireDefault(require("fs"));
+const { fatal, handled } = require('../errorHandler');
+const { performFirstRunTasks } = require('../firstRun');
+const { update: autostartUpdate } = require('../autoStart');
+const { initSplash, focusWindow, APP_SHOULD_LAUNCH, APP_SHOULD_SHOW, events: splashEvents } = require('../splash');
 
-var _path = _interopRequireDefault(require("path"));
 
-var moduleUpdater = _interopRequireWildcard(require("./moduleUpdater"));
+exports.update = (startMin, done, show) => {
+  if (updater.tryInitUpdater(buildInfo, NEW_UPDATE_ENDPOINT)) {
+    const updater = updater.getUpdater();
 
-var paths = _interopRequireWildcard(require("../paths"));
-
-var _updater = require("./updater");
-
-var _appSettings = require("../appSettings");
-
-var autoStart = _interopRequireWildcard(require("../autoStart"));
-
-var _buildInfo = _interopRequireDefault(require("../utils/buildInfo"));
-
-var _errorHandler = require("../errorHandler");
-
-var firstRun = _interopRequireWildcard(require("../firstRun"));
-
-var splashScreen = _interopRequireWildcard(require("../splash/splashScreen"));
-
-var _Constants = require("../Constants");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// settings
-const USE_PINNED_UPDATE_MANIFEST = 'USE_PINNED_UPDATE_MANIFEST';
-
-function update(startMinimized, doneCallback, showCallback) {
-  const settings = (0, _appSettings.getSettings)();
-
-  if ((0, _updater.tryInitUpdater)(_buildInfo.default, _Constants.NEW_UPDATE_ENDPOINT)) {
-    const updater = (0, _updater.getUpdater)();
-    const usePinnedUpdateManifest = settings.get(USE_PINNED_UPDATE_MANIFEST);
     updater.on('host-updated', () => {
-      autoStart.update(() => {});
+      autostartUpdate(() => {});
     });
-    updater.on('unhandled-exception', _errorHandler.fatal);
-    updater.on(_updater.INCONSISTENT_INSTALLER_STATE_ERROR, _errorHandler.fatal);
-    updater.on('update-error', _errorHandler.handled);
+    updater.on('unhandled-exception', fatal);
+    updater.on(updater.INCONSISTENT_INSTALLER_STATE_ERROR, fatal);
+    updater.on('update-error', handled);
 
-    if (usePinnedUpdateManifest) {
-      const manifestPath = _path.default.join(paths.getUserData(), 'pinned_update.json');
-
-      updater.setPinnedManifestSync(JSON.parse(_fs.default.readFileSync(manifestPath)));
-    }
-
-    firstRun.performFirstRunTasks(updater);
+    performFirstRunTasks(updater);
   } else {
-    moduleUpdater.init(_Constants.UPDATE_ENDPOINT, settings, _buildInfo.default);
+    moduleInit(UPDATE_ENDPOINT, settings, buildInfo);
   }
 
-  splashScreen.initSplash(startMinimized);
-  splashScreen.events.once(splashScreen.APP_SHOULD_LAUNCH, doneCallback);
-  splashScreen.events.once(splashScreen.APP_SHOULD_SHOW, showCallback);
-}
+  initSplash(startMin);
+  splashEvents.once(APP_SHOULD_LAUNCH, done);
+  splashEvents.once(APP_SHOULD_SHOW, show);
+};
 
-function focusSplash() {
-  splashScreen.focusWindow();
-}
\ No newline at end of file
+exports.focusSplash = () => focusWindow();
\ No newline at end of file