mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-19 14:48:08 +02:00
Code Activity

Remove the timeout logic from the TTX driver code

Browse source 
The original `test.py` code, see
c2376e5cea/test/test.py,
did not have any timeout logic for TTX, but it got introduced when
`test.py` was ported from Python to JavaScript as `test.js` in
c2376e5cea (diff-a561630bb56b82342bc66697aee2ad96efddcbc9d150665abd6fb7ecb7c0ab2f).

However, I don't think we've ever actually seen TTX timing out.
Moreover, back then we used a very old version of TTX and ran the font
tests on the bots (where a hanging process would block other jobs and
would require a manual action to fix), so this code was most likely
only included defensively.

Fortunately, nowadays it should not be necessary anymore because we use
the most recent version of TTX (which either returns the result or
errors out, but isn't known to hang on inputs) and we run the font tests
on GitHub Actions which doesn't block other jobs anymore and also
automatically times the job out for us in the unlikely event that a hang
would ever occur.

In short, we can safely remove this logic to simplify the code and to get
rid of a callback.
This commit is contained in:
Tim van der Meij 2024-04-05 12:35:47 +02:00
parent 5adad89eb3
commit 64065141b6
No known key found for this signature in database
GPG key ID: 8C3FD2925A5F2762
2 changed files with 7 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/font/ttxdriver.mjs
View file

@ -21,14 +21,9 @@ import { spawn } from "child_process";
let ttxTaskId = Date.now();
function runTtx(fontPath, registerOnCancel, callback) {
function runTtx(fontPath, callback) {
const ttx = spawn("ttx", [fontPath], { stdio: "ignore" });
let ttxRunError;
registerOnCancel(function (reason) {
ttxRunError = reason;
callback(reason);
ttx.kill();
});
ttx.on("error", function (errorTtx) {
ttxRunError = errorTtx;
callback(
@ -43,14 +38,14 @@ function runTtx(fontPath, registerOnCancel, callback) {
});
}
function translateFont(content, registerOnCancel, callback) {
function translateFont(content, callback) {
const buffer = Buffer.from(content, "base64");
const taskId = (ttxTaskId++).toString();
const fontPath = path.join(os.tmpdir(), `pdfjs-font-test-${taskId}.otf`);
const resultPath = path.join(os.tmpdir(), `pdfjs-font-test-${taskId}.ttx`);
fs.writeFileSync(fontPath, buffer);
runTtx(fontPath, registerOnCancel, function (err) {
runTtx(fontPath, function (err) {
fs.unlinkSync(fontPath);
if (err) {
console.error(err);

20
test/test.mjs
View file

@ -842,22 +842,10 @@ function unitTestPostHandler(req, res) {
});
req.on("end", function () {
if (pathname === "/ttx") {
var onCancel = null,
ttxTimeout = 10000;
var timeoutId = setTimeout(function () {
onCancel?.("TTX timeout");
}, ttxTimeout);
translateFont(
body,
function (fn) {
onCancel = fn;
},
function (err, xml) {
clearTimeout(timeoutId);
res.writeHead(200, { "Content-Type": "text/xml" });
res.end(err ? "<error>" + err + "</error>" : xml);
}
);
translateFont(body, function (err, xml) {
res.writeHead(200, { "Content-Type": "text/xml" });
res.end(err ? "<error>" + err + "</error>" : xml);
});
return;
}