add changes from vsf-api hotfix 1.12.1

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Add `Product.breadcrumbs`and `Category.breadcrumbs` - @gibkigonzo (#71)
+- Add changes from vsf-api hotfix 1.12.1 - @gibkigonzo (https://github.com/DivanteLtd/vue-storefront-api/pull/475)
 
 ### Fixed
 

config/default.json

@@ -31,7 +31,7 @@
     ],
     "index": "vue_storefront_catalog",
     "apiVersion": "7.2",
-
+    "cacheRequest": false,
     "searchScoring": {
       "attributes": {
         "attribute_code": {

packages/default-catalog/api/catalog.ts

@@ -115,6 +115,7 @@ export default ({ config, db }) => async function (req, res, body) {
       auth: auth
     }, async (_err, _res, _resBody) => { // TODO: add caching layer to speed up SSR? How to invalidate products (checksum on the response BEFORE processing it)
       if (_err || _resBody.error) {
+        Logger.error(_err || _resBody.error)
         apiError(res, _err || _resBody.error);
         return
       }

packages/lib/elastic.ts

@@ -65,6 +65,9 @@ export function adjustBackendProxyUrl (req, indexName: string, entityType: strin
     delete parsedQuery.request
     delete parsedQuery.request_format
     delete parsedQuery.response_format
+    if (config.get<boolean>('elasticsearch.cacheRequest')) {
+      parsedQuery.request_cache = !!config.get<boolean>('elasticsearch.cacheRequest')
+    }
     url = config.get<string>('elasticsearch.host') + ':' + config.get<number>('elasticsearch.port') + '/' + adjustIndexName(indexName, entityType, config) + '/_search?' + queryString.stringify(parsedQuery)
   }
   if (!url.startsWith('http')) {
@@ -99,6 +102,7 @@ export function getHits (result) {
   }
 }
 
+let esClient = null
 export function getClient (config: IConfig): Client {
   const { host, port, protocol, requestTimeout } = config.get('elasticsearch')
   const node = `${protocol}://${host}:${port}`
@@ -110,7 +114,11 @@ export function getClient (config: IConfig): Client {
     auth = { username: user, password }
   }
 
-  return new Client({ node, auth, requestTimeout })
+  if (!esClient) {
+    esClient = new Client({ node, auth, requestTimeout })
+  }
+
+  return esClient
 }
 
 export async function putAlias (db: Client, originalName: string, aliasName: string) {

packages/lib/util.ts

@@ -88,14 +88,14 @@ export function apiStatus (res, result: string|Record<any, any> = 'OK', code = 2
  *  @return {json} [result='OK']    Text message or result information object
  */
 export function apiError (res, error: Record<any, any>): string|Record<any, any> {
-  let errorCode = error.code || error.status || 500;
+  let errorCode = error.code || error.status;
   let errorMessage = error.errorMessage || error;
   if (error instanceof Error) {
     // Class 'Error' is not serializable with JSON.stringify, extract data explicitly.
     errorCode = (error as any).code || errorCode;
     errorMessage = error.message;
   }
-  return apiStatus(res, errorMessage, errorCode);
+  return apiStatus(res, errorMessage, Number(errorCode) || 500);
 }
 
 export function encryptToken (textToken, secret): string {

packages/platform-magento1/tax.ts

@@ -44,10 +44,10 @@ class TaxProxy extends AbstractTaxProxy {
         taxCountry = this._config.get('tax.defaultCountry')
       }
     }
-    if (sourcePriceInclTax === null) {
+    if (sourcePriceInclTax == null) {
       sourcePriceInclTax = this._config.get('tax.sourcePriceIncludesTax')
     }
-    if (finalPriceInclTax === null) {
+    if (finalPriceInclTax == null) {
       finalPriceInclTax = this._config.get('tax.finalPriceIncludesTax')
     }
     this._deprecatedPriceFieldsSupport = this._config.get('tax.deprecatedPriceFieldsSupport')

packages/platform-magento2/tax.ts

@@ -43,10 +43,10 @@ class TaxProxy extends AbstractTaxProxy {
         taxCountry = this._storeConfigTax.defaultCountry
       }
     }
-    if (sourcePriceInclTax === null) {
+    if (sourcePriceInclTax == null) {
       sourcePriceInclTax = this._storeConfigTax.sourcePriceIncludesTax
     }
-    if (finalPriceInclTax === null) {
+    if (finalPriceInclTax == null) {
       finalPriceInclTax = this._storeConfigTax.finalPriceIncludesTax
     }
     this._deprecatedPriceFieldsSupport = this._storeConfigTax.deprecatedPriceFieldsSupport