No commit message

src/glue/iframe.ts

@@ -1,4 +1,4 @@
-import { Disposable, Socket } from "../socket.ts";
+import { Closer, Socket } from "../socket.ts";
 import { checkAndRetryUntilSuccess } from "./misc.ts";
 import { createGlue, isGlueEvent } from "./index.ts";
 
@@ -7,18 +7,18 @@ const key = "<glue>";
 export interface CreateIframeSocketConfig {
   iframeElement: HTMLIFrameElement;
   iframeOrigin: string;
-  onDisposed?: () => void;
+  onClosed?: () => void;
 }
 export async function createIframeSocket(
   config: CreateIframeSocketConfig,
-): Promise<Disposable & Socket> {
-  const { iframeElement, iframeOrigin, onDisposed } = config;
+): Promise<Closer & Socket> {
+  const { iframeElement, iframeOrigin, onClosed } = config;
   await handshake(iframeElement);
   const glue = createGlue();
   globalThis.addEventListener("message", messageHandler);
-  onceIframeReloaded(iframeElement, dispose);
+  onceIframeReloaded(iframeElement, close);
   return {
-    dispose,
+    close,
     read: glue.read,
     async write(data) {
       const { contentWindow } = iframeElement;
@@ -33,10 +33,10 @@ export async function createIframeSocket(
     if (!isGlueEvent(event)) return;
     glue.recv(event.data[1]);
   }
-  function dispose() {
+  function close() {
     globalThis.removeEventListener("message", messageHandler);
-    glue.dispose();
-    onDisposed?.();
+    glue.close();
+    onClosed?.();
   }
 }
 

src/glue/index.ts

@@ -2,13 +2,13 @@ import {
   defer,
   Deferred,
 } from "https://deno.land/x/[email protected]/core/runtime/async/observer.ts";
-import { Disposable, Reader } from "../socket.ts";
+import { Closer, Reader } from "../socket.ts";
 import { chain } from "../misc.ts";
 import { str2u8s } from "./misc.ts";
 
 const key = "<glue>";
 
-export interface Glue extends Disposable, Reader {
+export interface Glue extends Closer, Reader {
   recv(data: Uint8Array | string): void;
 }
 
@@ -20,18 +20,18 @@ export function getGlue(): Glue {
 
 export function createGlue(): Glue {
   const queue: Uint8Array[] = [];
-  let disposed = false;
+  let closed = false;
   let wait: Deferred<void> | undefined;
   return {
-    dispose: () => disposed = true,
+    close: () => closed = true,
     recv: (data) => {
-      if (disposed) throw new Error("Glue has been disposed.");
+      if (closed) throw new Error("Glue has been closed.");
       queue.push(typeof data === "string" ? str2u8s(data) : data);
       wait?.resolve();
     },
     read: chain(async (data) => {
       if (queue.length < 1) {
-        if (disposed) return null;
+        if (closed) return null;
         await (wait = defer());
         wait = undefined;
       }

src/host.ts

@@ -22,7 +22,7 @@ export interface WrpRequest extends EventEmitter<WrpRequestEvents> {
 }
 interface WrpRequestEvents {
   "cancel-response": void;
-  "dispose": void;
+  "close": void;
 }
 
 interface RequestHandlingState {
@@ -124,7 +124,7 @@ export async function createWrpHost(
         }
       } finally {
         for (const reqId in states) {
-          states[reqId].request.emit("dispose", undefined);
+          states[reqId].request.emit("close", undefined);
           delete states[reqId];
         }
       }

src/react/useWrpIframeSocket.ts

@@ -1,6 +1,6 @@
 import { defer } from "https://deno.land/x/[email protected]/core/runtime/async/observer.ts";
 import { Ref, useEffect, useRef, useState } from "react";
-import { Disposable, Socket } from "../socket.ts";
+import { Closer, Socket } from "../socket.ts";
 import { createIframeSocket } from "../glue/iframe.ts";
 
 export interface UseWrpIframeSocketResult {
@@ -11,7 +11,7 @@ export default function useWrpIframeSocket(): UseWrpIframeSocketResult {
   const iframeRef = useRef<HTMLIFrameElement>(null);
   const [socket, setSocket] = useState<Socket | undefined>(undefined);
   useEffect(() => {
-    let socket: Disposable & Socket;
+    let socket: Closer & Socket;
     let unmounted = false;
     let waitForReconnect = defer<void>();
     const iframeElement = iframeRef.current!;
@@ -35,7 +35,7 @@ export default function useWrpIframeSocket(): UseWrpIframeSocketResult {
       void iframeElement.removeEventListener("load", tryReconnect);
     };
     function tryReconnect() {
-      if (socket) socket.dispose();
+      if (socket) socket.close();
       waitForReconnect.resolve();
       waitForReconnect = defer<void>();
     }

src/socket.ts

@@ -10,6 +10,7 @@ export interface Writer {
   write(p: Uint8Array): Promise<number>;
 }
 
-export interface Disposable {
-  dispose(): void;
+// same as `Deno.Closer`
+export interface Closer {
+  close(): void;
 }