diff --git a/src/components/routes/vaults/vaults.scss b/src/components/routes/vaults/vaults.scss
index 5f89696..d20d516 100755
--- a/src/components/routes/vaults/vaults.scss
+++ b/src/components/routes/vaults/vaults.scss
@@ -4,7 +4,7 @@
.vaults_vault {
padding: 0.5rem;
- border-bottom: solid 1px var(--fore-color);
+ border-bottom: solid 1px var(--card-border-color);
}
.vaults_vault:hover {
diff --git a/src/components/routing.scss b/src/components/routing.scss
index d0b08d9..b79d604 100755
--- a/src/components/routing.scss
+++ b/src/components/routing.scss
@@ -11,7 +11,7 @@
.transition_slidein {
animation-name: slidein;
animation-duration: 0.3s;
- z-index: 128;
+ z-index: 64;
}
@keyframes slidein {
diff --git a/src/index.html b/src/index.html
index c608af5..6a0b90f 100755
--- a/src/index.html
+++ b/src/index.html
@@ -22,7 +22,6 @@
-
diff --git a/src/index.tsx b/src/index.tsx
index 1ed344e..124df3a 100755
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,8 +1,8 @@
import { h, render } from 'preact';
import App from './components/App';
-// import "mini.css/src/flavors/mini-dark.scss"
-import "mini.css/src/flavors/mini-default.scss"
+import "mini.css/src/flavors/mini-dark.scss"
+// import "mini.css/src/flavors/mini-default.scss"
import "./index.scss"
import Navigation from './navigation';
import VaultsPage from './components/routes/vaults/Vaults';
@@ -11,6 +11,8 @@ import { Page } from './page';
import Notes from "./notes"
import DemoPage from './components/demo';
import VaultPage from './components/routes/vault/Vault';
+import SharePage from './components/routes/share/Share';
+import Notifications from './notifications';
console.log(Notes);
(async () => {
@@ -22,7 +24,7 @@ console.log(Notes);
if (code) {
let err = await Notes.getToken(code)
if (err) {
- alert("Login failed: " + err)
+ Notifications.sendError("Login failed: " + err)
Notes.login()
} else {
window.history.replaceState(null, document.title, "/" + window.location.hash);
@@ -37,6 +39,7 @@ console.log(Notes);
Navigation.default = VaultsPage as typeof Page;
Navigation.addPage("/vault", VaultPage as typeof Page)
Navigation.addPage("/demo", DemoPage as typeof Page)
+ Navigation.addPage("/share", SharePage as typeof Page)
Navigation.start();
render(
, document.body, document.getElementById('app'));
diff --git a/src/navigation.ts b/src/navigation.ts
index 5a23339..9de8368 100755
--- a/src/navigation.ts
+++ b/src/navigation.ts
@@ -1,6 +1,6 @@
import Observable from "./helper/observable";
import { Page, PageProps } from "./page";
-import { h } from "preact";
+import { h, VNode } from "preact";
function serializQuery(obj: any) {
var str = [];
@@ -32,6 +32,8 @@ export default class Navigation {
private static _state: { [key: string]: any };
private static _hidden_state: { [key: string]: any };
+ private static _page_cache = new Map
>();
+
public static addPage(route: string, comp: typeof Page) {
Navigation._pages.set(route, comp);
}
@@ -70,7 +72,22 @@ export default class Navigation {
else
window.history.pushState(hidden, document.title, newhash);
}
- let page = h(component as any, { state: state, key: newhash + serializQuery(hidden), hidden: hidden });
+ let page = this._page_cache.get(newkey);
+ if (!page) {
+ console.log("Creating new page")
+ page = h(component as any, { state: state, key: newhash + serializQuery(hidden), hidden: hidden });
+ this._page_cache.set(newkey, page);
+ if (this._page_cache.size > 10) {
+ let cnt = this._page_cache.size - 10;
+ for (let key of this._page_cache.keys()) {
+ this._page_cache.delete(key);
+ cnt--;
+ if (cnt <= 0)
+ break;
+ }
+
+ }
+ }
Navigation._state = state;
Navigation._hidden_state = hidden;
@@ -103,6 +120,22 @@ export default class Navigation {
}
}
+ static getQuery() {
+ let hash = window.location.hash.substring(1);
+ let s = undefined;
+ if (hash && hash !== "") {
+ let [_, query] = hash.split("?");
+ if (query) {
+ try {
+ s = parseQuery(query)
+ } catch (err) {
+ console.error(err);
+ }
+ }
+ }
+ return s;
+ }
+
static start() {
window.addEventListener("popstate", (ev) => {
Navigation.onHashChange(ev.state);
diff --git a/src/notes.ts b/src/notes.ts
old mode 100755
new mode 100644
index 22ef29f..7d13878
--- a/src/notes.ts
+++ b/src/notes.ts
@@ -12,12 +12,6 @@ export class HttpError extends Error {
}
}
-export enum MessageType {
- INFO,
- WARNING,
- ERROR
-}
-
// const newSymbol = Symbol("Symbol for new Notes")
export interface Note {
@@ -47,6 +41,7 @@ import clonedeep = require("lodash.clonedeep");
import * as uuidv4 from "uuid/v4"
import IDB from "./helper/indexeddb";
import { Transaction } from "idb";
+import Notifications, { MessageType } from "./notifications";
console.log(aesjs)
const Encoder = new TextEncoder();
@@ -87,7 +82,7 @@ export interface IVault {
getAllNotes(): Promise;
searchNote(term: string): Promise
newNote(): ViewNote;
- saveNote(note: ViewNote): Promise;
+ saveNote(note: ViewNote, date?: Date): Promise;
getNote(id: string): Promise;
deleteNote(id: string): Promise;
}
@@ -96,12 +91,8 @@ class NotesProvider {
private notesObservableServer = new Observable(true)
public notesObservable = this.notesObservableServer.getPublicApi()
- public messageObservableServer = new Observable<{ message: string, type: MessageType }>(false)
- public messageObservable = this.messageObservableServer.getPublicApi()
-
- public sendErrorMessage(error: Error) {
- this.messageObservableServer.send({ message: error.message, type: MessageType.ERROR })
- }
+ private syncObservableServer = new Observable(true)
+ public syncObservable = this.syncObservableServer.getPublicApi()
private database = new IDB("notes", ["notes", "oplog"]);
private noteDB = this.database.getStore("notes");
@@ -153,8 +144,14 @@ class NotesProvider {
}
}
- public start() {
- return this.apiLockRls.then(lock => lock.release()).then(() => { this.sync() })
+ public async start() {
+ const next = () => {
+ setTimeout(() => {
+ this.sync().then(() => next);
+ }, 30000)
+ }
+
+ return this.apiLockRls.then(lock => lock.release()).then(() => { this.sync() }).then(() => next())
}
private async getJWT() {
@@ -163,8 +160,8 @@ class NotesProvider {
console.log("Getting JWT");
let req = await fetch(config.auth_server + "/api/oauth/jwt?refreshtoken=" + localStorage.getItem("refreshtoken"));
if (req.status !== 200) {
- this.messageObservableServer.send({ message: "offline", type: MessageType.INFO });
- throw new Error("Need login!")
+ Notifications.sendNotification("offline", MessageType.INFO);
+ throw new Error("Offline")
}
let res = await req.json();
if (res.error) {
@@ -251,6 +248,16 @@ class NotesProvider {
log("Pairs builded");
+ let stats = {
+ remote_change: 0,
+ remote_delete: 0,
+ remote_create: 0,
+ local_change: 0,
+ local_delete: 0,
+ do_nothing: 0,
+ error: 0
+ }
+
log("Start inspection");
for (let { local, remote, oplog, id } of pairs) {
const apply = async (old = false) => {
@@ -259,15 +266,18 @@ class NotesProvider {
switch (op.type) {
case OpLogType.CHANGE:
log(id, "REMOTE CHANGE");
+ stats.remote_change++;
await this._secureFile.update(id, op.values.value, b64.encode(op.values.preview), op.date, old);
break;
case OpLogType.DELETE:
log(id, "REMOTE DELETE");
+ stats.remote_delete++;
if (old) break; // if the deletion is old, just ignore
await this._secureFile.delete(id)
break;
case OpLogType.CREATE:
log(id, "REMOTE CREATE");
+ stats.remote_create++;
await this._secureFile.create(
"",
op.values.value,
@@ -282,8 +292,13 @@ class NotesProvider {
}
}
+ const localChange = (id: string) => {
+ //TODO implement
+ }
+
const create = async () => {
log(id, "LOCAL CREATAE/UPDATE");
+ stats.local_change++;
let value = await this._secureFile.get(id);
let note: DBNote = {
_id: remote._id,
@@ -293,55 +308,61 @@ class NotesProvider {
__value: new Uint8Array(value)
}
await this.noteDB.set(id, note);
+ localChange(id);
}
try {
- log(id, "LRO: ", !!local, !!remote, !!oplog)
+ // log(id, "LRO: ", !!local, !!remote, !!oplog)
if (remote && !oplog) {
if (local) {
let old = remote.active.time.valueOf() > local.time.valueOf();
if (old)
await create()
- else
+ else {
+ stats.do_nothing++;
log(id, "DO NOTHING");
+ }
} else {
await create()
}
} else if (!remote && local && !oplog) { // No local changes, but remote deleted
log("LOCAL DELETE");
+ stats.local_delete++;
await this.noteDB.delete(id);
+ localChange(id);
} else if (!remote && oplog) { // Remote does not exist, but oplog, just apply all changes including possible delete
await apply()
} else if (remote && oplog) {
let last = oplog[oplog.length - 1]
let old = remote.active.time.valueOf() > last.date.valueOf();
- // if (local) { //If local changes and remote exist
if (old)
await create() // Will recreate local entry
await apply(old) // Will apply changes to remote
- // }
-
- // if (!local) { //If local ist deleted but remote exists check what is newer
- // if (old)
- // await create()
- // await apply(old)
- // }
} else {
log(id, "DO NOTHING");
+ stats.do_nothing++;
}
} catch (err) {
console.error(err);
- this.messageObservableServer.send({ message: "Error syncing: " + id, type: MessageType.ERROR })
+ stats.error++;
+ Notifications.sendNotification("Error syncing: " + id, MessageType.ERROR);
}
await this.oplogDB.delete(id);
}
+ log("Stats", stats);
} finally {
log("Finished")
lock.release()
+ this.syncObservableServer.send(null);
}
}
+ public forgetVaultKey(vault_id: string) {
+ this.vaultKeys.delete(vault_id);
+ localStorage.removeItem("vault_" + vault_id);
+ }
+
public getVaultKey(vault_id: string) {
let key = this.vaultKeys.get(vault_id);
if (!key) {
@@ -368,7 +389,7 @@ class NotesProvider {
.map(e => {
let value = e.__value;
let encrypted = false;
- if (Decoder.decode(value) !== "__BASELINE__") encrypted = true;
+ if (this.decrypt(value) !== "__BASELINE__") encrypted = true;
return { name: e.folder, encrypted, id: e._id }
}));
}
@@ -386,7 +407,7 @@ class NotesProvider {
this.addop(vault._id, OpLogType.CREATE, {
value: vault.__value,
preview: vault.preview
- }, tx),
+ }, vault.time, tx),
this.noteDB.set(vault._id, vault)
]);
}
@@ -398,6 +419,14 @@ class NotesProvider {
return new NotesProvider.Vault(vault, key)
}
+ public async deleteVault(vault_id: string) {
+ let vault = await this.noteDB.get(vault_id);
+ if (!vault) throw new Error("Vault not found!");
+ let v = new NotesProvider.Vault(vault);
+ await Promise.all((await v.getAllNotes()).map(note => this.delete(note._id)));
+ await this.delete(v.id); // This can also delete a vault
+ }
+
public passwordToKey(password: string) {
return new Uint8Array(sha256.arrayBuffer(password + config.client_id))
}
@@ -415,27 +444,37 @@ class NotesProvider {
}
private _decrypt(value: ArrayBuffer, key?: Uint8Array): Uint8Array {
- if (!key) value;
+ if (!key) return new Uint8Array(value);
var aesCtr = new aesjs.ModeOfOperation.ctr(key);
var decryptedBytes = aesCtr.decrypt(value);
return new Uint8Array(decryptedBytes)
}
- private decrypt(value: ArrayBuffer, key: Uint8Array): string {
+ private decrypt(value: ArrayBuffer, key?: Uint8Array): string {
let msg = this._decrypt(value, key)
return Decoder.decode(this._decrypt(msg, this.generalEncryption))
}
- async addop(note_id: string, type: OpLogType, values: { value: Uint8Array, preview: Uint8Array }, transaction?: Transaction) {
- let tx = transaction || Notes.oplogDB.transaction();
- let oplog = await Notes.oplogDB.get(note_id, tx);
+ async addop(note_id: string, type: OpLogType, values: { value: Uint8Array, preview: Uint8Array }, date: Date, transaction?: Transaction) {
+ let tx = transaction || this.oplogDB.transaction();
+ let oplog = await this.oplogDB.get(note_id, tx);
if (!oplog) oplog = { logs: [], id: note_id };
oplog.logs.push({
- date: new Date(),
+ date: date,
type,
values
})
- await Notes.oplogDB.set(note_id, oplog, tx);
+ await this.oplogDB.set(note_id, oplog, tx);
+ }
+
+ async delete(id: string) {
+ let lock = await this.syncLock.getLock();
+ let tx = this.database.transaction(this.oplogDB, this.noteDB)
+ await Promise.all([
+ this.addop(id, OpLogType.DELETE, null, new Date(), tx),
+ this.noteDB.delete(id, tx)
+ ])
+ lock.release();
}
static Vault = class implements IVault {
@@ -458,8 +497,7 @@ class NotesProvider {
async getAllNotes() {
return Notes.noteDB.getAll()
- .then(all => all
- .filter(e => e.folder === this.vault._id)
+ .then(all => all.filter(e => e.folder === this.vault._id)
.map(e => {
let new_note = clonedeep(e) as BaseNote
delete (new_note).__value
@@ -483,7 +521,7 @@ class NotesProvider {
}
}
- async saveNote(note: ViewNote) {
+ async saveNote(note: ViewNote, date = new Date()) {
let lock = await Notes.syncLock.getLock();
const tx = Notes.database.transaction(Notes.noteDB, Notes.oplogDB);
let old_note = await Notes.noteDB.get(note._id, tx);
@@ -493,13 +531,14 @@ class NotesProvider {
let [title, preview] = note.__value.split("\n");
if (preview) preview = "\n" + preview;
else preview = ""
- new_note.preview = this.encrypt(title + preview)
+ new_note.preview = this.encrypt((title + preview).substr(0, 128))
+ new_note.time = date;
await Promise.all([
Notes.addop(note._id, !old_note ? OpLogType.CREATE : OpLogType.CHANGE, {
value: new_note.__value,
preview: new_note.preview
- }, tx),
+ }, date, tx),
Notes.noteDB.set(note._id, new_note, tx)
])
lock.release();
@@ -513,14 +552,8 @@ class NotesProvider {
return new_note;
}
- async deleteNote(id: string) {
- let lock = await Notes.syncLock.getLock();
- let tx = Notes.database.transaction(Notes.oplogDB, Notes.noteDB)
- await Promise.all([
- Notes.addop(id, OpLogType.DELETE, null, tx),
- Notes.noteDB.delete(id, tx)
- ])
- lock.release();
+ deleteNote(id: string) {
+ return Notes.delete(id);
}
}
}
diff --git a/src/notifications.ts b/src/notifications.ts
new file mode 100644
index 0000000..9820a7c
--- /dev/null
+++ b/src/notifications.ts
@@ -0,0 +1,34 @@
+import Observable from "./helper/observable";
+
+export enum MessageType {
+ INFO,
+ WARNING,
+ ERROR,
+ SUCCESS
+}
+
+export default class Notifications {
+ private static messageObservableServer = new Observable<{ message: string, type: MessageType }>(false)
+ public static messageObservable = Notifications.messageObservableServer.getPublicApi()
+
+
+ public static sendNotification(message: string, type: MessageType = MessageType.INFO) {
+ Notifications.messageObservableServer.send({ message, type });
+ }
+
+ public static sendInfo(message: string) {
+ this.sendNotification(message, MessageType.INFO)
+ }
+
+ public static sendWarning(message: string) {
+ this.sendNotification(message, MessageType.WARNING)
+ }
+
+ public static sendSuccess(message: string) {
+ this.sendNotification(message, MessageType.SUCCESS)
+ }
+
+ public static sendError(error: Error | string) {
+ Notifications.messageObservableServer.send({ message: typeof error === "string" ? error : error.message, type: MessageType.ERROR })
+ }
+}
\ No newline at end of file
diff --git a/webpack-stats.json b/webpack-stats.json
deleted file mode 100755
index a413ef6..0000000
Binary files a/webpack-stats.json and /dev/null differ
diff --git a/webpack.config.js b/webpack.config.js
index 99f5576..2b0ebb4 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,13 +5,24 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const Visualizer = require('webpack-visualizer-plugin');
const path = require("path");
+const fs = require("fs");
+const config = require("./config.json");
+const url = require("url");
module.exports = {
devServer: {
host: "0.0.0.0", // Defaults to `localhost`
open: false, // Open the page in browser,
contentBase: path.join(__dirname, 'dist'),
- disableHostCheck: true
+ disableHostCheck: true,
+ headers: {
+ "Access-Control-Allow-Origin": "*"
+ },
+ watchOptions: {
+ aggregateTimeout: 300,
+ poll: 500
+ },
+ public: url.parse(config.callback_url).hostname
},
plugins: [
new CopyWebpackPlugin([{ from: "public", to: "public" }]),