Improve: Follow up on task T335086

AnYiEE · Apr 21, 2023 · 83a3142 · 83a3142
1 parent 742d1c4
commit 83a3142
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/conf/wiki-sub.conf b/conf/wiki-sub.conf
@@ -6,6 +6,7 @@ subs_filter  mapServer=mw\.config\.get\(('|\")wgKartographerMapServer\1\) mapSer
 subs_filter  phab\.wmfusercontent\.org phab.example.org ir;
 subs_filter  recommend\.wmflabs\.org recommend.wikimirror.net ir;
 subs_filter  wma\.wmcloud\.org wma.example.org ir;
+subs_filter  xtools\.wmcloud\.org\/api\/ xtools-api.example.org/ ir;
 subs_filter  xtools\.wmflabs\.org\/api\/ xtools-api.example.org/ ir;
 ############bug fix
 subs_filter  (?:m\.www\.|www\.m\.)(mediawiki|wikidata)\.org m.$1.example.org r;

diff --git a/conf/wiki.nginx b/conf/wiki.nginx
@@ -561,16 +561,16 @@ server {
         }
         error_page              404 = @errors;
         include                 /path/to/wikimirror/conf/wiki.conf;
-        proxy_pass              https://xtools.wmflabs.org/api/;
+        proxy_pass              https://xtools.wmcloud.org/api/;
         proxy_hide_header       access-control-allow-headers;
         proxy_hide_header       access-control-allow-methods;
         proxy_hide_header       access-control-allow-origin;
         proxy_hide_header       set-cookie;
         proxy_hide_header       x-clacks-overhead;
         proxy_intercept_errors  on;
         proxy_set_header        Accept-Encoding "";
-        proxy_set_header        Host xtools.wmflabs.org;
-        proxy_set_header        Referer https://xtools.wmflabs.org$request_uri;
+        proxy_set_header        Host xtools.wmcloud.org;
+        proxy_set_header        Referer https://xtools.wmcloud.org$request_uri;
     }
     location @errors {
         return 204;

diff --git a/static/wikimirror.js b/static/wikimirror.js
@@ -52,6 +52,7 @@ const WikiMirrorStartup = async function WikiMirrorStartup() {
 		},
 		regexps: {
 			noDarkmode: /developer|techblog/,
+			xtools_api: /xtools\.(wmcloud|wmflabs)\.org\/api\//i,
 		},
 	};
 	const privateMethod = new WikiMirrorPrivateMethod(config);
@@ -97,11 +98,7 @@ const WikiMirrorStartup = async function WikiMirrorStartup() {
 		},
 		onResponse: (response, handler) => {
 			const contentType = response.headers['content-type'] ?? response.headers['Content-Type'];
-			if (
-				contentType &&
-				/json|text|xml/i.test(contentType) &&
-				!/css|(ecma|java)script/i.test(contentType)
-			) {
+			if (contentType && /json|text|xml/i.test(contentType) && !/css|(ecma|java)script/i.test(contentType)) {
 				response = privateMethod.ahCallback_Response(response);
 			}
 			handler.next(response);
@@ -316,9 +313,8 @@ const WikiMirrorPrivateMethod = class WikiMirrorPrivateMethod {
 				if (domHref.match(RegexUrlRoot)) {
 					dom.href = this.getRealText(domHref);
 				}
-				const XTOOLS_API = 'xtools.wmflabs.org/api/';
-				if (domHref.includes(XTOOLS_API)) {
-					dom.href = domHref.replace(XTOOLS_API, `xtools-api.${this.MIRROR_DOMAIN}/`);
+				if (this.regexps.xtools_api.test(domHref)) {
+					dom.href = domHref.replace(this.regexps.xtools_api, `xtools-api.${this.MIRROR_DOMAIN}/`);
 				}
 			}
 			for (const dom of [
@@ -365,7 +361,7 @@ const WikiMirrorPrivateMethod = class WikiMirrorPrivateMethod {
 		} else {
 			value = value
 				.replace(new RegExp(`phab\\.${this.MIRROR_DOMAIN}`, 'gi'), 'phab.wmfusercontent.org')
-				.replace(new RegExp(`xtools-api\\.${this.MIRROR_DOMAIN}\\/`, 'gi'), 'xtools.wmflabs.org/api/')
+				.replace(new RegExp(`xtools-api\\.${this.MIRROR_DOMAIN}\\/`, 'gi'), 'xtools.wmcloud.org/api/')
 				.replace(new RegExp(`wma\\.${this.MIRROR_DOMAIN_REGEX}`, 'gi'), 'wma.wmcloud.org')
 				.replace(new RegExp(`recommend\\.${this.MIRROR_DOMAIN_REGEX}`, 'gi'), 'recommend.wmflabs.org')
 				.replace(RegexUrlLatex, 'wikimedia.org/api/rest_v1/media/math/render/$1')
@@ -1753,8 +1749,7 @@ const WikiMirrorPrivateMethod = class WikiMirrorPrivateMethod {
 					getObj.host = `wma.${this.MIRROR_DOMAIN}`;
 				}
 				const urlWithPath = `${getObj.host}${getObj.pathname}`;
-				const XTOOLS_API = 'xtools.wmflabs.org/api/';
-				if (urlWithPath.includes(XTOOLS_API)) {
+				if (this.regexps.xtools_api.test(urlWithPath)) {
 					const path = this.getRealText(getObj.pathname);
 					getObj.host = `xtools-api.${this.MIRROR_DOMAIN}`;
 					getObj.pathname = path.replace('/api/', '/');