vovk 3.0.0-draft.154 → 3.0.0-draft.156

package/cjs/client/createRPC.d.ts

@@ -1,3 +1,3 @@
 import type { KnownAny, VovkSchema } from '../types.js';
 import type { VovkClientOptions, VovkClient, VovkDefaultFetcherOptions } from './types.js';
-export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions<Record<string, never>>>(schema: VovkSchema, givenSegmentName: string, rpcModuleName: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;
+export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions<Record<string, never>>>(schema: VovkSchema, segmentName: string, rpcModuleName: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;

package/cjs/client/createRPC.js

@@ -17,8 +17,8 @@ const getHandlerPath = (endpoint, params, query) => {
     }
     return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
-const createRPC = (schema, givenSegmentName, rpcModuleName, options) => {
-    const segmentName = options?.segmentNameOverride ?? givenSegmentName;
+const createRPC = (schema, segmentName, rpcModuleName, options) => {
+    const segmentNamePath = options?.segmentNameOverride ?? segmentName;
     const segmentSchema = schema.segments[segmentName];
     if (!segmentSchema)
         throw new Error(`Unable to create RPC object. Segment schema is missing. Check client template.`);
@@ -34,10 +34,10 @@ const createRPC = (schema, givenSegmentName, rpcModuleName, options) => {
             const mainPrefix = [
                 apiRoot.startsWith('http://') || apiRoot.startsWith('https://') || apiRoot.startsWith('/') ? '' : '/',
                 apiRoot,
-                segmentName,
+                segmentNamePath,
             ]
                 .filter(Boolean)
-                .join('/');
+                .join('/') + '/';
             return mainPrefix + getHandlerPath([controllerPrefix, path].filter(Boolean).join('/'), params, query);
         };
         const handler = (input = {}) => {
@@ -83,7 +83,7 @@ const createRPC = (schema, givenSegmentName, rpcModuleName, options) => {
         handler.segmentSchema = segmentSchema;
         handler.fullSchema = schema;
         handler.isRPC = true;
-        handler.path = [segmentName, controllerPrefix, path].filter(Boolean).join('/');
+        handler.path = [segmentNamePath, controllerPrefix, path].filter(Boolean).join('/');
         // @ts-expect-error TODO
         client[staticMethodName] = handler;
     }

package/cjs/index.d.ts

@@ -7,7 +7,8 @@ import { createDecorator } from './createDecorator.js';
 import { JSONLinesResponse } from './JSONLinesResponse.js';
 import { generateStaticAPI } from './utils/generateStaticAPI.js';
 import { withValidation } from './utils/withValidation.js';
-export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidation, };
+import { multitenant } from './utils/multitenant.js';
+export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidation, multitenant, };
 export declare const get: {
     (givenPath?: string | undefined, options?: import("./types.js").DecoratorOptions | undefined): ReturnType<(givenPath?: string, options?: import("./types.js").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void>;
     auto: (options?: import("./types.js").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void;

package/cjs/index.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.withValidation = exports.generateStaticAPI = exports.createFetcher = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.JSONLinesResponse = exports.VovkSchemaIdEnum = void 0;
+exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.multitenant = exports.withValidation = exports.generateStaticAPI = exports.createFetcher = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.JSONLinesResponse = exports.VovkSchemaIdEnum = void 0;
 const createVovkApp_js_1 = require("./createVovkApp.js");
 Object.defineProperty(exports, "createVovkApp", { enumerable: true, get: function () { return createVovkApp_js_1.createVovkApp; } });
 const types_js_1 = require("./types.js");
@@ -22,4 +22,6 @@ const generateStaticAPI_js_1 = require("./utils/generateStaticAPI.js");
 Object.defineProperty(exports, "generateStaticAPI", { enumerable: true, get: function () { return generateStaticAPI_js_1.generateStaticAPI; } });
 const withValidation_js_1 = require("./utils/withValidation.js");
 Object.defineProperty(exports, "withValidation", { enumerable: true, get: function () { return withValidation_js_1.withValidation; } });
+const multitenant_js_1 = require("./utils/multitenant.js");
+Object.defineProperty(exports, "multitenant", { enumerable: true, get: function () { return multitenant_js_1.multitenant; } });
 _a = (0, createVovkApp_js_1.createVovkApp)(), exports.get = _a.get, exports.post = _a.post, exports.put = _a.put, exports.patch = _a.patch, exports.del = _a.del, exports.head = _a.head, exports.options = _a.options, exports.prefix = _a.prefix, exports.initVovk = _a.initVovk;

package/cjs/utils/multitenant.d.ts

@@ -0,0 +1,24 @@
+type Override = {
+    from: string;
+    to: string;
+};
+type Config = {
+    requestUrl: string;
+    requestHost: string;
+    targetHost: string;
+    overrides: {
+        [key: string]: Override[];
+    };
+};
+export declare function multitenant(config: Config): {
+    action: null;
+    destination: null;
+    message: string;
+    subdomains: null;
+} | {
+    action: string;
+    destination: string;
+    message: string;
+    subdomains: Record<string, string> | null;
+};
+export {};

package/cjs/utils/multitenant.js

@@ -0,0 +1,170 @@
+"use strict";
+/*
+Function "multitenant" accepts an object with "requestUrl", "requestHost", "targetHost" and "overrides" properties.
+The requestHost parameter comes from request headers and should be used instead of the hostname in the requestUrl.
+The keys in overrides are subdomains relative to the "targetHost". They can include a dot to indicate lower-level
+subdomains, and can use square brackets to indicate wildcard values. The values are arrays of objects with "from"
+and "to" properties, which are strings indicating the override paths for Next.js.
+
+If a path matches a specific subdomain name (e.g., "/admin" matches the "admin" subdomain),
+the request will be redirected to that specific subdomain instead of being processed on the current subdomain.
+
+If a path ends with "_schema_", it will not be processed by any overrides and will be passed through as-is.
+
+Example:
+
+const { action, destination, message, subdomains } = multitenant({
+  requestUrl: request.url,
+  requestHost: request.headers.get('host'),
+  targetHost: "localhost:3000",
+  overrides: {
+    "[customer_name].customer": [
+      { from: "api", to: "api/customer" }, // API
+      { from: "", to: "[customer_name]" } // UI
+    ],
+    "pro.[customer_name].customer": [
+        { from: "api", to: "api/customer/pro" }, // API
+        { from: "", to: "pro/[customer_name]" } // UI
+    ],
+    "admin": [
+      { from: "api", to: "api/admin" }, // API
+      { from: "", to: "admin" } // UI
+    ],
+  },
+});
+
+subdomains is a Record<string, string> | null where keys are subdomain names and values are their corresponding values. If non-wildcard subdomains are used, should be equal to null.
+action is one of "rewrite", "redirect", "notfound", or null.
+message is a string describing the action taken
+destination is a string URL to redirect or rewrite to, or null if no action is taken or "notfound"
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.multitenant = multitenant;
+// Get the reserved paths from the overrides configuration
+const getReservedPaths = (overrides) => {
+    return Object.keys(overrides).filter((key) => !key.includes('[') && !key.includes(']')); // Filter out dynamic paths
+};
+/**
+ * Convert a pattern with [placeholders] to a regex pattern and extract placeholder names
+ */
+const patternToRegex = (pattern) => {
+    const paramNames = [];
+    const regexPattern = pattern
+        .replace(/\[([^\]]+)\]/g, (_, name) => {
+        paramNames.push(name);
+        return '([^.]+)';
+    })
+        .replace(/\./g, '\\.'); // Escape dots in the pattern
+    return {
+        regex: new RegExp(`^${regexPattern}$`),
+        paramNames,
+    };
+};
+function multitenant(config) {
+    const { requestUrl, requestHost, targetHost, overrides } = config;
+    // Parse the URL
+    const urlObj = new URL(requestUrl);
+    const pathname = urlObj.pathname.slice(1); // Remove leading slash
+    // Skip processing for paths ending with "_schema_"
+    if (pathname.endsWith('_schema_')) {
+        return {
+            action: null,
+            destination: null,
+            message: 'Schema endpoint, bypassing overrides',
+            subdomains: null,
+        };
+    }
+    const pathSegments = pathname.split('/').filter(Boolean);
+    // Get reserved paths
+    const reservedPaths = getReservedPaths(overrides);
+    // Check if any path segment matches a reserved path (e.g., "admin")
+    for (let i = 0; i < pathSegments.length; i++) {
+        const segment = pathSegments[i];
+        if (reservedPaths.includes(segment)) {
+            // Create the destination URL with the reserved path as subdomain
+            const destinationHost = `${segment}.${targetHost}`;
+            // Keep path segments before the reserved path
+            const beforeSegments = pathSegments.slice(0, i);
+            // Keep path segments after the reserved path
+            const afterSegments = pathSegments.slice(i + 1);
+            // Construct the new path
+            const newPath = [...beforeSegments, ...afterSegments].join('/');
+            const destinationUrl = new URL(`${urlObj.protocol}//${destinationHost}`);
+            if (newPath) {
+                destinationUrl.pathname = `/${newPath}`;
+            }
+            // Keep any query parameters
+            destinationUrl.search = urlObj.search;
+            return {
+                action: 'redirect',
+                destination: destinationUrl.toString(),
+                message: `Redirecting to ${segment} subdomain`,
+                subdomains: null, // No wildcards used
+            };
+        }
+    }
+    // Process based on host and subdomains
+    for (const pattern in overrides) {
+        const fullPattern = `${pattern}.${targetHost}`;
+        const { regex, paramNames } = patternToRegex(fullPattern);
+        const match = requestHost.match(regex);
+        if (match) {
+            const overrideRules = overrides[pattern];
+            // Extract parameters from the match
+            const params = {};
+            if (match.length > 1) {
+                for (let i = 0; i < paramNames.length; i++) {
+                    params[paramNames[i]] = match[i + 1];
+                }
+            }
+            // Find the appropriate rule based on the path
+            for (const rule of overrideRules) {
+                if (pathname === rule.from || pathname.startsWith(`${rule.from}/`)) {
+                    // Replace path with the destination
+                    let destination = pathname.replace(rule.from, rule.to);
+                    // Replace any dynamic parameters in destination
+                    if (Object.keys(params).length > 0) {
+                        Object.entries(params).forEach(([key, value]) => {
+                            destination = destination.replace(`[${key}]`, value);
+                        });
+                    }
+                    // Only return non-null subdomains if we have wildcard parameters
+                    const wildcardSubdomains = paramNames.length > 0 ? params : null;
+                    return {
+                        action: 'rewrite',
+                        destination: `${urlObj.protocol}//${urlObj.host}/${destination}${urlObj.search}`,
+                        message: `Rewriting to ${destination}`,
+                        subdomains: wildcardSubdomains,
+                    };
+                }
+            }
+        }
+    }
+    // Handle cases where a customer subdomain tries to access reserved paths
+    if (pathSegments.length > 0 && reservedPaths.includes(pathSegments[0])) {
+        const reservedPath = pathSegments[0];
+        const restPath = pathSegments.slice(1).join('/');
+        // Create the destination URL with the reserved path as subdomain
+        const destinationHost = `${reservedPath}.${targetHost}`;
+        const destinationUrl = new URL(`${urlObj.protocol}//${destinationHost}`);
+        // Only add remaining path segments if they exist
+        if (restPath) {
+            destinationUrl.pathname = `/${restPath}`;
+        }
+        // Keep any query parameters
+        destinationUrl.search = urlObj.search;
+        return {
+            action: 'redirect',
+            destination: destinationUrl.toString(),
+            message: `Redirecting to ${reservedPath} subdomain`,
+            subdomains: null, // No wildcards used for reserved paths
+        };
+    }
+    // Default case - pass through
+    return {
+        action: null,
+        destination: null,
+        message: 'No action',
+        subdomains: null, // No wildcards matched
+    };
+}

package/mjs/client/createRPC.d.ts

@@ -1,3 +1,3 @@
 import type { KnownAny, VovkSchema } from '../types.js';
 import type { VovkClientOptions, VovkClient, VovkDefaultFetcherOptions } from './types.js';
-export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions<Record<string, never>>>(schema: VovkSchema, givenSegmentName: string, rpcModuleName: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;
+export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions<Record<string, never>>>(schema: VovkSchema, segmentName: string, rpcModuleName: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;

package/mjs/client/createRPC.js

@@ -17,8 +17,8 @@ const getHandlerPath = (endpoint, params, query) => {
     }
     return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
-const createRPC = (schema, givenSegmentName, rpcModuleName, options) => {
-    const segmentName = options?.segmentNameOverride ?? givenSegmentName;
+const createRPC = (schema, segmentName, rpcModuleName, options) => {
+    const segmentNamePath = options?.segmentNameOverride ?? segmentName;
     const segmentSchema = schema.segments[segmentName];
     if (!segmentSchema)
         throw new Error(`Unable to create RPC object. Segment schema is missing. Check client template.`);
@@ -34,10 +34,10 @@ const createRPC = (schema, givenSegmentName, rpcModuleName, options) => {
             const mainPrefix = [
                 apiRoot.startsWith('http://') || apiRoot.startsWith('https://') || apiRoot.startsWith('/') ? '' : '/',
                 apiRoot,
-                segmentName,
+                segmentNamePath,
             ]
                 .filter(Boolean)
-                .join('/');
+                .join('/') + '/';
             return mainPrefix + getHandlerPath([controllerPrefix, path].filter(Boolean).join('/'), params, query);
         };
         const handler = (input = {}) => {
@@ -83,7 +83,7 @@ const createRPC = (schema, givenSegmentName, rpcModuleName, options) => {
         handler.segmentSchema = segmentSchema;
         handler.fullSchema = schema;
         handler.isRPC = true;
-        handler.path = [segmentName, controllerPrefix, path].filter(Boolean).join('/');
+        handler.path = [segmentNamePath, controllerPrefix, path].filter(Boolean).join('/');
         // @ts-expect-error TODO
         client[staticMethodName] = handler;
     }

package/mjs/index.d.ts

@@ -7,7 +7,8 @@ import { createDecorator } from './createDecorator.js';
 import { JSONLinesResponse } from './JSONLinesResponse.js';
 import { generateStaticAPI } from './utils/generateStaticAPI.js';
 import { withValidation } from './utils/withValidation.js';
-export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidation, };
+import { multitenant } from './utils/multitenant.js';
+export { type KnownAny, type VovkClient, type VovkClientFetcher, type VovkDefaultFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkClientOptions, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkValidationType, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidation, multitenant, };
 export declare const get: {
     (givenPath?: string | undefined, options?: import("./types.js").DecoratorOptions | undefined): ReturnType<(givenPath?: string, options?: import("./types.js").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void>;
     auto: (options?: import("./types.js").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void;

package/mjs/index.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.withValidation = exports.generateStaticAPI = exports.createFetcher = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.JSONLinesResponse = exports.VovkSchemaIdEnum = void 0;
+exports.initVovk = exports.prefix = exports.options = exports.head = exports.del = exports.patch = exports.put = exports.post = exports.get = exports.multitenant = exports.withValidation = exports.generateStaticAPI = exports.createFetcher = exports.fetcher = exports.createRPC = exports.createDecorator = exports.createVovkApp = exports.HttpMethod = exports.HttpStatus = exports.HttpException = exports.JSONLinesResponse = exports.VovkSchemaIdEnum = void 0;
 const createVovkApp_js_1 = require("./createVovkApp.js");
 Object.defineProperty(exports, "createVovkApp", { enumerable: true, get: function () { return createVovkApp_js_1.createVovkApp; } });
 const types_js_1 = require("./types.js");
@@ -22,4 +22,6 @@ const generateStaticAPI_js_1 = require("./utils/generateStaticAPI.js");
 Object.defineProperty(exports, "generateStaticAPI", { enumerable: true, get: function () { return generateStaticAPI_js_1.generateStaticAPI; } });
 const withValidation_js_1 = require("./utils/withValidation.js");
 Object.defineProperty(exports, "withValidation", { enumerable: true, get: function () { return withValidation_js_1.withValidation; } });
+const multitenant_js_1 = require("./utils/multitenant.js");
+Object.defineProperty(exports, "multitenant", { enumerable: true, get: function () { return multitenant_js_1.multitenant; } });
 _a = (0, createVovkApp_js_1.createVovkApp)(), exports.get = _a.get, exports.post = _a.post, exports.put = _a.put, exports.patch = _a.patch, exports.del = _a.del, exports.head = _a.head, exports.options = _a.options, exports.prefix = _a.prefix, exports.initVovk = _a.initVovk;

package/mjs/utils/multitenant.d.ts

@@ -0,0 +1,24 @@
+type Override = {
+    from: string;
+    to: string;
+};
+type Config = {
+    requestUrl: string;
+    requestHost: string;
+    targetHost: string;
+    overrides: {
+        [key: string]: Override[];
+    };
+};
+export declare function multitenant(config: Config): {
+    action: null;
+    destination: null;
+    message: string;
+    subdomains: null;
+} | {
+    action: string;
+    destination: string;
+    message: string;
+    subdomains: Record<string, string> | null;
+};
+export {};

package/mjs/utils/multitenant.js

@@ -0,0 +1,170 @@
+"use strict";
+/*
+Function "multitenant" accepts an object with "requestUrl", "requestHost", "targetHost" and "overrides" properties.
+The requestHost parameter comes from request headers and should be used instead of the hostname in the requestUrl.
+The keys in overrides are subdomains relative to the "targetHost". They can include a dot to indicate lower-level
+subdomains, and can use square brackets to indicate wildcard values. The values are arrays of objects with "from"
+and "to" properties, which are strings indicating the override paths for Next.js.
+
+If a path matches a specific subdomain name (e.g., "/admin" matches the "admin" subdomain),
+the request will be redirected to that specific subdomain instead of being processed on the current subdomain.
+
+If a path ends with "_schema_", it will not be processed by any overrides and will be passed through as-is.
+
+Example:
+
+const { action, destination, message, subdomains } = multitenant({
+  requestUrl: request.url,
+  requestHost: request.headers.get('host'),
+  targetHost: "localhost:3000",
+  overrides: {
+    "[customer_name].customer": [
+      { from: "api", to: "api/customer" }, // API
+      { from: "", to: "[customer_name]" } // UI
+    ],
+    "pro.[customer_name].customer": [
+        { from: "api", to: "api/customer/pro" }, // API
+        { from: "", to: "pro/[customer_name]" } // UI
+    ],
+    "admin": [
+      { from: "api", to: "api/admin" }, // API
+      { from: "", to: "admin" } // UI
+    ],
+  },
+});
+
+subdomains is a Record<string, string> | null where keys are subdomain names and values are their corresponding values. If non-wildcard subdomains are used, should be equal to null.
+action is one of "rewrite", "redirect", "notfound", or null.
+message is a string describing the action taken
+destination is a string URL to redirect or rewrite to, or null if no action is taken or "notfound"
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.multitenant = multitenant;
+// Get the reserved paths from the overrides configuration
+const getReservedPaths = (overrides) => {
+    return Object.keys(overrides).filter((key) => !key.includes('[') && !key.includes(']')); // Filter out dynamic paths
+};
+/**
+ * Convert a pattern with [placeholders] to a regex pattern and extract placeholder names
+ */
+const patternToRegex = (pattern) => {
+    const paramNames = [];
+    const regexPattern = pattern
+        .replace(/\[([^\]]+)\]/g, (_, name) => {
+        paramNames.push(name);
+        return '([^.]+)';
+    })
+        .replace(/\./g, '\\.'); // Escape dots in the pattern
+    return {
+        regex: new RegExp(`^${regexPattern}$`),
+        paramNames,
+    };
+};
+function multitenant(config) {
+    const { requestUrl, requestHost, targetHost, overrides } = config;
+    // Parse the URL
+    const urlObj = new URL(requestUrl);
+    const pathname = urlObj.pathname.slice(1); // Remove leading slash
+    // Skip processing for paths ending with "_schema_"
+    if (pathname.endsWith('_schema_')) {
+        return {
+            action: null,
+            destination: null,
+            message: 'Schema endpoint, bypassing overrides',
+            subdomains: null,
+        };
+    }
+    const pathSegments = pathname.split('/').filter(Boolean);
+    // Get reserved paths
+    const reservedPaths = getReservedPaths(overrides);
+    // Check if any path segment matches a reserved path (e.g., "admin")
+    for (let i = 0; i < pathSegments.length; i++) {
+        const segment = pathSegments[i];
+        if (reservedPaths.includes(segment)) {
+            // Create the destination URL with the reserved path as subdomain
+            const destinationHost = `${segment}.${targetHost}`;
+            // Keep path segments before the reserved path
+            const beforeSegments = pathSegments.slice(0, i);
+            // Keep path segments after the reserved path
+            const afterSegments = pathSegments.slice(i + 1);
+            // Construct the new path
+            const newPath = [...beforeSegments, ...afterSegments].join('/');
+            const destinationUrl = new URL(`${urlObj.protocol}//${destinationHost}`);
+            if (newPath) {
+                destinationUrl.pathname = `/${newPath}`;
+            }
+            // Keep any query parameters
+            destinationUrl.search = urlObj.search;
+            return {
+                action: 'redirect',
+                destination: destinationUrl.toString(),
+                message: `Redirecting to ${segment} subdomain`,
+                subdomains: null, // No wildcards used
+            };
+        }
+    }
+    // Process based on host and subdomains
+    for (const pattern in overrides) {
+        const fullPattern = `${pattern}.${targetHost}`;
+        const { regex, paramNames } = patternToRegex(fullPattern);
+        const match = requestHost.match(regex);
+        if (match) {
+            const overrideRules = overrides[pattern];
+            // Extract parameters from the match
+            const params = {};
+            if (match.length > 1) {
+                for (let i = 0; i < paramNames.length; i++) {
+                    params[paramNames[i]] = match[i + 1];
+                }
+            }
+            // Find the appropriate rule based on the path
+            for (const rule of overrideRules) {
+                if (pathname === rule.from || pathname.startsWith(`${rule.from}/`)) {
+                    // Replace path with the destination
+                    let destination = pathname.replace(rule.from, rule.to);
+                    // Replace any dynamic parameters in destination
+                    if (Object.keys(params).length > 0) {
+                        Object.entries(params).forEach(([key, value]) => {
+                            destination = destination.replace(`[${key}]`, value);
+                        });
+                    }
+                    // Only return non-null subdomains if we have wildcard parameters
+                    const wildcardSubdomains = paramNames.length > 0 ? params : null;
+                    return {
+                        action: 'rewrite',
+                        destination: `${urlObj.protocol}//${urlObj.host}/${destination}${urlObj.search}`,
+                        message: `Rewriting to ${destination}`,
+                        subdomains: wildcardSubdomains,
+                    };
+                }
+            }
+        }
+    }
+    // Handle cases where a customer subdomain tries to access reserved paths
+    if (pathSegments.length > 0 && reservedPaths.includes(pathSegments[0])) {
+        const reservedPath = pathSegments[0];
+        const restPath = pathSegments.slice(1).join('/');
+        // Create the destination URL with the reserved path as subdomain
+        const destinationHost = `${reservedPath}.${targetHost}`;
+        const destinationUrl = new URL(`${urlObj.protocol}//${destinationHost}`);
+        // Only add remaining path segments if they exist
+        if (restPath) {
+            destinationUrl.pathname = `/${restPath}`;
+        }
+        // Keep any query parameters
+        destinationUrl.search = urlObj.search;
+        return {
+            action: 'redirect',
+            destination: destinationUrl.toString(),
+            message: `Redirecting to ${reservedPath} subdomain`,
+            subdomains: null, // No wildcards used for reserved paths
+        };
+    }
+    // Default case - pass through
+    return {
+        action: null,
+        destination: null,
+        message: 'No action',
+        subdomains: null, // No wildcards matched
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.154",
+  "version": "3.0.0-draft.156",
   "main": "./cjs/index.js",
   "module": "./mjs/index.js",
   "types": "./mjs/index.d.ts",