@webqit/webflo 0.11.34 → 0.11.36

package/src/runtime-pi/server/RuntimeClient.js

@@ -6,8 +6,9 @@ import Fs from 'fs';
 import Path from 'path';
 import QueryString from 'querystring';
 import Router from './Router.js';
+import _RuntimeClient from '../RuntimeClient.js';
 
-export default class RuntimeClient {
+export default class RuntimeClient extends _RuntimeClient {
 
     /**
      * RuntimeClient
@@ -15,10 +16,15 @@ export default class RuntimeClient {
      * @param Context cx
      */
     constructor(cx) {
-        this.cx = cx;
+        super(cx);
         this.renderFileCache = {};
     }
 
+	// Returns router class
+	get Router() {
+		return Router;
+	}
+
     /**
      * Handles navigation events.
      * 
@@ -29,23 +35,21 @@ export default class RuntimeClient {
      */
     async handle(httpEvent, remoteFetch) {
         // The app router
-        const router = new Router(this.cx, httpEvent.url.pathname);
+        const router = new this.Router(this.cx, httpEvent.url.pathname);
         const handle = async () => {
             // --------
             // ROUTE FOR DATA
             // --------
-            let httpMethodName = httpEvent.request.method.toUpperCase();
+            const httpMethodName = httpEvent.request.method.toUpperCase();
             let response = await router.route([httpMethodName, 'default'], httpEvent, {}, async event => {
                 return router.file(event);
             }, remoteFetch);
             if (!(response instanceof httpEvent.Response)) {
                 response = new httpEvent.Response(response);
             }
-            
             // --------
             // Rendering
             // --------
-
             if (response.ok && response.bodyAttrs.inputType === 'object' && httpEvent.request.headers.accept.match('text/html')) {
                 let rendering = await this.render(httpEvent, router, response);
                 if (typeof rendering !== 'string' && !(typeof rendering === 'object' && rendering && typeof rendering.toString === 'function')) {
@@ -59,7 +63,6 @@ export default class RuntimeClient {
 
             return response;
         };
-
         // --------
         // PIPE THROUGH MIDDLEWARES
         // --------

package/src/runtime-pi/server/index.js

@@ -12,9 +12,7 @@ import Runtime from './Runtime.js';
 export async function start(clientCallback = null) {
     const cx = this || {};
     const defaultClientCallback = _cx => new RuntimeClient(_cx);
-    return new Runtime(Context.create(cx), ( ...args ) => {
-        return clientCallback ? clientCallback( ...args.concat( defaultClientCallback ) ) : defaultClientCallback( ...args );
-    });
+    return new Runtime(Context.create(cx), clientCallback || defaultClientCallback);
 }
 
 /**

package/src/services-pi/cert/http-auth-hook.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * imports

package/src/services-pi/cert/http-cleanup-hook.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * imports

package/src/webflo.js

@@ -21,7 +21,7 @@ const cx = WebfloPI.Context.create({
     app: { title: appJson.title, version: appJson.version },
     logger: Logger,
     config: WebfloPI.config,
-    middlewares: [ WebfloPI.deployment.origins.webhook, ],
+    middlewares: [ WebfloPI.deployment.origins.webhook ],
 });
 
 /**