ui5-test-runner 5.9.0 → 5.10.0

package/index.js

@@ -99,10 +99,9 @@ async function main () {
       output.serving(url)
       serverReady()
     })
-    .on('error', error => {
-      output.serverError(error)
-      send({ msg: 'error', error })
-      serverError()
+    .on('error', ({ reason }) => {
+      send({ msg: 'error', reason })
+      serverError(reason)
     })
   await serverStarted
   if (job.preload) {

package/jest.config.json

@@ -14,6 +14,7 @@
   "coveragePathIgnorePatterns": [
     "\\.spec\\.js",
     "output\\.js",
+    "handle\\.js",
     "b\\capabilities\\b"
   ],
   "coverageThreshold": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui5-test-runner",
-  "version": "5.9.0",
+  "version": "5.10.0",
   "description": "Standalone test runner for UI5",
   "main": "index.js",
   "bin": {
@@ -46,24 +46,24 @@
   "homepage": "https://github.com/ArnaudBuchholz/ui5-test-runner#readme",
   "dependencies": {
     "commander": "^12.1.0",
-    "ps-tree": "^1.2.0",
+    "pidtree": "^0.6.0",
     "punybind": "^1.2.1",
-    "punyexpr": "1.1.1",
+    "punyexpr": "1.2.0",
     "reserve": "2.3.3"
   },
   "devDependencies": {
-    "@openui5/types": "^1.136.1",
-    "@ui5/cli": "^4.0.19",
+    "@openui5/types": "^1.140.0",
+    "@ui5/cli": "^4.0.26",
     "@ui5/middleware-code-coverage": "^2.0.1",
     "dotenv": "^16.5.0",
     "jest": "^29.7.0",
-    "nock": "^14.0.5",
-    "npm-check-updates": "^18.0.1",
+    "nock": "^14.0.10",
+    "npm-check-updates": "^18.3.0",
     "nyc": "^17.1.0",
     "rimraf": "^6.0.1",
     "standard": "^17.1.2",
-    "typescript": "^5.8.3",
-    "ui5-tooling-transpile": "^3.8.0"
+    "typescript": "^5.9.2",
+    "ui5-tooling-transpile": "^3.9.2"
   },
   "optionalDependencies": {
     "fsevents": "^2.3.3"

package/src/batch.js

@@ -70,10 +70,10 @@ const task = async function (batchItem) {
       .filter(name => job[$valueSources][name] === 'cli')
       .forEach(name => {
         const longName = toLongName(name)
-        const option = batchParameters[longName]
+        const option = batchParameters[longName] || batchParameters['no-' + longName]
         if (option) {
-          parameters.push(`--${longName}`)
-          if (!option.optional && !option.negate) {
+          parameters.push(option.long)
+          if (!option.negate) {
             if (name === 'env') {
               Object.keys(job.env).forEach(key => {
                 parameters.push(`${key}=${job.env[key]}`)

package/src/browsers.js

@@ -14,8 +14,9 @@ let lastScreenshotId = 0
 const screenshots = {}
 
 async function instantiate (job, config) {
+  const output = getOutput(job)
   if (job.browserArgs.some((arg) => !arg.trim())) {
-    getOutput(job).emptyBrowserArg()
+    output.emptyBrowserArg()
     job.browserArgs = job.browserArgs.filter((arg) => arg.trim())
   }
   const { dir, url } = config
@@ -48,6 +49,9 @@ async function instantiate (job, config) {
     }
     resolve(code)
   })
+  childProcess.on('error', err => {
+    output.browserChildProcessError(url, err)
+  })
   childProcess.closed = promise
   childProcess.stdoutFilename = stdoutFilename
   childProcess.stderrFilename = stderrFilename

package/src/clean.js

@@ -1,4 +1,5 @@
 const { getOutput } = require('./output')
+const { describeHandle } = require('./handle')
 
 module.exports = {
   cleanHandles (job) {
@@ -6,22 +7,14 @@ module.exports = {
     const activeHandles = process._getActiveHandles ? process._getActiveHandles() : []
     let displayWarning = true
     for (const handle of activeHandles) {
-      const className = handle && handle.constructor && handle.constructor.name
-      output.debug('handle', 'active handle', className)
-      if (className === 'TLSSocket') {
+      const { className, label } = describeHandle(handle)
+      output.debug('handle', 'active handle', label)
+      if (className === 'TLSSocket' || className === 'Socket') {
         if (displayWarning) {
           displayWarning = false
           output.detectedLeakOfHandles()
         }
-        let info
-        if (handle._httpMessage) {
-          const { path, method, host, protocol } = handle._httpMessage
-          info = `${method} ${protocol}//${host}${path}`
-        } else {
-          const { localAddress, localPort, remoteAddress, remotePort } = handle
-          info = `from ${localAddress}:${localPort} to ${remoteAddress}:${remotePort}`
-        }
-        output.debug('handle', 'TLS socket', info)
+        output.debug('handle', className, label)
         handle.destroy()
       }
     }

package/src/cors.js

@@ -7,8 +7,8 @@ module.exports = {
       response.writeHead(200, {
         'Access-Control-Allow-Origin': origin,
         Vary: 'Origin',
-        'Access-Control-Allow-Headers': 'content-type, content-length, x-page-url',
-        'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
+        'Access-Control-Allow-Headers': '*',
+        'Access-Control-Allow-Methods': '*',
         'Access-Control-Allow-Credentials': 'true'
       })
       response.end()

package/src/coverage.js

@@ -169,7 +169,7 @@ async function buildAllIndex (job) {
       await writeFile(join(job.coverageTempDir, 'all-index.json'), `{${index.join(',')}}`)
     }
   } catch (e) {
-    output.genericError(e)
+    output.genericError(e, e.url)
     output.noInfoForAllCoverage()
   } finally {
     progress.done()

package/src/defaults/puppeteer.js

@@ -3,6 +3,8 @@
 let browser
 let page
 
+console.time('⏲ run      ')
+
 require('./browser')({
   metadata: {
     name: 'puppeteer',
@@ -52,7 +54,10 @@ require('./browser')({
     consoleWriter,
     networkWriter
   }) {
+    console.timeEnd('⏲ run      ')
+    console.time('⏲ require  ')
     const puppeteer = require(modules.puppeteer)
+    console.timeEnd('⏲ require  ')
 
     let args = []
     let product
@@ -62,6 +67,7 @@ require('./browser')({
       args = options.chromeArgs()
     }
 
+    console.time('⏲ launch   ')
     browser = await puppeteer.launch({
       product,
       executablePath: options.binary,
@@ -69,6 +75,7 @@ require('./browser')({
       defaultViewport: null,
       args
     })
+    console.timeEnd('⏲ launch   ')
 
     page = (await browser.pages())[0]
 
@@ -94,14 +101,18 @@ require('./browser')({
         })
       })
 
+    console.time('⏲ scripts  ')
     if (scripts && scripts.length) {
       for (const script of scripts) {
         await page.evaluateOnNewDocument(script)
       }
     }
+    console.timeEnd('⏲ scripts  ')
 
     await page.setDefaultNavigationTimeout(0)
+    console.time('⏲ navigate ')
     await page.goto(url)
+    console.timeEnd('⏲ navigate ')
   },
 
   async error ({ error: e, exit }) {

package/src/defaults/report/decompress.js

@@ -0,0 +1,19 @@
+/* global DecompressionStream */
+/* eslint-disable-next-line no-unused-vars */
+async function decompress (base64) {
+  const bin = atob(base64)
+  const uint8Array = new Uint8Array(bin.length)
+  for (let i = 0; i < bin.length; ++i) {
+    uint8Array[i] = bin.charCodeAt(i)
+  }
+  const readableStream = new ReadableStream({
+    start (ctl) {
+      ctl.enqueue(uint8Array)
+      ctl.close()
+    }
+  })
+  const decompressionStream = new DecompressionStream('gzip')
+  const decompressedStream = readableStream.pipeThrough(decompressionStream)
+  const jsonString = await new Response(decompressedStream).text()
+  return JSON.parse(jsonString)
+}

package/src/defaults/report.js

@@ -1,10 +1,16 @@
 'use strict'
 
-const { join } = require('path')
+const { join, isAbsolute } = require('path')
 const { readFile, writeFile } = require('fs').promises
+const zlib = require('zlib')
 const [,, reportDir] = process.argv
+const verbose = process.argv.includes('--verbose')
 const { resolveDependencyPath } = require('../npm.js')
 
+const log = verbose ? console.log : () => {}
+
+log('🏗 Building report...')
+
 const defaultDir = join(__dirname, 'report')
 
 async function readDefault (name) {
@@ -35,30 +41,44 @@ function minifyJs (src) {
 
 async function main () {
   const html = await readDefault('default.html')
+  log('📦 default.html    :', html.length)
   const styles = (await readDefault('styles.css'))
     .replace(/\{\r?\n\s+/g, '{')
     .replace(/\}(\r?\n)+/g, '} ')
     .replace(/;\r?\n\s*/g, ';')
     .replace(/(:|,)\s*/g, (_, c) => c)
+  log('📦 styles.css      :', styles.length)
 
   const punyexpr = await readDependency('punyexpr')
+  log('📦 punyexpr        :', punyexpr.length)
   const punybind = await readDependency('punybind')
+  log('📦 punybind        :', punybind.length)
   const common = minifyJs(await readDefault('common.js'))
+  log('📦 common          :', common.length)
   const main = minifyJs(await readDefault('main.js'))
+  log('📦 main            :', main.length)
 
-  const job = (await readFile(join(reportDir, 'job.js'))).toString()
-    .replace(/(\{|,|\[)\r?\n\s*/g, (_, c) => c)
-    .replace(/\r?\n\s*(\}|\])/g, (_, c) => c)
-    .replace(/": "/g, '":"')
+  const decompress = minifyJs(await readDefault('decompress.js'))
+  log('📦 decompress      :', decompress.length)
+  const jobPath = isAbsolute(reportDir) ? reportDir : join(process.cwd(), reportDir)
+  log('📦 job path        :', jobPath)
+  const rawJob = require(join(jobPath, 'job.js'))
+  const json = JSON.stringify(rawJob)
+  log('📦 json            :', json.length)
+  const buffer = zlib.gzipSync(json)
+  const base64 = buffer.toString('base64')
+  log('📦 json (Gzip/b64) :', base64.length)
+  log('📦 compression     :', (100 * base64.length / json.length).toFixed(2) + '%')
 
-  return await writeFile(join(reportDir, 'report.html'), html
+  await writeFile(join(reportDir, 'report.html'), html
     .replace(/(>|\}\})\r?\n\s*</g, (_, c) => `${c}<`)
     .replace('<link rel="stylesheet" href="/_/report/styles.css">', `<style>${styles}</style>`)
     .replace('<script src="/_/punyexpr.js"></script>', `<script>${punyexpr}</script>`)
     .replace('<script src="/_/punybind.js"></script>', `<script>${punybind}</script>`)
     .replace('<script src="/_/report/common.js"></script>', `<script>${common}</script>`)
-    .replace('<script src="/_/report/main.js"></script>', `<script>const module={};${job};const job=module.exports;${main}</script>`)
+    .replace('<script src="/_/report/main.js"></script>', `<script>${decompress};let job={};decompress("${base64}").then(json=>{job=json;report.ready.then(update=>update({...json,elapsed:report.elapsed}))});${main}</script>`)
   )
+  log('✅ generated.')
 }
 
 main()

package/src/defaults/scan-ui5.js

@@ -2,7 +2,13 @@ module.exports = async function scanUI5 (url, onFolder, onFile) {
   if (url.match(/\/((?:test-)?resources\/.*)/)) {
     return // ignore UI5 resources
   }
-  const html = await (await fetch(url)).text()
+  let html
+  try {
+    html = await (await fetch(url)).text()
+  } catch (e) {
+    e.url = url
+    throw e
+  }
   const items = [...html.matchAll(/<a href="([^"]+)" class="icon/ig)]
     .map(([_, item]) => item)
     .filter(item => item.endsWith('/') || item.endsWith('.js') || item.endsWith('.ts'))

package/src/endpoints.js

@@ -123,6 +123,38 @@ module.exports = job => {
         match: '^/_/QUnit/done',
         custom: endpoint('QUnit/done', async (url, report) => done(job, url, report))
       }, {
+      // Fast batch endpoint for QUnit (no screenshot)
+        match: '^/_/QUnit/batch',
+        custom: async (request, response) => {
+          const url = extractPageUrl(request.headers)
+          const data = await body(request)
+          response.writeHead(200)
+          response.end()
+          try {
+            for (const [hook, hookData] of data) {
+              switch (hook) {
+                case 'QUnit/begin':
+                  await begin(job, url, hookData)
+                  break
+                case 'QUnit/testStart':
+                  await testStart(job, url, hookData)
+                  break
+                case 'QUnit/log':
+                  await log(job, url, hookData)
+                  break
+                case 'QUnit/testDone':
+                  await testDone(job, url, hookData)
+                  break
+                case 'QUnit/done':
+                  await done(job, url, hookData)
+                  break
+              }
+            }
+          } catch (error) {
+            getOutput(job).endpointError({ api: 'QUnit/batch', url, data, error })
+          }
+        }
+      }, {
       // UI to follow progress
         match: '^/_/progress.html',
         cwd: dirname(job.progressPage),

package/src/handle.js

@@ -0,0 +1,43 @@
+const { ServerResponse, ClientRequest } = require('node:http')
+
+module.exports = {
+  describeHandle (handle) {
+    const className = handle && handle.constructor && handle.constructor.name
+    let label = className
+    if (['TLSSocket', 'Socket'].includes(className)) {
+      if (handle._httpMessage instanceof ServerResponse) {
+        const { method, url } = handle._httpMessage.req
+        label += ` IncomingRequest ${method} ${url}`
+      } else if (handle._httpMessage instanceof ClientRequest) {
+        const { path, method, host, protocol } = handle._httpMessage
+        label += ` ClientRequest ${method} ${protocol}//${host}${path}`
+      } else if (handle.localAddress) {
+        const { localAddress, localPort, remoteAddress, remotePort } = handle
+        if (remoteAddress === undefined) {
+          label += ` local ${localAddress}:${localPort}`
+        } else {
+          label += ` local ${localAddress}:${localPort} remote ${remoteAddress}:${remotePort}`
+        }
+      } else if (handle._handle) {
+        const underlyingHandle = handle._handle
+        const underlyingClassName = underlyingHandle && underlyingHandle.constructor && underlyingHandle.constructor.name
+        label += ` <-> ${underlyingClassName || 'unknown'}`
+      } else {
+        label += ' unknown'
+      }
+    } else if (className === 'WriteStream') {
+      const fd = ['stdin', 'stdout', 'stderr'][handle.fd] || `fd: ${handle.fd}`
+      label += ` ${fd} ${handle.columns}x${handle.rows} isTTY: ${handle.isTTY}`
+    } else if (className === 'Server') {
+      label += ` connections: ${handle._connections} events: ${handle._eventsCount}`
+    } else if (className === 'ChildProcess') {
+      label += ` pid: ${handle.pid}`
+      if (handle.spawnargs) {
+        label += ` ${handle.spawnargs.map(value => ('' + value).replaceAll(/ /g, '␣'))}`
+      } else {
+        label += ' unknown'
+      }
+    }
+    return { className, label }
+  }
+}