@rest-vir/run-service 0.0.5 → 0.0.7

package/dist/handle-request/handle-cors.js

@@ -1,6 +1,6 @@
 import { check } from '@augment-vir/assert';
 import { HttpMethod } from '@augment-vir/common';
-import { AnyOrigin, getAllowedEndpointMethods, } from '@rest-vir/define-service';
+import { AnyOrigin, getAllowedEndpointMethods, isAnyOrigin, } from '@rest-vir/define-service';
 import { HttpStatus, RestVirHandlerError } from '@rest-vir/implement-service';
 import { convertDuration } from 'date-vir';
 /**
@@ -43,7 +43,7 @@ export async function handleCors({ route, request, }) {
     }
 }
 function buildStandardCorsHeaders(matchedOrigin) {
-    if (matchedOrigin === AnyOrigin) {
+    if (isAnyOrigin(matchedOrigin)) {
         return {
             'Access-Control-Allow-Origin': '*',
         };
@@ -82,7 +82,7 @@ function buildOptionsRequestCorsHeaders(matchedOrigin, allowedMethods) {
 }
 async function matchOrigin(endpoint, origin) {
     const endpointRequirement = await checkOriginRequirement(endpoint.requiredClientOrigin, origin);
-    if (endpointRequirement === AnyOrigin) {
+    if (isAnyOrigin(endpointRequirement)) {
         return AnyOrigin;
     }
     else if (endpointRequirement === false) {
@@ -93,7 +93,7 @@ async function matchOrigin(endpoint, origin) {
     }
     /** If the endpoint requirement is `undefined`, then we check the service requirement. */
     const serviceRequirement = await checkOriginRequirement(endpoint.service.requiredClientOrigin, origin);
-    if (serviceRequirement === AnyOrigin) {
+    if (isAnyOrigin(serviceRequirement)) {
         return AnyOrigin;
     }
     else if (serviceRequirement === false) {
@@ -109,7 +109,7 @@ async function matchOrigin(endpoint, origin) {
     throw new RestVirHandlerError(endpoint, `Request origin '${origin}' failed to get checked for endpoint '${endpoint.path}' or service '${endpoint.service.serviceName}'`);
 }
 async function checkOriginRequirement(originRequirement, origin) {
-    if (originRequirement === AnyOrigin) {
+    if (isAnyOrigin(originRequirement)) {
         /** Any origin has been explicitly allowed. */
         return AnyOrigin;
     }

package/dist/test/test-service.js

@@ -191,6 +191,20 @@ export async function testExistingServer(server, service, options = {}) {
                     : {}))
                 : new WebSocket(webSocketUrl, protocols);
             const finalized = await finalizeWebSocket(webSocketDefinition, webSocket, listeners, WebSocketLocation.OnClient);
+            if (webSocketOrigin == undefined) {
+                /**
+                 * `injectWS` gives us a WebSocket from the `ws` package with a slightly
+                 * different interface.
+                 */
+                webSocket.dispatchEvent = (event) => {
+                    return webSocket.emit(event.type, event);
+                };
+                /**
+                 * `injectWS` does not fire the `'open'` event so we have to do it manually
+                 * here.
+                 */
+                webSocket.dispatchEvent(new Event('open'));
+            }
             return finalized;
         };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rest-vir/run-service",
-    "version": "0.0.5",
+    "version": "0.0.7",
     "description": "Run a service defined by @rest-vir/define-service and implemented by @rest-vir/implement-service.",
     "keywords": [
         "rest",
@@ -39,29 +39,32 @@
         "test:update": "npm test update"
     },
     "dependencies": {
-        "@augment-vir/assert": "^31.9.1",
-        "@augment-vir/common": "^31.9.1",
-        "@augment-vir/node": "^31.9.1",
+        "@augment-vir/assert": "^31.9.2",
+        "@augment-vir/common": "^31.9.2",
+        "@augment-vir/node": "^31.9.2",
         "@fastify/websocket": "^11.0.2",
-        "@rest-vir/define-service": "^0.0.5",
-        "@rest-vir/implement-service": "^0.0.5",
+        "@rest-vir/define-service": "^0.0.7",
+        "@rest-vir/implement-service": "^0.0.7",
         "cluster-vir": "^0.1.0",
-        "date-vir": "^7.2.0",
+        "date-vir": "^7.2.1",
         "fastify": "^5.2.1",
         "light-my-request": "^6.6.0",
-        "object-shape-tester": "^5.1.1",
         "portfinder": "^1.0.32",
         "type-fest": "^4.35.0",
-        "url-vir": "^2.1.1"
+        "url-vir": "^2.1.2"
     },
     "devDependencies": {
-        "@augment-vir/test": "^31.9.1",
+        "@augment-vir/test": "^31.9.2",
         "@types/connect": "^3.4.38",
         "@types/node": "^22.13.4",
         "@types/ws": "^8.5.14",
         "c8": "^10.1.3",
         "istanbul-smart-text-reporter": "^1.1.5",
-        "markdown-code-example-inserter": "^3.0.3"
+        "markdown-code-example-inserter": "^3.0.3",
+        "object-shape-tester": "^5.1.3"
+    },
+    "peerDependencies": {
+        "object-shape-tester": ">=5"
     },
     "engines": {
         "node": ">=22"