ui5-test-runner 5.9.1 → 5.10.0

package/src/ui5.js

@@ -16,6 +16,109 @@ const buildCacheBase = job => {
   return join(job.cache || '', hostName.replace(':', '_'), version || '')
 }
 
+const ui5mappings = job => {
+  const cacheBase = buildCacheBase(job)
+  const match = /\/((?:test-)?resources\/.*)/
+  const ifCacheEnabled = (request, url, match) => job.cache
+  const uncachable = {}
+  const cachingInProgress = {}
+
+  const mappings = [{
+    /* Prevent caching issues :
+      * - Caching was not possible (99% URL does not exist)
+      * - Caching is in progress (must wait for the end of the writing stream)
+      */
+    match,
+    'if-match': ifCacheEnabled,
+    custom: async (request, response, path) => {
+      if (uncachable[path]) {
+        response.writeHead(404)
+        response.end()
+        return
+      }
+      const cachingPromise = cachingInProgress[path]
+      /* istanbul ignore next */ // Hard to reproduce
+      if (cachingPromise) {
+        await cachingPromise
+      }
+    }
+  }, {
+    // UI5 from cache
+    match,
+    'if-match': ifCacheEnabled,
+    cwd: cacheBase,
+    file: '$1',
+    static: !job.debugDevMode
+  }, {
+    // UI5 caching
+    method: 'GET',
+    match,
+    'if-match': ifCacheEnabled,
+    custom: async (request, response, path) => {
+      const filePath = /([^?#]+)/.exec(unescape(path))[1] // filter URL parameters & hash (assuming resources are static)
+      const cachePath = join(cacheBase, filePath)
+      const cacheFolder = dirname(cachePath)
+      await mkdir(cacheFolder, { recursive: true })
+      if (cachingInProgress[path]) {
+        return request.url // loop back to use cached result
+      }
+      const file = createWriteStream(cachePath)
+      cachingInProgress[path] = capture(response, file)
+        .catch(reason => {
+          file.end()
+          uncachable[path] = true
+          if (response.statusCode !== 404) {
+            getOutput(job).failedToCacheUI5resource(path, response.statusCode)
+          }
+          return unlink(cachePath)
+        })
+        .then(() => {
+          delete cachingInProgress[path]
+        })
+    }
+  }, {
+    // UI5 from url
+    method: ['GET', 'HEAD'],
+    match,
+    url: `${job.ui5}/$1`,
+    'ignore-unverifiable-certificate': true
+  }]
+
+  for (let { relative, source } of job.libs) {
+    if (source.endsWith('/') || source.endsWith('\\')) {
+      source = source.substring(0, source.length - 1)
+    }
+    const relativeUrl = relative.replace(/\//g, '\\/')
+    if (source.startsWith(job.webapp)) {
+      const relativeAbsoluteUrl = '/' + relativePath(job.webapp, source).replace(/\\/g, '/')
+      getOutput(job).debug('libs', `${relative} maps to webapp sub directory, use internal redirection to ${relativeAbsoluteUrl}`)
+      mappings.unshift({
+        match: new RegExp(`\\/resources\\/${relativeUrl}(.*)`),
+        custom: (request, response, $1) => `${relativeAbsoluteUrl}${$1}`
+      })
+    } else {
+      mappings.unshift({
+        match: new RegExp(`\\/resources\\/${relativeUrl}(.*)`),
+        cwd: source,
+        file: '$1',
+        static: !job.watch && !job.debugDevMode
+      }, {
+        match: new RegExp(`\\/resources\\/${relativeUrl}(.*)`),
+        custom: (request, response, $1) => {
+          if ($1 === undefined) {
+            getOutput(job).debug('libs', `Unable to map ${relative} : $1 is undefined`)
+          } else {
+            getOutput(job).debug('libs', `Unable to map ${relative}/${$1} to ${join(source, $1)}`)
+          }
+          return 404
+        }
+      })
+    }
+  }
+
+  return mappings
+}
+
 module.exports = {
   preload: async job => {
     const cacheBase = buildCacheBase(job)
@@ -57,110 +160,10 @@ module.exports = {
     progress.done()
   },
 
-  mappings: job => {
+  mappings: async job => {
     if (job.disableUi5) {
       return []
     }
-
-    const cacheBase = buildCacheBase(job)
-    const match = /\/((?:test-)?resources\/.*)/
-    const ifCacheEnabled = (request, url, match) => job.cache
-    const uncachable = {}
-    const cachingInProgress = {}
-
-    const mappings = [{
-      /* Prevent caching issues :
-      * - Caching was not possible (99% URL does not exist)
-      * - Caching is in progress (must wait for the end of the writing stream)
-      */
-      match,
-      'if-match': ifCacheEnabled,
-      custom: async (request, response, path) => {
-        if (uncachable[path]) {
-          response.writeHead(404)
-          response.end()
-          return
-        }
-        const cachingPromise = cachingInProgress[path]
-        /* istanbul ignore next */ // Hard to reproduce
-        if (cachingPromise) {
-          await cachingPromise
-        }
-      }
-    }, {
-      // UI5 from cache
-      match,
-      'if-match': ifCacheEnabled,
-      cwd: cacheBase,
-      file: '$1',
-      static: !job.debugDevMode
-    }, {
-      // UI5 caching
-      method: 'GET',
-      match,
-      'if-match': ifCacheEnabled,
-      custom: async (request, response, path) => {
-        const filePath = /([^?#]+)/.exec(unescape(path))[1] // filter URL parameters & hash (assuming resources are static)
-        const cachePath = join(cacheBase, filePath)
-        const cacheFolder = dirname(cachePath)
-        await mkdir(cacheFolder, { recursive: true })
-        if (cachingInProgress[path]) {
-          return request.url // loop back to use cached result
-        }
-        const file = createWriteStream(cachePath)
-        cachingInProgress[path] = capture(response, file)
-          .catch(reason => {
-            file.end()
-            uncachable[path] = true
-            if (response.statusCode !== 404) {
-              getOutput(job).failedToCacheUI5resource(path, response.statusCode)
-            }
-            return unlink(cachePath)
-          })
-          .then(() => {
-            delete cachingInProgress[path]
-          })
-      }
-    }, {
-      // UI5 from url
-      method: ['GET', 'HEAD'],
-      match,
-      url: `${job.ui5}/$1`,
-      'ignore-unverifiable-certificate': true
-    }]
-
-    for (let { relative, source } of job.libs) {
-      if (source.endsWith('/') || source.endsWith('\\')) {
-        source = source.substring(0, source.length - 1)
-      }
-      const relativeUrl = relative.replace(/\//g, '\\/')
-      if (source.startsWith(job.webapp)) {
-        const relativeAbsoluteUrl = '/' + relativePath(job.webapp, source).replace(/\\/g, '/')
-        getOutput(job).debug('libs', `${relative} maps to webapp sub directory, use internal redirection to ${relativeAbsoluteUrl}`)
-        mappings.unshift({
-          match: new RegExp(`\\/resources\\/${relativeUrl}(.*)`),
-          custom: (request, response, $1) => `${relativeAbsoluteUrl}${$1}`
-        })
-      } else {
-        mappings.unshift({
-          match: new RegExp(`\\/resources\\/${relativeUrl}(.*)`),
-          cwd: source,
-          file: '$1',
-          static: !job.watch && !job.debugDevMode
-        }, {
-          match: new RegExp(`\\/resources\\/${relativeUrl}(.*)`),
-          custom: (request, response, $1) => {
-            if ($1 === undefined) {
-              getOutput(job).debug('libs', `Unable to map ${relative} : $1 is undefined`)
-            } else {
-              getOutput(job).debug('libs', `Unable to map ${relative}/${$1} to ${join(source, $1)}`)
-            }
-            return 404
-          }
-        })
-      }
-    }
-
-    return mappings
+    return ui5mappings(job)
   }
 }