refactor: rename ensureSocket to send, moving into Request module

clients/TypeScript/packages/client/src/Connection.ts

@@ -54,34 +54,5 @@ export const createInteractionContext = async (
   })
 }
 
-const isContext = (config: ConnectionConfig | InteractionContext): config is InteractionContext =>
+export const isContext = (config: ConnectionConfig | InteractionContext): config is InteractionContext =>
   (config as InteractionContext).socket !== undefined
-
-export const ensureSocket = async <T>(
-  send: (socket: WebSocket) => Promise<T>,
-  config?: ConnectionConfig | InteractionContext
-): Promise<T> => {
-  const { socket } = isContext(config)
-    ? config
-    : await createInteractionContext(
-      () => {},
-      { connection: config }
-    )
-  const closeOnCompletion = !isContext(config)
-  const complete = (func: () => void) => {
-    if (closeOnCompletion) {
-      socket.once('close', func)
-      socket.close()
-    } else {
-      func()
-    }
-  }
-  return new Promise((resolve, reject) => {
-    if (!closeOnCompletion) {
-      return resolve(send(socket))
-    }
-    send(socket)
-      .then(result => complete(resolve.bind(this, result)))
-      .catch(error => complete(reject.bind(this, error)))
-  })
-}

clients/TypeScript/packages/client/src/Request.ts

@@ -1,6 +1,42 @@
+import WebSocket from 'isomorphic-ws'
+import {
+  ConnectionConfig,
+  createInteractionContext,
+  InteractionContext,
+  isContext
+} from './Connection'
 
 export const baseRequest = {
   type: 'jsonwsp/request',
   version: '1.0',
   servicename: 'ogmios'
 }
+
+export const send = async <T>(
+  send: (socket: WebSocket) => Promise<T>,
+  config?: ConnectionConfig | InteractionContext
+): Promise<T> => {
+  const { socket } = isContext(config)
+    ? config
+    : await createInteractionContext(
+      () => {},
+      { connection: config }
+    )
+  const closeOnCompletion = !isContext(config)
+  const complete = (func: () => void) => {
+    if (closeOnCompletion) {
+      socket.once('close', func)
+      socket.close()
+    } else {
+      func()
+    }
+  }
+  return new Promise((resolve, reject) => {
+    if (!closeOnCompletion) {
+      return resolve(send(socket))
+    }
+    send(socket)
+      .then(result => complete(resolve.bind(this, result)))
+      .catch(error => complete(reject.bind(this, error)))
+  })
+}

clients/TypeScript/packages/client/src/StateQuery/Query.ts

@@ -1,7 +1,7 @@
 import { nanoid } from 'nanoid'
 import { Data } from 'isomorphic-ws'
-import { baseRequest } from '../Request'
-import { ConnectionConfig, ensureSocket, InteractionContext } from '../Connection'
+import { ConnectionConfig, InteractionContext } from '../Connection'
+import { baseRequest, send } from '../Request'
 
 export const Query = <
   Request,
@@ -21,7 +21,7 @@ export const Query = <
   },
     config?: ConnectionConfig | InteractionContext
   ): Promise<Response> =>
-    ensureSocket<Response>((socket) =>
+    send<Response>((socket) =>
       new Promise((resolve, reject) => {
         const requestId = nanoid(5)