mwoffliner 1.17.4 → 2.0.0

package/lib/util/FileManager.js

@@ -0,0 +1,246 @@
+import * as logger from '../Logger.js';
+import Downloader from '../Downloader.js';
+import RedisStore from '../RedisStore.js';
+import { StringItem } from '@openzim/libzim';
+import pmap from 'p-map';
+import { parseRetryAfterHeader } from './misc.js';
+import { FILES_DOWNLOAD_FAILURE_MINIMUM_FOR_CHECK, FILES_DOWNLOAD_FAILURE_TRESHOLD_PER_TEN_THOUSAND, MAX_FILE_DOWNLOAD_RETRIES } from './const.js';
+import urlHelper from './url.helper.js';
+import { fileAddMutex, fileDownloadMutex, zimCreatorMutex } from '../mutex.js';
+import RedisQueue from './RedisQueue.js';
+const MAXIMUM_FILE_DOWNLOAD_DELAY = 20000;
+class FileManager {
+    static instance;
+    static getInstance() {
+        if (!FileManager.instance) {
+            FileManager.instance = new FileManager();
+        }
+        return FileManager.instance;
+    }
+    hosts = new Map();
+    get filesToDownloadXPath() {
+        return RedisStore.filesStore;
+    }
+    constructor() { }
+    /**
+     * Reset internal state for a new dump cycle.
+     */
+    reset() {
+        this.hosts = new Map();
+    }
+    /**
+     * Add a single file to download. Checks dedup via filesToDownloadXPath.
+     * On first add: writes to both filesToDownloadXPath and host queue.
+     * On resolution upgrade: updates filesToDownloadXPath only (queue already has the path).
+     *
+     * This method is typically called multiple times when the file is an image and the scraper detects
+     * a second use of an image already seen but with a higher resolution. Could be that we call this
+     * method twice with different urls / data for other usage in the future.
+     */
+    async addFileToProcess(path, detail) {
+        await fileAddMutex.runExclusive(async () => this._addFileToProcess(path, detail));
+    }
+    async _addFileToProcess(path, detail) {
+        const existing = await this.filesToDownloadXPath.get(path);
+        if (existing) {
+            const isHigherRes = existing.width < (detail.width || 10e6) || existing.mult < (detail.mult || 1);
+            if (!isHigherRes)
+                return;
+            // Resolution upgrade: update store only, queue already has this path
+            await this.filesToDownloadXPath.set(path, detail);
+            return;
+        }
+        // New file: add to both store and host queue
+        await this.filesToDownloadXPath.set(path, detail);
+        await this.pushToHostQueue(path, detail);
+    }
+    /**
+     * Batch version of addFileToProcess. Uses getMany for efficiency.
+     */
+    async addManyFilesToProcess(files) {
+        await fileAddMutex.runExclusive(async () => this._addManyFilesToProcess(files));
+    }
+    async _addManyFilesToProcess(files) {
+        const paths = Object.keys(files);
+        if (!paths.length)
+            return;
+        const existingVals = await this.filesToDownloadXPath.getMany(paths);
+        const toSet = {};
+        for (const [path, detail] of Object.entries(files)) {
+            const existing = existingVals[path];
+            if (existing) {
+                const isHigherRes = existing.width < (detail.width || 10e6) || existing.mult < (detail.mult || 1);
+                if (!isHigherRes)
+                    continue;
+                toSet[path] = detail; // upgrade only, no queue push
+            }
+            else {
+                toSet[path] = detail;
+                await this.pushToHostQueue(path, detail);
+            }
+        }
+        if (Object.keys(toSet).length) {
+            await this.filesToDownloadXPath.setMany(toSet);
+        }
+    }
+    async pushToHostQueue(path, detail) {
+        const hostname = new URL(urlHelper.deserializeUrl(detail.url)).hostname;
+        if (!this.hosts.has(hostname)) {
+            const queue = new RedisQueue(RedisStore.client, `${hostname}-files`);
+            await queue.flush();
+            RedisStore.filesQueues.push(queue);
+            this.hosts.set(hostname, {
+                queue,
+                requestInterval: 30,
+                downloadSuccess: 0,
+                downloadFailure: 0,
+                downloadsComplete: false,
+            });
+        }
+        await this.hosts.get(hostname).queue.push({
+            path,
+            downloadAttempts: 0,
+        });
+    }
+    /**
+     * Start download workers. Queues are already populated via addFileToProcess/addManyFilesToProcess.
+     */
+    async startDownloading(zimCreator, dump) {
+        const filesTotal = await this.filesToDownloadXPath.len();
+        let prevPercentProgress;
+        const hosts = this.hosts;
+        const filesToDownloadXPath = this.filesToDownloadXPath;
+        async function getNextFileToDownload() {
+            const startPolling = Date.now();
+            while (true) {
+                if (startPolling + 1000 * 60 * 60 < Date.now()) {
+                    logger.warn('No file to download for more than 1 hour, exiting the loop');
+                    for (const hostData of hosts.values()) {
+                        if (hostData.downloadsComplete)
+                            continue;
+                        while (await hostData.queue.pop()) {
+                            dump.status.files.fail += 1;
+                            if (dump.status.files.fail > FILES_DOWNLOAD_FAILURE_MINIMUM_FOR_CHECK &&
+                                (dump.status.files.fail * 10000) / filesTotal > FILES_DOWNLOAD_FAILURE_TRESHOLD_PER_TEN_THOUSAND) {
+                                throw new Error(`Too many files failed to download: [${dump.status.files.fail}/${filesTotal}]`);
+                            }
+                        }
+                    }
+                    return null;
+                }
+                const hostValues = Array.from(hosts.values());
+                const completedHosts = hostValues.reduce((buf, host) => {
+                    return host.downloadsComplete ? buf + 1 : buf;
+                }, 0);
+                if (completedHosts === hostValues.length)
+                    return null;
+                for (const [hostname, hostData] of hosts.entries()) {
+                    if (hostData.downloadsComplete ||
+                        (hostData.notBeforeDate && hostData.notBeforeDate > Date.now()) ||
+                        (hostData.lastRequestDate && hostData.lastRequestDate + hostData.requestInterval > Date.now())) {
+                        continue;
+                    }
+                    const fileToDownload = await hostData.queue.pop();
+                    if (!fileToDownload) {
+                        hostData.downloadsComplete = true;
+                        continue;
+                    }
+                    hostData.lastRequestDate = Date.now();
+                    return { fileToDownload, hostData, hostname };
+                }
+                await new Promise((resolve) => setTimeout(resolve, 10));
+            }
+        }
+        async function workerDownloadFile(fileToDownload, hostname, hostData, workerId) {
+            if ((dump.status.files.success + dump.status.files.fail) % (10 * Downloader.workers) === 0) {
+                const percentProgress = (((dump.status.files.success + dump.status.files.fail) / filesTotal) * 100).toFixed(1);
+                if (percentProgress !== prevPercentProgress) {
+                    prevPercentProgress = percentProgress;
+                    logger.info(`Progress downloading files [${dump.status.files.success + dump.status.files.fail}/${filesTotal}] [${percentProgress}%]`);
+                }
+                if (filesTotal > 0 &&
+                    dump.status.files.fail > FILES_DOWNLOAD_FAILURE_MINIMUM_FOR_CHECK &&
+                    (dump.status.files.fail * 10000) / filesTotal > FILES_DOWNLOAD_FAILURE_TRESHOLD_PER_TEN_THOUSAND) {
+                    throw new Error(`Too many files failed to download: [${dump.status.files.fail}/${filesTotal}]`);
+                }
+            }
+            fileToDownload.downloadAttempts += 1;
+            // Read latest details from filesToDownloadXPath (resolution may have been upgraded since queuing)
+            const latestDetail = await filesToDownloadXPath.get(fileToDownload.path);
+            if (!latestDetail) {
+                logger.warn(`File details missing in RedisStore for path [${fileToDownload.path}], unable to download`);
+                dump.status.files.fail += 1;
+                hostData.downloadFailure += 1;
+                return;
+            }
+            const downloadUrl = latestDetail.url;
+            const downloadKind = latestDetail.kind;
+            const downloadWidth = latestDetail.width;
+            logger.debug(`Worker ${workerId} downloading ${urlHelper.deserializeUrl(downloadUrl)} (${downloadKind})`);
+            await Downloader.downloadContent(downloadUrl, downloadKind, false, downloadWidth)
+                .then(async (resp) => {
+                if (resp && resp.content && resp.contentType) {
+                    const item = new StringItem(fileToDownload.path, resp.contentType, null, { FRONT_ARTICLE: 0 }, resp.content);
+                    await zimCreatorMutex.runExclusive(() => zimCreator.addItem(item));
+                    dump.status.files.success += 1;
+                    hostData.downloadSuccess += 1;
+                }
+                else {
+                    throw new Error(`Bad response received: ${JSON.stringify(resp)}`);
+                }
+            })
+                .catch(async (err) => {
+                const isRetriableTransportError = !!(err?.response || err?.code);
+                if (!isRetriableTransportError) {
+                    logger.warn(`Error processing file [${urlHelper.deserializeUrl(downloadUrl)}], skipping without retry`, err);
+                    dump.status.files.fail += 1;
+                    hostData.downloadFailure += 1;
+                    return;
+                }
+                if (fileToDownload.downloadAttempts > MAX_FILE_DOWNLOAD_RETRIES || (err.response && err.response.status === 404)) {
+                    logger.warn(`Error downloading file [${urlHelper.deserializeUrl(downloadUrl)}] [status=${err.response?.status}], skipping`);
+                    dump.status.files.fail += 1;
+                    hostData.downloadFailure += 1;
+                }
+                else {
+                    if (err.response) {
+                        const retryAfterHeader = err.response.headers['retry-after']?.toString();
+                        if (retryAfterHeader) {
+                            const retryDate = parseRetryAfterHeader(retryAfterHeader);
+                            if (retryDate) {
+                                if (retryDate > Date.now() + MAXIMUM_FILE_DOWNLOAD_DELAY) {
+                                    logger.info(`Received a [Retry-After=${retryAfterHeader}] on ${hostname} but this is too far away, ignoring`);
+                                }
+                                else {
+                                    hostData.notBeforeDate = retryDate;
+                                    logger.info(`Received a [Retry-After=${retryAfterHeader}], pausing down ${hostname} until ${hostData.notBeforeDate}`);
+                                }
+                            }
+                            else {
+                                logger.warn(`Received a [Retry-After=${retryAfterHeader}] from ${hostname} but failed to interpret it`);
+                            }
+                        }
+                    }
+                    if (err.response && [429, 503, 524].includes(err.response.status) && !urlHelper.deserializeUrl(downloadUrl).match(/^https?:\/\/upload\.wikimedia\.org\/.*\/thumb\//)) {
+                        hostData.requestInterval = Math.min(MAXIMUM_FILE_DOWNLOAD_DELAY, hostData.requestInterval * 1.2);
+                        logger.info(`Received a [status=${err.response.status}], slowing down ${hostname} to ${hostData.requestInterval}ms interval`);
+                    }
+                    await hostData.queue.push(fileToDownload);
+                }
+            });
+        }
+        await pmap(Array.from({ length: Downloader.workers }, (_, i) => i), async (workerId) => {
+            while (true) {
+                const nextFileData = await fileDownloadMutex.runExclusive(getNextFileToDownload);
+                if (!nextFileData)
+                    break;
+                const { fileToDownload, hostname, hostData } = nextFileData;
+                await workerDownloadFile(fileToDownload, hostname, hostData, workerId);
+            }
+        }, { concurrency: Downloader.workers });
+        logger.info(`Done with downloading ${filesTotal} files: ${dump.status.files.success} success, ${dump.status.files.fail} fail: `, JSON.stringify(Object.fromEntries([...hosts].map(([hostname, hostData]) => [hostname, { success: hostData.downloadSuccess, fail: hostData.downloadFailure }])), null, '\t'));
+    }
+}
+const fm = FileManager.getInstance();
+export default fm;
+//# sourceMappingURL=FileManager.js.map

package/lib/util/FileManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../src/util/FileManager.ts"],"names":[],"mappings":"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"}

package/lib/util/RedisKvs.js

@@ -24,7 +24,7 @@ export default class RedisKvs {
         return result;
     }
     exists(prop) {
-        return this.redisClient.hExists(this.dbName, prop);
+        return this.redisClient.hExists(this.dbName, prop).then((v) => v === 1);
     }
     async existsMany(prop, blocking = false) {
         // array of keys
@@ -132,13 +132,13 @@ export default class RedisKvs {
         });
     }
     async scan(scanCursor) {
-        const { cursor, tuples } = await this.redisClient.hScan(this.dbName, scanCursor);
+        const { cursor, entries } = await this.redisClient.hScan(this.dbName, String(scanCursor));
         const items = {};
-        for (const { field, value } of tuples) {
+        for (const { field, value } of entries) {
             items[field] = this.hydrateObject(value);
         }
         return {
-            cursor,
+            cursor: Number(cursor),
             items,
         };
     }

package/lib/util/RedisKvs.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisKvs.js","sourceRoot":"","sources":["../../src/util/RedisKvs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RedisKvs.js","sourceRoot":"","sources":["../../src/util/RedisKvs.ts"],"names":[],"mappings":"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"}

package/lib/util/RedisQueue.js

@@ -19,7 +19,7 @@ export default class RedisQueue {
         return this.redisClient.lPush(this.dbName, this.dehydrateObject(val));
     }
     len() {
-        return this.redisClient.hLen(this.dbName);
+        return this.redisClient.lLen(this.dbName);
     }
     flush() {
         return this.redisClient.del(this.dbName);

package/lib/util/RedisQueue.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisQueue.js","sourceRoot":"","sources":["../../src/util/RedisQueue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RedisQueue.js","sourceRoot":"","sources":["../../src/util/RedisQueue.ts"],"names":[],"mappings":"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"}

package/lib/util/builders/url/action-parse.director.d.ts

@@ -5,6 +5,6 @@ export default class ActionParseURLDirector {
     baseDomain: string;
     skin: string;
     variant?: string;
-    constructor(baseDomain: string, skin: string, variant?: string);
-    buildArticleURL(articleId: string, articleUrlOpts?: RendererArticleOpts): string;
+    constructor(baseDomain: string, skin: string);
+    buildPageUrl(pageTitle: PageTitle, pageUrlOpts?: PageUrlOpts): string;
 }

package/lib/util/builders/url/action-parse.director.js

@@ -7,26 +7,26 @@ export default class ActionParseURLDirector {
     baseDomain;
     skin;
     variant;
-    constructor(baseDomain, skin, variant) {
+    constructor(baseDomain, skin) {
         this.baseDomain = baseDomain;
         this.skin = skin;
-        this.variant = variant;
     }
-    buildArticleURL(articleId, articleUrlOpts = {}) {
-        const { sectionId } = articleUrlOpts;
+    buildPageUrl(pageTitle, pageUrlOpts = {}) {
+        const { sectionId, langVar, oldid } = pageUrlOpts;
         return urlBuilder
             .setDomain(this.baseDomain)
             .setQueryParams({
             action: 'parse',
             format: 'json',
-            prop: 'modules|jsconfigvars|headhtml|text|displaytitle|subtitle',
+            prop: 'modules|jsconfigvars|headhtml|text|displaytitle|subtitle|categorieshtml',
             usearticle: '1',
             disabletoc: '1',
             disableeditsection: '1',
             disablelimitreport: '1',
-            page: articleId,
+            page: oldid ? undefined : pageTitle,
+            oldid: oldid ? String(oldid) : undefined,
             useskin: this.skin,
-            variant: this.variant,
+            variant: langVar || undefined,
             redirects: '1',
             formatversion: '2',
             section: sectionId,

package/lib/util/builders/url/action-parse.director.js.map

@@ -1 +1 @@
-{"version":3,"file":"action-parse.director.js","sourceRoot":"","sources":["../../../../src/util/builders/url/action-parse.director.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,UAAU,MAAM,kBAAkB,CAAA;AAEzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACzC,UAAU,CAAQ;IAClB,IAAI,CAAQ;IACZ,OAAO,CAAS;IAEhB,YAAY,UAAkB,EAAE,IAAY,EAAE,OAAgB;QAC5D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,eAAe,CAAC,SAAiB,EAAE,iBAAsC,EAAE;QACzE,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,CAAA;QACpC,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CACb;YACE,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,0DAA0D;YAChE,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,GAAG;YACf,kBAAkB,EAAE,GAAG;YACvB,kBAAkB,EAAE,GAAG;YACvB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,GAAG;YACd,aAAa,EAAE,GAAG;YAClB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;SAC/B,EACD,GAAG,EACH,IAAI,CACL;aACA,KAAK,EAAE,CAAA;IACZ,CAAC;CACF"}
+{"version":3,"file":"action-parse.director.js","sourceRoot":"","sources":["../../../../src/util/builders/url/action-parse.director.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,UAAU,MAAM,kBAAkB,CAAA;AAEzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACzC,UAAU,CAAQ;IAClB,IAAI,CAAQ;IACZ,OAAO,CAAS;IAEhB,YAAY,UAAkB,EAAE,IAAY;QAC1C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,YAAY,CAAC,SAAoB,EAAE,cAA2B,EAAE;QAC9D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,WAAW,CAAA;QACjD,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CACb;YACE,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,yEAAyE;YAC/E,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,GAAG;YACf,kBAAkB,EAAE,GAAG;YACvB,kBAAkB,EAAE,GAAG;YACvB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YACnC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;YACxC,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,OAAO,EAAE,OAAO,IAAI,SAAS;YAC7B,SAAS,EAAE,GAAG;YACd,aAAa,EAAE,GAAG;YAClB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;SAC/B,EACD,GAAG,EACH,IAAI,CACL;aACA,KAAK,EAAE,CAAA;IACZ,CAAC;CACF"}

package/lib/util/builders/url/api.director.d.ts

@@ -4,10 +4,8 @@
 export default class ApiURLDirector {
     private baseDomain;
     constructor(baseDomain: string);
-    buildSubCategoriesURL(articleId: string, continueStr?: string): string;
     buildQueryURL<T extends Record<string, any>>(queryParams: T): string;
+    buildCategoryMembersURL(pageTitle: PageTitle, continueStr?: string): string;
     buildSiteInfoURL(): string;
-    buildVisualEditorURL(): URL;
-    buildLogEventsQuery(letype: string, articleId: string): string;
-    buildArticleApiURL(articleId: string): string;
+    buildLogEventsQuery(letype: string, pageTitle: PageTitle): string;
 }

package/lib/util/builders/url/api.director.js

@@ -8,25 +8,27 @@ export default class ApiURLDirector {
     constructor(baseDomain) {
         this.baseDomain = baseDomain;
     }
-    buildSubCategoriesURL(articleId, continueStr = '') {
+    buildQueryURL(queryParams) {
+        return urlBuilder.setDomain(this.baseDomain).setQueryParams(queryParams, '?', true).build();
+    }
+    buildCategoryMembersURL(pageTitle, continueStr = '') {
         return urlBuilder
             .setDomain(this.baseDomain)
             .setQueryParams({
             action: 'query',
             list: 'categorymembers',
-            cmtype: 'subcat',
+            cmtype: 'subcat|page|file',
+            cmprop: 'title|sortkeyprefix|type',
+            cmsort: 'sortkey',
             cmlimit: 'max',
             format: 'json',
             formatversion: '2',
-            cmtitle: articleId,
+            cmtitle: pageTitle,
             cmcontinue: continueStr,
             maxlag: config.defaults.maxlag,
         })
             .build();
     }
-    buildQueryURL(queryParams) {
-        return urlBuilder.setDomain(this.baseDomain).setQueryParams(queryParams, '?', true).build();
-    }
     buildSiteInfoURL() {
         return urlBuilder
             .setDomain(this.baseDomain)
@@ -46,19 +48,10 @@ export default class ApiURLDirector {
         })
             .build();
     }
-    buildVisualEditorURL() {
-        return urlBuilder.setDomain(this.baseDomain).setQueryParams({ action: 'visualeditor', mobileformat: 'html', format: 'json', paction: 'parse', formatversion: '2' }).build(true);
-    }
-    buildLogEventsQuery(letype, articleId) {
-        return urlBuilder
-            .setDomain(this.baseDomain)
-            .setQueryParams({ action: 'query', list: 'logevents', letype: letype, letitle: articleId, format: 'json', maxlag: config.defaults.maxlag })
-            .build();
-    }
-    buildArticleApiURL(articleId) {
+    buildLogEventsQuery(letype, pageTitle) {
         return urlBuilder
             .setDomain(this.baseDomain)
-            .setQueryParams({ action: 'parse', format: 'json', prop: 'modules|jsconfigvars|headhtml', formatversion: '2', page: articleId, maxlag: config.defaults.maxlag })
+            .setQueryParams({ action: 'query', list: 'logevents', letype: letype, letitle: pageTitle, format: 'json', maxlag: config.defaults.maxlag })
             .build();
     }
 }

package/lib/util/builders/url/api.director.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.director.js","sourceRoot":"","sources":["../../../../src/util/builders/url/api.director.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,UAAU,MAAM,kBAAkB,CAAA;AAEzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc;IACzB,UAAU,CAAQ;IAE1B,YAAY,UAAkB;QAC5B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,qBAAqB,CAAC,SAAiB,EAAE,WAAW,GAAG,EAAE;QACvD,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CAAC;YACd,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,GAAG;YAClB,OAAO,EAAE,SAAS;YAClB,UAAU,EAAE,WAAW;YACvB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;SAC/B,CAAC;aACD,KAAK,EAAE,CAAA;IACZ,CAAC;IAED,aAAa,CAAgC,WAAc;QACzD,OAAO,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAA;IAC7F,CAAC;IAED,gBAAgB;QACd,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CAAC;YACd,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,sBAAsB;YAC5B,MAAM,EAAE,sDAAsD;YAC9D,UAAU,EAAE,SAAS;YACrB,cAAc,EAAE,GAAG;YACnB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,aAAa;YACrB,aAAa,EAAE,GAAG;YAClB,aAAa,EAAE,GAAG;YAClB,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,GAAG;YAClB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;SAC/B,CAAC;aACD,KAAK,EAAE,CAAA;IACZ,CAAC;IAED,oBAAoB;QAClB,OAAO,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACjL,CAAC;IAED,mBAAmB,CAAC,MAAc,EAAE,SAAiB;QACnD,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aAC1I,KAAK,EAAE,CAAA;IACZ,CAAC;IAED,kBAAkB,CAAC,SAAiB;QAClC,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,+BAA+B,EAAE,aAAa,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aAC/J,KAAK,EAAE,CAAA;IACZ,CAAC;CACF"}
+{"version":3,"file":"api.director.js","sourceRoot":"","sources":["../../../../src/util/builders/url/api.director.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,UAAU,MAAM,kBAAkB,CAAA;AAEzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc;IACzB,UAAU,CAAQ;IAE1B,YAAY,UAAkB;QAC5B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,aAAa,CAAgC,WAAc;QACzD,OAAO,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAA;IAC7F,CAAC;IAED,uBAAuB,CAAC,SAAoB,EAAE,WAAW,GAAG,EAAE;QAC5D,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CAAC;YACd,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,kBAAkB;YAC1B,MAAM,EAAE,0BAA0B;YAClC,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,GAAG;YAClB,OAAO,EAAE,SAAS;YAClB,UAAU,EAAE,WAAW;YACvB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;SAC/B,CAAC;aACD,KAAK,EAAE,CAAA;IACZ,CAAC;IAED,gBAAgB;QACd,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CAAC;YACd,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,sBAAsB;YAC5B,MAAM,EAAE,sDAAsD;YAC9D,UAAU,EAAE,SAAS;YACrB,cAAc,EAAE,GAAG;YACnB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,aAAa;YACrB,aAAa,EAAE,GAAG;YAClB,aAAa,EAAE,GAAG;YAClB,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,GAAG;YAClB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;SAC/B,CAAC;aACD,KAAK,EAAE,CAAA;IACZ,CAAC;IAED,mBAAmB,CAAC,MAAc,EAAE,SAAoB;QACtD,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aAC1I,KAAK,EAAE,CAAA;IACZ,CAAC;CACF"}

package/lib/util/builders/url/base.director.d.ts

@@ -5,9 +5,5 @@ export default class BaseURLDirector {
     private baseDomain;
     constructor(baseDomain: string);
     buildURL(path: string): URL;
-    buildWikimediaDesktopApiUrl(): URL;
-    buildWikimediaMobileApiUrl(): URL;
     buildModuleURL(path?: string): string;
-    buildMobileModuleURL(path?: string): string;
-    buildRestApiUrl(path?: string): URL;
 }

package/lib/util/builders/url/base.director.js

@@ -1,5 +1,4 @@
 import urlBuilder from './url.builder.js';
-import { WIKIMEDIA_REST_API_PATH } from '../../const.js';
 /**
  * Interface to build URLs based on base URL
  */
@@ -11,35 +10,11 @@ export default class BaseURLDirector {
     buildURL(path) {
         return urlBuilder.setDomain(this.baseDomain).setPath(path).build(true);
     }
-    buildWikimediaDesktopApiUrl() {
-        return urlBuilder
-            .setDomain(this.baseDomain)
-            .setPath(WIKIMEDIA_REST_API_PATH + 'page/html')
-            .build(true, '/');
-    }
-    buildWikimediaMobileApiUrl() {
-        return urlBuilder
-            .setDomain(this.baseDomain)
-            .setPath(WIKIMEDIA_REST_API_PATH + 'page/mobile-html')
-            .build(true, '/');
-    }
     buildModuleURL(path) {
         return urlBuilder
             .setDomain(this.baseDomain)
             .setPath(path ?? '/w/load.php')
             .build(false, '?');
     }
-    buildMobileModuleURL(path) {
-        return urlBuilder
-            .setDomain(this.baseDomain)
-            .setPath(path ?? '/api/rest_v1/page/mobile-html-offline-resources')
-            .build(false, '/');
-    }
-    buildRestApiUrl(path) {
-        return urlBuilder
-            .setDomain(this.baseDomain)
-            .setPath(path ?? '/w/rest.php')
-            .build(true, '/');
-    }
 }
 //# sourceMappingURL=base.director.js.map

package/lib/util/builders/url/base.director.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.director.js","sourceRoot":"","sources":["../../../../src/util/builders/url/base.director.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAExD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAC1B,UAAU,CAAQ;IAE1B,YAAY,UAAkB;QAC5B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;IAC1G,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,OAAO,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACxE,CAAC;IAED,2BAA2B;QACzB,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,OAAO,CAAC,uBAAuB,GAAG,WAAW,CAAC;aAC9C,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IACrB,CAAC;IAED,0BAA0B;QACxB,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,OAAO,CAAC,uBAAuB,GAAG,kBAAkB,CAAC;aACrD,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IACrB,CAAC;IAED,cAAc,CAAC,IAAa;QAC1B,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,OAAO,CAAC,IAAI,IAAI,aAAa,CAAC;aAC9B,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACtB,CAAC;IAED,oBAAoB,CAAC,IAAa;QAChC,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,OAAO,CAAC,IAAI,IAAI,iDAAiD,CAAC;aAClE,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACtB,CAAC;IAED,eAAe,CAAC,IAAa;QAC3B,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,OAAO,CAAC,IAAI,IAAI,aAAa,CAAC;aAC9B,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IACrB,CAAC;CACF"}
+{"version":3,"file":"base.director.js","sourceRoot":"","sources":["../../../../src/util/builders/url/base.director.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,kBAAkB,CAAA;AAEzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAC1B,UAAU,CAAQ;IAE1B,YAAY,UAAkB;QAC5B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;IAC1G,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,OAAO,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACxE,CAAC;IAED,cAAc,CAAC,IAAa;QAC1B,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,OAAO,CAAC,IAAI,IAAI,aAAa,CAAC;aAC9B,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACtB,CAAC;CACF"}

package/lib/util/builders/url/basic.director.d.ts

@@ -3,7 +3,7 @@ type DownloaderBaseUrlConditions = Array<{
     value: string;
 }>;
 /**
- * Build base URL for specific wiki. Example of the output: 'https://en.wikipedia.org' or 'https://de.wikivoyage.org
+ * Build base URL for specific wiki. Example of the output: 'https://en.wikipedia.org' or 'https://de.wikivoyage.org'
  */
 declare class BasicURLDirector {
     buildMediawikiBaseURL(domain: string): URL;

package/lib/util/builders/url/basic.director.js

@@ -1,6 +1,6 @@
 import urlBuilder from './url.builder.js';
 /**
- * Build base URL for specific wiki. Example of the output: 'https://en.wikipedia.org' or 'https://de.wikivoyage.org
+ * Build base URL for specific wiki. Example of the output: 'https://en.wikipedia.org' or 'https://de.wikivoyage.org'
  */
 class BasicURLDirector {
     buildMediawikiBaseURL(domain) {

package/lib/util/builders/url/web.director.d.ts

@@ -4,5 +4,5 @@
 export default class WebURLDirector {
     baseDomain: string;
     constructor(baseDomain: string);
-    buildArticleRawURL(articleId: string): string;
+    buildPageRawURL(pageTitle: string): string;
 }

package/lib/util/builders/url/web.director.js

@@ -7,10 +7,10 @@ export default class WebURLDirector {
     constructor(baseDomain) {
         this.baseDomain = baseDomain;
     }
-    buildArticleRawURL(articleId) {
+    buildPageRawURL(pageTitle) {
         return urlBuilder
             .setDomain(this.baseDomain)
-            .setQueryParams({ title: encodeURIComponent(articleId), action: 'raw' })
+            .setQueryParams({ title: encodeURIComponent(pageTitle), action: 'raw' })
             .build();
     }
 }

package/lib/util/builders/url/web.director.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.director.js","sourceRoot":"","sources":["../../../../src/util/builders/url/web.director.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,kBAAkB,CAAA;AAEzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,UAAU,CAAQ;IAElB,YAAY,UAAkB;QAC5B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,kBAAkB,CAAC,SAAiB;QAClC,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CAAC,EAAE,KAAK,EAAE,kBAAkB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;aACvE,KAAK,EAAE,CAAA;IACZ,CAAC;CACF"}
+{"version":3,"file":"web.director.js","sourceRoot":"","sources":["../../../../src/util/builders/url/web.director.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,kBAAkB,CAAA;AAEzC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,UAAU,CAAQ;IAElB,YAAY,UAAkB;QAC5B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,eAAe,CAAC,SAAiB;QAC/B,OAAO,UAAU;aACd,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;aAC1B,cAAc,CAAC,EAAE,KAAK,EAAE,kBAAkB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;aACvE,KAAK,EAAE,CAAA;IACZ,CAAC;CACF"}

package/lib/util/categories.d.ts

@@ -1,5 +1,5 @@
-export declare function getCategoriesForArticles(articleStore: RKVS<ArticleDetail>, deleteArticleStore?: boolean): Promise<void>;
-export declare function trimUnmirroredPages(): Promise<number>;
-export declare function simplifyGraph(): Promise<{
-    deletedNodes: number;
-}>;
+import { Dump } from '../Dump.js';
+export declare function buildCategoryMemberList(type: 'subcats' | 'pages' | 'files', categoryMembers: Array<CategoryMember>, categoryinfo: CategoryInfo, pageDetail: PageDetail, doc: Document, dump: Dump, numericSorting: boolean, page: number, isLastPage: boolean, pagePath: string): HTMLElement;
+export declare function buildCategoryTypeItems(type: 'subcats' | 'pages' | 'files', categoryinfo: CategoryInfo, categoryMembers: GroupedCategoryMembers, pagePath: ZimPath, pageDetail: PageDetail, doc: Document, dump: Dump, numericSorting: boolean, moduleDependencies: {
+    styleDependenciesList: string[];
+}, pageTitle: PageTitle, categoryContent: HTMLElement, pageItems: Array<RenderSingleOutput>): Promise<void>;