Skip to content

Avoid requesting range beyond end of file if file size available #21

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
cmdcolin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid requesting range beyond end of file if file size available #21

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
23 changes: 22 additions & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ export default class Trix {
let { end, buffer } = res
let done = false
const decoder = new TextDecoder('utf8')

let fileSize: number | undefined
try {
fileSize = (await this.ixFile.stat()).size
} catch (e) {
/* do nothing */
}

// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
while (!done) {
let foundSomething = false
Expand Down Expand Up @@ -74,7 +82,20 @@ export default class Trix {
// if we are not done, and we haven't filled up maxResults with hits yet,
// then refetch
if (resultArr.length + hits.length < this.maxResults && !done) {
const res2 = await this.ixFile.read(CHUNK_SIZE, end, opts)
// if we are clear past the end of the file, break
if (fileSize !== undefined && end > fileSize) {
resultArr = resultArr.concat(hits)
break
}

// else if we are requesting past end of file, chop to length of file
const res2 = await this.ixFile.read(
fileSize !== undefined && end + CHUNK_SIZE > fileSize
? fileSize - end
: CHUNK_SIZE,
end,
opts,
)

// early break if empty response
if (res2.length === 0) {
Expand Down