github-starred/acebase
2
0
Fork 0
mirror of https://github.com/appy-one/acebase.git synced 2026-06-30 06:02:02 -06:00
Code Issues 20 Projects Packages Wiki Activity Actions

fixed node value getting and locking issue

Browse source
This commit is contained in:
Ewout Stortenbeker 2020-02-12 18:06:16 +01:00
parent f27f5ec065
commit ddba3abc61
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/storage-localstorage.js
View file

@ -1,7 +1,7 @@
const { debug, ID, PathReference, PathInfo, ascii85 } = require('acebase-core');
const { NodeInfo } = require('./node-info');
const { VALUE_TYPES } = require('./node-value-types');
const { Storage, StorageSettings } = require('./storage');
const { Storage, StorageSettings, NodeNotFoundError } = require('./storage');
class LocalStorageSettings extends StorageSettings {
constructor(settings) {
@ -76,7 +76,7 @@ class LocalStorage extends Storage {
}
})
.then(() => {
return this.indexes.load();
return this.indexes.supported && this.indexes.load();
})
.then(() => {
this.emit('ready');
@ -622,15 +622,15 @@ class LocalStorage extends Storage {
const targetRow = this._readNode(path);
if (!targetRow) {
// Lookup parent node
if (path === '') { return null; } // path is root. There is no parent.
if (path === '') { return { value: null }; } // path is root. There is no parent.
return lock.moveToParent()
.then(parentLock => {
lock = parentLock;
let parentNode = this._readNode(pathInfo.parentPath);
if ([VALUE_TYPES.OBJECT, VALUE_TYPES.ARRAY].includes(parentNode.type) && pathInfo.key in parentNode) {
return parentNode[pathInfo.key];
if (parentNode && [VALUE_TYPES.OBJECT, VALUE_TYPES.ARRAY].includes(parentNode.type) && pathInfo.key in parentNode) {
return { revision: parentNode.revision, value: parentNode.value[pathInfo.key] };
}
return null;
return { value: null };
});
}
@ -740,8 +740,6 @@ class LocalStorage extends Storage {
throw new Error(`multiple records found for non-object value!`);
}
lock.release();
// Post process filters to remove any data that got though because they were
// not stored in dedicated records. This will happen with smaller values because
// they are stored inline in their parent node.
@ -784,6 +782,10 @@ class LocalStorage extends Storage {
}
return result;
})
.then(result => {
lock.release();
return result;
})
.catch(err => {
lock.release();
throw err;