electrobun 0.3.0-beta.0 → 0.4.0-beta.0

package/dist/api/bun/core/Socket.ts

@@ -97,14 +97,25 @@ const startRPCServer = () => {
             }
           },
           close(ws, code, reason) {
+            if (!ws?.data) {
+              return;
+            }
             const { webviewId } = ws.data;
             console.log("Closed:", webviewId, code, reason);
-            socketMap[webviewId].socket = null;
+            if (socketMap[webviewId]) {
+              socketMap[webviewId].socket = null;
+            }
           },
 
           message(ws, message) {
+            if (!ws?.data) {
+              return;
+            }
             const { webviewId } = ws.data;
             const browserView = BrowserView.getById(webviewId);
+            if (!browserView) {
+              return;
+            }
 
             if (browserView.rpcHandler) {
               if (typeof message === "string") {

package/dist/api/bun/events/windowEvents.ts

@@ -9,4 +9,5 @@ export default {
     >("resize", data),
   move: (data) =>
     new ElectrobunEvent<{ id: number; x: number; y: number }, {}>("move", data),
+  focus: (data) => new ElectrobunEvent<{ id: number }, {}>("focus", data),
 };

package/dist/api/bun/proc/native.ts

@@ -69,13 +69,13 @@ export const native = (() => {
         args: [
           FFIType.u32,                 // windowId
           FFIType.f64, FFIType.f64,    // x, y
-          FFIType.f64, FFIType.f64,    // width, height    
-          FFIType.u32,           // styleMask 
+          FFIType.f64, FFIType.f64,    // width, height
+          FFIType.u32,           // styleMask
           FFIType.cstring,       // titleBarStyle
           FFIType.function,      // closeHandler
           FFIType.function,      // moveHandler
-          FFIType.function      // resizeHandler
-          
+          FFIType.function,      // resizeHandler
+          FFIType.function       // focusHandler
         ],
         returns: FFIType.ptr
       },
@@ -388,16 +388,17 @@ export const ffi = {
           )          
      
         const windowPtr = native.symbols.createWindowWithFrameAndStyleFromWorker(
-          id, 
+          id,
           // frame
-          x, y, width, height, 
+          x, y, width, height,
           styleMask,
           // style
           toCString(titleBarStyle),
           // callbacks
           windowCloseCallback,
           windowMoveCallback,
-          windowResizeCallback,       
+          windowResizeCallback,
+          windowFocusCallback,
         );
         
         
@@ -930,6 +931,26 @@ const windowResizeCallback = new JSCallback(
   }
 );
 
+const windowFocusCallback = new JSCallback(
+  (id) => {
+    const handler = electrobunEventEmitter.events.window.focus;
+    const event = handler({
+      id,
+    });
+
+    let result;
+    // global event
+    result = electrobunEventEmitter.emitEvent(event);
+
+    result = electrobunEventEmitter.emitEvent(event, id);
+  },
+  {
+    args: ["u32"],
+    returns: "void",
+    threadsafe: true,
+  }
+);
+
 const getMimeType = new JSCallback((filePath) => {
   const _filePath = new CString(filePath).toString();
   const mimeType = Bun.file(_filePath).type;// || "application/octet-stream";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrobun",
-  "version": "0.3.0-beta.0",
+  "version": "0.4.0-beta.0",
   "description": "Build ultra fast, tiny, and cross-platform desktop apps with Typescript.",
   "license": "MIT",
   "author": "Blackboard Technologies Inc.",