@pbvision/fastify-firestore-service 0.0.30 → 0.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pbvision/fastify-firestore-service",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "Web Framework using Fastify and Firestore ORM",
   "license": "Apache-2.0",
   "type": "module",

package/src/api/db-api.js

@@ -1,15 +1,15 @@
 import db from '@pbvision/firestore-orm'
 
 import API from './api.js'
+import { __RequestDone } from './exception.js'
 
 /**
  * Thrown to avoid committing a transaction when an error occurs.
  * @access private
  */
-class TransactionAborted extends Error {
-  constructor (respData) {
-    super()
-    this.respData = respData
+export class RequestDoneAbortTransaction extends __RequestDone {
+  constructor (code = 200, data = '') {
+    super(undefined, data, code)
     this.retryable = false
   }
 }
@@ -53,12 +53,13 @@ class DatabaseAPI extends API {
         }
         // if the response code indicates an error, then don't commit
         if (this.__reply.statusCode >= 400) {
-          throw new TransactionAborted(respData)
+          throw new RequestDoneAbortTransaction(
+            this.__reply.statusCode, respData)
         }
         return respData
       })
     } catch (e) {
-      if (e instanceof TransactionAborted) {
+      if (e instanceof RequestDoneAbortTransaction) {
         return e.respData
       } else {
         throw e

package/src/api/exception.js

@@ -301,6 +301,7 @@ class ServiceUnavailableException extends RequestError {
 
 export {
   // Base exceptions
+  __RequestDone,
   RequestError,
   RequestDone,
 

package/src/fetch-wrapper.js

@@ -1,5 +1,4 @@
 import querystring from 'node:querystring'
-import zlib from 'node:zlib'
 
 import realFetch from 'node-fetch'
 
@@ -8,16 +7,10 @@ async function fetchWrapper (request, mockedFetch) {
   let { body, headers } = request
   headers = { ...headers } // copy the headers before we change them
 
-  // compress the body using brotli
   if (json) {
     headers['content-type'] = 'application/json'
     body = JSON.stringify(request.json)
   }
-  if (body && compress) {
-    body = zlib.brotliCompressSync(body)
-    headers['content-encoding'] = 'br'
-  }
-
   const fetch = (mockedFetch === false)
     ? realFetch
     : (mockedFetch ?? fetchWrapper.__mock ?? realFetch)
@@ -30,7 +23,7 @@ async function fetchWrapper (request, mockedFetch) {
       fullURL += `?${qsStr}`
     }
   }
-  const options = { body, headers, method, compress: false }
+  const options = { body, headers, method, compress }
   return fetch(fullURL, options)
 }
 

package/src/index.js

@@ -1,5 +1,5 @@
 import API from './api/api.js'
-import DatabaseAPI from './api/db-api.js'
+import DatabaseAPI, { RequestDoneAbortTransaction } from './api/db-api.js'
 import * as EXCEPTIONS from './api/exception.js'
 import RESPONSES from './api/response.js'
 import ComponentRegistrar from './component-registrar.js'
@@ -8,5 +8,6 @@ import makeService from './make-app.js'
 export {
   API, DatabaseAPI, EXCEPTIONS, RESPONSES,
   makeService,
-  ComponentRegistrar
+  ComponentRegistrar,
+  RequestDoneAbortTransaction
 }

package/test/base-test.js

@@ -152,10 +152,6 @@ function mockNodeFetch () {
       }
       delete request.headers['content-encoding']
       const body = options.body
-        ? (request.compress
-            ? zlib.brotliDecompressSync(options.body)
-            : options.body)
-        : options.body
       if (options.headers['content-type'] === 'application/json') {
         delete options.headers['content-type']
         request.json = JSON.parse(body)