rx-player 3.25.2 → 3.26.3-dev.2022021400

package/scripts/doc-generator/utils.js

@@ -0,0 +1,74 @@
+const { promisify } = require("util");
+const fs = require("fs");
+const path = require("path");
+
+/**
+ * Recursive mkdir (create parent directories if they do not exist).
+ * @param {string} dirPath
+ * @param {string} mode
+ * @returns {Promise}
+ */
+async function mkdirParent(dirPath, mode) {
+  try {
+    await promisify(fs.mkdir)(dirPath, mode);
+  } catch(error) {
+    if (error && error.errno === -2) {
+      return mkdirParent(path.dirname(dirPath), mode)
+        .then(() => mkdirParent(dirPath, mode));
+    }
+    throw error;
+  }
+};
+
+/**
+ * @param {string} target
+ * @param {string} currentDir
+ * @returns {string}
+ */
+function toUriCompatibleRelativePath(target, currentDir) {
+  // TODO this is quite ugly but should work for most cases.
+  // See if there's a better and more compatible way of doing this.
+  let relativePath = path.relative(currentDir, target);
+  return pathToUrl(relativePath);
+}
+
+/**
+ * @param {string} _pathStr
+ * @returns {string}
+ */
+function pathToUrl(_pathStr) {
+  let pathStr = _pathStr;
+
+  // TODO this is quite ugly but should work for most cases.
+  // See if there's a better and more compatible way of doing this.
+  if (path.sep !== "/") {
+    pathStr = pathStr.split(path.sep).join("/");
+  }
+  pathStr = encodeURIComponent(pathStr).replace(/%2F/g, "/");
+  if (pathStr[0] !== ".") {
+    pathStr = "./" + pathStr;
+  }
+  return pathStr;
+}
+
+function getGithubSvg() {
+  return "<svg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'>" +
+    "<path d='M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 "+
+    "11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4." +
+    "042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-" +
+    ".729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 " +
+    "3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 " +
+    "0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 " +
+    "3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 " +
+    "3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 " +
+    "3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 " +
+    "2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 " +
+    "12.297c0-6.627-5.373-12-12-12'/></svg>";
+}
+
+module.exports = {
+  getGithubSvg,
+  mkdirParent,
+  pathToUrl,
+  toUriCompatibleRelativePath,
+};

package/scripts/fast_demo_build.js

@@ -0,0 +1,143 @@
+/**
+ * # fast_demo_build.js
+ *
+ * This file allows to perform a "fast" build of the RxPlayer's demo, by using
+ * esbuild.
+ *
+ * You can either run it directly as a script (run `node fast_demo_build.js -h`
+ * to see the different options) or by requiring it as a node module.
+ * If doing the latter you will obtain a function you will have to run with the
+ * right options.
+ */
+
+const path = require("path");
+const esbuild = require("esbuild");
+const getHumanReadableHours = require("./utils/get_human_readable_hours");
+
+// If true, this script is called directly
+if (require.main === module) {
+  const { argv } = process;
+  if (argv.includes("-h") || argv.includes("--help")) {
+    displayHelp();
+    process.exit(0);
+  }
+  const shouldWatch = argv.includes("-w") || argv.includes("--watch");
+  const shouldMinify = argv.includes("-m") || argv.includes("--minify");
+  const production = argv.includes("-p") || argv.includes("--production-mode");
+  fastDemoBuild({
+    watch: shouldWatch,
+    minify: shouldMinify,
+    production,
+  });
+} else {
+  // This script is loaded as a module
+  module.exports = fastDemoBuild;
+}
+
+/**
+ * Build the demo with the given options.
+ * @param {Object} options
+ * @param {boolean} [options.minify] - If `true`, the output will be minified.
+ * @param {boolean} [options.production] - If `false`, the code will be compiled
+ * in "development" mode, which has supplementary assertions.
+ * @param {boolean} [options.watch] - If `true`, the RxPlayer's files involve
+ * will be watched and the code re-built each time one of them changes.
+ */
+function fastDemoBuild(options) {
+  const minify = !!options.minify;
+  const watch = !!options.watch;
+  const isDevMode = !options.production;
+  let beforeTime = process.hrtime.bigint();
+
+  esbuild.build({
+    entryPoints: [path.join(__dirname, "../demo/full/scripts/index.jsx")],
+    bundle: true,
+    minify,
+    outfile: path.join(__dirname, "../demo/full/bundle.js"),
+    watch: !watch ? undefined : {
+      onRebuild(error, result) {
+        if (error) {
+          console.error(`\x1b[31m[${getHumanReadableHours()}]\x1b[0m Demo re-build failed:`,
+                        err);
+        } else {
+          if (result.errors > 0 || result.warnings > 0) {
+            const { errors, warnings } = result;
+            console.log(`\x1b[33m[${getHumanReadableHours()}]\x1b[0m ` +
+                        `Demo re-built with ${errors.length} error(s) and ` +
+                        ` ${warnings.length} warning(s) ` +
+                        `(in ${stats.endTime - stats.startTime} ms).`);
+          }
+          console.log(`\x1b[32m[${getHumanReadableHours()}]\x1b[0m ` +
+                      "Demo re-built!");
+        }
+      },
+    },
+    define: {
+      "process.env.NODE_ENV": JSON.stringify(isDevMode ? "development" : "production"),
+      __FEATURES__: JSON.stringify({
+        IS_DISABLED: 0,
+        IS_ENABLED: 1,
+
+        BIF_PARSER: 1,
+        DASH: 1,
+        DIRECTFILE: 1,
+        EME: 1,
+        HTML_SAMI: 1,
+        HTML_SRT: 1,
+        HTML_TTML: 1,
+        HTML_VTT: 1,
+        LOCAL_MANIFEST: 1,
+        METAPLAYLIST: 1,
+        NATIVE_SAMI: 1,
+        NATIVE_SRT: 1,
+        NATIVE_TTML: 1,
+        NATIVE_VTT: 1,
+        SMOOTH: 1,
+      }),
+      __ENVIRONMENT__: JSON.stringify({
+        PRODUCTION: 0,
+        DEV: 1,
+        CURRENT_ENV: isDevMode ? 1 : 0,
+      }),
+      __LOGGER_LEVEL__: JSON.stringify({
+        CURRENT_LEVEL: "INFO",
+      }),
+    }
+  }).then(
+  (result) => {
+    if (result.errors > 0 || result.warnings > 0) {
+      const { errors, warnings } = result;
+      console.log(`\x1b[33m[${getHumanReadableHours()}]\x1b[0m ` +
+                  `Demo built with ${errors.length} error(s) and ` +
+                  ` ${warnings.length} warning(s) ` +
+                  `(in ${stats.endTime - stats.startTime} ms).`);
+    }
+    const fullTime = (process.hrtime.bigint() - beforeTime) / 1000000n;
+    console.log(`\x1b[32m[${getHumanReadableHours()}]\x1b[0m ` +
+                `Build done in ${fullTime}ms`);
+  },
+  (err) => {
+    console.error(`\x1b[31m[${getHumanReadableHours()}]\x1b[0m Demo build failed:`,
+                  err);
+    process.exit(1);
+  });
+}
+
+/**
+ * Display through `console.log` an helping message relative to how to run this
+ * script.
+ */
+function displayHelp() {
+  /* eslint-disable no-console */
+  console.log(
+  /* eslint-disable indent */
+`Usage: node generate_full_demo.js [options]
+Options:
+  -h, --help             Display this help
+  -m, --minify           Minify the built demo
+  -p, --production-mode  Build all files in production mode (less runtime checks, mostly).
+  -w, --watch            Re-build each time either the demo or library files change`,
+  /* eslint-enable indent */
+  );
+  /* eslint-enable no-console */
+}

package/scripts/generate_demo_list.js

@@ -36,7 +36,7 @@
 
 const fs = require("fs");
 const path = require("path");
-const sanitizeHTML = require("sanitize-html");
+const { encode } = require("html-entities");
 const semver = require("semver");
 
 const INITIAL_PATH = "./versions";
@@ -88,8 +88,8 @@ if (versions.length <= 0) {
     const version = sortedVersions[i];
     // const versionAsNumber = +version.split(".").join();
     const dirPath = path.join(INITIAL_PATH, version, "demo/index.html");
-    body += `<li><a href=${sanitizeHTML(dirPath)}>` +
-      sanitizeHTML(version) +
+    body += `<li><a href=${encode(dirPath)}>` +
+      encode(version) +
       "</a></li>";
   }
   body += "</ul>";

package/scripts/generate_documentation_list.js

@@ -36,7 +36,7 @@
 
 const fs = require("fs");
 const path = require("path");
-const sanitizeHTML = require("sanitize-html");
+const { encode } = require("html-entities");
 const semver = require("semver");
 
 const INITIAL_PATH = "./versions";
@@ -86,10 +86,14 @@ if (versions.length <= 0) {
   const sortedVersions = sortVersions(versions);
   for (let i = 0; i < sortedVersions.length; i++) {
     const version = sortedVersions[i];
-    // const versionAsNumber = +version.split(".").join();
-    const dirPath = path.join(INITIAL_PATH, version, "doc/pages/index.html");
-    body += `<li><a href=${sanitizeHTML(dirPath)}>` +
-      sanitizeHTML(version) +
+
+    // documentation homepage changed for the v3.26.1
+    const dirPath = semver.gte(version, "3.26.1") ?
+      path.join(INITIAL_PATH, version, "doc/api/Overview.html") :
+      path.join(INITIAL_PATH, version, "doc/pages/index.html");
+
+    body += `<li><a href=${encode(dirPath)}>` +
+      encode(version) +
       "</a></li>";
   }
   body += "</ul>";

package/scripts/generate_full_demo.js

@@ -5,7 +5,7 @@
  * Build the full demo
  * ===================
  *
- * This script allows to build the full demo locally.
+ * This script allows to build the full demo locally, by using Webpack's bundler.
  *
  * You can either run it directly as a script (run `node
  * generate_full_demo.js -h` to see the different options) or by requiring it as
@@ -14,21 +14,27 @@
  * right options.
  */
 
+const path = require("path");
+const TerserPlugin = require("terser-webpack-plugin");
 const Webpack = require("webpack");
-const webpackDemoConfig = require("../webpack-demo.config.js");
-const displayWebpackErrors = require("./display_webpack_errors");
-const getHumanReadableHours = require("./get_human_readable_hours");
-
+const displayWebpackErrors = require("./utils/display_webpack_errors");
+const getHumanReadableHours = require("./utils/get_human_readable_hours");
 
+// If true, this script is called directly
 if (require.main === module) {
-  // This script is called directly
   const { argv } = process;
   if (argv.includes("-h") || argv.includes("--help")) {
     displayHelp();
     process.exit(0);
   }
   const shouldWatch = argv.includes("-w") || argv.includes("--watch");
-  generateFullDemo({ watch: shouldWatch });
+  const shouldMinify = argv.includes("-m") || argv.includes("--minify");
+  const production = argv.includes("-p") || argv.includes("--production-mode");
+  generateFullDemo({
+    watch: shouldWatch,
+    minify: shouldMinify,
+    production,
+  });
 } else {
   // This script is loaded as a module
   module.exports = generateFullDemo;
@@ -37,8 +43,98 @@ if (require.main === module) {
 /**
  * Build the demo with the given options.
  * @param {Object} options
+ * @param {boolean} [options.minify] - If `true`, the output will be minified.
+ * @param {boolean} [options.production] - If `false`, the code will be compiled
+ * in "development" mode, which has supplementary assertions.
+ * @param {boolean} [options.watch] - If `true`, the RxPlayer's files involve
+ * will be watched and the code re-built each time one of them changes.
  */
 function generateFullDemo(options) {
+  const shouldMinify = options.minify === true;
+  const isDevMode = options.production !== true;
+
+  const webpackDemoConfig = {
+    mode: isDevMode ? "development" : "production",
+    entry: path.join(__dirname, "../demo/full/scripts/index.jsx"),
+    resolve: {
+      extensions: [".ts", ".tsx", ".js", ".jsx", ".json"],
+    },
+    output: {
+      path: path.join(__dirname, "../demo/full"),
+      filename: "bundle.js",
+    },
+    optimization: {
+      minimize: shouldMinify,
+      minimizer: shouldMinify ? [
+        new TerserPlugin(),
+      ] : [],
+    },
+    performance: {
+      maxEntrypointSize: shouldMinify ? 1000000 : 2500000,
+      maxAssetSize: shouldMinify ? 1000000 : 2500000,
+    },
+    module: {
+      rules: [
+        {
+          test: /\.tsx?$/,
+          use: [{
+            loader: "ts-loader",
+            options: {
+              compilerOptions: { sourceMap: true },
+            },
+          }],
+        },
+        {
+          test: /\.jsx?$/,
+          use: {
+            loader: "babel-loader",
+            options: {
+              cacheDirectory: true,
+              presets: [
+                "@babel/react",
+                ["@babel/env", { loose: true, modules: false }],
+              ],
+            },
+          },
+        },
+      ],
+    },
+    plugins: [
+      new Webpack.DefinePlugin({
+        __FEATURES__: {
+          IS_DISABLED: 0,
+          IS_ENABLED: 1,
+
+          BIF_PARSER: 1,
+          DASH: 1,
+          DIRECTFILE: 1,
+          EME: 1,
+          HTML_SAMI: 1,
+          HTML_SRT: 1,
+          HTML_TTML: 1,
+          HTML_VTT: 1,
+          LOCAL_MANIFEST: 1,
+          METAPLAYLIST: 1,
+          NATIVE_SAMI: 1,
+          NATIVE_SRT: 1,
+          NATIVE_TTML: 1,
+          NATIVE_VTT: 1,
+          SMOOTH: 1,
+        },
+        __ENVIRONMENT__: {
+          PRODUCTION: 0,
+          DEV: 1,
+          CURRENT_ENV: isDevMode ? 1 : 0,
+        },
+        __LOGGER_LEVEL__: {
+          CURRENT_LEVEL: "\"INFO\"",
+        },
+      }),
+    ],
+    watchOptions: {
+      ignored: /node_modules/,
+    },
+  };
   const demoCompiler = Webpack(webpackDemoConfig);
   if (!options.watch) {
     /* eslint-disable no-console */
@@ -107,10 +203,12 @@ function displayHelp() {
   /* eslint-disable no-console */
   console.log(
   /* eslint-disable indent */
-`Usage: node generateFullDemo.js [options]
+`Usage: node generate_full_demo.js [options]
 Options:
-  -h, --help    Display this help
-  -w, --watch   Re-build each time either the demo or library files change`,
+  -h, --help             Display this help
+  -m, --minify           Minify the built demo
+  -p, --production-mode  Build all files in production mode (less runtime checks, mostly).
+  -w, --watch            Re-build each time either the demo or library files change`,
   /* eslint-enable indent */
   );
   /* eslint-enable no-console */

package/scripts/generate_standalone_demo.js

@@ -14,23 +14,30 @@
 
 const Webpack = require("webpack");
 const path = require("path");
-const displayWebpackErrors = require("./display_webpack_errors");
-const getHumanReadableHours = require("./get_human_readable_hours");
+const displayWebpackErrors = require("./utils/display_webpack_errors");
+const getHumanReadableHours = require("./utils/get_human_readable_hours");
 
 const webpackConfig = require("../webpack.config.js");
 
-// overwrite entries/output (ugly but just werks and did not find any better)
-webpackConfig.entry = path.join(__dirname, "../src/index.ts");
-webpackConfig.output.path = __dirname;
-webpackConfig.output.filename = "../demo/standalone/lib.js";
-
 /* eslint-disable no-console */
 console.log(
   `\x1b[35m[${getHumanReadableHours()}]\x1b[0m ` +
     "Building demo..."
 );
 /* eslint-enable no-console */
-const compiler = Webpack(webpackConfig);
+
+const config = webpackConfig({
+  production: false,
+  minify: false,
+  reportSize: false,
+});
+
+// overwrite entries/output (ugly but just werks and did not find any better for now)
+config.entry = path.join(__dirname, "../src/index.ts");
+config.output.path = __dirname;
+config.output.filename = "../demo/standalone/lib.js";
+
+const compiler = Webpack(config);
 
 const compilerWatching = compiler.watch({
   aggregateTimeout: 300,

package/scripts/launch_static_server.js

@@ -2,79 +2,162 @@
 /* eslint-env node */
 
 /**
- * Run the standalone demo server
- * ==============================
+ * Launch static server
+ * ====================
  *
- * This script allows to build the standalone demo locally and start both an
- * HTTP and an HTTPS (only if a certificate and key have been generated) server
- * to serve it, on the port 8001 and 8444 respectively.
- *
- * You can run it as a script through `node run_standalone_demo.js`.
- * Be aware that this demo will be built again every time one of the library
- * file is updated.
+ * This script allows to start both an HTTP and an HTTPS (only if a certificate
+ * path and a key path have been given) static file server.
  */
 
 const express = require("express");
 const fs = require("fs");
 const { promisify } = require("util");
 const https = require("https");
-const getHumanReadableHours = require("./get_human_readable_hours");
+const getHumanReadableHours = require("./utils/get_human_readable_hours");
 
+/**
+ * Launch the static server and begin to serve on the configured port.
+ * @param {string} path - Root path that will be served by the static server.
+ * @param {Object} config - Associated configuration.
+ * @param {number} config.httpPort - Port on which the server will be listening
+ * for HTTP traffic.
+ * @param {number} [config.httpsPort] - Port on which the server will be
+ * listening for HTTPS traffic.
+ * If not defined, the server won't listen for HTTPS traffic.
+ * @param {boolean} [config.verbose] - If set to `true` the server will output
+ * when the server start listening and when anything failed.
+ * @param {string} [config.certificatePath] - Path to the TLS certificate that
+ * will be used in HTTPS connections.
+ * If not defined, the server won't listen for HTTPS traffic.
+ * @param {string} [config.keyPath] - Path to the public key allowing to encrypt
+ * the HTTPS connection.
+ * If not defined, the server won't listen for HTTPS traffic.
+ * @returns {Object} Object with two properties:
+ *   - `listeningPromise` (Promise.<Object>): This promise rejects if the HTTP
+ *     server could not start but resolves in any other case (listening to HTTP
+ *     alone or both HTTP and HTTPS), even if the asked HTTPS server could not
+ *     be started.
+ *
+ *     The resolved object contains two boolean properties: `http` and `https`,
+ *     which are set to `true` when the corresponding server has been started.
+ *
+ *     You can know the reason for the HTTPS server not starting by setting the
+ *     `verbose` option to `true`. In that case, it will be logged.
+ *
+ *   - `close` (Function): Method allowing to stop the servers from listening
+ *     and to free their resources.
+ */
 module.exports = function launchStaticServer(path, config) {
+  const shouldStartHttps = config.httpsPort !== undefined &&
+                           config.certificatePath !== undefined &&
+                           config.keyPath !== undefined;
+  let isHttpServerStarted = false
+  let isHttpsServerStarted = false;
+
   const app = express();
   app.use(express.static(path));
 
-  app.listen(config.httpPort, (err) => {
-    if (err) {
-      /* eslint-disable no-console */
-      console.error(`\x1b[31m[${getHumanReadableHours()}]\x1b[0m ` +
-                    "Could not start HTTP server:",
-                    err);
-      /* eslint-enable no-console */
+  let server;
+  const listeningPromise = new Promise((res, rej) => {
+    server = app.listen(config.httpPort, (err) => {
+      if (err) {
+        if (config.verbose) {
+          /* eslint-disable-next-line no-console */
+          console.error(`\x1b[31m[${getHumanReadableHours()}]\x1b[0m ` +
+                        "Could not start static HTTP server:",
+                        err);
+        }
+        server.close();
+        return rej(err);
+      }
+      if (config.verbose) {
+        /* eslint-disable-next-line no-console */
+        console.log(`[${getHumanReadableHours()}] ` +
+                    `Listening HTTP at http://localhost:${config.httpPort}`);
+      }
+      isHttpServerStarted = true;
+      if (!shouldStartHttps || isHttpsServerStarted) {
+        res({ http: true, https: isHttpsServerStarted });
+      }
+    });
+
+    if (!shouldStartHttps) {
       return;
     }
-    /* eslint-disable no-console */
-    console.log(`[${getHumanReadableHours()}] ` +
-                `Listening HTTP at http://localhost:${config.httpPort}`);
-    /* eslint-enable no-console */
-  });
 
-  Promise.all([
-    promisify(fs.readFile)(config.certificatePath),
-    promisify(fs.readFile)(config.keyPath),
-  ]).then(([pubFile, privFile]) => {
-    if (pubFile != null && privFile != null) {
-      https.createServer({
-        key: privFile,
-        cert: pubFile,
-      }, app).listen(config.httpsPort, (err) => {
-        if (err) {
-          /* eslint-disable no-console */
+    Promise.all([
+      promisify(fs.readFile)(config.certificatePath),
+      promisify(fs.readFile)(config.keyPath),
+    ]).then(([certFile, keyFile]) => {
+      if (certFile != null && keyFile != null) {
+        https.createServer({
+          key: keyFile,
+          cert: certFile,
+        }, app).listen(config.httpsPort, (err) => {
+          if (err) {
+            if (config.verbose) {
+              /* eslint-disable-next-line no-console */
+              console.error(`\x1b[31m[${getHumanReadableHours()}]\x1b[0m ` +
+                            "Could not start static HTTPS server:",
+                            err);
+            }
+            if (isHttpServerStarted) {
+              res({ http: true, https: false });
+            }
+            return;
+          }
+          /* eslint-disable-next-line no-console */
+          console.log(`[${getHumanReadableHours()}] ` +
+                      `Listening HTTPS at https://localhost:${config.httpsPort}`);
+        });
+        if (isHttpServerStarted) {
+          res();
+        }
+        isHttpsServerStarted = true;
+      } else {
+        const err = new Error("Impossible to load the certificate and/or key file");
+        if (config.verbose === true) {
+          /* eslint-disable-next-line no-console */
           console.error(`\x1b[31m[${getHumanReadableHours()}]\x1b[0m ` +
-                        "Could not start HTTPS server:",
+                        "Could not start static HTTPS server:",
                         err);
-          /* eslint-enable no-console */
-          return;
         }
-        /* eslint-disable no-console */
-        console.log(`[${getHumanReadableHours()}] ` +
-                    `Listening HTTPS at https://localhost:${config.httpsPort}`);
-        /* eslint-enable no-console */
-      });
-    }
-  }, (err) => {
-    if (err.code === "ENOENT") {
-      /* eslint-disable no-console */
-      console.warn(`[${getHumanReadableHours()}] ` +
-                   "Not launching the demo in HTTPS: certificate not generated.\n" +
-                   "You can run `npm run certificate` to generate a certificate.");
-      /* eslint-enable no-console */
-    } else {
-      /* eslint-disable no-console */
-      console.error(`\x1b[31m[${getHumanReadableHours()}]\x1b[0m ` +
-                    "Could not readt keys and certificate:",
-                    err);
-      /* eslint-enable no-console */
-    }
+        if (isHttpServerStarted) {
+          res({ http: true, https: false });
+        }
+        return;
+      }
+    }, (err) => {
+      if (err.code === "ENOENT") {
+        if (config.verbose) {
+          /* eslint-disable-next-line no-console */
+          console.warn(`[${getHumanReadableHours()}] ` +
+                       "Could not start static HTTPS server: ",
+                       "Certificate not generated.\n" +
+                       "(You can run `npm run certificate` to generate a certificate.)");
+        }
+        if (isHttpServerStarted) {
+          res({ http: true, https: false });
+        }
+        return;
+      } else {
+        const err = new Error("Could not read key and certificate file.");
+        if (config.verbose) {
+          /* eslint-disable-next-line no-console */
+          console.error(`\x1b[31m[${getHumanReadableHours()}]\x1b[0m ` +
+                        "Could not start static HTTPS server:",
+                        err);
+        }
+        if (isHttpServerStarted) {
+          res({ http: true, https: false });
+        }
+        return;
+      }
+    });
   });
+
+  return {
+    listeningPromise,
+    close() { server.close() },
+  };
 };