@rest-vir/run-service 0.0.7 → 0.2.0

package/dist/handle-request/handle-web-socket.js

@@ -25,12 +25,12 @@ export async function handleWebSocketRequest({ attachId, request, implementedWeb
         protocols: restVirContext.protocols,
         searchParams: restVirContext.searchParams,
     };
-    if (implementedWebSocket.implementation.onClose) {
+    if (implementedWebSocket.implementation.close) {
         webSocket.on('close', async () => {
-            await implementedWebSocket.implementation.onClose?.(webSocketCallbackParams);
+            await implementedWebSocket.implementation.close?.(webSocketCallbackParams);
         });
     }
-    if (implementedWebSocket.implementation.onMessage) {
+    if (implementedWebSocket.implementation.message) {
         webSocket.on('message', async (rawMessage) => {
             let message;
             try {
@@ -49,7 +49,7 @@ export async function handleWebSocketRequest({ attachId, request, implementedWeb
                 implementedWebSocket.service.logger.error(ensureErrorClass(error, RestVirHandlerError, implementedWebSocket, errorMessage));
             }
             try {
-                await implementedWebSocket.implementation.onMessage?.({
+                await implementedWebSocket.implementation.message?.({
                     ...webSocketCallbackParams,
                     message,
                 });
@@ -59,7 +59,7 @@ export async function handleWebSocketRequest({ attachId, request, implementedWeb
             }
         });
     }
-    if (implementedWebSocket.implementation.onConnection) {
-        await implementedWebSocket.implementation.onConnection(webSocketCallbackParams);
+    if (implementedWebSocket.implementation.open) {
+        await implementedWebSocket.implementation.open(webSocketCallbackParams);
     }
 }

package/dist/test/test-service.js

@@ -199,10 +199,7 @@ export async function testExistingServer(server, service, options = {}) {
                 webSocket.dispatchEvent = (event) => {
                     return webSocket.emit(event.type, event);
                 };
-                /**
-                 * `injectWS` does not fire the `'open'` event so we have to do it manually
-                 * here.
-                 */
+                /** `injectWS` fires the `'open'` event before we have a chance to listen to it. */
                 webSocket.dispatchEvent(new Event('open'));
             }
             return finalized;

package/dist/test/test-web-socket.js

@@ -19,8 +19,10 @@ export const testWebSocket = async function testWebSocket(webSocketImplementatio
         debug: true,
     });
     const webSocket = await connectWebSocket[webSocketImplementation.path](params);
-    webSocket.addEventListener('close', async () => {
-        await kill();
+    webSocket.addEventListener('close', () => {
+        setTimeout(async () => {
+            await kill();
+        }, 1000);
     });
     return webSocket;
 };
@@ -62,6 +64,6 @@ export function withWebSocketTest(webSocketDefinition, params, callback) {
     return async () => {
         const clientWebSocket = await testWebSocket(webSocketDefinition, params);
         await callback(clientWebSocket);
-        clientWebSocket.close();
+        await clientWebSocket.close();
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rest-vir/run-service",
-    "version": "0.0.7",
+    "version": "0.2.0",
     "description": "Run a service defined by @rest-vir/define-service and implemented by @rest-vir/implement-service.",
     "keywords": [
         "rest",
@@ -43,8 +43,8 @@
         "@augment-vir/common": "^31.9.2",
         "@augment-vir/node": "^31.9.2",
         "@fastify/websocket": "^11.0.2",
-        "@rest-vir/define-service": "^0.0.7",
-        "@rest-vir/implement-service": "^0.0.7",
+        "@rest-vir/define-service": "^0.2.0",
+        "@rest-vir/implement-service": "^0.2.0",
         "cluster-vir": "^0.1.0",
         "date-vir": "^7.2.1",
         "fastify": "^5.2.1",