@rest-vir/run-service 0.15.1 → 0.17.0

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

@@ -1,6 +1,5 @@
-import { check } from '@augment-vir/assert';
 import { HttpMethod } from '@augment-vir/common';
-import { AnyOrigin, getAllowedEndpointMethods, isAnyOrigin, restVirServiceNameHeader, } from '@rest-vir/define-service';
+import { AnyOrigin, checkOriginRequirement, getAllowedEndpointMethods, isAnyOrigin, restVirServiceNameHeader, } from '@rest-vir/define-service';
 import { HttpStatus, RestVirHandlerError } from '@rest-vir/implement-service';
 import { convertDuration } from 'date-vir';
 /**
@@ -93,7 +92,7 @@ function buildOptionsRequestCorsHeaders(matchedOrigin, allowedMethods, customHea
     };
 }
 async function matchOrigin(endpoint, origin) {
-    const endpointRequirement = await checkOriginRequirement(endpoint.requiredClientOrigin, origin);
+    const endpointRequirement = await checkOriginRequirement(origin, endpoint.requiredClientOrigin);
     if (isAnyOrigin(endpointRequirement)) {
         return AnyOrigin;
     }
@@ -104,7 +103,7 @@ async function matchOrigin(endpoint, origin) {
         return origin;
     }
     /** If the endpoint requirement is `undefined`, then we check the service requirement. */
-    const serviceRequirement = await checkOriginRequirement(endpoint.service.requiredClientOrigin, origin);
+    const serviceRequirement = await checkOriginRequirement(origin, endpoint.service.requiredClientOrigin);
     if (isAnyOrigin(serviceRequirement)) {
         return AnyOrigin;
     }
@@ -120,34 +119,3 @@ 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 (isAnyOrigin(originRequirement)) {
-        /** Any origin has been explicitly allowed. */
-        return AnyOrigin;
-    }
-    else if (originRequirement === undefined) {
-        /** No checking occurred. */
-        return undefined;
-    }
-    else if (!origin) {
-        /** If there is an origin requirement but no origin then the origin automatically fails. */
-        return false;
-    }
-    else if (check.isString(originRequirement)) {
-        return origin === originRequirement;
-    }
-    else if (check.instanceOf(originRequirement, RegExp)) {
-        return !!originRequirement.exec(origin);
-    }
-    else if (check.isArray(originRequirement)) {
-        for (const requirement of originRequirement) {
-            if (await checkOriginRequirement(requirement, origin)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    else {
-        return await originRequirement(origin);
-    }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rest-vir/run-service",
-    "version": "0.15.1",
+    "version": "0.17.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.16.0",
         "@augment-vir/node": "^31.16.0",
         "@fastify/websocket": "^11.0.2",
-        "@rest-vir/define-service": "^0.15.1",
-        "@rest-vir/implement-service": "^0.15.1",
+        "@rest-vir/define-service": "^0.17.0",
+        "@rest-vir/implement-service": "^0.17.0",
         "cluster-vir": "^0.1.0",
         "date-vir": "^7.3.1",
         "fastify": "^5.3.2",