@daisy/ace-axe-runner-electron 1.2.3 → 1.2.6-alpha.3

package/lib/selfsigned.js

@@ -1,34 +1,34 @@
-'use strict';
+// NO_HTTP_REMOVE
+// const selfsigned = require('selfsigned');
+// const { v4: uuidv4 } = require('uuid');
 
-const selfsigned = require('selfsigned');
-const { v4: uuidv4 } = require('uuid');
+// function generateSelfSignedData() {
+//     return new Promise((resolve, reject) => {
+//         const opts = {
+//             algorithm: "sha256",
+//             // clientCertificate: true,
+//             // clientCertificateCN: "KB insecure client",
+//             days: 30,
+//             extensions: [{
+//                 altNames: [{
+//                     type: 2, // DNSName
+//                     value: "localhost",
+//                 }],
+//                 name: "subjectAltName",
+//             }],
+//         };
+//         const rand = uuidv4();
+//         const attributes = [{ name: "commonName", value: "KB insecure server " + rand }];
 
-function generateSelfSignedData() {
-    return new Promise((resolve, reject) => {
-        const opts = {
-            algorithm: "sha256",
-            // clientCertificate: true,
-            // clientCertificateCN: "KB insecure client",
-            days: 30,
-            extensions: [{
-                altNames: [{
-                    type: 2, // DNSName
-                    value: "localhost"
-                }],
-                name: "subjectAltName"
-            }]
-        };
-        const rand = uuidv4();
-        const attributes = [{ name: "commonName", value: "KB insecure server " + rand }];
+//         selfsigned.generate(attributes, opts, (err, keys) => {
+//             if (err) {
+//                 reject(err);
+//                 return;
+//             }
 
-        selfsigned.generate(attributes, opts, (err, keys) => {
-            if (err) {
-                reject(err);
-                return;
-            }
-
-            resolve(keys);
-        });
-    });
-}
-module.exports = { generateSelfSignedData };
+//             resolve(keys);
+//         });
+//     });
+// }
+// module.exports = { generateSelfSignedData };
+"use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daisy/ace-axe-runner-electron",
-  "version": "1.2.3",
+  "version": "1.2.6-alpha.3",
   "engines": {
     "node": ">=12.0.0",
     "yarn": "^1.22.0",
@@ -23,16 +23,14 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "@daisy/ace-cli-shared": "^1.2.3",
-    "express": "^4.17.1",
-    "portfinder": "^1.0.28",
-    "selfsigned": "^1.10.11",
+    "@daisy/ace-cli-shared": "^1.2.6-alpha.3",
+    "mime-types": "^2.1.34",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "electron": "^13.2.3",
+    "electron": "^16.0.7",
     "json": "^11.0.0",
-    "json-diff": "^0.5.4"
+    "json-diff": "^0.7.1"
   },
   "publishConfig": {
     "access": "public"

package/src/cli.js

@@ -5,9 +5,13 @@ const app = electron.app;
 // const ipcMain = electron.ipcMain;
 // const ipcRenderer = electron.ipcRenderer;
 
+// NO_HTTP_ADD
+const protocol = electron.protocol;
+
 // Removes the deprecation warning message in the console
 // https://github.com/electron/electron/issues/18397
-app.allowRendererProcessReuse = true;
+// app.allowRendererProcessReuse = true;
+// https://www.electronjs.org/releases/stable#breaking-changes-1400
 
 const EventEmitter = require('events');
 class ElectronMockMainRendererEmitter extends EventEmitter {}
@@ -30,6 +34,22 @@ const ACE_LOG_PREFIX = "[ACE-AXE]";
 
 if (LOG_DEBUG) console.log(`${ACE_LOG_PREFIX} axeRunner CLI launch...`);
 
+// NO_HTTP_ADD
+const ACE_ELECTRON_HTTP_PROTOCOL = "acehttps";
+// app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required");
+protocol.registerSchemesAsPrivileged([{
+    privileges: {
+        allowServiceWorkers: false,
+        bypassCSP: false,
+        corsEnabled: true,
+        secure: true,
+        standard: true,
+        stream: true,
+        supportFetchAPI: true,
+    },
+    scheme: ACE_ELECTRON_HTTP_PROTOCOL,
+}]);
+
 // let win;
 // app.whenReady().then(() => {
 app.on('ready', async () => {
@@ -46,6 +66,7 @@ app.on('ready', async () => {
     //             sandbox: false,
     //             webSecurity: true,
     //             webviewTag: false,
+    //             nativeWindowOpen: false, // The default of nativeWindowOpen is deprecated and will be changing from false to true in Electron 15. See https://github.com/electron/electron/issues/28511
     //         }
     //     }
     // );