fix: replace Window type with reduced types (#306)

fix: replace Window type with reduced types
GoogleChromeLabs · Jun 16, 2019 · 22c11c9 · 22c11c9
2 parents 75e9c62 + e42601d
commit 22c11c9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/comlink.ts b/src/comlink.ts
@@ -13,8 +13,10 @@
 
 import {
   Endpoint,
+  EventSource,
   Message,
   MessageType,
+  PostMessageWithOrigin,
   WireValue,
   WireValueType
 } from "./protocol.js";
@@ -245,7 +247,10 @@ export function proxy<T>(obj: T): T & { [proxyMarker]: true } {
   return Object.assign(obj, { [proxyMarker]: true }) as any;
 }
 
-export function windowEndpoint(w: Window, context = self): Endpoint {
+export function windowEndpoint(
+  w: PostMessageWithOrigin,
+  context: EventSource = self
+): Endpoint {
   return {
     postMessage: (msg: any, transferables: Transferable[]) =>
       w.postMessage(msg, "*", transferables),

diff --git a/src/protocol.ts b/src/protocol.ts
@@ -11,8 +11,7 @@
  * limitations under the License.
  */
 
-export interface Endpoint {
-  postMessage(message: any, transfer?: Transferable[]): void;
+export interface EventSource {
   addEventListener(
     type: string,
     listener: EventListenerOrEventListenerObject,
@@ -23,6 +22,18 @@ export interface Endpoint {
     listener: EventListenerOrEventListenerObject,
     options?: {}
   ): void;
+}
+
+export interface PostMessageWithOrigin {
+  postMessage(
+    message: any,
+    targetOrigin: string,
+    transfer?: Transferable[]
+  ): void;
+}
+
+export interface Endpoint extends EventSource {
+  postMessage(message: any, transfer?: Transferable[]): void;
   start?: () => void;
 }