AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update object store with promises and multiple tables for future localstorage migration

Browse source
This commit is contained in:
Stewart Allen 2021-09-21 12:23:36 -04:00
commit da3faa2bf5
4 changed files with 85 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app.js
View file

@ -254,7 +254,7 @@ const script = {
"kiri/ui",
"kiri/lang",
"kiri/lang-en",
"kiri/db",
"kiri/catalog",
"kiri/slice",
"kiri/layers",
"kiri/client",
@ -411,7 +411,7 @@ const script = {
"moto/load-stl",
"moto/db",
"moto/ui",
"kiri/db",
"kiri/catalog",
"meta"
].map(p => `src/${p}.js`)
};

0
src/kiri/db.js → src/kiri/catalog.js
View file

10
src/kiri/main.js
View file

@ -1,4 +1,4 @@
console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
"use strict";
@ -18,6 +18,7 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
LOCAL = self.debug && !SETUP.remote,
SDB = MOTO.KV,
ODB = KIRI.odb = new MOTO.Storage(SETUP.d ? SETUP.d[0] : 'kiri'),
K3DB = KIRI.wdb = new MOTO.Storage('kiri3', { stores:["file","work"] }).init(),
SPACE = KIRI.space = MOTO.Space,
WIDGETS = KIRI.widgets = [],
CATALOG = KIRI.catalog = KIRI.openCatalog(ODB),
@ -246,7 +247,7 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
dec: () => { kiri.api.event.emit("busy", --busy) }
},
conf: {
dbo: () => { return ls2o('ws-settings') },
dbo: () => { console.log("dbo() deprecated"); return ls2o('ws-settings') },
get: getSettings,
put: putSettings,
load: loadSettings,
@ -3140,10 +3141,15 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
// prevent safari from exiting full screen mode
DOC.onkeydown = function (evt) { if (evt.keyCode == 27) evt.preventDefault() }
K3DB.onIdle(function() {
console.log("k3db idle");
});
// run optional module functions NOW before kiri-init has run
if (Array.isArray(self.kirimod)) {
kirimod.forEach(function(mod) { mod(kiri.api) });
}
// new module loading
kiri.loader.forEach(mod => { mod(kiri.api)} );

94
src/moto/db.js
View file

@ -25,11 +25,13 @@
* @param {number} [version]
* @constructor
*/
function Storage(dbname, version) {
function Storage(dbname, options = {}) {
this.db = null;
this.name = dbname;
this.version = version || 1;
this.stores = options.stores || [ dbname ];
this.version = options.version || 1;
this.queue = [];
this.idle = [];
this.initCalled = false;
}
@ -43,6 +45,37 @@
* indexedDB implementation
******************************************************************* */
SP.onIdle = function(fn) {
if (this.queue.length) {
this.idle.push(fn);
} else {
fn();
}
return this;
};
SP.promise = {
keys: (lower, upper) => new Promise(function(resolve, reject) {
this.keys(resolve,lower,upper);
}),
iterate: (lower, upper, nullterm) => new Promise(function(resolve, reject) {
this.iterate(resolve, lower, upper, nullterm);
}),
get: (key) => new Promise(function(resolve, reject) {
this.get(key, resolve);
}),
put: (key, value) => new Promise(function(resolve, reject) {
this.put(key, value, resolve);
}),
remove: (key) => new Promise(function(resolve, reject) {
this.remove(key, resolve);
})
};
SP.keys = function(callback, lower, upper) {
let out = [];
this.iterate(function(k,v) {
@ -63,15 +96,18 @@
lower ? IRR.lowerBound(lower) :
upper ? IRR.upperBound(upper) : undefined;
// iterate over all db values for debugging
this.db.transaction(this.name).objectStore(this.name).openCursor(range).onsuccess = function(event) {
let cursor = event.target.result;
if (cursor) {
callback(cursor.key,cursor.value);
cursor.continue();
} else if (nullterm) {
callback(null);
}
};
this.db
.transaction(this.name)
.objectStore(this.current)
.openCursor(range).onsuccess = function(event) {
let cursor = event.target.result;
if (cursor) {
callback(cursor.key,cursor.value);
cursor.continue();
} else if (nullterm) {
callback(null);
}
};
};
SP.deleteStore = function() {
@ -80,7 +116,12 @@
return this.init(true);
};
SP.init = function(deleteOS) {
SP.use = function(store) {
this.current = store;
return this;
}
SP.init = function(options = {}) {
if (this.initCalled) return;
let storage = this,
@ -97,18 +138,22 @@
request = IDB.open(name, this.version);
request.onupgradeneeded = function(event) {
if (deleteOS) {
if (options.delete === true) {
storage.db.deleteObjectStore(name);
return;
}
storage.db = request.result;
storage.store = storage.db.createObjectStore(name);
let db = storage.db = request.result;
for (let store of storage.stores) {
storage.store = db.createObjectStore(store);
storage.current = store;
}
event.target.transaction.oncomplete = function(event) {
storage.runQueue();
};
};
request.onsuccess = function(event) {
storage.current = storage.stores[0];
storage.db = request.result;
storage.runQueue();
};
@ -141,6 +186,9 @@
}
this.queue = [];
}
while (this.idle.length) {
this.idle.shift()();
}
};
SP.put = function(key, value, callback) {
@ -154,7 +202,9 @@
return this.queue.push(['put', key, value, callback]);
}
try {
let req = this.db.transaction(this.name, "readwrite").objectStore(this.name).put(value, key);
let req = this.db
.transaction(this.name, "readwrite")
.objectStore(this.current).put(value, key);
if (callback) {
req.onsuccess = function(event) { callback(true) };
req.onerror = function(event) { callback(false) };
@ -175,7 +225,9 @@
return this.queue.push(['get', key, callback]);
}
try {
let req = this.db.transaction(this.name).objectStore(this.name).get(key);
let req = this.db
.transaction(this.name)
.objectStore(this.current).get(key);
if (callback) {
req.onsuccess = function(event) { callback(req.result) };
req.onerror = function(event) { callback(null) };
@ -197,7 +249,9 @@
return this.queue.push(['remove', key, callback]);
}
try {
let req = this.db.transaction(this.name, "readwrite").objectStore(this.name).delete(key);
let req = this.db
.transaction(this.name, "readwrite")
.objectStore(this.current).delete(key);
if (callback) {
req.onsuccess = function(event) { callback(true) };
req.onerror = function(event) { callback(false) };
@ -213,7 +267,9 @@
this.init();
return this.queue.push(['clear']);
}
this.db.transaction(this.name, "readwrite").objectStore(this.name).clear();
this.db
.transaction(this.name, "readwrite")
.objectStore(this.current).clear();
};
})();