@itentialopensource/adapter-utils 5.4.0 → 5.5.1

package/CHANGELOG.md

@@ -1,4 +1,22 @@
 
+## 5.5.1 [07-30-2024]
+
+* Fix gzip conditional in propertyUtils
+
+See merge request itentialopensource/adapter-utils!295
+
+---
+
+## 5.5.0 [05-30-2024]
+
+* Add support for gzip responsedatatype
+
+Closes ADAPT-3270
+
+See merge request itentialopensource/adapter-utils!293
+
+---
+
 ## 5.4.0 [04-26-2024]
 
 * changes to support changing scope and resource

package/compliance-report.json

@@ -0,0 +1,9 @@
+{
+  "ComplianceEntries": [
+    {
+      "name": "Compliance Summary",
+      "numInvalidProjects": 0,
+      "numValidProjects": 0
+    }
+  ]
+}

package/compliance-report.txt

@@ -0,0 +1,5 @@
+---------------------------------------------------------------------------------------------
+**** Project Compliance Summary ****
+0 project(s) are not valid
+0 project(s) are valid
+---------------------------------------------------------------------------------------------

package/lib/propertyUtil.js

@@ -527,11 +527,15 @@ class AdapterPropertyUtil {
       // need to make sure we have supported datatypes - PLAIN is best if not supported - no translation or encoding
       if (entitySchema.requestDatatype.toUpperCase() !== 'JSON' && entitySchema.requestDatatype.toUpperCase() !== 'XML'
         && entitySchema.requestDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.requestDatatype.toUpperCase() !== 'URLQUERY'
-        && entitySchema.requestDatatype.toUpperCase() !== 'FORM' && entitySchema.requestDatatype.toUpperCase() !== 'JSON2XML') {
+        && entitySchema.requestDatatype.toUpperCase() !== 'FORM' && entitySchema.requestDatatype.toUpperCase() !== 'JSON2XML'
+        && entitySchema.requestDatatype.toUpperCase() !== 'GZIP2XML2JSON' && entitySchema.requestDatatype.toUpperCase() !== 'GZIP2XML'
+        && entitySchema.requestDatatype.toUpperCase() !== 'GZIP2JSON') {
         entitySchema.requestDatatype = 'PLAIN';
       }
       if (entitySchema.responseDatatype.toUpperCase() !== 'JSON' && entitySchema.responseDatatype.toUpperCase() !== 'XML'
-        && entitySchema.responseDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.responseDatatype.toUpperCase() !== 'XML2JSON') {
+        && entitySchema.responseDatatype.toUpperCase() !== 'URLENCODE' && entitySchema.responseDatatype.toUpperCase() !== 'XML2JSON'
+        && entitySchema.requestDatatype.toUpperCase() !== 'GZIP2XML2JSON' && entitySchema.requestDatatype.toUpperCase() !== 'GZIP2XML'
+        && entitySchema.requestDatatype.toUpperCase() !== 'GZIP2JSON') {
         entitySchema.responseDatatype = 'PLAIN';
       }
 

package/lib/restHandler.js

@@ -8,6 +8,7 @@ const querystring = require('querystring');
 const jsonQuery = require('json-query');
 const jsonxml = require('jsontoxml');
 const xml2js = require('xml2js');
+const pako = require('pako');
 
 const globalSchema = JSON.parse(require('fs').readFileSync(require('path').join(__dirname, '/../schemas/globalSchema.json')));
 
@@ -52,6 +53,19 @@ function matchResponse(uriPath, method, type, mockresponses) {
   return null;
 }
 
+/*
+ * INTERNAL FUNCTION: Parse XML
+ */
+function parseXML(xmlString, callback) {
+  const parser = new xml2js.Parser({ explicitArray: false, attrkey: '_attr' });
+  parser.parseString(xmlString, (error, result) => {
+    if (error) {
+      return callback(error);
+    }
+    return callback(null, result);
+  });
+}
+
 /*
  * INTERNAL FUNCTION: recursively inspect body data if heirarchical
  */
@@ -477,6 +491,53 @@ function handleRestRequest(request, entityId, entitySchema, callProperties, filt
       if (entitySchema && entitySchema.responseDatatype && entitySchema.responseDatatype.toUpperCase() === 'URLENCODE') {
         // return the response
         retResponse = querystring.parse(resObj.response.trim());
+      } else if (entitySchema && entitySchema.responseDatatype && (entitySchema.responseDatatype.toUpperCase() === 'GZIP2PLAIN'
+          || entitySchema.responseDatatype.toUpperCase() === 'GZIP2JSON' || entitySchema.responseDatatype.toUpperCase() === 'GZIP2XML'
+          || entitySchema.responseDatatype.toUpperCase() === 'GZIP2XML2JSON')) {
+        // If response is GZIP
+        const responseDatatype = entitySchema.responseDatatype.toUpperCase();
+        const responseBody = pako.inflate(Buffer.from(resObj.response, 'binary'), { to: 'string' });
+        // Handle conversion based on responseDatatype
+        if (responseDatatype === 'GZIP2PLAIN') {
+          retObject.response = responseBody;
+        } else if (responseDatatype === 'GZIP2JSON') {
+          // Parse responseBody as JSON
+          retObject.response = JSON.parse(responseBody);
+        } else if (responseDatatype === 'GZIP2XML' || responseDatatype === 'GZIP2XML2JSON') {
+          parseXML(responseBody, (error, xmlResult) => {
+            if (error) {
+              log.warn(`${origin}: Error parsing XML response: ${error}`);
+              return callback(retObject);
+            }
+
+            retObject.response = xmlResult;
+
+            if (responseDatatype === 'GZIP2XML2JSON') {
+              // Optionally convert XML to JSON
+              try {
+                const parser = new xml2js.Parser({ explicitArray: false, attrkey: '_attr' });
+                return parser.parseString(xmlResult, (err, result) => {
+                  if (err) {
+                    log.warn(`${origin}: Unable to parse xml to json ${err}`);
+                    return callback(retObject);
+                  }
+                  // Logic to convert keys specified to array if object
+                  if (xmlArrayKeys) {
+                    setArrays(result, xmlArrayKeys);
+                  }
+                  retObject.response = result;
+                  return callback(retObject);
+                });
+              } catch (ex) {
+                log.warn(`${origin}: Unable to get json from xml ${ex}`);
+                return callback(retObject);
+              }
+            }
+
+            log.debug(`${origin}: RESPONSE: ${retObject.response}`);
+            return callback(retObject);
+          });
+        }
       } else {
         // process the response - parse it
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-utils",
-  "version": "5.4.0",
+  "version": "5.5.1",
   "description": "Itential Adapter Utility Libraries",
   "scripts": {
     "postinstall": "node utils/setup.js",
@@ -31,7 +31,7 @@
     "aws4": "^1.9.1",
     "cookie": "^0.5.0",
     "crypto-js": "^4.1.1",
-    "ejs": "^3.1.9",
+    "ejs": "^3.1.10",
     "form-data": "^4.0.0",
     "fs-extra": "^11.1.1",
     "https-proxy-agent": "^7.0.0",
@@ -39,6 +39,7 @@
     "jsontoxml": "^1.0.1",
     "jsonwebtoken": "^9.0.1",
     "mongodb": "^3.7.4",
+    "pako": "^2.1.0",
     "querystring": "^0.2.0",
     "readline-sync": "^1.4.10",
     "socks-proxy-agent": "^8.0.1",
@@ -59,6 +60,5 @@
     "testdouble": "^3.18.0",
     "winston": "^3.9.0"
   },
-  "peerDependencies": {},
   "private": false
 }