1.0.46

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apiglobal/typedrequest",
-  "version": "1.0.37",
+  "version": "1.0.46",
   "private": false,
   "description": "make typed requests towards apis",
   "main": "dist_ts/index.js",
@@ -9,24 +9,26 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web)",
+    "build": "(tsbuild --web && tsbundle npm)",
     "format": "(gitzone format)"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.24",
-    "@gitzone/tstest": "^1.0.33",
-    "@pushrocks/smartexpress": "^3.0.69",
-    "@pushrocks/tapbundle": "^3.2.1",
-    "@types/node": "^14.0.13",
+    "@gitzone/tsbundle": "^1.0.72",
+    "@gitzone/tstest": "^1.0.43",
+    "@pushrocks/smartexpress": "^3.0.73",
+    "@pushrocks/tapbundle": "^3.2.9",
+    "@types/node": "^14.0.26",
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest-interfaces": "^1.0.13",
-    "@pushrocks/lik": "^4.0.13",
-    "@pushrocks/smartdelay": "^2.0.9",
-    "@pushrocks/smartjson": "^3.0.10",
-    "@pushrocks/smartrequest": "^1.1.47"
+    "@apiglobal/typedrequest-interfaces": "^1.0.15",
+    "@pushrocks/isounique": "^1.0.4",
+    "@pushrocks/lik": "^4.0.17",
+    "@pushrocks/smartdelay": "^2.0.10",
+    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/webrequest": "^2.0.10"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -27,6 +27,76 @@ Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20W
 
 Use TypeScript for best in class intellisense.
 
+```typescript
+import { expect, tap } from '@pushrocks/tapbundle';
+import * as smartexpress from '@pushrocks/smartexpress';
+
+import * as typedrequest from '../ts/index';
+
+let testServer: smartexpress.Server;
+let testTypedHandler: typedrequest.TypedHandler<ITestReqRes>;
+
+// lets define an interface
+interface ITestReqRes {
+  method: 'hi';
+  request: {
+    name: string;
+  };
+  response: {
+    surname: string;
+  };
+}
+
+tap.test('should create a typedHandler', async () => {
+  // lets use the interface in a TypedHandler
+  testTypedHandler = new typedrequest.TypedHandler<ITestReqRes>('hi', async reqArg => {
+    return {
+      surname: 'wow'
+    };
+  });
+});
+
+tap.test('should spawn a server to test with', async () => {
+  testServer = new smartexpress.Server({
+    cors: true,
+    forceSsl: false,
+    port: 3000
+  });
+});
+
+tap.test('should define a testHandler', async () => {
+  const testTypedRouter = new typedrequest.TypedRouter(); // typed routers can broker typedrequests between handlers
+  testTypedRouter.addTypedHandler(testTypedHandler);
+  testServer.addRoute(
+    '/testroute',
+    new smartexpress.HandlerTypedRouter(testTypedRouter as any) // the "any" is testspecific, since smartexpress ships with its own version of typedrequest.
+  );
+});
+
+tap.test('should start the server', async () => {
+  await testServer.start();
+});
+
+tap.test('should fire a request', async () => {
+  const typedRequest = new typedrequest.TypedRequest<ITestReqRes>(
+    'http://localhost:3000/testroute',
+    'hi'
+  );
+  const response = await typedRequest.fire({
+    name: 'really'
+  });
+  console.log('this is the response:');
+  console.log(response);
+  expect(response.surname).to.equal('wow');
+});
+
+tap.test('should end the server', async () => {
+  await testServer.stop();
+});
+
+tap.start();
+```
+
 ## Contribution
 
 We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)

test/test.ts

@@ -6,6 +6,7 @@ import * as typedrequest from '../ts/index';
 let testServer: smartexpress.Server;
 let testTypedHandler: typedrequest.TypedHandler<ITestReqRes>;
 
+// lets define an interface
 interface ITestReqRes {
   method: 'hi';
   request: {
@@ -17,6 +18,7 @@ interface ITestReqRes {
 }
 
 tap.test('should create a typedHandler', async () => {
+  // lets use the interface in a TypedHandler
   testTypedHandler = new typedrequest.TypedHandler<ITestReqRes>('hi', async reqArg => {
     return {
       surname: 'wow'
@@ -33,12 +35,11 @@ tap.test('should spawn a server to test with', async () => {
 });
 
 tap.test('should define a testHandler', async () => {
+  const testTypedRouter = new typedrequest.TypedRouter(); // typed routers can broker typedrequests between handlers
+  testTypedRouter.addTypedHandler(testTypedHandler);
   testServer.addRoute(
     '/testroute',
-    new smartexpress.Handler('POST', async (req, res) => {
-      console.log(req.body);
-      res.json(await testTypedHandler.addResponse(req.body));
-    })
+    new smartexpress.HandlerTypedRouter(testTypedRouter as any) // the "any" is testspecific, since smartexpress ships with its own version of typedrequest.
   );
 });
 
@@ -54,6 +55,7 @@ tap.test('should fire a request', async () => {
   const response = await typedRequest.fire({
     name: 'really'
   });
+  console.log('this is the response:');
   console.log(response);
   expect(response.surname).to.equal('wow');
 });

ts/typedrequest.classes.typedhandler.ts

@@ -42,12 +42,13 @@ export class TypedHandler<T extends plugins.typedRequestInterfaces.ITypedRequest
         data: typedResponseError.errorData
       };
     }
-    
+
     if (response) {
       typedRequestArg.response = response;
     }
 
-    
+    typedRequestArg?.correlation?.phase ? typedRequestArg.correlation.phase = 'response' : null;
+
     return typedRequestArg;
   }
 }

ts/typedrequest.classes.typedrequest.ts

@@ -1,30 +1,89 @@
 import * as plugins from './typedrequest.plugins';
 import { TypedResponseError } from './typedrequest.classes.typedresponseerror';
+import { TypedRouter } from './typedrequest.classes.typedrouter';
+
+export type IPostMethod = (
+  typedRequestPostObject: plugins.typedRequestInterfaces.ITypedRequest
+) => void | Promise<plugins.typedRequestInterfaces.ITypedRequest>;
 
 export class TypedRequest<T extends plugins.typedRequestInterfaces.ITypedRequest> {
-  public urlEndPoint: string;
+  /**
+   * this typedrouter allows us to have easy async request response cycles
+   */
+  public typedRouterRef: TypedRouter;
+  public webrequest = new plugins.webrequest.WebRequest();
+
+  /**
+   * in case we post against a url endpoint
+   */
+  public urlEndPoint?: string;
+
+  /**
+   * in case we post with some other method, ec ipc communication
+   */
+  public postMethod?: IPostMethod;
   public method: string;
 
   // STATIC
-  constructor(urlEndPointArg: string, methodArg: T['method']) {
-    this.urlEndPoint = urlEndPointArg;
+  constructor(
+    postEndPointArg: string | IPostMethod,
+    methodArg: T['method'],
+    typedrouterRefArg?: TypedRouter
+  ) {
+    if (typeof postEndPointArg === 'string') {
+      this.urlEndPoint = postEndPointArg;
+    } else {
+      this.postMethod = postEndPointArg;
+    }
     this.method = methodArg;
+    this.typedRouterRef = typedrouterRefArg;
   }
 
   /**
-   * firest the request
+   * fires the request
    */
   public async fire(fireArg: T['request']): Promise<T['response']> {
-    const response = await plugins.smartrequest.postJson(this.urlEndPoint, {
-      requestBody: {
-        method: this.method,
-        request: fireArg,
-        response: null
+    const payload: plugins.typedRequestInterfaces.ITypedRequest = {
+      method: this.method,
+      request: fireArg,
+      response: null,
+      correlation: {
+        id: plugins.isounique.uni(),
+        phase: 'request',
+      },
+    };
+
+    let responseBody: plugins.typedRequestInterfaces.ITypedRequest;
+    if (this.urlEndPoint) {
+      const response = await this.webrequest.postJson(this.urlEndPoint, payload);
+      responseBody = response;
+    } else {
+      let responseInterest: plugins.lik.Interest<
+          string,
+          plugins.typedRequestInterfaces.ITypedRequest
+      >;
+      // having a typedrouter allows us to work with async request response cycles.
+      if (this.typedRouterRef) {
+        responseInterest = await this.typedRouterRef.fireEventInterestMap.addInterest(
+          payload.correlation.id,
+          payload
+        );
       }
-    });
-    const responseBody: T = response.body;
+      const postMethodReturnValue = await this.postMethod(payload);
+      if (responseInterest) {
+        responseBody = await responseInterest.interestFullfilled;
+      } else if (postMethodReturnValue) {
+        responseBody = postMethodReturnValue;
+      } else {
+        responseBody = payload;
+      }
+    }
     if (responseBody.error) {
-      console.error(`Got an error ${responseBody.error.text} with data ${JSON.stringify(responseBody.error.data)}`);
+      console.error(
+        `Got an error ${responseBody.error.text} with data ${JSON.stringify(
+          responseBody.error.data
+        )}`
+      );
       if (!responseBody.retry) {
         throw new TypedResponseError(responseBody.error.text, responseBody.error.data);
       }

ts/typedrequest.classes.typedresponseerror.ts

@@ -7,4 +7,4 @@ export class TypedResponseError {
     this.errorText = errorTextArg;
     this.errorData = errorDataArg;
   }
-}
+}

ts/typedrequest.classes.typedrouter.ts

@@ -1,6 +1,7 @@
 import * as plugins from './typedrequest.plugins';
 
 import { TypedHandler } from './typedrequest.classes.typedhandler';
+import { TypedRequest } from './typedrequest.classes.typedrequest';
 
 /**
  * A typed router decides on which typed handler to call based on the method
@@ -16,6 +17,11 @@ export class TypedRouter {
     TypedHandler<plugins.typedRequestInterfaces.ITypedRequest>
   >();
 
+  public fireEventInterestMap = new plugins.lik.InterestMap<
+    string,
+    plugins.typedRequestInterfaces.ITypedRequest
+  >((correlationId: string) => correlationId);
+
   /**
    * adds the handler to the routing map
    * @param typedHandlerArg
@@ -64,12 +70,12 @@ export class TypedRouter {
     if (this.upstreamTypedRouter && checkUpstreamRouter) {
       typedHandler = this.upstreamTypedRouter.getTypedHandlerForMethod(methodArg);
     } else {
-      typedHandler = this.handlerMap.find(handler => {
+      typedHandler = this.handlerMap.find((handler) => {
         return handler.method === methodArg;
       });
 
       if (!typedHandler) {
-        this.routerMap.getArray().forEach(typedRouter => {
+        this.routerMap.getArray().forEach((typedRouter) => {
           if (!typedHandler) {
             typedHandler = typedRouter.getTypedHandlerForMethod(methodArg, false);
           }
@@ -81,22 +87,29 @@ export class TypedRouter {
   }
 
   /**
-   * routes a typed request to a handler
+   * if typedrequest object has correlation.phase === 'request' -> routes a typed request object to a handler
+   * if typedrequest object has correlation.phase === 'response' -> routes a typed request object to request fire event
    * @param typedRequestArg
    */
   public async routeAndAddResponse(typedRequestArg: plugins.typedRequestInterfaces.ITypedRequest) {
-    const typedHandler = this.getTypedHandlerForMethod(typedRequestArg.method);
+    if (!typedRequestArg?.correlation?.phase || typedRequestArg.correlation.phase === 'request') {
+      const typedHandler = this.getTypedHandlerForMethod(typedRequestArg.method);
 
-    if (!typedHandler) {
-      console.log(`Cannot find handler for methodname ${typedRequestArg.method}`);
-      typedRequestArg.error = {
-        text: 'There is no available method for this call on the server side',
-        data: {}
-      };
-      return typedRequestArg;
+      if (!typedHandler) {
+        console.log(`Cannot find handler for methodname ${typedRequestArg.method}`);
+        typedRequestArg.error = {
+          text: 'There is no available method for this call on the server side',
+          data: {},
+        };
+        return typedRequestArg;
+      }
+
+      typedRequestArg = await typedHandler.addResponse(typedRequestArg);
+    } else if (typedRequestArg.correlation.phase === 'response') {
+      this.fireEventInterestMap
+        .findInterest(typedRequestArg.correlation.id)
+        ?.fullfillInterest(typedRequestArg);
     }
-
-    typedRequestArg = await typedHandler.addResponse(typedRequestArg);
     return typedRequestArg;
   }
 }

ts/typedrequest.plugins.ts

@@ -4,9 +4,10 @@ import * as typedRequestInterfaces from '@apiglobal/typedrequest-interfaces';
 export { typedRequestInterfaces };
 
 // pushrocks scope
+import * as isounique from '@pushrocks/isounique';
 import * as lik from '@pushrocks/lik';
 import * as smartdelay from '@pushrocks/smartdelay';
-import * as smartrequest from '@pushrocks/smartrequest';
-import * as smartjson from '@pushrocks/smartjson';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as webrequest from '@pushrocks/webrequest';
 
-export { lik, smartdelay, smartrequest, smartjson };
+export { isounique, lik, smartdelay, smartpromise, webrequest };