Add auto resolving fields

.drone.yml

@@ -0,0 +1,21 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: Build with node
+    image: node:12
+    commands:
+      - npm install
+      - npm run build
+  - name: Publish to docker
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      auto_tag: true
+      repo: hibas123.azurecr.io/realtimedb
+      registry: hibas123.azurecr.io
+      debug: true

.editorconfig

@@ -1,3 +1,5 @@
+[*]
 charset = utf-8
 indent_size = 3
 indent_style = space
+insert_final_newline = true

package.json

@@ -1,47 +1,47 @@
 {
-  "name": "@hibas123/realtimedb",
-  "version": "2.0.0-beta.8",
-  "description": "",
-  "main": "lib/index.js",
-  "private": true,
-  "scripts": {
-    "start": "node lib/index.js",
-    "build": "tsc",
-    "watch-ts": "tsc -w",
-    "watch-node": "nodemon --ignore *.ts lib/index.js",
-    "watch": "concurrently \"npm:watch-*\"",
-    "build-docker": "npm run build && docker build -t realtimedb .",
-    "prepublishOnly": "tsc"
-  },
-  "author": "Fabian Stamm <dev@fabianstamm.de>",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/dotenv": "^8.2.0",
-    "@types/jsonwebtoken": "^8.3.5",
-    "@types/koa": "^2.0.51",
-    "@types/koa-router": "^7.0.42",
-    "@types/leveldown": "^4.0.1",
-    "@types/levelup": "^3.1.1",
-    "@types/nanoid": "^2.1.0",
-    "@types/node": "^12.12.5",
-    "@types/ws": "^6.0.3",
-    "concurrently": "^5.0.0",
-    "nodemon": "^1.19.4",
-    "typescript": "^3.6.4"
-  },
-  "dependencies": {
-    "@hibas123/nodelogging": "^2.1.1",
-    "@hibas123/utils": "^2.1.1",
-    "dotenv": "^8.2.0",
-    "handlebars": "^4.5.1",
-    "jsonwebtoken": "^8.5.1",
-    "koa": "^2.11.0",
-    "koa-body": "^4.1.1",
-    "koa-router": "^7.4.0",
-    "leveldown": "^5.4.1",
-    "levelup": "^4.3.2",
-    "nanoid": "^2.1.6",
-    "what-the-pack": "^2.0.3",
-    "ws": "^7.2.0"
-  }
+   "name": "@hibas123/realtimedb",
+   "version": "2.0.0-beta.19",
+   "description": "",
+   "main": "lib/index.js",
+   "private": true,
+   "scripts": {
+      "start": "node lib/index.js",
+      "build": "tsc",
+      "watch-ts": "tsc -w",
+      "watch-node": "nodemon --ignore *.ts lib/index.js",
+      "watch": "concurrently \"npm:watch-*\"",
+      "build-docker": "npm run build && docker build -t realtimedb .",
+      "prepublishOnly": "tsc"
+   },
+   "author": "Fabian Stamm <dev@fabianstamm.de>",
+   "license": "ISC",
+   "devDependencies": {
+      "@types/dotenv": "^8.2.0",
+      "@types/jsonwebtoken": "^8.3.8",
+      "@types/koa": "^2.11.2",
+      "@types/koa-router": "^7.4.0",
+      "@types/leveldown": "^4.0.2",
+      "@types/levelup": "^4.3.0",
+      "@types/nanoid": "^2.1.0",
+      "@types/node": "^13.9.3",
+      "@types/ws": "^7.2.3",
+      "concurrently": "^5.1.0",
+      "nodemon": "^2.0.2",
+      "typescript": "^3.8.3"
+   },
+   "dependencies": {
+      "@hibas123/nodelogging": "^2.1.5",
+      "@hibas123/utils": "^2.2.3",
+      "dotenv": "^8.2.0",
+      "handlebars": "^4.7.3",
+      "jsonwebtoken": "^8.5.1",
+      "koa": "^2.11.0",
+      "koa-body": "^4.1.1",
+      "koa-router": "^8.0.8",
+      "leveldown": "^5.5.1",
+      "levelup": "^4.3.2",
+      "nanoid": "^2.1.11",
+      "what-the-pack": "^2.0.3",
+      "ws": "^7.2.3"
+   }
 }

src/connection.ts

@@ -1,8 +1,8 @@
 import Logging from "@hibas123/nodelogging";
 import { IncomingMessage, Server } from "http";
 import * as WebSocket from "ws";
-import { DatabaseManager, IQuery, ITypedQuery } from "./database/database";
-import { CollectionQuery, DocumentQuery } from "./database/query";
+import { DatabaseManager } from "./database/database";
+import { CollectionQuery, DocumentQuery, IQuery, ITypedQuery } from "./database/query";
 import Session from "./database/session";
 import { verifyJWT } from "./helper/jwt";
 import nanoid = require("nanoid");
@@ -61,14 +61,22 @@ export class ConnectionManager {
       }
 
       const answer = (id: string, data: any, error: boolean = false) => {
+         if (error)
+            Logging.error(error as any);
          socket.send(JSON.stringify({ ns: "message", data: { id, error, data } }));
       }
 
       const handler = new Map<string, ((data: any) => void)>();
 
-      handler.set("v2", async ({ id, query }: { id: string, query: IQuery }) => db.run(query, session)
+      handler.set("v2", async ({ id, query }) => db.run(Array.isArray(query) ? query : [query], session)
          .then(res => answer(id, res))
-         .catch(err => answer(id, undefined, err)));
+         .catch(err => answer(id, undefined, err))
+      );
+
+      // handler.set("bulk", async ({ id, query }) => db.run(query, session)
+      //    .then(res => answer(id, res))
+      //    .catch(err => answer(id, undefined, err))
+      // );
 
 
       const SnapshotMap = new Map<string, string>();
@@ -106,10 +114,8 @@ export class ConnectionManager {
 
       socket.on("close", () => {
          Logging.log(`${session.id} has disconnected!`);
-         session.queries.forEach((query: DocumentQuery | CollectionQuery) => {
-            query.unsubscribe();
-         })
-         session.queries.clear();
+         session.subscriptions.forEach(unsubscribe => unsubscribe());
+         session.subscriptions.clear();
          socket.removeAllListeners();
       })
    }

src/database/database.ts

@@ -1,29 +1,18 @@
 import { Rules } from "./rules";
 import Settings from "../settings";
-import getLevelDB, { LevelDB, deleteLevelDB } from "../storage";
+import getLevelDB, { LevelDB, deleteLevelDB, resNull } from "../storage";
 import DocumentLock from "./lock";
-import { DocumentQuery, CollectionQuery, Query, QueryError } from "./query";
+import { DocumentQuery, CollectionQuery, Query, QueryError, ITypedQuery, IQuery } from "./query";
 import Logging from "@hibas123/nodelogging";
 import Session from "./session";
-import nanoid = require("nanoid");
+import nanoid = require("nanoid/generate");
+import { Observable } from "@hibas123/utils";
 
-type IWriteQueries = "set" | "update" | "delete" | "add";
-type ICollectionQueries = "get" | "add" | "keys" | "delete-collection" | "list";
-type IDocumentQueries = "get" | "set" | "update" | "delete";
-
-export interface ITypedQuery<T> {
-   path: string[];
-   type: T;
-   data?: any;
-   options?: any;
-}
-
-interface ITransaction {
-   queries: ITypedQuery<IWriteQueries>[];
-}
-
-export type IQuery = ITypedQuery<ICollectionQueries | IDocumentQueries>;
+const ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
+// interface ITransaction {
+//    queries: ITypedQuery<IWriteQueries>[];
+// }
 
 export class DatabaseManager {
    static databases = new Map<string, Database>();
@@ -66,12 +55,17 @@ export type ChangeTypes = "added" | "modified" | "deleted";
 export type Change = {
    data: any;
    document: string;
+   collection: string;
    type: ChangeTypes;
    sender: string;
 }
 
 
 export class Database {
+   public static getKey(collectionid: string, documentid?: string) {
+      return `${collectionid || ""}/${documentid || ""}`;
+   }
+
    private level = getLevelDB(this.name);
 
    get data() {
@@ -84,10 +78,15 @@ export class Database {
 
 
    public rules: Rules;
-   public locks = new DocumentLock()
+   private locks = new DocumentLock()
    public collectionLocks = new DocumentLock()
 
-   public changes = new Map<string, Set<(change: Change) => void>>();
+   public changeListener = new Map<string, Set<(change: Change[]) => void>>();
+   public collectionChangeListener = new Observable<{
+      key: string;
+      id: string;
+      type: "create" | "delete"
+   }>();
 
    toJSON() {
       return {
@@ -124,14 +123,71 @@ export class Database {
       this.publickey = key;
    }
 
+   public async resolve(path: string[], create = false): Promise<{ collection: string, document: string, collectionKey: string }> {
+      path = [...path]; // Create modifiable copy
+      let collectionID: string = undefined;
+      let documentKey = path.length % 2 === 0 ? path.pop() : undefined;
+      let key = path.join("/");
 
-   getQuery(path: string[], session: Session, type: "document" | "collection" | "any") {
-      if (type === "document")
-         return new DocumentQuery(this, path, session);
-      else if (type === "collection")
-         return new CollectionQuery(this, path, session);
-      else
-         return new Query(this, path, session);
+      const lock = await this.collectionLocks.lock(key);
+
+      try {
+         collectionID = await this.collections.get(key).then(r => r.toString()).catch(resNull);
+         if (!collectionID && create) {
+            collectionID = nanoid(ALPHABET, 32);
+            await this.collections.put(key, collectionID);
+            setImmediate(() => {
+               this.collectionChangeListener.send({
+                  id: collectionID,
+                  key,
+                  type: "create"
+               })
+            })
+         }
+      } finally {
+         lock();
+      }
+
+      return {
+         collection: collectionID,
+         document: documentKey,
+         collectionKey: key
+      };
+   }
+
+   private sendChanges(changes: Change[]) {
+      let col = new Map<string, Map<string, Change[]>>();
+      changes.forEach(change => {
+         let e = col.get(change.collection);
+         if (!e) {
+            e = new Map()
+            col.set(change.collection, e);
+         }
+
+         let d = e.get(change.document);
+         if (!d) {
+            d = [];
+            e.set(change.document, d);
+         }
+
+         d.push(change);
+      })
+
+      setImmediate(() => {
+         for (let [collection, documents] of col.entries()) {
+            let collectionChanges = [];
+            for (let [document, documentChanges] of documents.entries()) {
+               let s = this.changeListener.get(Database.getKey(collection, document));
+               if (s)
+                  s.forEach(e => setImmediate(() => e(documentChanges)));
+
+               collectionChanges.push(...documentChanges);
+            }
+            let s = this.changeListener.get(Database.getKey(collection))
+            if (s)
+               s.forEach(e => setImmediate(() => e(collectionChanges)))
+         }
+      })
    }
 
    private validate(query: ITypedQuery<any>) {
@@ -146,80 +202,121 @@ export class Database {
          throw inv;
    }
 
-   async run(query: IQuery, session: Session) {
-      this.validate(query);
-      const isCollection = query.path.length % 2 === 1;
-      if (isCollection) {
-         const q = new CollectionQuery(this, query.path, session);
-         let type = query.type as ICollectionQueries;
-         switch (type) {
-            case "add":
-               return q.add(query.data);
-            case "get":
-               const limit = (query.options || {}).limit;
-               if (limit)
-                  q.limit = limit;
-               const where = (query.options || {}).where;
-               if (where)
-                  q.where = where;
-               return q.get();
-            case "keys":
-               return q.keys();
-            case "list":
-               return q.collections();
-            case "delete-collection":
-               return q.deleteCollection();
-            default:
-               return Promise.reject(new Error("Invalid query!"));
-         }
-      } else {
-         const q = new DocumentQuery(this, query.path, session);
-         let type = query.type as IDocumentQueries;
-         switch (type) {
-            case "get":
-               return q.get();
-            case "set":
-               return q.set(query.data, query.options || {});
-            case "update":
-               return q.update(query.data);
-            case "delete":
-               return q.delete();
-            default:
-               return Promise.reject(new Error("Invalid query!"));
+   async run(queries: IQuery[], session: Session) {
+      let resolve: { path: string[], create: boolean, resolved?: [string, string, string] }[] = [];
+
+      const addToResolve = (path: string[], create?: boolean) => {
+         let entry = resolve.find(e => { //TODO: Find may be slow...
+            if (e.path.length !== path.length)
+               return false;
+            for (let i = 0; i < e.path.length; i++) {
+               if (e.path[i] !== path[i])
+                  return false;
+            }
+            return true;
+         })
+
+         if (!entry) {
+            entry = {
+               path,
+               create
+            }
+            resolve.push(entry);
          }
+
+         entry.create = entry.create || create;
+
+         return entry;
       }
+
+      const isBatch = queries.length > 1;
+      let parsed = queries.map(rawQuery => {
+         this.validate(rawQuery);
+         const isCollection = rawQuery.path.length % 2 === 1;
+
+         let query = isCollection
+            ? new CollectionQuery(this, session, rawQuery)
+            : new DocumentQuery(this, session, rawQuery);
+
+         if (isBatch && !query.batchCompatible)
+            throw new Error("There are queries that are not batch compatible!");
+
+         let path = addToResolve(rawQuery.path, query.createCollection);
+         if (query.additionalLock)
+            addToResolve(query.additionalLock);
+
+         return {
+            path,
+            query
+         };
+      });
+
+      resolve = resolve.sort((a, b) => a.path.length - b.path.length);
+
+      let locks: (() => void)[] = [];
+      for (let e of resolve) {
+         let { collection, document, collectionKey } = await this.resolve(e.path, e.create);
+         e.resolved = [collection, document, collectionKey];
+
+         locks.push(
+            await this.locks.lock(collection, document)
+         );
+      }
+
+      let result = [];
+      try {
+         let batch = this.data.batch();
+         let changes: Change[] = [];
+         for (let e of parsed) {
+            result.push(
+               await e.query.run(e.path.resolved[0], e.path.resolved[1], batch, e.path.resolved[2])
+            );
+            changes.push(...e.query.changes);
+         }
+         if (batch.length > 0)
+            await batch.write();
+
+         this.sendChanges(changes);
+      } finally {
+         locks.forEach(lock => lock());
+      }
+
+      if (isBatch)
+         return result;
+      else
+         return result[0]
    }
 
-   async snapshot(query: ITypedQuery<"snapshot">, session: Session, onchange: (change: any) => void) {
-      this.validate(query);
+   async snapshot(rawQuery: ITypedQuery<"snapshot">, session: Session, onchange: (change: any) => void) {
+      Logging.debug("Snaphot request:", rawQuery.path);
+      this.validate(rawQuery);
 
-      const isCollection = query.path.length % 2 === 1;
-      let q: DocumentQuery | CollectionQuery;
-      if (isCollection) {
-         q = new CollectionQuery(this, query.path, session);
-         const limit = (query.options || {}).limit;
-         if (limit)
-            q.limit = limit;
-         const where = (query.options || {}).where;
-         if (where)
-            q.where = where;
-      } else {
-         q = new DocumentQuery(this, query.path, session);
-      }
+      if (rawQuery.type !== "snapshot")
+         throw new Error("Invalid query type!");
 
-      const id = nanoid(16);
-      session.queries.set(id, q);
+      const isCollection = rawQuery.path.length % 2 === 1;
+      let query = isCollection
+         ? new CollectionQuery(this, session, rawQuery, true)
+         : new DocumentQuery(this, session, rawQuery, true);
+
+      const {
+         unsubscribe,
+         value
+      } = await query.snapshot(onchange);
+
+      const id = nanoid(ALPHABET, 16);
+      session.subscriptions.set(id, unsubscribe);
       return {
          id,
-         snaphot: await q.snapshot(onchange)
+         snaphot: value
       };
    }
 
    async unsubscribe(id: string, session: Session) {
-      let query: CollectionQuery | DocumentQuery = session.queries.get(id) as any;
+      let query = session.subscriptions.get(id);
       if (query) {
-         query.unsubscribe();
-         session.queries.delete(id);
+         query();
+         session.subscriptions.delete(id);
       }
    }
 

src/database/lock.ts

@@ -8,6 +8,7 @@ export default class DocumentLock {
    }
 
    async lock(collection: string = "", document: string = "") {
+      //TODO: Check collection locks
       let key = collection + "/" + document;
       let l = this.locks.get(key);
       if (l)

src/database/rules.ts

@@ -2,13 +2,15 @@ import Session from "./session";
 import Logging from "@hibas123/nodelogging";
 
 interface IRule<T> {
-   ".write"?: T
-   ".read"?: T
+   ".write"?: T;
+   ".read"?: T;
 }
 
-type IRuleConfig<T> = {
-   [segment: string]: IRuleConfig<T>;
-} | IRule<T>;
+type IRuleConfig<T> =
+   | IRule<T>
+   | {
+        [segment: string]: IRuleConfig<T>;
+     };
 
 type IRuleRaw = IRuleConfig<string>;
 type IRuleParsed = IRuleConfig<boolean>;
@@ -17,17 +19,16 @@ const resolve = (value: any) => {
    if (value === true) {
       return true;
    } else if (typeof value === "string") {
-
    }
    return undefined;
-}
+};
 
 export class Rules {
    rules: IRuleParsed;
    constructor(private config: string) {
       let parsed: IRuleRaw = JSON.parse(config);
 
-      const analyze = (raw: IRuleRaw) => {
+      const analyse = (raw: IRuleRaw) => {
          let r: IRuleParsed = {};
 
          if (raw[".read"]) {
@@ -47,25 +48,34 @@ export class Rules {
          }
 
          for (let segment in raw) {
-            if (segment.startsWith("."))
-               continue;
+            if (segment.startsWith(".")) continue;
 
-            r[segment] = analyze(raw[segment]);
+            r[segment] = analyse(raw[segment]);
          }
          return r;
-      }
+      };
 
-      this.rules = analyze(parsed);
+      this.rules = analyse(parsed);
    }
 
-   hasPermission(path: string[], session: Session): { read: boolean, write: boolean } {
+   hasPermission(
+      path: string[],
+      session: Session
+   ): { read: boolean; write: boolean; path: string[] } {
+      if (session.root)
+         return {
+            read: true,
+            write: true,
+            path: path
+         };
       let read = this.rules[".read"] || false;
       let write = this.rules[".write"] || false;
 
       let rules = this.rules;
 
-      for (let segment of path) {
-         if (segment.startsWith("$") || segment.startsWith(".")) {
+      for (let idx in path) {
+         let segment = path[idx];
+         if (segment.startsWith(".")) {
             read = false;
             write = false;
             Logging.log("Invalid query path (started with '$' or '.'):", path);
@@ -77,22 +87,25 @@ export class Rules {
             .find(e => {
                switch (e) {
                   case "$uid":
-                     if (segment === session.uid)
+                     if (segment === "$uid") {
+                        path[idx] = session.uid;
                         return true;
+                     }
+                     if (segment === session.uid) return true;
                      break;
                }
                return false;
-            })
+            });
 
          rules = (k ? rules[k] : undefined) || rules[segment] || rules["*"];
 
          if (rules) {
             if (rules[".read"]) {
-               read = rules[".read"]
+               read = rules[".read"];
             }
 
             if (rules[".write"]) {
-               read = rules[".write"]
+               read = rules[".write"];
             }
          } else {
             break;
@@ -101,8 +114,9 @@ export class Rules {
 
       return {
          read: read as boolean,
-         write: write as boolean
-      }
+         write: write as boolean,
+         path
+      };
    }
 
    toJSON() {

src/database/session.ts

@@ -1,4 +1,3 @@
-import { Query } from "./query";
 
 export default class Session {
    constructor(private _sessionid: string) { }
@@ -8,5 +7,5 @@ export default class Session {
    root: boolean = false;
    uid: string = undefined;
 
-   queries = new Map<string, Query>();
+   subscriptions = new Map<string, (() => void)>();
 }

src/web/helper/form.ts

@@ -5,16 +5,26 @@ interface IFormConfigField {
    type: "text" | "number" | "boolean" | "textarea";
    label: string;
    value?: string;
+   disabled?: boolean;
 }
 
-type IFormConfig = { [name: string]: IFormConfigField }
+type IFormConfig = { [name: string]: IFormConfigField };
 
-export default function getForm(url: string, title: string, fieldConfig: IFormConfig): (ctx: Context) => void {
-   let fields = Object.keys(fieldConfig).map(name => ({ name, ...fieldConfig[name] }))
+export default function getForm(
+   url: string,
+   title: string,
+   fieldConfig: IFormConfig
+): (ctx: Context) => void {
+   let fields = Object.keys(fieldConfig).map(name => ({
+      name,
+      ...fieldConfig[name],
+      disabled: fieldConfig.disabled ? "disabled" : ""
+   }));
 
-   return ctx => ctx.body = getTemplate("forms")({
-      url,
-      title,
-      fields
-   });
+   return ctx =>
+      (ctx.body = getTemplate("forms")({
+         url,
+         title,
+         fields
+      }));
 }

src/web/v1/admin.ts

@@ -2,7 +2,11 @@ import * as Router from "koa-router";
 import Settings from "../../settings";
 import getForm from "../helper/form";
 import getTable from "../helper/table";
-import { BadRequestError, NoPermissionError } from "../helper/errors";
+import {
+   BadRequestError,
+   NoPermissionError,
+   NotFoundError
+} from "../helper/errors";
 import { DatabaseManager } from "../../database/database";
 import { MP } from "../../database/query";
 import config from "../../config";
@@ -13,10 +17,9 @@ const AdminRoute = new Router();
 
 AdminRoute.use(async (ctx, next) => {
    const { key } = ctx.query;
-   if (key !== config.admin)
-      throw new NoPermissionError("No permission!");
+   if (key !== config.admin) throw new NoPermissionError("No permission!");
    return next();
-})
+});
 
 AdminRoute.get("/", async ctx => {
    //TODO: Main Interface
@@ -33,26 +36,24 @@ AdminRoute.get("/settings", async ctx => {
       let res = [["key", "value"]];
       stream.on("data", ({ key, value }) => {
          res.push([key, value]);
-      })
+      });
 
       stream.on("error", no);
-      stream.on("end", () => yes(res))
-   })
+      stream.on("end", () => yes(res));
+   });
 
    if (ctx.query.view) {
       return getTable("Settings", res, ctx);
    } else {
       ctx.body = res;
    }
-})
+});
 
 AdminRoute.get("/data", async ctx => {
    const { database } = ctx.query;
    let db = DatabaseManager.getDatabase(database);
-   if (!db)
-      throw new BadRequestError("Database not found");
+   if (!db) throw new BadRequestError("Database not found");
    let res = await new Promise<string[][]>((yes, no) => {
-
       const stream = db.data.createReadStream({
          keys: true,
          values: true,
@@ -61,73 +62,71 @@ AdminRoute.get("/data", async ctx => {
          limit: 1000
       });
       let res = [["key", "value"]];
-      stream.on("data", ({ key, value }: { key: string, value: Buffer }) => {
-         res.push([key, key.split("/").length > 2 ? value.toString() : JSON.stringify(MP.decode(value))]);
-      })
+      stream.on("data", ({ key, value }: { key: string; value: Buffer }) => {
+         res.push([
+            key,
+            key.split("/").length > 2
+               ? value.toString()
+               : JSON.stringify(MP.decode(value))
+         ]);
+      });
 
       stream.on("error", no);
-      stream.on("end", () => yes(res))
-   })
+      stream.on("end", () => yes(res));
+   });
 
    if (ctx.query.view) {
       return getTable("Data from " + database, res, ctx);
    } else {
       ctx.body = res;
    }
-})
+});
 
-AdminRoute
-   .get("/database", ctx => {
-      const isFull = ctx.query.full === "true" || ctx.query.full === "1";
-      let res;
-      if (isFull) {
-         //TODO: Better than JSON.parse / JSON.stringify
-         res = Array.from(DatabaseManager.databases.entries()).map(([name, config]) => ({ name, ...(JSON.parse(JSON.stringify(config))) }));
-      } else {
-         res = Array.from(DatabaseManager.databases.keys());
-      }
+AdminRoute.get("/database", ctx => {
+   const isFull = ctx.query.full === "true" || ctx.query.full === "1";
+   let res;
+   if (isFull) {
+      //TODO: Better than JSON.parse / JSON.stringify
+      res = Array.from(DatabaseManager.databases.entries()).map(
+         ([name, config]) => ({
+            name,
+            ...JSON.parse(JSON.stringify(config))
+         })
+      );
+   } else {
+      res = Array.from(DatabaseManager.databases.keys());
+   }
 
-      if (ctx.query.view) {
-         return getTable("Databases" + (isFull ? "" : " small"), res, ctx);
-      } else {
-         ctx.body = res;
-      }
-   })
-   .post("/database", async ctx => {
-      const { name, rules, publickey, accesskey, rootkey } = ctx.request.body;
+   if (ctx.query.view) {
+      return getTable("Databases" + (isFull ? "" : " small"), res, ctx);
+   } else {
+      ctx.body = res;
+   }
+}).post("/database", async ctx => {
+   const { name, rules, publickey, accesskey, rootkey } = ctx.request.body;
 
-      if (!name)
-         throw new BadRequestError("Name must be set!");
+   if (!name) throw new BadRequestError("Name must be set!");
 
-      let db = DatabaseManager.getDatabase(name);
-      if (!db)
-         db = await DatabaseManager.addDatabase(name);
+   let db = DatabaseManager.getDatabase(name);
+   if (!db) db = await DatabaseManager.addDatabase(name);
 
-      if (publickey)
-         await db.setPublicKey(publickey);
+   if (publickey) await db.setPublicKey(publickey);
 
-      if (rules)
-         await db.setRules(rules);
+   if (rules) await db.setRules(rules);
 
-      if (accesskey)
-         await db.setAccessKey(accesskey);
+   if (accesskey) await db.setAccessKey(accesskey);
 
+   if (rootkey) await db.setRootKey(rootkey);
 
-      if (rootkey)
-         await db.setRootKey(rootkey);
-
-
-      ctx.body = "Success";
-   })
+   ctx.body = "Success";
+});
 
 AdminRoute.get("/collections", async ctx => {
    const { database } = ctx.query;
    let db = DatabaseManager.getDatabase(database);
-   if (!db)
-      throw new BadRequestError("Database not found");
+   if (!db) throw new BadRequestError("Database not found");
 
    let res = await new Promise<string[]>((yes, no) => {
-
       const stream = db.collections.createKeyStream({
          keyAsBuffer: false,
          limit: 1000
@@ -135,24 +134,23 @@ AdminRoute.get("/collections", async ctx => {
       let res = [];
       stream.on("data", (key: string) => {
          res.push(key);
-      })
+      });
 
       stream.on("error", no);
-      stream.on("end", () => yes(res))
-   })
+      stream.on("end", () => yes(res));
+   });
 
    if (ctx.query.view) {
       return getTable("Databases", res, ctx);
    } else {
       ctx.body = res;
    }
-})
+});
 
 AdminRoute.get("/collections/cleanup", async ctx => {
    const { database } = ctx.query;
    let db = DatabaseManager.getDatabase(database);
-   if (!db)
-      throw new BadRequestError("Database not found");
+   if (!db) throw new BadRequestError("Database not found");
 
    let deleted = await db.runCleanup();
    if (ctx.query.view) {
@@ -160,14 +158,55 @@ AdminRoute.get("/collections/cleanup", async ctx => {
    } else {
       ctx.body = deleted;
    }
-})
+});
 
-AdminRoute.get("/database/new", getForm("/v1/admin/database", "New/Change Database", {
-   name: { label: "Name", type: "text", },
-   accesskey: { label: "Access Key", type: "text" },
-   rootkey: { label: "Root access key", type: "text" },
-   rules: { label: "Rules", type: "textarea", value: `{\n   ".write": true, \n   ".read": true \n}` },
-   publickey: { label: "Public Key", type: "textarea" }
-}))
+AdminRoute.get(
+   "/database/new",
+   getForm("/v1/admin/database", "New Database", {
+      name: { label: "Name", type: "text" },
+      accesskey: { label: "Access Key", type: "text" },
+      rootkey: { label: "Root access key", type: "text" },
+      rules: {
+         label: "Rules",
+         type: "textarea",
+         value: `{\n   ".write": true, \n   ".read": true \n}`
+      },
+      publickey: { label: "Public Key", type: "textarea" }
+   })
+);
+
+AdminRoute.get("/database/update", async ctx => {
+   const { database } = ctx.query;
+   let db = DatabaseManager.getDatabase(database);
+   if (!db) throw new NotFoundError("Database not found!");
+   getForm("/v1/admin/database", "Change Database", {
+      name: {
+         label: "Name",
+         type: "text",
+         value: db.name,
+         disabled: true
+      },
+      accesskey: {
+         label: "Access Key",
+         type: "text",
+         value: db.accesskey
+      },
+      rootkey: {
+         label: "Root access key",
+         type: "text",
+         value: db.rootkey
+      },
+      rules: {
+         label: "Rules",
+         type: "textarea",
+         value: db.rules.toJSON()
+      },
+      publickey: {
+         label: "Public Key",
+         type: "textarea",
+         value: db.publickey
+      }
+   })(ctx);
+});
 
 export default AdminRoute;

src/web/v1/index.ts

@@ -1,7 +1,11 @@
 import * as Router from "koa-router";
 import AdminRoute from "./admin";
 import { DatabaseManager } from "../../database/database";
-import { NotFoundError, NoPermissionError, BadRequestError } from "../helper/errors";
+import {
+   NotFoundError,
+   NoPermissionError,
+   BadRequestError
+} from "../helper/errors";
 import Logging from "@hibas123/nodelogging";
 import Session from "../../database/session";
 import nanoid = require("nanoid");
@@ -28,7 +32,7 @@ V1.post("/db/:database/query", async ctx => {
 
    if (db.accesskey) {
       if (!accesskey || accesskey !== db.accesskey) {
-         throw new NoPermissionError("");
+         throw new NoPermissionError("Invalid Access Key");
       }
    }
 
@@ -36,7 +40,6 @@ V1.post("/db/:database/query", async ctx => {
       let res = await verifyJWT(authkey, db.publickey);
       if (!res || !res.uid) {
          throw new BadRequestError("Invalid JWT");
-         return;
       } else {
          session.uid = res.uid;
       }
@@ -49,11 +52,11 @@ V1.post("/db/:database/query", async ctx => {
       }
    }
 
-   ctx.body = await db.run(query, session).catch(err => {
+   ctx.body = await db.run([query], session).catch(err => {
       if (err instanceof QueryError) {
          throw new BadRequestError(err.message);
       }
       throw err;
-   })
-})
+   });
+});
 export default V1;

views/admin.html

@@ -1,112 +1,118 @@
 <!DOCTYPE html>
 <html lang="en">
+   <head>
+      <meta charset="UTF-8" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+      <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+      <title>Admin Interface</title>
+      <link
+         rel="stylesheet"
+         href="https://unpkg.com/@hibas123/theme/out/base.css"
+      />
+      <link
+         rel="stylesheet"
+         href="https://unpkg.com/@hibas123/theme/out/light.css"
+      />
 
-<head>
-   <meta charset="UTF-8">
-   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-   <title>Admin Interface</title>
-   <link rel="stylesheet" href="https://unpkg.com/@hibas123/theme/out/base.css">
-   <link rel="stylesheet" href="https://unpkg.com/@hibas123/theme/out/light.css">
+      <script src="https://unpkg.com/handlebars/dist/handlebars.min.js"></script>
 
-   <script src="https://unpkg.com/handlebars/dist/handlebars.min.js"></script>
+      <style>
+         #message {
+            visibility: hidden;
+            background-color: lightgreen;
+            border: 1px solid lime;
+            border-radius: 0.5rem;
+            padding: 1rem;
+            font-size: 1.5rem;
+            margin-bottom: 1rem;
+         }
 
-   <style>
-      #message {
-         visibility: hidden;
-         background-color: lightgreen;
-         border: 1px solid lime;
-         border-radius: .5rem;
-         padding: 1rem;
-         font-size: 1.5rem;
-         margin-bottom: 1rem;
-      }
+         .grid {
+            display: grid;
+            height: 100vh;
+            grid-template-columns: 360px auto;
+         }
 
-      .grid {
-         display: grid;
-         height: 100vh;
-         grid-template-columns: 360px auto;
-      }
-
-      #content {
-         position: absolute;
-         top: 0;
-         left: 0;
-         width: 100%;
-         height: 100%;
-         border: 0;
-      }
-   </style>
-</head>
-
-<body>
-   <div class="grid">
-      <div style="border-right: 1px solid darkgrey; padding: 1rem;">
-         <h2>Navigation: </h2>
-         <ul class="list list-clickable">
-            <li onclick="loadView('settings');">Settings</li>
-            <li onclick="loadView('database', {full:true});">Databases</li>
-            <li onclick="loadView('database/new');">New Database</li>
-         </ul>
-         Databases:
-         <div id="dbs" class="list list-clickable" style="margin: 1rem;"></div>
+         #content {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            border: 0;
+         }
+      </style>
+   </head>
 
+   <body>
+      <div class="grid">
+         <div style="border-right: 1px solid darkgrey; padding: 1rem;">
+            <h2>Navigation:</h2>
+            <ul class="list list-clickable">
+               <li onclick="loadView('settings');">Settings</li>
+               <li onclick="loadView('database', {full:true});">Databases</li>
+               <li onclick="loadView('database/new');">New Database</li>
+            </ul>
+            Databases:
+            <div
+               id="dbs"
+               class="list list-clickable"
+               style="margin: 1rem;"
+            ></div>
+         </div>
+         <div style="position:relative;">
+            <iframe id="content"></iframe>
+         </div>
       </div>
-      <div style="position:relative;">
-         <iframe id="content"></iframe>
-      </div>
-   </div>
 
-   <template>
+      <template> </template>
 
-   </template>
+      <script>
+         const key = new URL(window.location.href).searchParams.get("key");
+         const content = document.getElementById("content");
+         const base = new URL(window.location.href).host;
 
-   <script>
-      const key = new URL(window.location.href).searchParams.get("key");
-      const content = document.getElementById("content");
-      const base = new URL(window.location.href).host;
+         function getUrl(name, params, view = true) {
+            const url = new URL(window.location.href);
+            url.pathname = "/v1/admin/" + name;
+            for (let key in params || {})
+               url.searchParams.set(key, params[key]);
 
-      function getUrl(name, params, view = true) {
-         const url = new URL(window.location.href);
-         url.pathname = "/v1/admin/" + name;
-         for (let key in params || {})
-            url.searchParams.set(key, params[key]);
+            url.searchParams.set("key", key);
+            if (view) url.searchParams.set("view", "true");
 
-         url.searchParams.set("key", key);
-         if (view)
-            url.searchParams.set("view", "true");
+            return url.href;
+         }
 
-         return url.href;
-      }
+         function loadView(name, params) {
+            content.src = getUrl(name, params);
+         }
 
-      function loadView(name, params) {
-         content.src = getUrl(name, params);
-      }
+         loadView("settings");
 
-      loadView("settings")
-
-      const dbsul = document.getElementById("dbs");
-      function reloadDBs() {
-         fetch(getUrl("database", {}, false))
-            .then(res => res.json())
-            .then(databases => databases.map(database => `
+         const dbsul = document.getElementById("dbs");
+         function reloadDBs() {
+            fetch(getUrl("database", {}, false))
+               .then(res => res.json())
+               .then(databases =>
+                  databases.map(
+                     database => `
 <div class="card margin elv-4">
    <h3>${database}</h3>
    <button class=btn onclick="loadView('data', {database:'${database}'})">Data</button>
    <button class=btn onclick="loadView('collections', {database:'${database}'})">Collections</button>
    <button class=btn onclick="loadView('collections/cleanup', {database:'${database}'})">Clean</button>
+   <button class=btn onclick="loadView('database/update', {database:'${database}'})">Change</button>
 </div>`
-            ))
-            .then(d => d.join("\n"))
-            .then(d => dbsul.innerHTML = d)
-            .catch(console.error)
-
-
-      }
-
-      reloadDBs();
-      setInterval(reloadDBs, 5000);
-   </script>
-</body>
+                  )
+               )
+               .then(d => d.join("\n"))
+               .then(d => (dbsul.innerHTML = d))
+               .catch(console.error);
+         }
 
+         reloadDBs();
+         setInterval(reloadDBs, 5000);
+      </script>
+   </body>
 </html>

views/forms.hbs

@@ -32,19 +32,19 @@
             <div class="input-group">
                <label>{{label}}</label>
                {{#ifCond type  "===" "text"}}
-               <input type="text" placeholder="{{label}}" name="{{name}}" value="{{value}}" />
+               <input type="text" placeholder="{{label}}" name="{{name}}" value="{{value}}" {{disabled}} />
                {{/ifCond}}
 
                {{#ifCond type "===" "number"}}
-               <input type="number" placeholder="{{label}}" name="{{name}}" value="{{value}}" />
+               <input type="number" placeholder="{{label}}" name="{{name}}" value="{{value}}" {{disabled}} />
                {{/ifCond}}
 
                {{#ifCond type "===" "boolean"}}
-               <input type="checkbox" name="{{name}}" checked="{{value}}" />
+               <input type="checkbox" name="{{name}}" checked="{{value}}" {{disabled}} />
                {{/ifCond}}
 
                {{#ifCond type "===" "textarea"}}
-               <textarea class="inp" name="{{name}}" rows="20">{{value}}</textarea>
+               <textarea class="inp" name="{{name}}" rows="20" {{disabled}}>{{value}}</textarea>
                {{/ifCond}}
             </div>
             {{/each}}