@quenk/frontend 0.20.4 → 0.21.0

package/lib/app/model/http/callback.d.ts

@@ -0,0 +1,23 @@
+import { Object } from '@quenk/noni/lib/data/jsonx';
+import { Response } from '@quenk/jhr/lib/response';
+export declare const ERR_REQUEST_FAILED = "ERR_REQUEST_FAILED";
+/**
+ * HttpCallback is a set of optional callbacks that can be used to
+ * hook into and handle undesired responses.
+ */
+export interface HttpCallback {
+    onNotFound(res: Response<Object>): void;
+    onConflict(res: Response<Object>): void;
+    onBadRequest(res: Response<Object>): void;
+    onUnauthorized(res: Response<Object>): void;
+    onForbidden(res: Response<Object>): void;
+    onError(err: Error): void;
+}
+export declare class DefaultHttpCallback {
+    onNotFound(_: Response<Object>): void;
+    onConflict(_: Response<Object>): void;
+    onBadRequest(_: Response<Object>): void;
+    onUnauthorized(_: Response<Object>): void;
+    onForbidden(_: Response<Object>): void;
+    onError(_: Error): void;
+}

package/lib/app/model/http/callback.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultHttpCallback = exports.ERR_REQUEST_FAILED = void 0;
+exports.ERR_REQUEST_FAILED = 'ERR_REQUEST_FAILED';
+class DefaultHttpCallback {
+    onNotFound(_) { }
+    onConflict(_) { }
+    onBadRequest(_) { }
+    onUnauthorized(_) { }
+    onForbidden(_) { }
+    onError(_) { }
+}
+exports.DefaultHttpCallback = DefaultHttpCallback;
+//# sourceMappingURL=callback.js.map

package/lib/app/model/http/callback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../src/app/model/http/callback.ts"],"names":[],"mappings":";;;AAIa,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAoBvD,MAAa,mBAAmB;IAC5B,UAAU,CAAC,CAAmB,IAAG,CAAC;IAElC,UAAU,CAAC,CAAmB,IAAG,CAAC;IAElC,YAAY,CAAC,CAAmB,IAAG,CAAC;IAEpC,cAAc,CAAC,CAAmB,IAAG,CAAC;IAEtC,WAAW,CAAC,CAAmB,IAAG,CAAC;IAEnC,OAAO,CAAC,CAAQ,IAAG,CAAC;CACvB;AAZD,kDAYC"}

package/lib/app/model/{http.d.ts → http/index.d.ts}

@@ -2,12 +2,14 @@ import { Maybe } from '@quenk/noni/lib/data/maybe';
 import { Object } from '@quenk/noni/lib/data/jsonx';
 import { Record } from '@quenk/noni/lib/data/record';
 import { Type } from '@quenk/noni/lib/data/type';
-import { Except } from '@quenk/noni/lib/control/except';
+import { Path } from '@quenk/noni/lib/io/file';
 import { Agent } from '@quenk/jhr/lib/agent';
 import { Response } from '@quenk/jhr/lib/response';
 import { Request } from '@quenk/jhr/lib/request';
-import { Id, Model } from './';
+import { HttpCallback } from './callback';
+import { Id, Model } from '../';
 export { Id, Model };
+export declare const ERR_REQUEST_ABORTED = "ERR_REQUEST_ABORTED";
 export declare const ERR_REQUEST_FAILED = "ERR_REQUEST_FAILED";
 /**
  * Result is the structure of the response body expected after a successful
@@ -84,8 +86,8 @@ export declare const NO_PATH = "?invalid?";
  * the "search" path for "create" etc.
  */
 export declare class RequestFactory {
-    paths: Paths;
-    constructor(paths?: Paths);
+    path: Path;
+    constructor(path: Path);
     /**
      * create generates a request for the model "create" method.
      */
@@ -107,24 +109,6 @@ export declare class RequestFactory {
      */
     remove(id: Id): Request<Object>;
 }
-/**
- * HttpCallback is a set of optional callbacks that can be used to
- * hook into and handle undesired responses.
- */
-export interface HttpCallback {
-    onConflict(res: Response<Object>): void;
-    onBadRequest(res: Response<Object>): void;
-    onUnauthorized(res: Response<Object>): void;
-    onForbidden(res: Response<Object>): void;
-    onError(res: Response<Object>): void;
-}
-export declare class DefaultHttpCallback {
-    onConflict(_: Response<Object>): void;
-    onBadRequest(_: Response<Object>): void;
-    onUnauthorized(_: Response<Object>): void;
-    onForbidden(_: Response<Object>): void;
-    onError(_: Response<Object>): void;
-}
 /**
  * HttpModel is an abstract implementation of a Model class that uses http
  * for CSUGR operations.
@@ -133,22 +117,23 @@ export declare class DefaultHttpCallback {
  * to utilize a Remote actor, see the RemoteModel implementation elsewhere.
  */
 export declare abstract class HttpModel<T extends Object> implements Model<T> {
+    path: Path;
     callback: HttpCallback;
-    constructor(callback?: HttpCallback);
+    constructor(path: Path, callback?: HttpCallback);
     /**
      * requests factory used to create Request objects.
      */
-    abstract requests: RequestFactory;
+    requests: RequestFactory;
     /**
      * send is left abstract for child classes to implement.
      */
-    abstract send(req: Request<Object>): Promise<Response<Result<T>>>;
-    handleResponse<A>(res: Response<Type>): Except<A>;
-    create(data: T): Promise<Except<Id>>;
-    search(qry: Object): Promise<Except<T[]>>;
-    update(id: Id, changes: Partial<T>): Promise<Except<boolean>>;
-    get(id: Id): Promise<Except<Maybe<T>>>;
-    remove(id: Id): Promise<Except<boolean>>;
+    abstract send(req: Request<Object>): Promise<Response<Object>>;
+    handleResponse(res: Response<Type>): void;
+    create(data: T): Promise<Id>;
+    search(qry: Object): Promise<T[]>;
+    update(id: Id, changes: Partial<T>): Promise<boolean>;
+    get(id: Id): Promise<Maybe<T>>;
+    remove(id: Id): Promise<boolean>;
 }
 /**
  * SimpleHttpModel is an HttpModel that uses the JHR lib directly.
@@ -159,13 +144,9 @@ export declare abstract class HttpModel<T extends Object> implements Model<T> {
  * need something more complicated.
  */
 export declare class SimpleHttpModel<T extends Object> extends HttpModel<T> {
+    path: Path;
     agent: Agent<Object, Object>;
-    requests: RequestFactory;
     callbacks?: HttpCallback | undefined;
-    constructor(agent: Agent<Object, Object>, requests: RequestFactory, callbacks?: HttpCallback | undefined);
-    /**
-     * fromPaths generates a new HttpModel using Paths object.
-     */
-    static fromPaths(agent: Agent<Object, Object>, paths: Paths): SimpleHttpModel<Object>;
-    send(req: Request<Object>): Promise<Response<Result<T>>>;
+    constructor(path: Path, agent: Agent<Object, Object>, callbacks?: HttpCallback | undefined);
+    send(req: Request<Object>): Promise<Response<Object>>;
 }

package/lib/app/model/{http.js → http/index.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimpleHttpModel = exports.HttpModel = exports.DefaultHttpCallback = exports.RequestFactory = exports.NO_PATH = exports.ERR_REQUEST_FAILED = void 0;
+exports.SimpleHttpModel = exports.HttpModel = exports.RequestFactory = exports.NO_PATH = exports.ERR_REQUEST_FAILED = exports.ERR_REQUEST_ABORTED = void 0;
 const status = require("@quenk/jhr/lib/status");
 const maybe_1 = require("@quenk/noni/lib/data/maybe");
-const string_1 = require("@quenk/noni/lib/data/string");
 const record_1 = require("@quenk/noni/lib/data/record");
 const type_1 = require("@quenk/noni/lib/data/type");
-const either_1 = require("@quenk/noni/lib/data/either");
 const request_1 = require("@quenk/jhr/lib/request");
+const callback_1 = require("./callback");
+exports.ERR_REQUEST_ABORTED = 'ERR_REQUEST_ABORTED';
 exports.ERR_REQUEST_FAILED = 'ERR_REQUEST_FAILED';
 exports.NO_PATH = '?invalid?';
 /**
@@ -19,16 +19,16 @@ exports.NO_PATH = '?invalid?';
  * the "search" path for "create" etc.
  */
 class RequestFactory {
-    constructor(paths = {}) {
-        this.paths = paths;
+    constructor(path) {
+        this.path = path;
     }
     /**
      * create generates a request for the model "create" method.
      */
     create(data) {
-        return new request_1.Post(this.paths.create || this.paths.search || exports.NO_PATH, data, {
+        return new request_1.Post(this.path, data, {
             tags: {
-                path: this.paths.create || this.paths.get || exports.NO_PATH,
+                path: this.path,
                 verb: 'post',
                 method: 'create'
             }
@@ -38,9 +38,9 @@ class RequestFactory {
      * search generates a request for the model "search" method.
      */
     search(qry) {
-        return new request_1.Get(this.paths.search || exports.NO_PATH, qry, {
+        return new request_1.Get(this.path, qry, {
             tags: (0, record_1.merge)((0, type_1.isObject)(qry.$tags) ? qry.$tags : {}, {
-                path: this.paths.search,
+                path: this.path,
                 verb: 'get',
                 method: 'search'
             })
@@ -50,9 +50,9 @@ class RequestFactory {
      * update generates a request for the model "update" method.
      */
     update(id, changes) {
-        return new request_1.Patch((0, string_1.interpolate)(this.paths.update || this.paths.get || exports.NO_PATH, { id }), changes, {
+        return new request_1.Patch(`${this.path}/${id}`, changes, {
             tags: {
-                path: this.paths.update,
+                path: `${this.path}/id`,
                 verb: 'patch',
                 method: 'update'
             }
@@ -62,9 +62,9 @@ class RequestFactory {
      * get generates a request for the model "get" method.
      */
     get(id) {
-        return new request_1.Get((0, string_1.interpolate)(this.paths.get || exports.NO_PATH, { id }), {}, {
+        return new request_1.Get(`${this.path}/${id}`, {}, {
             tags: {
-                path: this.paths.get,
+                path: `${this.path}/id`,
                 verb: 'get',
                 method: 'get'
             }
@@ -74,9 +74,9 @@ class RequestFactory {
      * remove generates a request for the model "remove" method.
      */
     remove(id) {
-        return new request_1.Delete((0, string_1.interpolate)(this.paths.remove || this.paths.get || exports.NO_PATH, { id }), {}, {
+        return new request_1.Delete(`${this.path}/${id}`, {}, {
             tags: {
-                path: this.paths.remove,
+                path: `${this.path}/id`,
                 verb: 'delete',
                 method: 'remove'
             }
@@ -84,14 +84,6 @@ class RequestFactory {
     }
 }
 exports.RequestFactory = RequestFactory;
-class DefaultHttpCallback {
-    onConflict(_) { }
-    onBadRequest(_) { }
-    onUnauthorized(_) { }
-    onForbidden(_) { }
-    onError(_) { }
-}
-exports.DefaultHttpCallback = DefaultHttpCallback;
 /**
  * HttpModel is an abstract implementation of a Model class that uses http
  * for CSUGR operations.
@@ -100,8 +92,13 @@ exports.DefaultHttpCallback = DefaultHttpCallback;
  * to utilize a Remote actor, see the RemoteModel implementation elsewhere.
  */
 class HttpModel {
-    constructor(callback = new DefaultHttpCallback()) {
+    constructor(path, callback = new callback_1.DefaultHttpCallback()) {
+        this.path = path;
         this.callback = callback;
+        /**
+         * requests factory used to create Request objects.
+         */
+        this.requests = new RequestFactory(this.path);
     }
     handleResponse(res) {
         switch (res.code) {
@@ -117,46 +114,49 @@ class HttpModel {
             case status.CONFLICT:
                 this.callback.onConflict(res);
                 break;
+            case status.NOT_FOUND:
+                this.callback.onNotFound(res);
+                break;
             default:
-                this.callback.onError(res);
+                this.callback.onError(new Error(`Invalid Status: ${res.code}`));
         }
-        return either_1.Either.left(new Error(exports.ERR_REQUEST_FAILED));
+        throw new Error(exports.ERR_REQUEST_FAILED);
     }
     async create(data) {
         let res = await this.send(this.requests.create(data));
-        return res.code !== status.CREATED
-            ? this.handleResponse(res)
-            : either_1.Either.right(res.body.data.id);
+        if (res.code !== status.CREATED)
+            this.handleResponse(res);
+        return res.body.data.id;
     }
     async search(qry) {
         let res = await this.send(this.requests.search(qry));
         if (res.code !== status.OK && res.code !== status.NO_CONTENT)
-            return this.handleResponse(res);
-        return either_1.Either.right(res.code === status.NO_CONTENT
+            this.handleResponse(res);
+        return res.code === status.NO_CONTENT
             ? []
-            : res.body.data);
+            : res.body.data;
     }
     async update(id, changes) {
         let res = await this.send(this.requests.update(id, changes));
         if (res.code === status.NOT_FOUND)
-            return either_1.Either.right(false);
+            false;
         if (res.code !== status.OK)
-            return this.handleResponse(res);
-        return either_1.Either.right(true);
+            this.handleResponse(res);
+        return true;
     }
     async get(id) {
         let res = await this.send(this.requests.get(id));
         if (res.code === status.NOT_FOUND)
-            return either_1.Either.right((0, maybe_1.nothing)());
+            return (0, maybe_1.nothing)();
         if (res.code !== status.OK)
-            return this.handleResponse(res);
-        return either_1.Either.right((0, maybe_1.fromNullable)(res.body));
+            this.handleResponse(res);
+        return (0, maybe_1.fromNullable)(res.body);
     }
     async remove(id) {
         let res = await this.send(this.requests.remove(id));
         if (res.code !== status.OK)
-            return this.handleResponse(res);
-        return either_1.Either.right(true);
+            this.handleResponse(res);
+        return true;
     }
 }
 exports.HttpModel = HttpModel;
@@ -169,21 +169,15 @@ exports.HttpModel = HttpModel;
  * need something more complicated.
  */
 class SimpleHttpModel extends HttpModel {
-    constructor(agent, requests, callbacks) {
-        super(callbacks);
+    constructor(path, agent, callbacks) {
+        super(path, callbacks);
+        this.path = path;
         this.agent = agent;
-        this.requests = requests;
         this.callbacks = callbacks;
     }
-    /**
-     * fromPaths generates a new HttpModel using Paths object.
-     */
-    static fromPaths(agent, paths) {
-        return new SimpleHttpModel(agent, new RequestFactory(paths));
-    }
-    send(req) {
+    async send(req) {
         return this.agent.send(req);
     }
 }
 exports.SimpleHttpModel = SimpleHttpModel;
-//# sourceMappingURL=http.js.map
+//# sourceMappingURL=index.js.map

package/lib/app/model/http/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/app/model/http/index.ts"],"names":[],"mappings":"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"}

package/lib/app/model/http/remote.d.ts

@@ -0,0 +1,30 @@
+import { Request } from '@quenk/jhr/lib/request';
+import { Response } from '@quenk/jhr/lib/response';
+import { Path } from '@quenk/noni/lib/io/file';
+import { Object } from '@quenk/noni/lib/data/jsonx';
+import { Address } from '@quenk/potoo/lib/actor/address';
+import { Parent } from '@quenk/potoo/lib/actor/api';
+import { HttpCallback } from './callback';
+import { HttpModel } from '.';
+export declare const ERR_REQUEST_ABORTED = "ERR_REQUEST_ABORTED";
+/**
+ * RemoteModel is an HttpModel implementation that relies on the remote actor
+ * API.
+ *
+ * Use this class when requests become complicated requiring UI widgets to be
+ * updated, authentication errors to be intercepted etc. at scale.
+ */
+export declare class RemoteModel<T extends Object> extends HttpModel<T> {
+    parent: Parent;
+    server: Address;
+    path: Path;
+    callback: HttpCallback;
+    constructor(parent: Parent, server: Address, path: Path, callback?: HttpCallback);
+    /**
+     * send a request to the remote back-end.
+     *
+     * Use this method to submit the request to the remote actor using
+     * the optional installed handler(s) to handle the request before completion.
+     */
+    send(req: Request<Object>): Promise<Response<Object>>;
+}

package/lib/app/model/http/remote.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RemoteModel = exports.ERR_REQUEST_ABORTED = void 0;
+const future_1 = require("@quenk/noni/lib/control/monad/future");
+const framework_1 = require("@quenk/potoo/lib/actor/framework");
+const callback_1 = require("./callback");
+const remote_1 = require("../../remote");
+const _1 = require(".");
+exports.ERR_REQUEST_ABORTED = 'ERR_REQUEST_ABORTED';
+/**
+ * RemoteModel is an HttpModel implementation that relies on the remote actor
+ * API.
+ *
+ * Use this class when requests become complicated requiring UI widgets to be
+ * updated, authentication errors to be intercepted etc. at scale.
+ */
+class RemoteModel extends _1.HttpModel {
+    constructor(parent, server, path, callback = new callback_1.DefaultHttpCallback()) {
+        super(path);
+        this.parent = parent;
+        this.server = server;
+        this.path = path;
+        this.callback = callback;
+    }
+    /**
+     * send a request to the remote back-end.
+     *
+     * Use this method to submit the request to the remote actor using
+     * the optional installed handler(s) to handle the request before completion.
+     */
+    send(req) {
+        return future_1.Future.fromCallback(cb => {
+            this.parent.spawn(async (ref) => {
+                await ref.tell(this.server, new remote_1.Send(ref.self, req));
+                while (ref.isValid()) {
+                    await ref.receive([
+                        new framework_1.TypeCase(remote_1.SendOk, ({ response }) => cb(null, response)),
+                        new framework_1.TypeCase(remote_1.SendFailed, ({ error }) => cb(error))
+                    ]);
+                }
+                return ref.raise(new Error(exports.ERR_REQUEST_ABORTED));
+            });
+        });
+    }
+}
+exports.RemoteModel = RemoteModel;
+//# sourceMappingURL=remote.js.map

package/lib/app/model/http/remote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../src/app/model/http/remote.ts"],"names":[],"mappings":";;;AAGA,iEAA8D;AAK9D,gEAA4D;AAG5D,yCAA+D;AAC/D,yCAAwD;AACxD,wBAA8B;AAEjB,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;AAEzD;;;;;;GAMG;AACH,MAAa,WAA8B,SAAQ,YAAY;IAC3D,YACW,MAAc,EACd,MAAe,EACf,IAAU,EACV,WAAyB,IAAI,8BAAmB,EAAE;QAEzD,KAAK,CAAC,IAAI,CAAC,CAAC;QALL,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAS;QACf,SAAI,GAAJ,IAAI,CAAM;QACV,aAAQ,GAAR,QAAQ,CAA0C;IAG7D,CAAC;IAED;;;;;OAKG;IACH,IAAI,CAAC,GAAoB;QACrB,OAAO,eAAM,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;gBAC1B,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,aAAI,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;gBAErD,OAAO,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;oBACnB,MAAM,GAAG,CAAC,OAAO,CAAC;wBACd,IAAI,oBAAQ,CAAC,eAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAClC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CACrB;wBACD,IAAI,oBAAQ,CAAC,mBAAU,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;qBACrD,CAAC,CAAC;gBACP,CAAC;gBAED,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,2BAAmB,CAAC,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAlCD,kCAkCC"}

package/lib/app/model/index.d.ts

@@ -1,4 +1,3 @@
-import { Except } from '@quenk/noni/lib/control/except';
 import { Object } from '@quenk/noni/lib/data/jsonx';
 import { Maybe } from '@quenk/noni/lib/data/maybe';
 /**
@@ -16,21 +15,21 @@ export interface Model<T extends Object> {
     /**
      * create a new entry for the data type.
      */
-    create(data: T): Promise<Except<Id>>;
+    create(data: T): Promise<Id>;
     /**
      * search for entries that match the specified query criteria.
      */
-    search(qry: Object): Promise<Except<T[]>>;
+    search(qry: Object): Promise<T[]>;
     /**
      * update a single entry with the data provided.
      */
-    update(id: Id, changes: Partial<T>): Promise<Except<boolean>>;
+    update(id: Id, changes: Partial<T>): Promise<boolean>;
     /**
      * get a single entry using its id.
      */
-    get(id: Id): Promise<Except<Maybe<T>>>;
+    get(id: Id): Promise<Maybe<T>>;
     /**
      * remove a single entry using its id
      */
-    remove(id: Id): Promise<Except<boolean>>;
+    remove(id: Id): Promise<boolean>;
 }

package/lib/app/remote.d.ts

@@ -0,0 +1,56 @@
+import { TypeCase } from '@quenk/noni/lib/control/match/case';
+import { Object } from '@quenk/noni/lib/data/jsonx';
+import { HTTPAgent } from '@quenk/jhr/lib/agent';
+import { Request as HTTPRequest } from '@quenk/jhr/lib/request';
+import { Response } from '@quenk/jhr/lib/response';
+import { Address } from '@quenk/potoo/lib/actor/address';
+import { Immutable } from '@quenk/potoo/lib/actor/framework/resident';
+import { Runtime } from '@quenk/potoo/lib/actor/system/vm/runtime';
+import { HttpCallback } from './model/http/callback';
+/**
+ * Send a single request to the remote host, forwarding the response to the
+ * specified address.
+ */
+export declare class Send {
+    client: Address;
+    request: HTTPRequest<Object>;
+    constructor(client: Address, request: HTTPRequest<Object>);
+}
+export type SendResult = SendFailed | SendOk;
+/**
+ * SendOk is used when the request has been sent to the server successfully.
+ */
+export declare class SendOk {
+    response: Response<Object>;
+    constructor(response: Response<Object>);
+}
+/**
+ * SendFailed is used when sending the request fails to reach the server for
+ * some reason (offline etc).
+ */
+export declare class SendFailed {
+    error: Error;
+    constructor(error: Error);
+}
+/**
+ * Remote represents an HTTP server the app has access to.
+ *
+ * This actor is an abstraction over the `@quenk/jhr` so that requests
+ * can be sent via message passing. However, this abstraction is more
+ * concerned with application level logic than the details of the HTTP
+ * protocols.
+ */
+export declare class Remote extends Immutable {
+    runtime: Runtime;
+    agent: HTTPAgent<Object, Object>;
+    callback: HttpCallback;
+    constructor(runtime: Runtime, agent: HTTPAgent<Object, Object>, callback?: HttpCallback);
+    onSend: ({ client, request }: Send) => Promise<void>;
+    /**
+     * handleResponse allows for the Remote's global hooks to be invoked.
+     *
+     * These are meant to handle client errors not the main flow of requests.
+     */
+    handleResponse(res: Response<Object>): Promise<void>;
+    selectors(): TypeCase<typeof Send, Promise<void>>[];
+}

package/lib/app/remote.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Remote = exports.SendFailed = exports.SendOk = exports.Send = void 0;
+const status = require("@quenk/jhr/lib/status");
+const case_1 = require("@quenk/noni/lib/control/match/case");
+const resident_1 = require("@quenk/potoo/lib/actor/framework/resident");
+const callback_1 = require("./model/http/callback");
+/**
+ * Send a single request to the remote host, forwarding the response to the
+ * specified address.
+ */
+class Send {
+    constructor(client, request) {
+        this.client = client;
+        this.request = request;
+    }
+}
+exports.Send = Send;
+/**
+ * SendOk is used when the request has been sent to the server successfully.
+ */
+class SendOk {
+    constructor(response) {
+        this.response = response;
+    }
+}
+exports.SendOk = SendOk;
+/**
+ * SendFailed is used when sending the request fails to reach the server for
+ * some reason (offline etc).
+ */
+class SendFailed {
+    constructor(error) {
+        this.error = error;
+    }
+}
+exports.SendFailed = SendFailed;
+/**
+ * Remote represents an HTTP server the app has access to.
+ *
+ * This actor is an abstraction over the `@quenk/jhr` so that requests
+ * can be sent via message passing. However, this abstraction is more
+ * concerned with application level logic than the details of the HTTP
+ * protocols.
+ */
+class Remote extends resident_1.Immutable {
+    constructor(runtime, agent, callback = new callback_1.DefaultHttpCallback()) {
+        super(runtime);
+        this.runtime = runtime;
+        this.agent = agent;
+        this.callback = callback;
+        this.onSend = async ({ client, request }) => {
+            let res;
+            try {
+                res = await this.agent.send(request);
+            }
+            catch (e) {
+                await this.callback.onError(e);
+                await this.tell(client, new SendFailed(e));
+                return;
+            }
+            this.handleResponse(res);
+            await this.tell(client, new SendOk(res));
+        };
+    }
+    /**
+     * handleResponse allows for the Remote's global hooks to be invoked.
+     *
+     * These are meant to handle client errors not the main flow of requests.
+     */
+    async handleResponse(res) {
+        switch (res.code) {
+            case status.BAD_REQUEST:
+                await this.callback.onBadRequest(res);
+                break;
+            case status.UNAUTHORIZED:
+                await this.callback.onUnauthorized(res);
+                break;
+            case status.FORBIDDEN:
+                await this.callback.onForbidden(res);
+                break;
+            case status.CONFLICT:
+                await this.callback.onConflict(res);
+                break;
+            case status.NOT_FOUND:
+                await this.callback.onNotFound(res);
+                break;
+            default:
+                break;
+        }
+    }
+    selectors() {
+        return [new case_1.TypeCase(Send, this.onSend)];
+    }
+}
+exports.Remote = Remote;
+//# sourceMappingURL=remote.js.map

package/lib/app/remote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/app/remote.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAEhD,6DAA8D;AAQ9D,wEAAsE;AAGtE,oDAA0E;AAE1E;;;GAGG;AACH,MAAa,IAAI;IACb,YACW,MAAe,EACf,OAA4B;QAD5B,WAAM,GAAN,MAAM,CAAS;QACf,YAAO,GAAP,OAAO,CAAqB;IACpC,CAAC;CACP;AALD,oBAKC;AAID;;GAEG;AACH,MAAa,MAAM;IACf,YAAmB,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;IAAG,CAAC;CACpD;AAFD,wBAEC;AAED;;;GAGG;AACH,MAAa,UAAU;IACnB,YAAmB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;IAAG,CAAC;CACtC;AAFD,gCAEC;AAED;;;;;;;GAOG;AACH,MAAa,MAAO,SAAQ,oBAAS;IACjC,YACW,OAAgB,EAChB,KAAgC,EAChC,WAAyB,IAAI,8BAAmB,EAAE;QAEzD,KAAK,CAAC,OAAO,CAAC,CAAC;QAJR,YAAO,GAAP,OAAO,CAAS;QAChB,UAAK,GAAL,KAAK,CAA2B;QAChC,aAAQ,GAAR,QAAQ,CAA0C;QAK7D,WAAM,GAAG,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAQ,EAAE,EAAE;YACzC,IAAI,GAAG,CAAC;YACR,IAAI,CAAC;gBACD,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAQ,CAAC,CAAC,CAAC;gBAEtC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,UAAU,CAAQ,CAAC,CAAC,CAAC,CAAC;gBAClD,OAAO;YACX,CAAC;YAED,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YAEzB,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC;IAhBF,CAAC;IAkBD;;;;OAIG;IAEH,KAAK,CAAC,cAAc,CAAC,GAAqB;QACtC,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,WAAW;gBACnB,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBACtC,MAAM;YACV,KAAK,MAAM,CAAC,YAAY;gBACpB,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;gBACxC,MAAM;YACV,KAAK,MAAM,CAAC,SAAS;gBACjB,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBACrC,MAAM;YACV,KAAK,MAAM,CAAC,QAAQ;gBAChB,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACpC,MAAM;YACV,KAAK,MAAM,CAAC,SAAS;gBACjB,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACpC,MAAM;YAEV;gBACI,MAAM;QACd,CAAC;IACL,CAAC;IAED,SAAS;QACL,OAAO,CAAC,IAAI,eAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7C,CAAC;CACJ;AAzDD,wBAyDC"}

package/lib/app/scene/form/index.d.ts

@@ -1,7 +1,6 @@
 import { Object, Value } from '@quenk/noni/lib/data/jsonx';
 import { Any } from '@quenk/noni/lib/data/type';
 import { TypeCase } from '@quenk/noni/lib/control/match/case';
-import { Except } from '@quenk/noni/lib/control/except';
 import { Address } from '@quenk/potoo/lib/actor/address';
 import { Runtime } from '@quenk/potoo/lib/actor/system/vm/runtime';
 import { AppScene } from '../';
@@ -169,7 +168,7 @@ export declare abstract class AppFormScene<T extends Object> extends AppScene im
     /**
      * doSave executes the form saving logic.
      */
-    doSave(): Promise<Except<FormSaveResult>>;
+    doSave(): Promise<FormSaveResult>;
     /**
      * save executes the form saving operation and takes care of invoking the
      * callback.

package/lib/app/scene/form/index.js

@@ -5,7 +5,6 @@ const record_1 = require("@quenk/noni/lib/data/record");
 const array_1 = require("@quenk/noni/lib/data/array");
 const type_1 = require("@quenk/noni/lib/data/type");
 const case_1 = require("@quenk/noni/lib/control/match/case");
-const either_1 = require("@quenk/noni/lib/data/either");
 const __1 = require("../");
 /**
  * Abort causes a FormScene to cease operations and return control to the
@@ -116,7 +115,7 @@ class AppFormScene extends __1.AppScene {
      * doSave executes the form saving logic.
      */
     async doSave() {
-        return either_1.Either.right('');
+        return '';
     }
     /**
      * save executes the form saving operation and takes care of invoking the
@@ -129,13 +128,9 @@ class AppFormScene extends __1.AppScene {
      */
     async save() {
         this.errors = {};
-        let eresult = await this.doSave();
-        if (eresult.isRight()) {
-            // Leave it to the child class to handle error cases.
-            let result = eresult.takeRight();
-            await this.tell(this.owner, new FormState(this.self, true, this.getValues(), result));
-            await this.exit();
-        }
+        let result = await this.doSave();
+        await this.tell(this.owner, new FormState(this.self, true, this.getValues(), result));
+        await this.exit();
     }
 }
 exports.AppFormScene = AppFormScene;

package/lib/app/scene/form/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/app/scene/form/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/app/scene/form/index.ts"],"names":[],"mappings":"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"}

package/lib/app/scene/form/model.d.ts

@@ -1,6 +1,5 @@
 import { Value } from '@quenk/noni/lib/data/jsonx';
 import { Object } from '@quenk/noni/lib/data/jsonx';
-import { Except } from '@quenk/noni/lib/control/except';
 import { Address } from '@quenk/potoo/lib/actor/address';
 import { Runtime } from '@quenk/potoo/lib/actor/system/vm/runtime';
 import { Event } from '@quenk/wml-widgets/lib/control';
@@ -40,5 +39,5 @@ export declare abstract class ModelFormScene<T extends Object> extends AppFormSc
      * doSave either a create or update depending on the specified write
      * mode.
      */
-    doSave(): Promise<Except<Value>>;
+    doSave(): Promise<Value>;
 }

package/lib/app/scene/form/model.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelFormScene = exports.WRITE_MODE_UPDATE = exports.WRITE_MODE_CREATE = void 0;
-const either_1 = require("@quenk/noni/lib/data/either");
 const _1 = require(".");
 exports.WRITE_MODE_CREATE = 'create';
 exports.WRITE_MODE_UPDATE = 'update';
@@ -37,7 +36,7 @@ class ModelFormScene extends _1.AppFormScene {
         }
         else {
             await this.model.update(this.id, this.getModifiedValues());
-            return either_1.Either.right(this.id);
+            return this.id;
         }
     }
 }

package/lib/app/scene/form/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/app/scene/form/model.ts"],"names":[],"mappings":";;;AAGA,wDAAqD;AAQrD,wBAAiC;AAOpB,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAE1C;;GAEG;AACH,MAAsB,cAAiC,SAAQ,eAAe;IAC1E,YACW,OAAgB,EAChB,KAAc,EACd,OAAgB,EAChB,QAAoB,EAAE,EACtB,OAAkB,cAAc,CAAC,iBAAiB;QAEzD,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAN/B,YAAO,GAAP,OAAO,CAAS;QAChB,UAAK,GAAL,KAAK,CAAS;QACd,YAAO,GAAP,OAAO,CAAS;QAChB,UAAK,GAAL,KAAK,CAAiB;QACtB,SAAI,GAAJ,IAAI,CAA8C;QAqB7D;;WAEG;QACH,aAAQ,GAAG,KAAK,EAAE,CAAe,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IArB9D,CAAC;IAWD;;OAEG;IACH,IAAI,EAAE;QACF,OAAW,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IAC7B,CAAC;IAOD;;;OAGG;IACH,KAAK,CAAC,MAAM;QACR,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,iBAAiB,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;YAC3D,OAAO,eAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;;AA3CL,wCA4CC;AAjCU,gCAAiB,GAAG,yBAAiB,AAApB,CAAqB;AAEtC,gCAAiB,GAAG,yBAAiB,AAApB,CAAqB"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../src/app/scene/form/model.ts"],"names":[],"mappings":";;;AASA,wBAAiC;AAOpB,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAE1C;;GAEG;AACH,MAAsB,cAAiC,SAAQ,eAAe;IAC1E,YACW,OAAgB,EAChB,KAAc,EACd,OAAgB,EAChB,QAAoB,EAAE,EACtB,OAAkB,cAAc,CAAC,iBAAiB;QAEzD,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAN/B,YAAO,GAAP,OAAO,CAAS;QAChB,UAAK,GAAL,KAAK,CAAS;QACd,YAAO,GAAP,OAAO,CAAS;QAChB,UAAK,GAAL,KAAK,CAAiB;QACtB,SAAI,GAAJ,IAAI,CAA8C;QAqB7D;;WAEG;QACH,aAAQ,GAAG,KAAK,EAAE,CAAe,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IArB9D,CAAC;IAWD;;OAEG;IACH,IAAI,EAAE;QACF,OAAW,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IAC7B,CAAC;IAOD;;;OAGG;IACH,KAAK,CAAC,MAAM;QACR,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,iBAAiB,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC,EAAE,CAAC;QACnB,CAAC;IACL,CAAC;;AA3CL,wCA4CC;AAjCU,gCAAiB,GAAG,yBAAiB,AAApB,CAAqB;AAEtC,gCAAiB,GAAG,yBAAiB,AAApB,CAAqB"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@quenk/frontend",
-    "version": "0.20.4",
+    "version": "0.21.0",
     "description": "Actor oriented client side toolkit for Quenk Technologies.",
     "author": [
         "Quenk Technologies Limited <info@quenk.com> (https://quenk.com)"

package/lib/app/model/http.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/app/model/http.ts"],"names":[],"mappings":"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"}