@rest-vir/run-service 0.15.0 → 0.16.0

package/dist/handle-request/endpoint-handler.d.ts

@@ -1,7 +1,7 @@
 import { type HttpStatus, type MaybePromise, type PartialWithUndefined } from '@augment-vir/common';
-import { ServerRequest, ServerResponse, type ImplementedEndpoint, type ImplementedWebSocket } from '@rest-vir/implement-service';
-import type { FastifyReply } from 'fastify';
-import { OutgoingHttpHeaders } from 'node:http';
+import { type ImplementedEndpoint, type ImplementedWebSocket, type ServerRequest, type ServerResponse } from '@rest-vir/implement-service';
+import { type FastifyReply } from 'fastify';
+import { type OutgoingHttpHeaders } from 'node:http';
 /**
  * Options for `handleRoute`.
  *

package/dist/handle-request/handle-cors.d.ts

@@ -1,5 +1,5 @@
-import { SelectFrom } from '@augment-vir/common';
-import { EndpointHandlerParams, HandledOutput } from './endpoint-handler.js';
+import { type SelectFrom } from '@augment-vir/common';
+import { type EndpointHandlerParams, type HandledOutput } from './endpoint-handler.js';
 /**
  * Determines the required origin for the endpoint and compares it with the given request.
  *

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/dist/handle-request/handle-endpoint.d.ts

@@ -1,5 +1,5 @@
-import { ImplementedEndpoint, type RunningServerInfo } from '@rest-vir/implement-service';
-import { EndpointHandlerParams, type HandledOutput } from './endpoint-handler.js';
+import { type ImplementedEndpoint, type RunningServerInfo } from '@rest-vir/implement-service';
+import { type EndpointHandlerParams, type HandledOutput } from './endpoint-handler.js';
 /**
  * Handles an endpoint's implementation execution.
  *

package/dist/handle-request/handle-request-method.d.ts

@@ -1,5 +1,5 @@
-import { SelectFrom } from '@augment-vir/common';
-import { HandledOutput, type EndpointHandlerParams } from './endpoint-handler.js';
+import { type SelectFrom } from '@augment-vir/common';
+import { type EndpointHandlerParams, type HandledOutput } from './endpoint-handler.js';
 /**
  * Verifies that a request's method matches the given endpoint's expectations. If it does not, an
  * error response is sent.

package/dist/handle-request/handle-route.d.ts

@@ -1,6 +1,6 @@
-import { ImplementedEndpoint, ImplementedWebSocket, RunningServerInfo, ServerRequest, ServerResponse } from '@rest-vir/implement-service';
+import { type ImplementedEndpoint, type ImplementedWebSocket, type RunningServerInfo, type ServerRequest, type ServerResponse } from '@rest-vir/implement-service';
 import { type WebSocket as WsWebSocket } from 'ws';
-import { HandleRouteOptions } from './endpoint-handler.js';
+import { type HandleRouteOptions } from './endpoint-handler.js';
 /**
  * Handles a WebSocket or Endpoint request.
  *

package/dist/handle-request/handle-search-params.d.ts

@@ -1,5 +1,5 @@
 import { type ErrorHttpStatusCategories, type HttpStatusByCategory, type SelectFrom } from '@augment-vir/common';
-import type { BaseSearchParams } from '@rest-vir/define-service';
+import { type BaseSearchParams } from '@rest-vir/define-service';
 import { type ImplementedEndpoint, type ImplementedWebSocket, type ServerRequest } from '@rest-vir/implement-service';
 /**
  * Handles a request's search params and compares it against the route's required search params

package/dist/handle-request/handle-web-socket.d.ts

@@ -1,4 +1,4 @@
-import { ImplementedWebSocket, ServerRequest, type RunningServerInfo } from '@rest-vir/implement-service';
+import { type ImplementedWebSocket, type RunningServerInfo, type ServerRequest } from '@rest-vir/implement-service';
 import { type WebSocket as WsWebSocket } from 'ws';
 /**
  * Handles a WebSocket request.

package/dist/handle-request/pre-handler.d.ts

@@ -1,5 +1,5 @@
 import { type SelectFrom } from '@augment-vir/common';
-import { GenericServiceImplementation, RunningServerInfo, ServerRequest, ServerResponse } from '@rest-vir/implement-service';
+import { type GenericServiceImplementation, type RunningServerInfo, type ServerRequest, type ServerResponse } from '@rest-vir/implement-service';
 import { type FastifyReply } from 'fastify';
 /**
  * Handles a request before it gets to the actual route handlers.

package/dist/start-service/attach-service.d.ts

@@ -1,8 +1,8 @@
-import { SelectFrom } from '@augment-vir/common';
-import type { BaseSearchParams, MinimalService } from '@rest-vir/define-service';
-import { GenericServiceImplementation, type RunningServerInfo } from '@rest-vir/implement-service';
+import { type SelectFrom } from '@augment-vir/common';
+import { type BaseSearchParams, type MinimalService } from '@rest-vir/define-service';
+import { type GenericServiceImplementation, type RunningServerInfo } from '@rest-vir/implement-service';
 import { type FastifyInstance } from 'fastify';
-import { HandleRouteOptions } from '../handle-request/endpoint-handler.js';
+import { type HandleRouteOptions } from '../handle-request/endpoint-handler.js';
 declare module 'fastify' {
     interface FastifyRequest {
         restVirContext: {

package/dist/start-service/start-service.d.ts

@@ -1,8 +1,8 @@
 import { type SelectFrom } from '@augment-vir/common';
-import { GenericServiceImplementation } from '@rest-vir/implement-service';
+import { type GenericServiceImplementation } from '@rest-vir/implement-service';
 import { ClusterManager, type WorkerRunner } from 'cluster-vir';
 import { type FastifyInstance, type FastifyPluginCallback } from 'fastify';
-import { StartServiceUserOptions } from './start-service-options.js';
+import { type StartServiceUserOptions } from './start-service-options.js';
 /**
  * Output of {@link startService}.
  *

package/dist/test/test-endpoint.d.ts

@@ -1,4 +1,4 @@
-import { CollapsedFetchEndpointParams, EndpointDefinition } from '@rest-vir/define-service';
+import { type CollapsedFetchEndpointParams, type EndpointDefinition } from '@rest-vir/define-service';
 /**
  * The type definition for {@link testEndpoint}.
  *

package/dist/test/test-service.d.ts

@@ -1,9 +1,9 @@
 import { type Overwrite, type PartialWithUndefined, type SelectFrom } from '@augment-vir/common';
-import { ClientWebSocket, CollapsedConnectWebSocketParams, CollapsedFetchEndpointParams, EndpointDefinition, WebSocketDefinition } from '@rest-vir/define-service';
-import { GenericServiceImplementation } from '@rest-vir/implement-service';
-import { FastifyInstance } from 'fastify';
-import { HandleRouteOptions } from '../handle-request/endpoint-handler.js';
-import { StartServiceOptions, type StartServiceUserOptions } from '../start-service/start-service-options.js';
+import { type ClientWebSocket, type CollapsedConnectWebSocketParams, type CollapsedFetchEndpointParams, type EndpointDefinition, type WebSocketDefinition } from '@rest-vir/define-service';
+import { type GenericServiceImplementation } from '@rest-vir/implement-service';
+import { type FastifyInstance } from 'fastify';
+import { type HandleRouteOptions } from '../handle-request/endpoint-handler.js';
+import { type StartServiceOptions, type StartServiceUserOptions } from '../start-service/start-service-options.js';
 /**
  * Options for {@link condenseResponse}.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rest-vir/run-service",
-    "version": "0.15.0",
+    "version": "0.16.0",
     "description": "Run a service defined by @rest-vir/define-service and implemented by @rest-vir/implement-service.",
     "keywords": [
         "rest",
@@ -39,25 +39,25 @@
         "test:update": "npm test update"
     },
     "dependencies": {
-        "@augment-vir/assert": "^31.14.1",
-        "@augment-vir/common": "^31.14.1",
-        "@augment-vir/node": "^31.14.1",
+        "@augment-vir/assert": "^31.16.0",
+        "@augment-vir/common": "^31.16.0",
+        "@augment-vir/node": "^31.16.0",
         "@fastify/websocket": "^11.0.2",
-        "@rest-vir/define-service": "^0.15.0",
-        "@rest-vir/implement-service": "^0.15.0",
+        "@rest-vir/define-service": "^0.16.0",
+        "@rest-vir/implement-service": "^0.16.0",
         "cluster-vir": "^0.1.0",
         "date-vir": "^7.3.1",
         "fastify": "^5.3.2",
         "light-my-request": "^6.6.0",
-        "portfinder": "^1.0.36",
-        "type-fest": "^4.40.0",
+        "portfinder": "^1.0.37",
+        "type-fest": "^4.40.1",
         "url-vir": "^2.1.3"
     },
     "devDependencies": {
-        "@augment-vir/test": "^31.14.1",
+        "@augment-vir/test": "^31.16.0",
         "@fastify/multipart": "^9.0.3",
         "@types/connect": "^3.4.38",
-        "@types/node": "^22.14.1",
+        "@types/node": "^22.15.3",
         "@types/ws": "^8.18.1",
         "c8": "^10.1.3",
         "istanbul-smart-text-reporter": "^1.1.5",