Add better support for private wikis to fix #89

Author: Frederisk

src/export_command/uri_function/editPage.ts

@@ -14,8 +14,12 @@ export async function editPage(query: string): Promise<void> {
     // vscode-insiders://rowewilsonfrederiskholme.wikitext/PullPage?Title=1
     const pars: Record<string, string> = parseArgs(query);
 
+    const transferProtocolPar = pars["TransferProtocol"] ?? '';
+    const siteHostPar = pars["SiteHost"] ?? '';
+    const apiPathPar = pars["APIPath"] ?? '';
+
     const tBot: MWBot | undefined = isRemoteBot(pars) ? new MWBot({
-        apiUrl: pars["TransferProtocol"] + pars["SiteHost"] + pars["APIPath"]
+        apiUrl: transferProtocolPar + siteHostPar + apiPathPar
     }) : await getDefaultBot();
 
     const title: string | undefined = pars['Title'];

src/export_command/uri_function/uri.ts

@@ -30,7 +30,15 @@ export function baseUriProcess(uri: vscode.Uri): void {
 }
 
 export function isRemoteBot(pars: Record<string, string>): boolean {
-    return !!(pars['RemoteBot'] || pars['SiteHost']);
+    const remoteBotPar: string | undefined = pars['RemoteBot']?.toLowerCase();
+    switch (remoteBotPar) {
+        case undefined:
+        case '':
+        case 'false':
+            return false;
+        default:
+            return true;
+    };
 }
 
 export function parseArgs(query: string): Record<string, string> {

src/export_command/uri_function/viewPage.ts

@@ -12,14 +12,21 @@ import { isRemoteBot, parseArgs } from './uri';
 
 export async function viewPage(query: string): Promise<void> {
     function setArgs(par: string, defaultValue?: string): void {
-        args[par.toLowerCase()] = pars[par] ?? defaultValue;
+        const value = pars[par] ?? defaultValue;
+        if (value !== undefined) {
+            args[par.toLowerCase()] = value;
+        }
     }
 
     const config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("wikitext");
     const pars: Record<string, string> = parseArgs(query);
 
+    const transferProtocolPar = pars["TransferProtocol"] ?? '';
+    const siteHostPar = pars["SiteHost"] ?? '';
+    const apiPathPar = pars["APIPath"] ?? '';
+
     const tBot: MWBot | undefined = isRemoteBot(pars) ? new MWBot({
-        apiUrl: pars["TransferProtocol"] + pars["SiteHost"] + pars["APIPath"]
+        apiUrl: transferProtocolPar + siteHostPar + apiPathPar
     }) : await getDefaultBot();
 
     if (!tBot) {
@@ -28,7 +35,7 @@ export async function viewPage(query: string): Promise<void> {
     }
 
     const baseHref: string = isRemoteBot(pars)
-        ? pars["TransferProtocol"] + pars["SiteHost"] + pars["APIPath"]
+        ? transferProtocolPar + siteHostPar + apiPathPar
         : config.get("transferProtocol") as string + config.get('host') + config.get("articlePath");
 
     // args value

src/export_command/wikimedia_function/bot.ts

@@ -84,7 +84,7 @@ export async function getDefaultBot(): Promise<MWBot | undefined> {
     if (bot) {
         tBot = bot;
     } else {
-        tBot = new MWBot({
+        tBot = await getLoggedInBot() ?? new MWBot({
             apiUrl: config.get("transferProtocol") as string + config.get('host') + config.get("apiPath")
         });
     }
@@ -142,9 +142,9 @@ export async function compareVersion(tBot: MWBot, major: number, minor: number,
         return undefined;
     }
 
-    const siteMajor: number = parseInt(generatorInfo[1]);
-    const siteMinor: number = parseInt(generatorInfo[2]);
-    const siteRevision: number = parseInt(generatorInfo[3]);
+    const siteMajor: number = parseInt(generatorInfo[1]!, 10);
+    const siteMinor: number = parseInt(generatorInfo[2]!, 10);
+    const siteRevision: number = parseInt(generatorInfo[3]!, 10);
 
     if (isNaN(siteMajor + siteMinor + siteRevision)) {
         return undefined;

src/export_command/wikimedia_function/page.ts

@@ -259,12 +259,12 @@ ${infoLine}
         const re: ReadPageResult = ReadPageConvert.toResult(result);
         if (re.query?.interwiki) {
             vscode.window.showWarningMessage(
-                `Interwiki page "${re.query.interwiki[0].title}" in space "${re.query.interwiki[0].iw}" are currently not supported. Please try to modify host.`
+                `Interwiki page "${re.query.interwiki[0]?.title}" in space "${re.query.interwiki[0]?.iw}" are currently not supported. Please try to modify host.`
             );
         }
 
         // get first page
-        const page: Page | undefined = re.query?.pages?.[Object.keys(re.query.pages)[0]];
+        const page: Page | undefined = re.query?.pages?.[Object.keys(re.query.pages)[0]!];
         // need a page elements
         if (!page) { return undefined; }
 
@@ -332,7 +332,7 @@ export function getContentInfo(content: string): ContentInfo {
     let pageInfo: Record<PageInfo, string | undefined> | undefined;
     if (info) {
         const getInfo = (infoName: PageInfo): string | undefined => {
-            const nameFirst: string = infoName[0];
+            const nameFirst: string = infoName[0]!;
             const nameRest: string = infoName.substring(1);
             const reg = new RegExp(`(?<=[${nameFirst.toLowerCase()}${nameFirst.toUpperCase()}]${nameRest}\\s*=\\s*#).*?(?=#)`);
             return info.match(reg)?.[0];

tsconfig.json

@@ -26,6 +26,7 @@
     "importHelpers": true,
     "experimentalDecorators": true,
     "forceConsistentCasingInFileNames": true,
+    "noUncheckedIndexedAccess": true,
   },
   "exclude": [
     "./.vscode-test/*"