eimer 0.1.1 → 0.1.2

package/dist/cjs/transports/EimerUtilityProcessTransport.d.ts

@@ -4,8 +4,11 @@ import { EimerMessagePortTransport, EimerMessagePortTransportDependencies, Eimer
  * - `utilityProcess` (Electron.UtilityProcess) in the main process
  * - `process.parentPort` (Electron.ParentPort) inside the utility process
  *
- * Both satisfy eimer's MessagePort duck-type at runtime; this interface exists
- * so callers don't need an `as unknown as MessagePort` cast.
+ * Note that the two sides are *not* symmetric at runtime: `UtilityProcess`
+ * delivers the raw message to its `'message'` listener, while `ParentPort`
+ * wraps it in a `MessageEvent` (`{ data, ports }`). `EimerUtilityProcessTransport`
+ * unwraps that `MessageEvent` shape internally so callers can use this type on
+ * both ends without worrying about the discrepancy.
  */
 export interface UtilityProcessPort {
     postMessage(message: any): void;

package/dist/cjs/transports/EimerUtilityProcessTransport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EimerUtilityProcessTransport.d.ts","sourceRoot":"","sources":["../../../src/transports/EimerUtilityProcessTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,qCAAqC,EAAE,gCAAgC,EAAe,MAAM,6BAA6B,CAAC;AAE9J;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IAC/B,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;IAChC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;IAC5D,GAAG,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;CACjE;AAED,MAAM,WAAW,mCAAoC,SAAQ,gCAAgC;CAAG;AAEhG,MAAM,WAAW,wCAAyC,SAAQ,qCAAqC;CAAG;AAE1G;;;;;;;GAOG;AACH,qBAAa,4BAA6B,SAAQ,yBAAyB;gBAC3D,IAAI,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,mCAAmC,EAAE,YAAY,CAAC,EAAE,wCAAwC;CAG/I"}
+{"version":3,"file":"EimerUtilityProcessTransport.d.ts","sourceRoot":"","sources":["../../../src/transports/EimerUtilityProcessTransport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,qCAAqC,EAAE,gCAAgC,EAAe,MAAM,6BAA6B,CAAC;AAE9J;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IAC/B,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;IAChC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;IAC5D,GAAG,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;CACjE;AAED,MAAM,WAAW,mCAAoC,SAAQ,gCAAgC;CAAG;AAEhG,MAAM,WAAW,wCAAyC,SAAQ,qCAAqC;CAAG;AA+B1G;;;;;;;GAOG;AACH,qBAAa,4BAA6B,SAAQ,yBAAyB;gBAC3D,IAAI,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,mCAAmC,EAAE,YAAY,CAAC,EAAE,wCAAwC;CAG/I"}

package/dist/cjs/transports/EimerUtilityProcessTransport.js

@@ -1,7 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EimerUtilityProcessTransport = void 0;
+const EimerMessage_1 = require("../eimer/EimerMessage");
 const EimerMessagePortTransport_1 = require("./EimerMessagePortTransport");
+/**
+ * Wraps a `UtilityProcessPort` so that `'message'` listeners always receive the
+ * raw eimer message, regardless of whether the underlying port delivers it directly
+ * (`Electron.UtilityProcess`) or wrapped in a `MessageEvent` (`Electron.ParentPort`).
+ */
+class MessageEventUnwrappingPort {
+    constructor(port) {
+        this.port = port;
+    }
+    postMessage(message) {
+        this.port.postMessage(message);
+    }
+    on(event, handler) {
+        this.port.on(event, (received) => {
+            if (!EimerMessage_1.EimerMessage.isEimerMessage(received) && received !== null && typeof received === 'object' && 'data' in received) {
+                handler(received.data);
+                return;
+            }
+            handler(received);
+        });
+        return this;
+    }
+    off(event, handler) {
+        this.port.off?.(event, handler);
+        return this;
+    }
+}
 /**
  * Eimer UtilityProcess Transport
  *
@@ -12,7 +40,7 @@ const EimerMessagePortTransport_1 = require("./EimerMessagePortTransport");
  */
 class EimerUtilityProcessTransport extends EimerMessagePortTransport_1.EimerMessagePortTransport {
     constructor(port, options, dependencies) {
-        super(port, { ...options, logModuleName: options?.logModuleName ?? 'EimerUtilityProcessTransport' }, dependencies);
+        super(new MessageEventUnwrappingPort(port), { ...options, logModuleName: options?.logModuleName ?? 'EimerUtilityProcessTransport' }, dependencies);
     }
 }
 exports.EimerUtilityProcessTransport = EimerUtilityProcessTransport;

package/dist/cjs/transports/EimerUtilityProcessTransport.js.map

@@ -1 +1 @@
-{"version":3,"file":"EimerUtilityProcessTransport.js","sourceRoot":"","sources":["../../../src/transports/EimerUtilityProcessTransport.ts"],"names":[],"mappings":";;;AAAA,2EAA8J;AAoB9J;;;;;;;GAOG;AACH,MAAa,4BAA6B,SAAQ,qDAAyB;IACvE,YAAY,IAAwB,EAAE,OAA6C,EAAE,YAAuD;QACxI,KAAK,CAAC,IAAmB,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,IAAI,8BAA8B,EAAE,EAAE,YAAY,CAAC,CAAC;IACtI,CAAC;CACJ;AAJD,oEAIC"}
+{"version":3,"file":"EimerUtilityProcessTransport.js","sourceRoot":"","sources":["../../../src/transports/EimerUtilityProcessTransport.ts"],"names":[],"mappings":";;;AAAA,wDAAqD;AAErD,2EAA8J;AAuB9J;;;;GAIG;AACH,MAAM,0BAA0B;IAC5B,YAA6B,IAAwB;QAAxB,SAAI,GAAJ,IAAI,CAAoB;IAAG,CAAC;IAEzD,WAAW,CAAC,OAAY;QACpB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,EAAE,CAAC,KAAgB,EAAE,OAA+B;QAChD,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,QAAa,EAAQ,EAAE;YACxC,IAAI,CAAC,2BAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,IAAI,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,IAAI,QAAQ,EAAE,CAAC;gBACpH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACvB,OAAO;YACX,CAAC;YACD,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,GAAG,CAAC,KAAgB,EAAE,OAA+B;QACjD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAED;;;;;;;GAOG;AACH,MAAa,4BAA6B,SAAQ,qDAAyB;IACvE,YAAY,IAAwB,EAAE,OAA6C,EAAE,YAAuD;QACxI,KAAK,CAAC,IAAI,0BAA0B,CAAC,IAAI,CAAgB,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,IAAI,8BAA8B,EAAE,EAAE,YAAY,CAAC,CAAC;IACtK,CAAC;CACJ;AAJD,oEAIC"}

package/dist/esm/transports/EimerUtilityProcessTransport.js

@@ -1,4 +1,32 @@
+import { EimerMessage } from '../eimer/EimerMessage';
 import { EimerMessagePortTransport } from './EimerMessagePortTransport';
+/**
+ * Wraps a `UtilityProcessPort` so that `'message'` listeners always receive the
+ * raw eimer message, regardless of whether the underlying port delivers it directly
+ * (`Electron.UtilityProcess`) or wrapped in a `MessageEvent` (`Electron.ParentPort`).
+ */
+class MessageEventUnwrappingPort {
+    constructor(port) {
+        this.port = port;
+    }
+    postMessage(message) {
+        this.port.postMessage(message);
+    }
+    on(event, handler) {
+        this.port.on(event, (received) => {
+            if (!EimerMessage.isEimerMessage(received) && received !== null && typeof received === 'object' && 'data' in received) {
+                handler(received.data);
+                return;
+            }
+            handler(received);
+        });
+        return this;
+    }
+    off(event, handler) {
+        this.port.off?.(event, handler);
+        return this;
+    }
+}
 /**
  * Eimer UtilityProcess Transport
  *
@@ -9,7 +37,7 @@ import { EimerMessagePortTransport } from './EimerMessagePortTransport';
  */
 export class EimerUtilityProcessTransport extends EimerMessagePortTransport {
     constructor(port, options, dependencies) {
-        super(port, { ...options, logModuleName: options?.logModuleName ?? 'EimerUtilityProcessTransport' }, dependencies);
+        super(new MessageEventUnwrappingPort(port), { ...options, logModuleName: options?.logModuleName ?? 'EimerUtilityProcessTransport' }, dependencies);
     }
 }
 //# sourceMappingURL=EimerUtilityProcessTransport.js.map

package/dist/esm/transports/EimerUtilityProcessTransport.js.map

@@ -1 +1 @@
-{"version":3,"file":"EimerUtilityProcessTransport.js","sourceRoot":"","sources":["../../../src/transports/EimerUtilityProcessTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAwF,MAAM,6BAA6B,CAAC;AAoB9J;;;;;;;GAOG;AACH,MAAM,OAAO,4BAA6B,SAAQ,yBAAyB;IACvE,YAAY,IAAwB,EAAE,OAA6C,EAAE,YAAuD;QACxI,KAAK,CAAC,IAAmB,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,IAAI,8BAA8B,EAAE,EAAE,YAAY,CAAC,CAAC;IACtI,CAAC;CACJ"}
+{"version":3,"file":"EimerUtilityProcessTransport.js","sourceRoot":"","sources":["../../../src/transports/EimerUtilityProcessTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,yBAAyB,EAAwF,MAAM,6BAA6B,CAAC;AAuB9J;;;;GAIG;AACH,MAAM,0BAA0B;IAC5B,YAA6B,IAAwB;QAAxB,SAAI,GAAJ,IAAI,CAAoB;IAAG,CAAC;IAEzD,WAAW,CAAC,OAAY;QACpB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,EAAE,CAAC,KAAgB,EAAE,OAA+B;QAChD,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,QAAa,EAAQ,EAAE;YACxC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,IAAI,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,IAAI,QAAQ,EAAE,CAAC;gBACpH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACvB,OAAO;YACX,CAAC;YACD,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,GAAG,CAAC,KAAgB,EAAE,OAA+B;QACjD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAED;;;;;;;GAOG;AACH,MAAM,OAAO,4BAA6B,SAAQ,yBAAyB;IACvE,YAAY,IAAwB,EAAE,OAA6C,EAAE,YAAuD;QACxI,KAAK,CAAC,IAAI,0BAA0B,CAAC,IAAI,CAAgB,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,IAAI,8BAA8B,EAAE,EAAE,YAAY,CAAC,CAAC;IACtK,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eimer",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Electron Interprocess MEssage Router - IPC library for Electron.js",
   "author": "Jan Hapke (https://janhapke.com)",
   "license": "MIT",