mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-08 06:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add optional ID for database buffering (for nested buffering)

Browse Source
This commit is contained in:
Gregory Schier 2019-03-08 22:55:39 -05:00
parent ede06c0274
commit 6b8bb2515c
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
packages/insomnia-app/app/common/database.js
View File

@ -140,6 +140,7 @@ export async function init(types: Array<string>, config: Object = {}, forceReset
// ~~~~~~~~~~~~~~~~ //
let bufferingChanges = false;
let bufferChangesId = 1;
let changeBuffer = [];
let changeListeners = [];
@ -151,13 +152,16 @@ export function offChange(callback: Function): void {
changeListeners = changeListeners.filter(l => l !== callback);
}
/** buffers database changes and returns false if was already buffering */
export const bufferChanges = (database.bufferChanges = async function(
millis: number = 1000,
): Promise<void> {
): Promise<number> {
if (db._empty) return _send('bufferChanges', ...arguments);
bufferingChanges = true;
setTimeout(database.flushChanges, millis);
return ++bufferChangesId;
});
export const flushChangesAsync = (database.flushChangesAsync = async function() {
@ -166,9 +170,14 @@ export const flushChangesAsync = (database.flushChangesAsync = async function()
});
});
export const flushChanges = (database.flushChanges = async function() {
export const flushChanges = (database.flushChanges = async function(id: number = 0) {
if (db._empty) return _send('flushChanges', ...arguments);
// Only flush if ID is 0 or the current flush ID is the same as passed
if (id !== 0 && bufferChangesId !== id) {
return;
}
bufferingChanges = false;
const changes = [...changeBuffer];
changeBuffer = [];
@ -377,7 +386,7 @@ export const remove = (database.remove = async function<T: BaseModel>(
): Promise<void> {
if (db._empty) return _send('remove', ...arguments);
await database.bufferChanges();
const flushId = await database.bufferChanges();
const docs = await database.withDescendants(doc);
const docIds = docs.map(d => d._id);
@ -388,7 +397,18 @@ export const remove = (database.remove = async function<T: BaseModel>(
docs.map(d => notifyOfChange(CHANGE_REMOVE, d, fromSync));
await database.flushChanges();
await database.flushChanges(flushId);
});
/** Removes entries without removing their children */
export const unsafeRemove = (database.unsafeRemove = async function<T: BaseModel>(
doc: T,
fromSync: boolean = false,
): Promise<void> {
if (db._empty) return _send('unsafeRemove', ...arguments);
db[doc.type].remove({ _id: doc._id });
notifyOfChange(CHANGE_REMOVE, doc, fromSync);
});
export const removeWhere = (database.removeWhere = async function(
@ -397,7 +417,7 @@ export const removeWhere = (database.removeWhere = async function(
): Promise<void> {
if (db._empty) return _send('removeWhere', ...arguments);
await database.bufferChanges();
const flushId = await database.bufferChanges();
for (const doc of await database.find(type, query)) {
const docs = await database.withDescendants(doc);
@ -410,7 +430,7 @@ export const removeWhere = (database.removeWhere = async function(
docs.map(d => notifyOfChange(CHANGE_REMOVE, d, false));
}
await database.flushChanges();
await database.flushChanges(flushId);
});
// ~~~~~~~~~~~~~~~~~~~ //
@ -466,10 +486,14 @@ export const withDescendants = (database.withDescendants = async function(
continue;
}
const promises = [];
for (const type of allTypes()) {
// If the doc is null, we want to search for parentId === null
const parentId = d ? d._id : null;
const more = await database.find(type, { parentId });
promises.push(database.find(type, { parentId }));
}
for (const more of await Promise.all(promises)) {
foundDocs = [...foundDocs, ...more];
}
}
@ -528,7 +552,7 @@ export const duplicate = (database.duplicate = async function<T: BaseModel>(
): Promise<T> {
if (db._empty) return _send('duplicate', ...arguments);
await database.bufferChanges();
const flushId = await database.bufferChanges();
async function next<T: BaseModel>(docToCopy: T, patch: Object): Promise<T> {
// 1. Copy the doc
@ -558,7 +582,7 @@ export const duplicate = (database.duplicate = async function<T: BaseModel>(
const createdDoc = await next(originalDoc, patch);
await database.flushChanges();
await database.flushChanges(flushId);
return createdDoc;
});