primate 0.1.1 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "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/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);
   }
 

package/source/server/domain/Domain.js

@@ -45,14 +45,7 @@ export default class Domain extends Base {
     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();
+      return store.default.open();
     });
   }
 
@@ -126,7 +119,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])}))

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

@@ -1,8 +1,7 @@
 {
   "default-src": "'self'",
   "object-src": "'none'",
-  "style-src": "'self'",
-  "img-src": "'self' data: https:",
+  "img-src": "'self' 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;
-  }
-};