nats-hemera - npm Package Compare versions

Comparing version 5.0.1 to 5.0.2

index.d.ts

@@ -91,4 +91,4 @@ /// <reference types="node" />
       handler: (
-        request: ServerRequest,
-        response: ServerResponse,
+        request: Request,
+        response: Response,
         next: (err?: Error) => void
@@ -99,4 +99,4 @@ ) => void
       handler: ((
-        request: ServerRequest,
-        response: ServerResponse,
+        request: Request,
+        response: Response,
         next: (err?: Error) => void
@@ -108,4 +108,4 @@ ) => void)[]
       handler: (
-        request: ServerRequest,
-        response: ServerResponse
+        request: Request,
+        response: Response
       ) => Promise<void>
@@ -115,4 +115,4 @@ ): AddDefinition
       handler: ((
-        request: ServerRequest,
-        response: ServerResponse
+        request: Request,
+        response: Response
       ) => Promise<void>)[]
@@ -138,3 +138,3 @@ ): AddDefinition
 
-  interface ServerRequest {
+  interface Request {
     payload: any
@@ -144,3 +144,3 @@ error: Error
 
-  interface ServerResponse {
+  interface Response {
     payload: any
@@ -281,3 +281,3 @@ error: Error
       instance: Hemera,
-      request: Hemera.ServerRequest,
+      request: Hemera.Request,
       reply: Hemera.Reply,
@@ -291,3 +291,3 @@ next: (err?: Error) => void
       instance: Hemera,
-      request: Hemera.ServerRequest,
+      request: Hemera.Request,
       reply: Hemera.Reply
@@ -301,3 +301,3 @@ ) => Promise<void>
       instance: Hemera,
-      request: Hemera.ServerRequest,
+      request: Hemera.Request,
       reply: Hemera.Reply,
@@ -311,3 +311,3 @@ next: (err?: Error) => void
       instance: Hemera,
-      request: Hemera.ServerRequest,
+      request: Hemera.Request,
       reply: Hemera.Reply
@@ -321,3 +321,3 @@ ) => Promise<void>
       instance: Hemera,
-      request: Hemera.ServerRequest,
+      request: Hemera.Request,
       reply: Hemera.Reply,
@@ -331,3 +331,3 @@ next: (err?: Error) => void
       instance: Hemera,
-      request: Hemera.ServerRequest,
+      request: Hemera.Request,
       reply: Hemera.Reply
@@ -374,2 +374,4 @@ ) => Promise<void>
   matchedAction: Hemera.AddDefinition
+  request: Hemera.Request
+  response: Hemera.Response
 
@@ -376,0 +378,0 @@ context$: any

lib/add.js

@@ -61,2 +61,3 @@ 'use strict'
   }
+
   /**
@@ -101,2 +102,3 @@ *
   }
+
   /**
@@ -133,2 +135,3 @@ *
   }
+
   /**
@@ -144,2 +147,3 @@ *
   }
+
   /**
@@ -152,12 +156,2 @@ *
    */
-  get plugin() {
-    return this.actMeta.plugin
-  }
-  /**
-   *
-   *
-   * @readonly
-   *
-   * @memberOf Add
-   */
   get transport() {
@@ -164,0 +158,0 @@ return this.actMeta.transport

lib/clientRequest.js

@@ -34,4 +34,4 @@ 'use strict'
    */
-  get payload() {
-    return this._request.value
+  get error() {
+    return this._request.error
   }
@@ -42,8 +42,7 @@
    *
-   * @readonly
-   * @type {*}
+   *
    * @memberOf ClientRequest
    */
-  get error() {
-    return this._request.error
+  set error(error) {
+    this._request.error = error
   }
@@ -54,7 +53,8 @@
    *
-   *
+   * @readonly
+   * @type {*}
    * @memberOf ClientRequest
    */
-  set payload(value) {
-    this._request.value = value
+  get payload() {
+    return this._request.value
   }
@@ -68,4 +68,4 @@
    */
-  set error(error) {
-    this._request.error = error
+  set payload(value) {
+    this._request.value = value
   }
@@ -72,0 +72,0 @@ }

lib/extensionRunner.js

@@ -30,3 +30,3 @@ 'use strict'
 function serverExtIterator(fn, state, next) {
-  return fn(state, state._request, state.reply, next)
+  return fn(state, state.request, state.reply, next)
 }
@@ -33,0 +33,0 @@

lib/extensions.js

@@ -111,3 +111,3 @@ 'use strict'
   let pattern = context._pattern
-  let msg = context._response.payload
+  let msg = context.response.payload
 
@@ -146,3 +146,3 @@ // pass to act context
 function onServerPreRequest(context, req, res, next) {
-  let m = context._serverDecoder(context._request.payload)
+  let m = context._serverDecoder(context.request.payload)
 
@@ -164,7 +164,7 @@ if (m.error) {
 
-  context._request.payload = m.value
-  context._request.error = null
+  context.request.payload = m.value
+  context.request.error = null
 
   // incoming pattern
-  context._pattern = context._request.payload.pattern
+  context._pattern = context.request.payload.pattern
   // find matched action
@@ -171,0 +171,0 @@ context.matchedAction = context._router.lookup(context._pattern)

lib/index.js

@@ -94,6 +94,6 @@ /**
     this.matchedAction = null
+    this.request = null
+    this.response = null
 
     this._topic = ''
-    this._request = null
-    this._response = null
     this._pattern = null
@@ -740,7 +740,7 @@ this._execute = null
       hemera._topic = topic
-      hemera._request = new ServerRequest(request)
-      hemera._response = new ServerResponse(replyTo)
+      hemera.request = new ServerRequest(request)
+      hemera.response = new ServerResponse(replyTo)
       hemera.reply = new Reply(
-        hemera._request,
-        hemera._response,
+        hemera.request,
+        hemera.response,
         hemera,
@@ -856,3 +856,3 @@ hemera.log
     // action middleware
-    self.matchedAction.run(self._request, self.reply, err =>
+    self.matchedAction.run(self.request, self.reply, err =>
       self._afterMiddlewareHandler(err)
@@ -906,4 +906,4 @@ )
     // if request type is 'pubsub' we don't have to reply back
-    if (self._request.payload.request.type === 'pubsub') {
-      action(self._request.payload.pattern)
+    if (self.request.payload.request.type === 'pubsub') {
+      action(self.request.payload.pattern)
       self.reply.send()
@@ -913,3 +913,3 @@ return
 
-    return action(self._request.payload.pattern, (err, result) => {
+    return action(self.request.payload.pattern, (err, result) => {
       if (err) {
@@ -1161,14 +1161,14 @@ self._isValidError(err)
     const res = self._clientDecoder(response)
-    self._response.payload = res.value
-    self._response.error = res.error
+    self.response.payload = res.value
+    self.response.error = res.error
 
     // decoding error
-    if (self._response.error) {
+    if (self.response.error) {
       let internalError = new Errors.ParseError(
         'Client payload decoding',
         self.errorDetails
-      ).causedBy(self._response.error)
+      ).causedBy(self.response.error)
       self.log.error(internalError)
-      self.emit('clientResponseError', self._response.error)
-      self._execute(self._response.error)
+      self.emit('clientResponseError', self.response.error)
+      self._execute(self.response.error)
       return
@@ -1206,4 +1206,4 @@ }
 
-    if (self._response.payload.error) {
-      let error = Errio.fromObject(self._response.payload.error)
+    if (self.response.payload.error) {
+      let error = Errio.fromObject(self.response.payload.error)
       const internalError = new Errors.ResponseError(
@@ -1220,3 +1220,3 @@ 'Response error received',
 
-    self._execute(null, self._response.payload.result)
+    self._execute(null, self.response.payload.result)
   }
@@ -1261,6 +1261,7 @@
     hemera._cleanPattern = Util.cleanFromSpecialVars(pattern)
-    hemera._response = new ClientResponse()
-    hemera._request = new ClientRequest()
     hemera._isServer = false
     hemera._execute = null
+
+    hemera.response = new ClientResponse()
+    hemera.request = new ClientRequest()
     hemera.sid = 0
@@ -1330,4 +1331,8 @@
 
+    self.request.payload = m.value
+
     // encoding issue
     if (m.error) {
+      self.request.payload = null
+      self.request.error = m.error
       let error = new Errors.ParseError('Client payload encoding').causedBy(
@@ -1344,2 +1349,4 @@ m.error
       let error = self.getRootError(err)
+      self.request.payload = null
+      self.request.error = error
       const internalError = new Errors.HemeraError(
@@ -1354,8 +1361,5 @@ 'onClientPreRequest extension'
 
-    self._request.payload = m.value
-    self._request.error = m.error
-
     // use simple publish mechanism instead of request/reply
     if (self._pattern.pubsub$ === true) {
-      self._transport.send(self._pattern.topic, self._request.payload, err =>
+      self._transport.send(self._pattern.topic, self.request.payload, err =>
         self._execute(err)
@@ -1383,3 +1387,3 @@ )
         self._pattern.topic,
-        self._request.payload,
+        self.request.payload,
         optOptions,
@@ -1424,3 +1428,3 @@ resp => self._sendRequestHandler(resp)
     self.log.error(error)
-    self._response.error = error
+    self.response.error = error
     self.emit('clientResponseError', error)
@@ -1451,7 +1455,7 @@
       self.log.error(internalError)
-      self._response.error = error
+      self.response.error = error
       self.emit('clientResponseError', error)
     }
 
-    self._execute(self._response.error)
+    self._execute(self.response.error)
   }
@@ -1458,0 +1462,0 @@

package.json

 {
   "name": "nats-hemera",
   "author": "Dustin Deus (https://github.com/StarpTech)",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "main": "lib/index.js",
@@ -6,0 +6,0 @@ "homepage": "https://hemerajs.github.io/hemera/",

No alert changes

Worsened metrics

Total package byte prevSize

75844

decreased by-0.2%

Lines of code

3056

decreased by-0.16%

No dependency changes