mwoffliner 1.17.4 → 2.0.0

package/lib/Logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../src/Logger.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;AAGlE,IAAI,YAAY,GAAG,OAAO,CAAA;AAE1B,MAAM,SAAS,GAAG,CAAC,KAAe,EAAE,EAAE;IACpC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,iBAAiB,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IACzD,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9C,OAAO,aAAa,IAAI,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;AAC1D,CAAC,CAAA;AAED,MAAM,KAAK,GAAG,CAAC,IAAc,EAAE,IAAW,EAAE,EAAE;IAC5C,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,MAAM,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;IAClD,CAAC;AACH,CAAC,CAAA;AAED,MAAM,KAAK,GAAG,GAAG,EAAE;IACjB,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;AACjC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAsB,EAAE,EAAE;IACxD,YAAY,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAA;AAChD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;IACrC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;IACpC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AACpB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;IACrC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;IACtC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAU,EAAE,EAAE;IACxC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,GAAG,GAAG;aACZ,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;aACX,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,SAAS,CAAC;aACnC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../src/Logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,UAAU,MAAM,aAAa,CAAA;AAEpC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAU,CAAA;AAG9E,2FAA2F;AAC3F,sFAAsF;AACtF,MAAM,MAAM,GAAG,UAAU,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK;IACvC,WAAW,EAAE,OAAO,CAAC,MAAM;IAC3B,MAAM,EAAE,cAAc;IACtB,aAAa,EAAE,2BAA2B;CAC3C,CAAC,CAAA;AACF,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAe,EAAE,EAAE;IAC7C,KAAK,CAAC,KAAK,GAAG,KAAK,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,SAA8C,EAAE,EAAE;IACnE,OAAO,CAAC,GAAW,EAAE,GAAG,IAAW,EAAE,EAAE;QACrC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,KAAK,EAAE,CAAC;YAClD,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;QACzC,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;QACxC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAA;QACvB,CAAC;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;AACvC,MAAM,CAAC,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;AACrC,MAAM,CAAC,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;AACrC,MAAM,CAAC,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;AAEvC,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAU,EAAE,EAAE;IACxC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,GAAG,GAAG;aACZ,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;aACX,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,SAAS,CAAC;aACnC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;AACH,CAAC,CAAA"}

package/lib/MediaWiki.d.ts

@@ -1,17 +1,15 @@
 import { Gadget } from './Gadgets.js';
 import BaseURLDirector from './util/builders/url/base.director.js';
-import WikimediaDesktopURLDirector from './util/builders/url/desktop.director.js';
-import WikimediaMobileURLDirector from './util/builders/url/mobile.director.js';
-import VisualEditorURLDirector from './util/builders/url/visual-editor.director.js';
-import RestApiURLDirector from './util/builders/url/rest-api.director.js';
 import ActionParseURLDirector from './util/builders/url/action-parse.director.js';
 export interface QueryOpts {
     action: string;
     format: string;
     prop: string;
     rdlimit: string;
-    rdnamespace: string | number;
     rdprop: string;
+    ppprop: string;
+    clprop: string;
+    cllimit: string;
     redirects?: boolean;
     formatversion: string;
     maxlag: string;
@@ -68,6 +66,7 @@ export interface SiteInfoGeneral {
     variants?: {
         code: string;
     }[];
+    categorycollation: string;
 }
 export interface SiteInfoSkin {
     code: string;
@@ -82,30 +81,21 @@ declare class MediaWiki {
     metaData: MWMetaData;
     baseUrl: URL;
     getCategories: boolean;
+    categoriesPageSize: number;
     namespaces: MWNamespaces;
     namespacesToMirror: string[];
-    apiCheckArticleId: string;
+    apiCheckPageTitle: PageTitle;
     queryOpts: QueryOpts;
     urlDirector: BaseURLDirector;
     skin: string;
-    wikimediaDesktopUrlDirector: WikimediaDesktopURLDirector;
-    wikimediaMobileUrlDirector: WikimediaMobileURLDirector;
-    visualEditorUrlDirector: VisualEditorURLDirector;
-    restApiUrlDirector: RestApiURLDirector;
     actionParseUrlDirector: ActionParseURLDirector;
-    visualEditorApiUrl: URL;
     actionApiUrl: URL;
-    restApiUrl: URL;
     webUrl: URL;
-    wikimediaDesktopApiUrl: URL;
-    wikimediaMobileApiUrl: URL;
     modulePath: string;
-    mobileModulePath: string;
     set username(value: string);
     set password(value: string);
     get actionApiPath(): string;
     set actionApiPath(value: string);
-    set restApiPath(value: string);
     set domain(value: string);
     set wikiPath(value: string);
     set indexPhpPath(value: string);
@@ -113,39 +103,32 @@ declare class MediaWiki {
     set modulePathOpt(value: string);
     private initializeMediaWikiDefaults;
     private constructor();
-    hasWikimediaDesktopApi(): Promise<boolean>;
-    hasWikimediaMobileApi(): Promise<boolean>;
-    hasVisualEditorApi(): Promise<boolean>;
-    hasRestApi(): Promise<boolean>;
     hasActionParseApi(): Promise<boolean>;
     hasCoordinates(): Promise<boolean>;
     hasModuleApi(): Promise<boolean>;
-    private setWikimediaDesktopApiUrl;
-    private setWikimediaMobileApiUrl;
-    private setRestApiURL;
-    private setVisualEditorURL;
+    hasFlaggedRevs(): Promise<boolean>;
     private setModuleURL;
-    private setMobileModuleUrl;
-    login(): Promise<void>;
-    setNamespaces(json: SiteInfoQueryResponse, addNamespaces: number[]): void;
-    extractPageTitleFromHref(href: any): any;
+    login(mightBeAlreadyLoggedIn?: boolean): Promise<void>;
+    setNamespaces(json: SiteInfoQueryResponse, addNamespaces: number[], onlyNamespaces: number[]): void;
+    extractPageTitleFromHref(href: any): PageTitle;
     getCreatorName(): string;
     getDefaultSkin(skins: SiteInfoSkin[]): string;
-    getSiteInfo({ mwWikiPath, mwIndexPhpPath, addNamespaces, mwRestApiPath, mwModulePath, forceSkin, langVariant }?: SiteInfoArgv): Promise<{
+    getSiteInfo({ addNamespaces, onlyNamespaces, mwModulePath, forceSkin, langVariants }?: GetSiteInfoArgv): Promise<{
         mainPage: string;
         mainPageIsDomainRoot: boolean;
         siteName: string;
         textDir: string;
         langMw: string;
-        langVar: string;
         langIso2: any;
         langIso3: any;
         logo: string;
         licenseName: string;
         licenseUrl: string;
         subTitle: string;
+        categoryCollation: string;
+        versionMw: string;
     }>;
-    getMwMetaData(argvOpts?: SiteInfoArgv): Promise<MWMetaData>;
+    getMwMetaData(argvOpts?: GetSiteInfoArgv): Promise<MWMetaData>;
     reset(): void;
 }
 declare const _default: MediaWiki;

package/lib/MediaWiki.js

@@ -8,10 +8,6 @@ import semver from 'semver';
 import basicURLDirector from './util/builders/url/basic.director.js';
 import BaseURLDirector from './util/builders/url/base.director.js';
 import ApiURLDirector from './util/builders/url/api.director.js';
-import WikimediaDesktopURLDirector from './util/builders/url/desktop.director.js';
-import WikimediaMobileURLDirector from './util/builders/url/mobile.director.js';
-import VisualEditorURLDirector from './util/builders/url/visual-editor.director.js';
-import RestApiURLDirector from './util/builders/url/rest-api.director.js';
 import ActionParseURLDirector from './util/builders/url/action-parse.director.js';
 import { checkApiAvailability } from './util/mw-api.js';
 import { BLACKLISTED_NS } from './util/const.js';
@@ -27,9 +23,10 @@ class MediaWiki {
     metaData;
     baseUrl;
     getCategories;
+    categoriesPageSize;
     namespaces = {};
     namespacesToMirror = [];
-    apiCheckArticleId;
+    apiCheckPageTitle;
     queryOpts;
     urlDirector;
     skin = 'vector'; // Default fallback
@@ -37,31 +34,18 @@ class MediaWiki {
     #indexPhpPath;
     #actionApiPath;
     #modulePathOpt;
-    #restApiPath;
     #username;
     #password;
     #domain;
-    wikimediaDesktopUrlDirector;
-    wikimediaMobileUrlDirector;
-    visualEditorUrlDirector;
-    restApiUrlDirector;
     actionParseUrlDirector;
-    visualEditorApiUrl;
     actionApiUrl;
-    restApiUrl;
     webUrl;
-    wikimediaDesktopApiUrl;
-    wikimediaMobileApiUrl;
     modulePath; // only for reading
-    mobileModulePath;
     #apiUrlDirector;
-    #hasWikimediaDesktopApi;
-    #hasWikimediaMobileApi;
-    #hasVisualEditorApi;
-    #hasRestApi;
     #hasActionParseApi;
     #hasCoordinates;
     #hasModuleApi;
+    #hasFlaggedRevs;
     set username(value) {
         this.#username = value;
     }
@@ -75,13 +59,7 @@ class MediaWiki {
         if (value) {
             this.#actionApiPath = value;
             this.actionApiUrl = this.urlDirector.buildURL(this.#actionApiPath);
-            this.setVisualEditorURL();
-        }
-    }
-    set restApiPath(value) {
-        if (value) {
-            this.#restApiPath = value;
-            this.setRestApiURL();
+            this.#apiUrlDirector = new ApiURLDirector(this.actionApiUrl.href);
         }
     }
     set domain(value) {
@@ -91,7 +69,7 @@ class MediaWiki {
         if (value) {
             this.#wikiPath = value;
             this.webUrl = this.urlDirector.buildURL(this.#wikiPath);
-            logger.log(`webUrl: ${this.webUrl}`);
+            logger.info(`webUrl: ${this.webUrl}`);
         }
     }
     set indexPhpPath(value) {
@@ -105,12 +83,8 @@ class MediaWiki {
             this.urlDirector = new BaseURLDirector(this.baseUrl.href);
             this.webUrl = this.urlDirector.buildURL(this.#wikiPath);
             this.actionApiUrl = this.urlDirector.buildURL(this.#actionApiPath);
-            this.setWikimediaDesktopApiUrl();
-            this.setWikimediaMobileApiUrl();
-            this.setRestApiURL();
-            this.setVisualEditorURL();
+            this.#apiUrlDirector = new ApiURLDirector(this.actionApiUrl.href);
             this.setModuleURL();
-            this.setMobileModuleUrl();
         }
     }
     set modulePathOpt(value) {
@@ -130,98 +104,58 @@ class MediaWiki {
         this.#password = '';
         this.getCategories = false;
         this.#actionApiPath = '/w/api.php';
-        this.#restApiPath = '/w/rest.php';
         this.#wikiPath = '/wiki/';
         this.#indexPhpPath = '/w/index.php';
         this.#modulePathOpt = '/w/load.php';
         this.namespaces = {};
         this.namespacesToMirror = [];
-        this.apiCheckArticleId = 'MediaWiki:Sidebar';
+        this.apiCheckPageTitle = 'MediaWiki:Sidebar';
         this.queryOpts = {
             action: 'query',
             format: 'json',
-            prop: 'info|redirects|revisions',
+            prop: 'info|redirects|revisions|categoryinfo|pageprops|categories',
             rdlimit: 'max',
-            rdnamespace: '0',
             // pageid in rdprop is not mandatory in general, but required for proper
             // mdwiki API operation
             rdprop: 'pageid|title|fragment',
+            ppprop: 'nogallery',
+            clprop: 'hidden',
+            cllimit: 'max',
             redirects: false,
             formatversion: '2',
             maxlag: config.defaults.maxlag,
         };
-        this.#hasWikimediaDesktopApi = null;
-        this.#hasWikimediaMobileApi = null;
-        this.#hasVisualEditorApi = null;
-        this.#hasRestApi = null;
         this.#hasActionParseApi = null;
         this.#hasCoordinates = null;
         this.#hasModuleApi = null;
+        this.#hasFlaggedRevs = null;
         this.metaData = null;
     }
     constructor() {
         this.initializeMediaWikiDefaults();
     }
-    async hasWikimediaDesktopApi() {
-        if (this.#hasWikimediaDesktopApi === null) {
-            this.wikimediaDesktopUrlDirector = new WikimediaDesktopURLDirector(this.wikimediaDesktopApiUrl.href);
-            const checkUrl = this.wikimediaDesktopUrlDirector.buildArticleURL(this.apiCheckArticleId);
-            this.#hasWikimediaDesktopApi = await checkApiAvailability(checkUrl);
-            logger.log('Checked for WikimediaDesktopApi at', checkUrl, '-- result is: ', this.#hasWikimediaDesktopApi);
-        }
-        return this.#hasWikimediaDesktopApi;
-    }
-    async hasWikimediaMobileApi() {
-        if (this.#hasWikimediaMobileApi === null) {
-            this.wikimediaMobileUrlDirector = new WikimediaMobileURLDirector(this.wikimediaMobileApiUrl.href);
-            const checkUrl = this.wikimediaMobileUrlDirector.buildArticleURL(this.apiCheckArticleId);
-            this.#hasWikimediaMobileApi = await checkApiAvailability(checkUrl);
-            logger.log('Checked for WikimediaMobileApi at', checkUrl, '-- result is: ', this.#hasWikimediaMobileApi);
-        }
-        return this.#hasWikimediaMobileApi;
-    }
-    async hasVisualEditorApi() {
-        if (this.#hasVisualEditorApi === null) {
-            this.visualEditorUrlDirector = new VisualEditorURLDirector(this.visualEditorApiUrl.href);
-            const checkUrl = this.visualEditorUrlDirector.buildArticleURL(this.apiCheckArticleId);
-            this.#hasVisualEditorApi = await checkApiAvailability(checkUrl, this.visualEditorUrlDirector.validMimeTypes);
-            logger.log('Checked for VisualEditorApi at', checkUrl, '-- result is: ', this.#hasVisualEditorApi);
-        }
-        return this.#hasVisualEditorApi;
-    }
-    async hasRestApi() {
-        if (this.#hasRestApi === null) {
-            this.restApiUrlDirector = new RestApiURLDirector(this.restApiUrl.href);
-            const checkUrl = this.restApiUrlDirector.buildArticleURL(this.apiCheckArticleId);
-            this.#hasRestApi = await checkApiAvailability(checkUrl);
-            logger.log('Checked for RestApi at', checkUrl, '-- result is: ', this.#hasRestApi);
-        }
-        return this.#hasRestApi;
-    }
     async hasActionParseApi() {
         if (this.#hasActionParseApi === null) {
-            this.actionParseUrlDirector = new ActionParseURLDirector(this.actionApiUrl.href, this.skin, this.metaData.langVar);
-            const checkUrl = this.actionParseUrlDirector.buildArticleURL(this.apiCheckArticleId);
+            this.actionParseUrlDirector = new ActionParseURLDirector(this.actionApiUrl.href, this.skin);
+            const checkUrl = this.actionParseUrlDirector.buildPageUrl(this.apiCheckPageTitle);
             this.#hasActionParseApi = await checkApiAvailability(checkUrl);
-            logger.log(`Checked for ActionParseApi at ${checkUrl} -- result is: ${this.#hasActionParseApi}`);
+            logger.info(`Checked for ActionParseApi at ${checkUrl} -- result is: ${this.#hasActionParseApi}`);
         }
         return this.#hasActionParseApi;
     }
     async hasCoordinates() {
         if (this.#hasCoordinates === null) {
-            const validNamespaceIds = this.namespacesToMirror.map((ns) => this.namespaces[ns].num);
             const reqOpts = {
                 ...this.queryOpts,
                 prop: this.queryOpts.prop + '|coordinates', // add coordinates for this call to get proper warning if not supported
-                rdnamespace: validNamespaceIds.join('|'),
             };
             const resp = await Downloader.getJSON(this.#apiUrlDirector.buildQueryURL(reqOpts));
             const isCoordinateWarning = JSON.stringify(resp?.warnings?.query ?? '').includes('coordinates');
             if (isCoordinateWarning) {
-                logger.log('Coordinates not available on this wiki');
+                logger.info('Coordinates not available on this wiki');
                 return (this.#hasCoordinates = false);
             }
-            logger.log('Coordinates available on this wiki');
+            logger.info('Coordinates available on this wiki');
             return (this.#hasCoordinates = true);
         }
         return this.#hasCoordinates;
@@ -231,30 +165,32 @@ class MediaWiki {
             // startup JS module is supposed to be available on all Mediawikis
             const checkUrl = `${this.modulePath}lang=en&modules=startup&only=scripts`;
             this.#hasModuleApi = await checkApiAvailability(checkUrl);
-            logger.log('Checked for Module API at', checkUrl, '-- result is: ', this.#hasRestApi);
+            logger.info('Checked for Module API at', checkUrl, '-- result is: ', this.#hasModuleApi);
         }
         return this.#hasModuleApi;
     }
-    setWikimediaDesktopApiUrl() {
-        this.wikimediaDesktopApiUrl = this.urlDirector.buildWikimediaDesktopApiUrl();
-    }
-    setWikimediaMobileApiUrl() {
-        this.wikimediaMobileApiUrl = this.urlDirector.buildWikimediaMobileApiUrl();
-    }
-    setRestApiURL() {
-        this.restApiUrl = this.urlDirector.buildRestApiUrl(this.#restApiPath);
-    }
-    setVisualEditorURL() {
-        this.#apiUrlDirector = new ApiURLDirector(this.actionApiUrl.href);
-        this.visualEditorApiUrl = this.#apiUrlDirector.buildVisualEditorURL();
+    async hasFlaggedRevs() {
+        if (this.#hasFlaggedRevs === null) {
+            const reqOpts = {
+                ...this.queryOpts,
+                prop: 'info|flagged',
+                titles: this.apiCheckPageTitle,
+            };
+            const resp = await Downloader.getJSON(this.#apiUrlDirector.buildQueryURL(reqOpts));
+            const isFlaggedWarning = JSON.stringify(resp?.warnings?.query ?? '').includes('flagged');
+            if (isFlaggedWarning) {
+                logger.info('FlaggedRevs not available on this wiki');
+                return (this.#hasFlaggedRevs = false);
+            }
+            logger.info('FlaggedRevs available on this wiki');
+            return (this.#hasFlaggedRevs = true);
+        }
+        return this.#hasFlaggedRevs;
     }
     setModuleURL() {
         this.modulePath = this.urlDirector.buildModuleURL(this.#modulePathOpt);
     }
-    setMobileModuleUrl() {
-        this.mobileModulePath = this.urlDirector.buildMobileModuleURL();
-    }
-    async login() {
+    async login(mightBeAlreadyLoggedIn = false) {
         if (this.#username && this.#password) {
             let url = this.actionApiUrl.href + '?';
             // Add domain if configured
@@ -281,17 +217,25 @@ class MediaWiki {
                 if (resp.data.login?.result !== 'Success') {
                     const reason = resp.data.login?.reason;
                     if (reason) {
-                        logger.error(reason);
+                        if (mightBeAlreadyLoggedIn && reason.includes('Cannot log in when using MediaWiki\\Session\\BotPasswordSessionProvider sessions')) {
+                            logger.info('Already logged in');
+                        }
+                        else {
+                            logger.error(reason);
+                            throw new Error('Login Failed');
+                        }
+                    }
+                    else {
+                        throw new Error('Login Failed');
                     }
-                    throw new Error('Login Failed');
                 }
                 else {
-                    logger.log('Login Success');
+                    logger.info('Login Success');
                 }
             });
         }
     }
-    setNamespaces(json, addNamespaces) {
+    setNamespaces(json, addNamespaces, onlyNamespaces) {
         ;
         ['namespaces', 'namespacealiases'].forEach((type) => {
             const entries = json[type];
@@ -300,10 +244,8 @@ class MediaWiki {
                 const name = type === 'namespaces' ? entry.name : entry.alias;
                 const num = entry.id;
                 const allowedSubpages = 'subpages' in entry;
-                const isContent = type === 'namespaces' ? !!(entry.content || util.contains(addNamespaces, num)) : !!(entry.content !== undefined || util.contains(addNamespaces, num));
-                const isBlacklisted = BLACKLISTED_NS.includes(name);
                 const canonical = entry.canonical ? entry.canonical : '';
-                const details = { num, allowedSubpages, isContent };
+                const details = { num, allowedSubpages };
                 /* Namespaces in local language */
                 this.namespaces[util.lcFirst(name)] = details;
                 this.namespaces[util.ucFirst(name)] = details;
@@ -312,50 +254,63 @@ class MediaWiki {
                     this.namespaces[util.lcFirst(canonical)] = details;
                     this.namespaces[util.ucFirst(canonical)] = details;
                 }
-                /* Is content to mirror */
-                if (isContent && !isBlacklisted) {
-                    this.namespacesToMirror.push(name);
+                /* Is namespace to mirror */
+                if (onlyNamespaces.length) {
+                    if (util.contains(onlyNamespaces, num)) {
+                        this.namespacesToMirror.push(name);
+                    }
+                }
+                else {
+                    const isContent = type === 'namespaces' ? !!entry.content : !!(entry.content !== undefined);
+                    const isBlacklisted = BLACKLISTED_NS.includes(name);
+                    if ((isContent || util.contains(addNamespaces, num)) && !isBlacklisted) {
+                        this.namespacesToMirror.push(name);
+                    }
                 }
             });
         });
     }
     extractPageTitleFromHref(href) {
-        try {
-            const pathname = new URL(href, this.baseUrl).pathname;
-            // Link to domain root when main page is domain root
-            if (href === '/' && this.metaData.mainPageIsDomainRoot) {
-                return this.metaData.mainPage;
-            }
-            // Link to index.php with query parameters like "/w/index.php?title=Blue_whale"
-            if (pathname === this.#indexPhpPath) {
-                const queryString = href.split('?')[1];
-                const params = new URLSearchParams(queryString);
-                return params.get('title');
-            }
-            // Local relative URL
-            if (href.indexOf('./') === 0) {
-                return util.decodeURIComponent(pathname.substr(1));
-            }
-            // Absolute path
-            if (pathname.startsWith(this.webUrl.pathname)) {
-                return util.decodeURIComponent(pathname.substr(this.webUrl.pathname.length));
-            }
-            const isPaginatedRegExp = /\/[0-9]+(\.|$)/;
-            const isPaginated = isPaginatedRegExp.test(href);
-            if (isPaginated) {
-                const withoutDotHtml = href.split('.').slice(0, -1).join('.');
-                const lastTwoSlashes = withoutDotHtml.split('/').slice(-2).join('/');
-                return lastTwoSlashes;
+        const extractPageTitleOrIdFromHref = (href) => {
+            try {
+                const pathname = new URL(href, this.baseUrl).pathname;
+                // Link to domain root when main page is domain root
+                if (href === '/' && this.metaData.mainPageIsDomainRoot) {
+                    return this.metaData.mainPage;
+                }
+                // Link to index.php with query parameters like "/w/index.php?title=Blue_whale"
+                if (pathname === this.#indexPhpPath) {
+                    const queryString = href.split('?')[1];
+                    const params = new URLSearchParams(queryString);
+                    return params.get('title');
+                }
+                // Local relative URL
+                if (href.indexOf('./') === 0) {
+                    return util.decodeURIComponent(pathname.substr(1));
+                }
+                // Absolute path
+                if (pathname.startsWith(this.webUrl.pathname)) {
+                    return util.decodeURIComponent(pathname.substr(this.webUrl.pathname.length));
+                }
+                const isPaginatedRegExp = /\/[0-9]+(\.|$)/;
+                const isPaginated = isPaginatedRegExp.test(href);
+                if (isPaginated) {
+                    const withoutDotHtml = href.split('.').slice(0, -1).join('.');
+                    const lastTwoSlashes = withoutDotHtml.split('/').slice(-2).join('/');
+                    return lastTwoSlashes;
+                }
+                if (pathParser.parse(href).dir.includes('../')) {
+                    return pathParser.parse(href).name;
+                }
+                return null; /* Interwiki link? -- return null */
             }
-            if (pathParser.parse(href).dir.includes('../')) {
-                return pathParser.parse(href).name;
+            catch {
+                logger.warn(`Unable to parse href ${href}`);
+                return null;
             }
-            return null; /* Interwiki link? -- return null */
-        }
-        catch {
-            logger.warn(`Unable to parse href ${href}`);
-            return null;
-        }
+        };
+        const pageLink = extractPageTitleOrIdFromHref(href);
+        return pageLink && pageLink.replace(/_/g, ' ');
     }
     getCreatorName() {
         /*
@@ -377,7 +332,7 @@ class MediaWiki {
     }
     getDefaultSkin(skins) {
         const defaultSkins = skins.filter((skin) => skin.default).map((skin) => skin.code);
-        if (defaultSkins.length == 0) {
+        if (defaultSkins.length === 0) {
             throw new Error(`This wiki has no default skin:\n${JSON.stringify(skins)}`);
         }
         if (defaultSkins.length > 1) {
@@ -385,8 +340,8 @@ class MediaWiki {
         }
         return defaultSkins[0];
     }
-    async getSiteInfo({ mwWikiPath, mwIndexPhpPath, addNamespaces, mwRestApiPath, mwModulePath, forceSkin, langVariant } = {}) {
-        logger.log('Getting site info...');
+    async getSiteInfo({ addNamespaces, onlyNamespaces, mwModulePath, forceSkin, langVariants } = {}) {
+        logger.info('Getting site info...');
         const body = await Downloader.querySiteInfo();
         const generalEntries = body.query.general;
         // Checking mediawiki version
@@ -395,17 +350,18 @@ class MediaWiki {
         if (!generalEntries.generator || !semver.satisfies(mwVersion, `>=${mwMinimalVersion}`)) {
             throw new Error(`Mediawiki version ${mwVersion} not supported should be >=${mwMinimalVersion}`);
         }
-        this.setNamespaces(body.query, addNamespaces || []);
+        this.setNamespaces(body.query, addNamespaces || [], onlyNamespaces || []);
         Gadgets.setGadgets(body.query.gadgets);
         const { url: licenseUrl, text: licenseName } = body.query.rightsinfo;
         const subTitle = body.query.allmessages[0].content || '';
-        const mainPage = generalEntries.mainpage.replace(/ /g, '_');
+        const mainPage = generalEntries.mainpage;
         const mainPageIsDomainRoot = generalEntries.mainpageisdomainroot;
         const siteName = generalEntries.sitename;
+        const categoryCollation = generalEntries.categorycollation;
         const logo = generalEntries.logo;
         const langMw = generalEntries.lang;
         const textDir = generalEntries.rtl ? 'rtl' : 'ltr';
-        logger.log(`Text direction is [${textDir}]`);
+        logger.info(`Text direction is [${textDir}]`);
         // Gather languages codes (en remove the 'dialect' part)
         const langs = [langMw].concat(generalEntries.fallback.map((e) => e.code)).map(function (e) {
             return e.replace(/-.*/, '');
@@ -429,46 +385,39 @@ class MediaWiki {
             return possibleLangPairs[0] || ['en', 'eng'];
         });
         // Use CLI parameter and set MediaWiki config
-        if (mwWikiPath) {
-            mwWikiPath = mwWikiPath + '$1';
-            if (mwWikiPath !== generalEntries.articlepath) {
-                logger.warn(`mwWikiPath [${mwWikiPath}] does not match the path [${generalEntries.articlepath}] returned by the wiki.`);
-            }
-        }
-        const articlepath = mwWikiPath || generalEntries.articlepath;
+        const articlepath = generalEntries.articlepath;
         if (articlepath.includes('?') || !articlepath.endsWith('$1')) {
             throw new Error(`Article path [${articlepath}] is not supported`);
         }
         this.wikiPath = articlepath.replace('$1', '');
-        if (mwIndexPhpPath && mwIndexPhpPath !== generalEntries.script) {
-            logger.warn(`mwIndexPhpPath [${mwIndexPhpPath}] does not match the path [${generalEntries.script}] returned by the wiki.`);
-        }
-        this.indexPhpPath = mwIndexPhpPath || generalEntries.script;
-        this.restApiPath = mwRestApiPath || generalEntries.scriptpath + '/rest.php';
+        this.indexPhpPath = generalEntries.script;
         this.modulePathOpt = mwModulePath || generalEntries.scriptpath + '/load.php';
         const skins = body.query.skins.filter((skin) => !skin.unusable);
         if (forceSkin && !skins.map((skin) => skin.code).includes(forceSkin)) {
             throw new Error(`Skin [${forceSkin}] is not usable on the wiki`);
         }
         this.skin = forceSkin || this.getDefaultSkin(skins);
-        const validLangVars = (generalEntries.variants || []).map((e) => e.code);
-        if (langVariant && !validLangVars.includes(langVariant)) {
-            throw new Error(`Language variant [${langVariant}] is not available on the wiki`);
+        if (langVariants) {
+            const validLangVars = (generalEntries.variants || []).map((e) => e.code);
+            const invalidLangVars = langVariants.filter((langVariant) => langVariant && !validLangVars.includes(langVariant));
+            if (invalidLangVars.length) {
+                throw new Error(`Language variants [${invalidLangVars.join(', ')}] is not available on the wiki`);
+            }
         }
-        const langVar = langVariant || null;
         return {
             mainPage,
             mainPageIsDomainRoot,
             siteName,
             textDir,
             langMw,
-            langVar,
             langIso2,
             langIso3,
             logo,
             licenseName,
             licenseUrl,
             subTitle,
+            categoryCollation,
+            versionMw: mwVersion,
         };
     }
     async getMwMetaData(argvOpts = {}) {
@@ -476,24 +425,20 @@ class MediaWiki {
             return this.metaData;
         }
         const creator = this.getCreatorName() || 'Kiwix';
-        const { langIso2, langIso3, mainPage, mainPageIsDomainRoot, siteName, logo, langMw, langVar, textDir, licenseName, licenseUrl, subTitle } = await this.getSiteInfo(argvOpts);
+        const { langIso2, langIso3, mainPage, mainPageIsDomainRoot, siteName, logo, langMw, textDir, licenseName, licenseUrl, subTitle, categoryCollation, versionMw } = await this.getSiteInfo(argvOpts);
         const mwMetaData = {
             webUrl: this.webUrl.href,
             actionApiUrl: this.actionApiUrl.href,
-            restApiUrl: this.restApiUrl.href,
             modulePathOpt: this.#modulePathOpt,
             modulePath: this.modulePath,
-            mobileModulePath: this.mobileModulePath,
             webUrlPath: this.webUrl.pathname,
             wikiPath: this.#wikiPath,
             indexPhpPath: this.#indexPhpPath,
             baseUrl: this.baseUrl.href,
             actionApiPath: this.#actionApiPath,
-            restApiPath: this.#restApiPath,
             domain: this.#domain,
             textDir: textDir,
             langMw,
-            langVar,
             langIso2,
             langIso3,
             title: siteName,
@@ -504,6 +449,8 @@ class MediaWiki {
             logo,
             licenseName,
             licenseUrl,
+            categoryCollation,
+            versionMw,
         };
         this.metaData = mwMetaData;
         return mwMetaData;