Skip to content

Parsoid: Add the variant proxy #1207

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

Merged
d00rman merged 11 commits into from
Oct 28, 2019
Merged

Parsoid: Add the variant proxy #1207

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a8fb336
Parsoid: Move the Parsoid class to lib/parsoid.js
Oct 12, 2019
56cbde4
Parsoid: Create the modules for both variants
Oct 12, 2019
eec926e
Parsoid: Add the variant proxy
Oct 13, 2019
3a7cfeb
Parsoid: Use Parsoid/PHP for tests using Beta wikipedia
Oct 13, 2019
cce372e
Parsoid: Add fallback for transforms to the proxy
Oct 15, 2019
a5d5f5d
Parsoid: Throw errors for unimplemented methods
Oct 15, 2019
8cfead2
Parsoid: Stash: Honour our own ETag when retrieving the stash
Oct 16, 2019
3d63e77
Minor: Parsoid: No return JSDoc for abstract methods
Oct 22, 2019
1665ed0
Parsoid: Tests: Add Parsoid/PHP to the list of allowed URLs
Oct 24, 2019
ccdf409
Parsoid: Set content-language and vary if they are missing
Oct 24, 2019
cd991c8
Travis: Start Cassandra only for the `cassandra` test target
Oct 25, 2019
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
Prev Previous commit
Next Next commit
Parsoid: Add fallback for transforms to the proxy 
When we are in split mode, we need to account for the transition period
of each domain, during which time some transform requests will actually
need to be handled by Parsoid/JS since the clients retrieved the JS
variant of the HTML. Thefore, for transform end points provide a
fallback in case of a 404 which happens if RESTBase can't retrieve the
stashed content.

Bug: T230791
  • Loading branch information
Marko Obrovac committed Oct 16, 2019
commit cce372e48fcbd1eb91563d4aaf6fe3e3c794d887
16 changes: 16 additions & 0 deletions sys/parsoid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,22 @@ class ParsoidProxy {
res.headers = res.headers || {};
res.headers['x-parsoid-variant'] = variant;
return P.resolve(res);
}).catch({ status: 404 }, (e) => {
// if we are in split mode, provide a fallback for
// transforms for the non-default variant
if (this.mode === 'split' && /transform/.test(operation) &&
variant !== this.default_variant) {
if (setHdr) {
req.headers['x-parsoid-variant'] = this.default_variant;
}
return this.mods[this.default_variant][operation](hyper, req)
.then((res) => {
res.headers = res.headers || {};
res.headers['x-parsoid-variant'] = this.default_variant;
return P.resolve(res);
});
}
throw e;
});
}

Expand Down