Merge branch 'release-3.6.1'

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [3.6.1] - 2019-08-12
+
+### Fixed
+
+* [#508](https://github.com/dadi/cdn/pull/508): bypass JS processing when no transformation parameters supplied
+
 ## [3.6.0] - 2019-05-15
 
 ### Changed

dadi/lib/handlers/js.js

@@ -21,12 +21,41 @@ const JSHandler = function (format, req, {
   options = {}
 } = {}) {
   this.legacyURLOverrides = this.getLegacyURLOverrides(req.url)
-  this.options = options
   this.url = url.parse(
     this.legacyURLOverrides.url || req.url,
     true
   )
 
+  const mergedOptions = Object.assign({}, this.url.query, this.legacyURLOverrides, options)
+
+  // Normalising boolean values (e.g. true vs. 1 vs. '1').
+  this.options = Object.keys(mergedOptions).reduce((result, key) => {
+    let value
+
+    switch (mergedOptions[key]) {
+      case 0:
+      case '0':
+      case 'false':
+        value = false
+
+        break
+
+      case 1:
+      case '1':
+      case 'true':
+        value = true
+
+        break
+
+      default:
+        value = mergedOptions[key]
+    }
+
+    result[key] = value
+
+    return result
+  }, {})
+
   this.isExternalUrl = this.url.pathname.indexOf('http://') > 0 || this.url.pathname.indexOf('https://') > 0
 
   this.cache = Cache()
@@ -82,7 +111,13 @@ JSHandler.prototype.get = function () {
     }
 
     return this.storageHandler.get().then(stream => {
-      return this.transform(stream)
+      const {compress, transform} = this.options
+
+      if (compress === true || transform === true) {
+        return this.transform(stream)
+      }
+
+      return stream
     }).then(stream => {
       return this.cache.cacheFile(stream, this.cacheKey, {
         ttl: config.get('caching.ttl', this.req.__domain)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dadi/cdn",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "product": "DADI CDN",
   "description": "A high performance, just-in-time asset manipulation and delivery layer designed as a modern content distribution solution.",
   "scripts": {

test/acceptance/recipes.js

@@ -48,7 +48,8 @@ describe('Recipes', function () {
         'blur': '0',
         'strip': '0',
         'rotate': '0',
-        'flip': '0'
+        'flip': '0',
+        'transform': '1'
       }
     }