Skip to content

Add timeout option #478

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
merged 4 commits into from
Jan 26, 2024
+29 −2
Merged

Add timeout option #478

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de211d4
Add timeout option
ExplodingCabbage Jan 17, 2024
e5026a6
Add docs
ExplodingCabbage Jan 26, 2024
c18c7ec
Add test of timeout feature
ExplodingCabbage Jan 26, 2024
e211a83
Add release notes
ExplodingCabbage Jan 26, 2024
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
Next Next commit
Add timeout option
  • Loading branch information
@ExplodingCabbage
ExplodingCabbage committed Jan 17, 2024
commit de211d4fff01c9e00892ac08a154bdded4d4a5fd
6 changes: 4 additions & 2 deletions src/diff/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ Diff.prototype = {
if(options.maxEditLength) {
maxEditLength = Math.min(maxEditLength, options.maxEditLength);
}
const maxExecutionTime = options.timeout ?? Infinity;
const abortAfterTimestamp = Date.now() + maxExecutionTime;

let bestPath = [{ oldPos: -1, lastComponent: undefined }];

Expand Down Expand Up @@ -128,7 +130,7 @@ Diff.prototype = {
if (callback) {
(function exec() {
setTimeout(function() {
if (editLength > maxEditLength) {
if (editLength > maxEditLength || Date.now() > abortAfterTimestamp) {
return callback();
}

Expand All @@ -138,7 +140,7 @@ Diff.prototype = {
}, 0);
}());
} else {
while (editLength <= maxEditLength) {
while (editLength <= maxEditLength && Date.now() <= abortAfterTimestamp) {
let ret = execEditLength();
if (ret) {
return ret;
Expand Down