Merge pull request #15571 from nextcloud/enhancement/maintenance-mode-bundle

Migrate the maintenance script to a modern module and bundle

core/js/maintenance-check.js

@@ -1,17 +0,0 @@
-// Check every 20 seconds via status.php if maintenance is over
-window.setInterval(checkStatus, 20000);
-
-function checkStatus() {
-	var request = new XMLHttpRequest();
-	request.open("GET", OC.getRootPath()+'/status.php', true);
-	request.onreadystatechange = function() {
-		if (request.readyState === 4) {
-			var response = request.responseText;
-			var responseobj = JSON.parse(response);
-			if (responseobj.maintenance === false) {
-				window.location.reload();
-			}
-		}
-	};
-	request.send();
-}

core/src/maintenance.js

@@ -0,0 +1,49 @@
+/*
+ * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import Axios from 'nextcloud-axios'
+
+import OC from './OC/index'
+
+const url = `${OC.getRootPath()}/status.php`
+
+const check = () => {
+	console.info('checking the Nextcloud maintenance status')
+	Axios.get(url)
+		.then(resp => resp.data)
+		.then(status => {
+			if (status.maintenance === false) {
+				console.info('Nextcloud is not in maintenance mode anymore -> reloading')
+
+				window.location.reload()
+				return
+			}
+
+			console.info('Nextcloud is still in maintenance mode')
+
+			// Wait 20sec before the next request
+			setTimeout(check, 20 * 1000);
+		})
+		.catch(console.error.bind(this))
+};
+
+// Off we go!
+check();

core/webpack.js

@@ -5,7 +5,8 @@ module.exports = [
 	{
 		entry: {
 			login: path.join(__dirname, 'src/login.js'),
-			main: path.join(__dirname, 'src/main.js')
+			main: path.join(__dirname, 'src/main.js'),
+			maintenance: path.join(__dirname, 'src/maintenance.js'),
 		},
 		output: {
 			filename: '[name].js',

lib/base.php

@@ -292,7 +292,7 @@ class OC {
 
 			// render error page
 			$template = new OC_Template('', 'update.user', 'guest');
-			OC_Util::addScript('maintenance-check');
+			OC_Util::addScript('dist/maintenance');
 			OC_Util::addStyle('core', 'guest');
 			$template->printPage();
 			die();