Skip to content

Fix #3: drop broken CORS proxy, use MediaWiki API directly #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fredrik-lindseth wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #3: drop broken CORS proxy, use MediaWiki API directly #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,29 +537,37 @@ function getAvg(nums) {
}

/**
* Fetch a progress page and parse its first <table> into JSON.
*
* @param {string} url
* For wiki.openstreetmap.org we hit the MediaWiki action API with origin=*
* for CORS. For other hosts we fetch the page directly — works as long as
* the host sends Access-Control-Allow-Origin (GitHub Pages does).
*
* @param {string} hostname
* @param {string} path
* @returns
*/
async function convertWikiToJson(url, path) {
const resp = await fetch(
`https://production.osmno-cors-proxy.mathiash98.workers.dev/${path}?url=${url}`
);

if (resp.ok) {
// parse html table and get percentage for each kommune
const progressDocumentText = await resp.text();
const progressHtml = new DOMParser().parseFromString(
progressDocumentText,
"text/html"
);
const progressTable = progressHtml.querySelector("table");
const tableAsJson = parseHTMLTableElem(progressTable);
return tableAsJson;
async function convertWikiToJson(hostname, path) {
let html;
if (hostname === "wiki.openstreetmap.org") {
const page = path.replace(/^wiki\//, "");
const apiUrl = `https://${hostname}/w/api.php?action=parse&page=${encodeURIComponent(
page
)}&prop=text&format=json&origin=*`;
const resp = await fetch(apiUrl);
if (!resp.ok) throw new Error(resp.statusText);
const json = await resp.json();
if (json.error) throw new Error(json.error.info);
html = json.parse.text["*"];
} else {
throw new Error(resp.statusText);
const resp = await fetch(`https://${hostname}/${path}`);
if (!resp.ok) throw new Error(resp.statusText);
html = await resp.text();
}

const progressHtml = new DOMParser().parseFromString(html, "text/html");
const progressTable = progressHtml.querySelector("table");
return parseHTMLTableElem(progressTable);
}

/**
Expand Down