ui5-test-runner 5.7.2 → 5.7.4

package/index.js

@@ -85,7 +85,10 @@ async function main () {
   output.debug('reserve', 'configuration', configuration)
   const server = serve(configuration)
   if (job.logServer) {
-    server.on('redirected', output.redirected)
+    server
+      .on('incoming', output.logServerIncoming)
+      .on('redirected', output.logServerRedirected)
+      .on('closed', output.logServerClosed)
   }
 
   const { promise: serverStarted, resolve: serverReady, reject: serverError } = allocPromise()
@@ -148,7 +151,11 @@ async function main () {
     await end(job)
   }
   output.stop()
-  await server.close()
+  await server.close({ close: true })
+  await new Promise(resolve => setTimeout(resolve, 100)) // wait for server handles to be released
+  if (job.logServer) {
+    output.logServerSummary()
+  }
   if (startedCommand) {
     await startedCommand.stop()
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui5-test-runner",
-  "version": "5.7.2",
+  "version": "5.7.4",
   "description": "Standalone test runner for UI5",
   "main": "index.js",
   "bin": {
@@ -49,7 +49,7 @@
     "ps-tree": "^1.2.0",
     "punybind": "^1.2.1",
     "punyexpr": "1.1.1",
-    "reserve": "2.2.0"
+    "reserve": "2.3.1"
   },
   "devDependencies": {
     "@openui5/types": "^1.136.0",

package/src/capabilities/index.js

@@ -81,7 +81,10 @@ async function capabilities (job) {
     })
     const server = serve(configuration)
     if (job.logServer) {
-      server.on('redirected', output.redirected)
+      server
+        .on('incoming', output.logServerIncoming)
+        .on('redirected', output.logServerRedirected)
+        .on('closed', output.logServerClosed)
     }
     server.on('error', (error) => {
       output.error('REserve error:', error)

package/src/clean.js

@@ -16,7 +16,7 @@ module.exports = {
         let info
         if (handle._httpMessage) {
           const { path, method, host, protocol } = handle._httpMessage
-          info = `${method} ${protocol}://${host}${path}`
+          info = `${method} ${protocol}//${host}${path}`
         } else {
           const { localAddress, localPort, remoteAddress, remotePort } = handle
           info = `from ${localAddress}:${localPort} to ${remoteAddress}:${remotePort}`

package/src/defaults/junit-xml-report.js

@@ -24,9 +24,9 @@ async function main () {
   const job = require(join(reportDir, 'job.js'))
   o('<?xml version="1.0" encoding="UTF-8"?>')
   o('<testsuites>')
-  const urls = Object.keys(job.qunitPages)
+  const urls = Object.keys(job.qunitPages || {})
   for (const url of urls) {
-    const qunitPage = job.qunitPages[url]
+    const qunitPage = job.qunitPages[url] || { modules: [] }
     for (const module of qunitPage.modules) {
       o(`  <testsuite
     name="${xmlEscape(url)}"

package/src/output.js

@@ -15,6 +15,10 @@ const interactive = process.stdout.columns !== undefined && !inJest
 const $output = Symbol('output')
 const $outputStart = Symbol('output-start')
 const $outputProgress = Symbol('output-progress')
+const $logServerIncomingCount = Symbol('log-server-incoming')
+const $logServerRedirectedCount = Symbol('log-server-redirected')
+const $logServerClosedCount = Symbol('log-server-closed')
+const $logServerRequests = Symbol('log-server-requests')
 
 if (!interactive) {
   const UTF8_BOM_CODE = '\ufeff'
@@ -295,8 +299,18 @@ function build (job) {
       }
     },
 
-    redirected: wrap(({ method, url, statusCode, timeSpent }) => {
-      if (url.startsWith('/_/progress')) {
+    logServerIncoming: wrap(({ id, method, url }) => {
+      if (url.startsWith('/_/')) {
+        return // avoids pollution
+      }
+      job[$logServerIncomingCount] = (job[$logServerIncomingCount] || 0) + 1
+      job[$logServerRequests] ??= {}
+      job[$logServerRequests][id] = { method, url }
+      log(job, p80()`🛜 INC ${id.toString(36).toUpperCase().padStart(4, ' ')} ${method.padEnd(7, ' ')} ${pad.lt(url)}`)
+    }),
+
+    logServerRedirected: wrap(({ id, method, url, statusCode, timeSpent }) => {
+      if (url.startsWith('/_/')) {
         return // avoids pollution
       }
       let statusText
@@ -305,7 +319,33 @@ function build (job) {
       } else {
         statusText = statusCode
       }
-      log(job, p80()`${method.padEnd(7, ' ')} ${pad.lt(url)} ${statusText} ${timeSpent.toString().padStart(4, ' ')}ms`)
+      job[$logServerRedirectedCount] = (job[$logServerRedirectedCount] || 0) + 1
+      const request = job[$logServerRequests][id]
+      request.redirected = true
+      if (request.closed) {
+        delete job[$logServerRequests][id]
+      }
+      log(job, p80()`🛜 SRV ${id.toString(36).toUpperCase().padStart(4, ' ')} ${method.padEnd(7, ' ')} ${pad.lt(url)} ${statusText} ${timeSpent.toString().padStart(4, ' ')}ms`)
+    }),
+
+    logServerClosed: wrap(({ id, method, url }) => {
+      if (url.startsWith('/_/')) {
+        return // avoids pollution
+      }
+      job[$logServerClosedCount] = (job[$logServerClosedCount] || 0) + 1
+      const request = job[$logServerRequests][id]
+      request.closed = true
+      if (request.redirected) {
+        delete job[$logServerRequests][id]
+      }
+      log(job, p80()`🛜 CLS ${id.toString(36).toUpperCase().padStart(4, ' ')} ${method.padEnd(7, ' ')} ${pad.lt(url)}`)
+    }),
+
+    logServerSummary: wrap(() => {
+      log(job, p80()`🛜  requests: ${job[$logServerIncomingCount] || 0} incoming, ${job[$logServerRedirectedCount] || 0} redirected, ${job[$logServerClosedCount] || 0} closed.`)
+      if (job[$logServerRequests] && Object.keys(job[$logServerRequests]).length) {
+        log(job, job[$logServerRequests])
+      }
     }),
 
     status (status) {