chore: handling logging, waiting for registration completion

Author: Denny09310

src/ElectronNET.API/API/Protocol.cs

@@ -56,18 +56,19 @@ public Task RegisterSchemesAsPrivilegedAsync(params CustomScheme[] customSchemes
         /// </summary>
         /// <param name="scheme">scheme to handle, for example https or my-app. This is the bit before the : in a URL.</param>
         /// <param name="handler">Either a <see cref="Response" /> or a <see cref="Task{Response}"/> can be returned.</param>
-        public void Handle(string scheme, Func<Request, Response> handler)
+        public Task HandleAsync(string scheme, Func<Request, Response> handler)
         {
             if (string.IsNullOrWhiteSpace(scheme))
                 throw new ArgumentException("Scheme must not be null or empty.", nameof(scheme));
 
-            if (handler == null)
-                throw new ArgumentNullException(nameof(handler));
-
-            Handle(scheme, req => Task.FromResult(handler(req)));
+            return handler switch
+            {
+                null => throw new ArgumentNullException(nameof(handler)),
+                _ => HandleAsync(scheme, req => Task.FromResult(handler(req)))
+            };
         }
 
-        public void Handle(string scheme, Func<Request, Task<Response>> handler)
+        public Task HandleAsync(string scheme, Func<Request, Task<Response>> handler)
         {
             if (string.IsNullOrWhiteSpace(scheme))
                 throw new ArgumentException("Scheme must not be null or empty.", nameof(scheme));
@@ -78,6 +79,7 @@ public void Handle(string scheme, Func<Request, Task<Response>> handler)
             var tsc = new TaskCompletionSource();
 
             // Tell TS to register protocol.handle for this scheme.
+            BridgeConnector.Socket.Once("protocol-handle-register-completed", tsc.SetResult);
             BridgeConnector.Socket.Emit("protocol-handle-register", new
             {
                 scheme
@@ -133,6 +135,8 @@ public void Handle(string scheme, Func<Request, Task<Response>> handler)
                     });
                 }
             });
+
+            return tsc.Task;
         }
     }
 

src/ElectronNET.Host/api/protocol.js

@@ -2,7 +2,7 @@ import { Socket } from "net";
 import { protocol } from "electron";
 import { randomUUID } from "crypto"; // Node 14+; or a simple counter
 
-let electronSocket: Socket;
+let _socket: Socket;
 
 type Request1 = {
     id: string;
@@ -21,17 +21,22 @@ type Response1 = {
 };
 
 export = (socket: Socket) => {
-    electronSocket = socket;
+    _socket = socket;
+
+    console.log("protocol api initialized.");
+
+    socket.on("register-schemes-as-privileged", (schemes) => {
+        console.log("register schemes as privileged called.");
 
-    // Already handled earlier:
-    socket.on("registerSchemesAsPrivileged", (schemes) => {
         protocol.registerSchemesAsPrivileged(schemes);
-        electronSocket.emit("registerSchemesAsPrivilegedCompleted");
+        _socket.emit("register-schemes-as-privileged-completed");
     });
 
-    // New: protocol.handle
     socket.on("protocol-handle-register", ({ scheme }: { scheme: string }) => {
+        console.log("protocol handle called.");
+
         protocol.handle(scheme, (request) => handle(scheme, request));
+        _socket.emit("protocol-handle-register-completed");
     });
 };
 
@@ -49,7 +54,7 @@ async function handle(scheme: string, request: Request): Promise<Response> {
         body = buffer.toString("base64");
     }
 
-    const dto: Request1 = {
+    const req: Request1 = {
         id,
         scheme,
         url: request.url,
@@ -60,12 +65,11 @@ async function handle(scheme: string, request: Request): Promise<Response> {
 
     return new Promise<Response>((resolve, reject) => {
         const handle = (res: Response1) => {
-            // Filter by correlation ID
             if (res?.id !== id) {
                 return;
             }
 
-            electronSocket.off("protocol-handle-response", handle as any);
+            _socket.off("protocol-handle-response", handle);
 
             try {
                 const status = res.status ?? 200;
@@ -95,7 +99,7 @@ async function handle(scheme: string, request: Request): Promise<Response> {
             }
         };
 
-        electronSocket.on("protocol-handle-response", handle);
-        electronSocket.emit("protocol-handle-request", dto);
+        _socket.once("protocol-handle-response", handle);
+        _socket.emit("protocol-handle-request", req);
     });
 }

src/ElectronNET.Host/api/protocol.js.map

@@ -1 +1 @@
-{"root":["./globals.d.ts","./types-shims.d.ts","./api/app.ts","./api/autoupdater.ts","./api/browserview.ts","./api/browserwindows.ts","./api/clipboard.ts","./api/commandline.ts","./api/dialog.ts","./api/dock.ts","./api/globalshortcut.ts","./api/ipc.ts","./api/menu.ts","./api/nativetheme.ts","./api/notification.ts","./api/powermonitor.ts","./api/process.ts","./api/screen.ts","./api/shell.ts","./api/tray.ts","./api/webcontents.ts"],"version":"5.9.3"}
+{"root":["./globals.d.ts","./types-shims.d.ts","./api/app.ts","./api/autoupdater.ts","./api/browserview.ts","./api/browserwindows.ts","./api/clipboard.ts","./api/commandline.ts","./api/dialog.ts","./api/dock.ts","./api/globalshortcut.ts","./api/ipc.ts","./api/menu.ts","./api/nativetheme.ts","./api/notification.ts","./api/powermonitor.ts","./api/process.ts","./api/protocol.ts","./api/screen.ts","./api/shell.ts","./api/tray.ts","./api/webcontents.ts"],"version":"5.9.3"}