primate 0.1.0 → 0.3.1

package/README.md

@@ -18,8 +18,8 @@ yarn add primate
 * **Minimal** just one dependency ([ws][])
 * **Simple** only native web technologies (JavaScript, HTML)
 * **Full-stack** server and client, both in JavaScript
-* **Layered** separation of data (domains), logic (actions) and
-presentation (views)
+* **Layered** separation of data (domains), logic (actions) and presentation
+(views)
 * **Correct** data verification using field definitions in domains
 * **Secure** serving hash-verified scripts on secure HTTP with a strong CSP
 * **Roles** access control with contexts
@@ -31,7 +31,7 @@ ad-hoc getters
 
 ## Getting started
 
-Coming soon.
+See the [getting started][getting-started] guide.
 
 ## Resources
 
@@ -46,3 +46,6 @@ will move over to semantic versioning.
 ## License
 
 BSD-3-Clause
+
+[ws]: https://github.com/websockets/ws
+[getting-started]: https://primatejs.com/getting-started

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.1.0",
+  "version": "0.3.1",
   "author": "Primate core team <core@primatejs.com>",
   "homepage": "https://primatejs.com",
   "description": "Server-client framework",

package/source/client/Action.js

@@ -1,9 +1,7 @@
 import Element from "../Element.js";
 import View from "./View.js";
 import Base from "./Base.js";
-
-const base = document.baseURI.replace(document.location.origin, "");
-const full = `${document.location.origin}${base}`;
+import {origin_base} from "./document.js";
 
 export default class Action extends Base {
   constructor(name, context) {
@@ -75,7 +73,7 @@ export default class Action extends Base {
     }
     event.preventDefault();
     const data = await this.write(target.action, this.get_form_data(target));
-    return data.pathname === document.location.href.replace(full, "")
+    return data.pathname === document.location.href.replace(origin_base, "")
       ? this.view.update(data.payload)
       : this.context.run(data);
   }
@@ -94,8 +92,8 @@ export default class Action extends Base {
     }
     if (target !== null) {
       const href = Element.value(target, "href");
-      const url = new URL(href, full);
-      if (event.button === 0 && url.href.startsWith(full)) {
+      const url = new URL(href, origin_base);
+      if (event.button === 0 && url.href.startsWith(origin_base)) {
         event.preventDefault();
         if (href !== "") {
           const data = await this.read(href);

package/source/client/App.js

@@ -1,15 +1,12 @@
 import Client from "./Client.js";
 
-const host = document.location.host;
-const base = document.baseURI.replace(document.location.origin, "");
-
 export default class App {
   constructor() {
     this.definitions = {};
   }
 
   run() {
-    this.client = new Client({host, base});
+    this.client = new Client();
     this.client.open();
   }
 

package/source/client/Client.js

@@ -1,8 +1,10 @@
 import Context from "./Context.js";
 import {contexts} from "./exports.js";
+import {base, host, origin_base} from "./document.js";
 
 const events = ["submit", "click", "change", "input"];
 let back = undefined;
+const location = `wss://${host}${base}`;
 
 export default class Client {
   constructor(conf) {
@@ -18,14 +20,10 @@ export default class Client {
     }
   }
 
-  get location() {
-    return `wss://${this.conf.host}${this.conf.base}`;
-  }
-
   open() {
     return this.connection?.readyState === 1 ? this
       : new Promise(resolve => {
-        const connection = new WebSocket(this.location);
+        const connection = new WebSocket(location);
         connection.addEventListener("message", ({data}) => data === "open"
           ? resolve(this)
           : this.receive(JSON.parse(data)));
@@ -56,13 +54,9 @@ export default class Client {
     return this.send("write", url, payload);
   }
 
-  get full() {
-    return `${document.location.origin}${this.conf.base}`;
-  }
-
   async send(type, url, payload = {}) {
     await this.open();
-    const {pathname, search} = new URL(url, this.full);
+    const {pathname, search} = new URL(url, origin_base);
     return new Promise(resolve => {
       back = data => resolve(data);
       this.connection.send(JSON.stringify({type, pathname, search, payload}));

package/source/client/Element.js

@@ -143,8 +143,10 @@ export default class Element {
     return this;
   }
 
-  class(name, set) {
-    this.element.classList.toggle(name, set !== false);
+  class(classes, set) {
+    classes.split(" ").forEach(name => {
+      this.element.classList.toggle(name, set !== false);
+    })
     return this;
   }
 

package/source/client/document.js

@@ -0,0 +1,6 @@
+const {baseURI} = document;
+const {host, href, origin} = document.location;
+const base = baseURI === href ? "/" : baseURI.replace(origin, "");
+const origin_base = `${origin}${base}`;
+
+export {base, origin_base, host};

package/source/server/Bundler.js

@@ -125,7 +125,7 @@ export default class Bundler {
 
   register(src, source) {
     const integrity = `${algorithm}-${hash(source)}`;
-    this.scripts.push({src, integrity});
+    this.scripts.push({"src": `${this.conf.base}${src}`, integrity});
     this.hashes.add(integrity);
   }
 
@@ -139,7 +139,7 @@ export default class Bundler {
       client += `<script type="module" integrity="${integrity}" src="${src}">`
               + "</script>\n";
     }
-    return client + "${view}";
+    return client + "<first-view />";
   }
 
   async write_exports() {

package/source/server/File.js

@@ -31,10 +31,14 @@ export default class File {
     return this.exists && !this.stats.isDirectory();
   }
 
-  get stream() {
+  get read_stream() {
     return fs.createReadStream(this.path, {"flags": "r"});
   }
 
+  get write_stream() {
+    return fs.createWriteStream(this.path);
+  }
+
   remove() {
     return new Promise((resolve, reject) => fs.rm(this.path,
       {"recursive": true, "force": true},

package/source/server/domain/Domain.js

@@ -1,12 +1,9 @@
 import Base from "../Base.js";
 import Field from "./Field.js";
-import Store from "../store/Store.js";
-import {PredicateError, InternalServerError} from "../errors.js";
+import {PredicateError} from "../errors.js";
 import {EagerPromise} from "../promises.js";
-import {assert} from "../invariants.js";
 import cache from "../cache.js";
 import {random} from "../Crypto.js";
-import fallback from "../fallback.js";
 
 const length = 12;
 const preset = "../../preset/data/stores";
@@ -43,16 +40,14 @@ export default class Domain extends Base {
 
   static get store() {
     return cache(this, "store", async () => {
-      const logic = path => import(`${path}/${this.store_file}`);
-      const store = await fallback(this.conf.paths.data.stores, preset, logic);
-
-      const instance = store.default;
-
-      const message = `${instance.constructor.name} must instance Store`;
-      const error = () => { throw new InternalServerError(message); };
-      assert(instance instanceof Store, error);
-
-      return instance.open();
+      const create_path = path => `${path}/${this.store_file}`;
+      let store;
+      try {
+        store = await import(create_path(this.conf.paths.data.stores));
+      } catch(error) {
+        store = await import(create_path(preset));
+      }
+      return store.default.open();
     });
   }
 
@@ -110,10 +105,10 @@ export default class Domain extends Base {
 
   // #serialize
   // Serializing is done from the instance's point of view.
-  serialize() {
+  async serialize() {
     const {properties, fields} = this;
-    return properties.map(property =>
-      ({property, "value": fields[property].serialize(this[property])}))
+    return (await Promise.all(properties.map(async property =>
+      ({property, "value": await fields[property].serialize(this[property])}))))
       .filter(({value}) => value !== undefined)
       .reduce((document, {property, value}) => {
         document[property] = value;
@@ -126,7 +121,7 @@ export default class Domain extends Base {
   static deserialize(serialized) {
     const fields = this._fields;
     return new this(Object.keys(serialized)
-      //.filter(property => fields[property] !== undefined)
+      .filter(property => fields[property] !== undefined)
       .map(property =>
         ({property,
         "value": fields[property].deserialize(serialized[property])}))
@@ -177,7 +172,7 @@ export default class Domain extends Base {
     const verified = await this.verify(delta);
     if (verified) {
       const store = await this.store;
-      const document = this.serialize();
+      const document = await this.serialize();
       await store.save(this.collection, {"_id": document._id}, document);
       await after();
     }

package/source/server/servers/Static.js

@@ -58,7 +58,7 @@ export default class StaticServer extends Server {
       response.setHeader("Content-Type", mime(filename));
       response.setHeader("Etag", file.modified);
       await session.log("green", url);
-      return stream(file.stream, response);
+      return stream(file.read_stream, response);
     } else {
       return this.serve_data(url, session, request, response);
     }
@@ -79,7 +79,7 @@ export default class StaticServer extends Server {
     const integrity = `${algorithm}-${hash(src)}`;
     const view = `<script type="module" integrity="${integrity}">${src}`
                + "</script>";
-    const file = new Function("view", "return `"+index+"`")(view);
+    const file = index.replace("<first-view />", view);
     const script_src = Array.from(hashes)
       .concat([integrity])
       .reduce((hash_string, next_hash) => hash_string + ` '${next_hash}'`, "");

package/source/server/servers/content-security-policy.json

@@ -1,8 +1,6 @@
 {
   "default-src": "'self'",
   "object-src": "'none'",
-  "style-src": "'self'",
-  "img-src": "'self' data: https:",
   "frame-ancestors": "'none'",
   "form-action": "'self'",
   "base-uri": "'self'"

package/source/server/types/Date.js

@@ -14,7 +14,7 @@ export default class extends Instance {
     return value instanceof this.instance;
   }
 
-  /*static deserialize(value) {
+  static deserialize(value) {
     return value instanceof this.instance ? value : new this.instance(value);
-  }*/
+  }
 }

package/source/server/constructible.js

@@ -1,8 +0,0 @@
-export default value => {
-  try {
-    Reflect.construct(String, [], value);
-    return true;
-  } catch (error) {
-    return false;
-  }
-};