Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 30 additions & 0 deletions attack-search/__tests__/search-service.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,36 @@ describe('SearchService', () => {
expect(tableResults).toEqual(data);
});

test('Backup search index completes when FlexSearch exports fewer than nine persisted chunks', async () => {
const exportedChunks = [
['title.1.map', 'title map data'],
['content.1.map', 'content map data'],
['content.1.ctx', 'content context data'],
['1.reg', 'register data'],
];

searchService.attackIndex = {
index: {
export: jest.fn((handler) => {
exportedChunks.forEach(([key, value], index) => {
setTimeout(() => handler(key, value), index);
});
}),
},
};
searchService.searchIndexDb = {
put: jest.fn(() => Promise.resolve()),
};

const result = await Promise.race([
searchService.backupSearchIndex().then(() => 'completed'),
new Promise((resolve) => setTimeout(() => resolve('timed out'), 250)),
]);

expect(result).toBe('completed');
expect(searchService.searchIndexDb.put).toHaveBeenCalledTimes(exportedChunks.length);
});

test('Resolve search results', async () => {
await searchService.initializeAsync(data);

Expand Down
49 changes: 35 additions & 14 deletions attack-search/src/search-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,25 +190,46 @@ module.exports = class SearchService {
* @returns {Promise<Array<string>>}
*/
async backupSearchIndex() {
return new Promise((resolve, reject) => {
let idleTimer = null;
let pendingWrites = 0;
let settled = false;

const resolveWhenIdle = () => {
clearTimeout(idleTimer);
idleTimer = setTimeout(() => {
if (!settled && pendingWrites === 0) {
settled = true;
resolve(true);
}
}, 100);
};

const keys = [];
let processedKeys = 0;

// totalKeys(x) = (3 * #searchFields) + 3
// ^
// title + content --> 2 fields
const totalKeys = 9;
const rejectOnce = (error) => {
if (settled) return;
settled = true;
clearTimeout(idleTimer);
reject(error);
};

return new Promise((resolve) => {
this.attackIndex.index.export(async (key, data) => {
await this.searchIndexDb.put({ key, data });
keys.push(key);
processedKeys++;
this.attackIndex.index.export((key, data) => {
clearTimeout(idleTimer);

if (processedKeys === totalKeys) {
resolve(true);
if (data === undefined) {
resolveWhenIdle();
return null;
}

pendingWrites++;
return this.searchIndexDb.put({ key, data })
.catch(rejectOnce)
.finally(() => {
pendingWrites--;
resolveWhenIdle();
});
});

resolveWhenIdle();
});
}

Expand Down
Loading