Merge pull request #6 from takker99:refactor

style: deno lint

Author: takker99

mod.ts

@@ -7,17 +7,30 @@ import type { DataOf, EventMap, ListenEventMap, ResponseOf } from "./types.ts";
 export * from "./types.ts";
 export * from "./socket.ts";
 
-export function wrap(
+export interface SocketOperator {
+  request: <EventName extends keyof EventMap>(
+    event: EventName,
+    data: DataOf<EventName>,
+  ) => Promise<
+    EventName extends "cursor" ? void
+      : ResponseOf<"socket.io-request">["data"]
+  >;
+  response: <EventName extends keyof ListenEventMap>(
+    ...events: EventName[]
+  ) => AsyncGenerator<Parameters<ListenEventMap[EventName]>[0], void, unknown>;
+}
+
+export const wrap = (
   socket: Socket,
   timeout = 90000,
-) {
-  function request<EventName extends keyof EventMap>(
+): SocketOperator => {
+  const request = <EventName extends keyof EventMap>(
     event: EventName,
     data: DataOf<EventName>,
   ): Promise<
     EventName extends "cursor" ? void
       : ResponseOf<"socket.io-request">["data"]
-  > {
+  > => {
     let id: number | undefined;
     type ResolveType = EventName extends "cursor" ? void
       : ResponseOf<"socket.io-request">["data"];
@@ -46,7 +59,7 @@ export function wrap(
       }, timeout);
       socket.once("disconnect", onDisconnect);
     });
-  }
+  };
 
   async function* response<EventName extends keyof ListenEventMap>(
     ...events: EventName[]
@@ -77,4 +90,4 @@ export function wrap(
   }
 
   return { request, response };
-}
+};

socket.ts

@@ -1,6 +1,7 @@
 /// <reference no-default-lib="true" />
 /// <reference lib="esnext" />
 /// <reference lib="dom" />
+
 import type {
   Manager,
   ManagerOptions,
@@ -9,22 +10,7 @@ import type {
 } from "./types/socketIO/index.ts";
 export type { Manager, ManagerOptions, Socket, SocketOptions };
 
-type IO = (
-  uri: string,
-  opts?: Partial<ManagerOptions & SocketOptions>,
-) => Socket;
-
-declare global {
-  interface Window {
-    io?: IO;
-  }
-}
-const version = "4.2.0";
-const url =
-  `https://cdnjs.cloudflare.com/ajax/libs/socket.io/${version}/socket.io.min.js`;
-let error: string | Event | undefined;
-
-export async function socketIO(): Promise<Socket> {
+export const socketIO = async (): Promise<Socket> => {
   const io = await importSocketIO();
   const socket = io("https://scrapbox.io", {
     reconnectionDelay: 5000,
@@ -40,9 +26,20 @@ export async function socketIO(): Promise<Socket> {
     socket.once("disconnect", onDisconnect);
   });
   return socket;
-}
+};
+
+type IO = (
+  uri: string,
+  opts?: Partial<ManagerOptions & SocketOptions>,
+) => Socket;
+declare const io: IO | undefined;
+const version = "4.2.0";
+const url =
+  `https://cdnjs.cloudflare.com/ajax/libs/socket.io/${version}/socket.io.min.js`;
+let error: string | Event | undefined;
 
-async function importSocketIO(): Promise<IO> {
+const importSocketIO = async (): Promise<IO> => {
+  if (!error) throw error;
   if (!document.querySelector(`script[src="${url}"]`)) {
     const script = document.createElement("script");
     script.src = url;
@@ -56,11 +53,11 @@ async function importSocketIO(): Promise<IO> {
     });
   }
 
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     const id = setInterval(() => {
-      if (!window.io) return;
+      if (!io) return;
       clearInterval(id);
-      resolve(window.io);
+      resolve(io);
     }, 500);
   });
-}
+};

types/socketIO/socket.ts

@@ -1,4 +1,4 @@
-// deno-lint-ignore-file no-explicit-any ban-types camelcase
+// deno-lint-ignore-file no-explicit-any camelcase
 // this file is copied from https://cdn.esm.sh/v54/socket.io-client@4.2.0/build/socket.d.ts
 import { Packet } from "./parser.ts";
 import { Manager } from "./manager.ts";