OpenServer/SecureNotes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updaing to IDB 4x

Browse Source
This commit is contained in:
Fabian 2019-07-02 18:34:41 +02:00
parent 93b272ecb5
commit c3f9529feb
4 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -3541,9 +3541,9 @@
} }
}, },
"idb": { "idb": {
"version": "3.0.2", "version": "4.0.3",
"resolved": "https://registry.npmjs.org/idb/-/idb-3.0.2.tgz", "resolved": "https://registry.npmjs.org/idb/-/idb-4.0.3.tgz",
"integrity": "sha512-+FLa/0sTXqyux0o6C+i2lOR0VoS60LU/jzUo5xjfY6+7sEEgy4Gz1O7yFBXvjd7N0NyIGWIRg8DcQSLEG+VSPw==" "integrity": "sha512-moRlNNe0Gsvp4jAwz5cJ7scjyNTVA/cESKGCobULaljfaKZ970y8NDNCseHdMY+YxNXH58Z1V+7tTyf0GZyKqw=="
}, },
"ieee754": { "ieee754": {
"version": "1.1.13", "version": "1.1.13",

2
package.json
View File

@ -18,7 +18,7 @@
"@hibas123/utils": "^2.1.0", "@hibas123/utils": "^2.1.0",
"aes-js": "^3.1.2", "aes-js": "^3.1.2",
"feather-icons": "^4.22.1", "feather-icons": "^4.22.1",
"idb": "3.0.2", "idb": "^4.0.3",
"js-sha256": "^0.9.0", "js-sha256": "^0.9.0",
"lodash.clonedeep": "^4.5.0", "lodash.clonedeep": "^4.5.0",
"secure-file-wrapper": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git", "secure-file-wrapper": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git",

49
src/helper/indexeddb.ts
View File

@ -1,14 +1,12 @@
import { Lock } from "@hibas123/utils"; import { Lock } from "@hibas123/utils";
import { DB, openDb, Transaction } from "idb"; import { openDB, IDBPDatabase, IDBPTransaction, } from "idb";
export default class IDB { export default class IDB {
initLock = new Lock(); initLock = new Lock();
db: DB; db: IDBPDatabase;
constructor(database: string, private stores: string[]) { constructor(database: string, private stores: string[]) {
let lock = this.initLock.getLock(); this.initLock.getLock().then(async l => {
lock.then(async l => {
let v = localStorage.getItem(database + "_version"); let v = localStorage.getItem(database + "_version");
let version = 0; let version = 0;
if (v) version = Number(v) if (v) version = Number(v)
@ -21,12 +19,15 @@ export default class IDB {
localStorage.setItem(database + "_version", version.toString()); localStorage.setItem(database + "_version", version.toString());
localStorage.setItem(database + "_stores", stores.join(",")); localStorage.setItem(database + "_stores", stores.join(","));
this.db = await openDb(database, version, db => { this.db = await openDB(database, version, {
upgrade: (db) => {
console.log("IndexedDB need update") console.log("IndexedDB need update")
const check = name => (<any>db.objectStoreNames as DOMStringList).contains ? (<any>db.objectStoreNames as DOMStringList).contains(name) : db.objectStoreNames.find(e => e === name);
stores.forEach(store => { stores.forEach(store => {
if (!db.objectStoreNames.contains(store)) if (!check(store))
db.createObjectStore(store); db.createObjectStore(store);
}) })
},
}) })
console.log("Got DATABASE", this.db) console.log("Got DATABASE", this.db)
l.release(); l.release();
@ -48,42 +49,42 @@ export default class IDB {
return { return {
name: name, name: name,
transaction: () => { transaction: () => {
return this.db.transaction(name, "readwrite") return <any>this.db.transaction(name, "readwrite") as IDBPTransaction<unknown, string[]>;
}, },
get: async (key: string, transaction?: Transaction): Promise<T> => { get: async (key: string, transaction?: IDBPTransaction<unknown, string[]>): Promise<T> => {
(await this.initLock.getLock()).release() (await this.initLock.getLock()).release()
return (transaction || this.db.transaction(name)) return (transaction || this.db.transaction(name))
.objectStore(name).get(key); .objectStore(name).get(key);
}, },
getAll: async (transaction?: Transaction): Promise<T[]> => { getAll: async (transaction?: IDBPTransaction<unknown, string[]>): Promise<T[]> => {
(await this.initLock.getLock()).release() (await this.initLock.getLock()).release()
return (transaction || this.db.transaction(name)) return (transaction || this.db.transaction(name))
.objectStore(name).getAll(); .objectStore(name).getAll();
}, },
set: async (key: string, val: T, transaction?: Transaction) => { set: async (key: string, val: T, transaction?: IDBPTransaction<unknown, string[]>) => {
(await this.initLock.getLock()).release() (await this.initLock.getLock()).release()
const tx = (transaction || this.db.transaction(name, "readwrite")); const tx = (transaction || this.db.transaction(name, "readwrite"));
tx.objectStore(name).put(val, key); tx.objectStore(name).put(val, key);
return tx.complete; return tx.done;
}, },
delete: async (key: string, transaction?: Transaction) => { delete: async (key: string, transaction?: IDBPTransaction<unknown, string[]>) => {
(await this.initLock.getLock()).release() (await this.initLock.getLock()).release()
const tx = (transaction || this.db.transaction(name, "readwrite")); const tx = (transaction || this.db.transaction(name, "readwrite"));
tx.objectStore(name).delete(key); tx.objectStore(name).delete(key);
return tx.complete; return tx.done;
}, },
clear: async (transaction?: Transaction) => { clear: async (transaction?: IDBPTransaction<unknown, string[]>) => {
(await this.initLock.getLock()).release() (await this.initLock.getLock()).release()
const tx = (transaction || this.db.transaction(name, "readwrite")); const tx = (transaction || this.db.transaction(name, "readwrite"));
tx.objectStore(name).clear(); tx.objectStore(name).clear();
return tx.complete; return tx.done;
}, },
keys: async (transaction?: Transaction): Promise<string[]> => { keys: async (transaction?: IDBPTransaction<unknown, string[]>): Promise<string[]> => {
(await this.initLock.getLock()).release() (await this.initLock.getLock()).release()
const tx = (transaction || this.db.transaction(name)); const tx = (transaction || this.db.transaction(name));
const keys: string[] = []; const keys: string[] = [];
@ -91,13 +92,15 @@ export default class IDB {
// This would be store.getAllKeys(), but it isn't supported by Edge or Safari. // This would be store.getAllKeys(), but it isn't supported by Edge or Safari.
// openKeyCursor isn't supported by Safari, so we fall back // openKeyCursor isn't supported by Safari, so we fall back
(store.iterateKeyCursor || store.iterateCursor).call(store, (cursor: any) => { store.getAllKeys()
if (!cursor) return;
keys.push(cursor.key);
cursor.continue();
});
return tx.complete.then(() => keys); // (store.iterateKeyCursor || store.iterateCursor).call(store, (cursor: any) => {
// if (!cursor) return;
// keys.push(cursor.key);
// cursor.continue();
// });
return tx.done.then(() => keys);
} }
} }
} }

4
src/notes.ts
View File

@ -1,7 +1,7 @@
import SecureFile, { IFile } from "@hibas123/secure-file-wrapper"; import SecureFile, { IFile } from "@hibas123/secure-file-wrapper";
import { Lock, Observable } from "@hibas123/utils"; import { Lock, Observable } from "@hibas123/utils";
import * as aesjs from "aes-js"; import * as aesjs from "aes-js";
import { Transaction } from "idb"; import { IDBPTransaction } from "idb";
import { sha256 } from "js-sha256"; import { sha256 } from "js-sha256";
import * as uuidv4 from "uuid/v4"; import * as uuidv4 from "uuid/v4";
import * as config from "../config.json"; import * as config from "../config.json";
@ -480,7 +480,7 @@ class NotesProvider {
return Decoder.decode(this._decrypt(msg, this.generalEncryption)) return Decoder.decode(this._decrypt(msg, this.generalEncryption))
} }
async addop(note_id: string, type: OpLogType, values: { value: Uint8Array, preview: Uint8Array }, date: Date, transaction?: Transaction) { async addop(note_id: string, type: OpLogType, values: { value: Uint8Array, preview: Uint8Array }, date: Date, transaction?: IDBPTransaction<unknown, string[]>) {
let tx = transaction || this.oplogDB.transaction(); let tx = transaction || this.oplogDB.transaction();
let oplog = await this.oplogDB.get(note_id, tx); let oplog = await this.oplogDB.get(note_id, tx);
if (!oplog) oplog = { logs: [], id: note_id }; if (!oplog) oplog = { logs: [], id: note_id };