@rest-vir/define-service 0.1.0 → 0.2.0

package/dist/web-socket/overwrite-web-socket-methods.d.ts

@@ -95,6 +95,11 @@ export type OverwriteWebSocketMethods<WebSocketClass extends CommonWebSocket, Lo
     MessageFromHostType: true;
     SearchParamsType: true;
 }>> | NoParam = NoParam> = Overwrite<WebSocketClass, {
+    /**
+     * Closes the WebSocket and waits it to actually close (so that you _know_ it's been closed
+     * once this resolves).
+     */
+    close(): Promise<void>;
     /**
      * Adds an event listener that's wrapped in assertions to verify that message events have
      * the expected contents.

package/dist/web-socket/overwrite-web-socket-methods.js

@@ -1,5 +1,5 @@
 import { waitUntil } from '@augment-vir/assert';
-import { DeferredPromise, ensureErrorAndPrependMessage, getOrSet, stringify, } from '@augment-vir/common';
+import { callAsynchronously, DeferredPromise, ensureErrorAndPrependMessage, getOrSet, stringify, } from '@augment-vir/common';
 import { convertDuration } from 'date-vir';
 import { assertValidShape } from 'object-shape-tester';
 import { parseJsonWithUndefined } from '../augments/json.js';
@@ -44,12 +44,31 @@ export function getOppositeWebSocketLocation(originalWebSocketLocation) {
  */
 export function overwriteWebSocketMethods(webSocketDefinition, rawWebSocket, webSocketLocation) {
     const originalSend = rawWebSocket.send;
+    const originalClose = rawWebSocket.close;
     const originalAddEventListener = rawWebSocket.addEventListener;
     const originalRemoveEventListener = rawWebSocket.removeEventListener;
     const webSocket = rawWebSocket;
+    const deferredClosePromise = new DeferredPromise();
+    webSocket.addEventListener('close', () => {
+        /**
+         * Call this asynchronously so the other `close` event listeners get fired before this
+         * resolves.
+         */
+        void callAsynchronously(() => {
+            deferredClosePromise.resolve();
+        });
+    });
     const originalListenerMap = {};
     Object.assign(webSocket, {
         originalListenerMap,
+        async close() {
+            originalClose.call(webSocket);
+            /**
+             * Closing takes a _long time_ for some reason, so we want to wait until it's actually
+             * done before proceeding with other operations.
+             */
+            await deferredClosePromise.promise;
+        },
         addEventListener(eventName, listener) {
             function newListener(event) {
                 const baseParams = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rest-vir/define-service",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "description": "Define an connect to a declarative and type safe REST and WebSocket service.",
     "keywords": [
         "rest",