@owlmeans/route 0.1.18-rc.2 → 0.1.18-rc.21

package/build/types.d.ts

@@ -1,6 +1,20 @@
-import type { AppType, BasicContext, BasicConfig } from '@owlmeans/context';
+import type { AppType, EntrypointReference } from '@owlmeans/context';
 import type { RouteProtocols, RouteMethod } from './consts';
-export interface CommonRoute extends BasicRoute {
+export interface BasicRoute {
+    type: AppType;
+    service?: string;
+    host?: string;
+    port?: number;
+    base?: string;
+    internalHost?: string;
+    internalPort?: number;
+}
+/**
+ * The plain, declarative half of a route — what a `route()` call produces and what an application
+ * ships in its contract package. It is never rewritten: `path` stays the segment this route
+ * contributes under its parent, and the address is worked out on demand against a context.
+ */
+export interface RouteDeclaration extends BasicRoute {
     alias: string;
     path: string;
     parent?: string;
@@ -8,28 +22,45 @@ export interface CommonRoute extends BasicRoute {
     method?: RouteMethod;
     protocol?: RouteProtocols;
     secure?: boolean;
+    /**
+     * QUEUE routes only: the queue that carries this entrypoint's jobs. It names an address, not a
+     * process — which queues a given process consumes is configuration, never a declaration.
+     */
+    queue?: string;
+    /**
+     * QUEUE routes only: whether the caller waits for the job's return value. `false` resolves as
+     * soon as the job is accepted, which is what a long pipeline wants; the default is to wait.
+     */
+    reply?: boolean;
+    /** How long a caller waits for an answer, in milliseconds, when the transport supports it. */
+    timeout?: number;
 }
 export interface CommonServiceRoute extends BasicRoute {
     home?: string;
     service: string;
     default?: boolean;
 }
-export interface BasicRoute {
-    type: AppType;
-    service?: string;
-    host?: string;
-    port?: number;
-    base?: string;
-    resolved: boolean;
-}
 export interface ResolvedServiceRoute extends CommonServiceRoute {
     host: string;
-    resolved: true;
 }
-export interface CommonRouteModel {
-    route: CommonRoute;
-    resolve: <C extends BasicConfig, T extends BasicContext<C>>(context: T) => Promise<CommonRoute>;
+/** Where a route actually answers, once its service has been picked. */
+export interface RouteAddress {
+    host: string;
+    port?: number;
+    base?: string;
+    secure: boolean;
+    protocol: RouteProtocols;
+}
+/**
+ * The model wrapping a declaration. It carries no resolution state of its own — every address
+ * question is answered from the declaration plus the context that asks.
+ */
+export interface RouteModel {
+    route: RouteDeclaration;
 }
-export interface RouteOptions extends Partial<CommonRoute> {
+export type RouteParent = string | EntrypointReference;
+export interface RouteOptions extends Omit<Partial<RouteDeclaration>, 'parent'> {
+    /** A parent protocol is preferred in application declarations; strings remain adapter input. */
+    parent?: RouteParent;
 }
 //# sourceMappingURL=types.d.ts.map

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAE3D,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC7C,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,MAAM,WAAW,kBAAmB,SAAQ,UAAU;IACpD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,IAAI,CAAA;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,WAAW,CAAA;IAClB,OAAO,EAAE,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;CAChG;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO,CAAC,WAAW,CAAC;CACzD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAE3D,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,8FAA8F;IAC9F,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,kBAAmB,SAAQ,UAAU;IACpD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,IAAI,EAAE,MAAM,CAAA;CACb;AAED,wEAAwE;AACxE,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,cAAc,CAAA;CACzB;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,gBAAgB,CAAA;CACxB;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,mBAAmB,CAAA;AAEtD,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,QAAQ,CAAC;IAC7E,gGAAgG;IAChG,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB"}

package/build/utils/route.d.ts

@@ -1,9 +1,29 @@
 import type { BasicConfig, BasicContext } from '@owlmeans/context';
-import type { CommonRoute } from '../types.js';
+import type { RouteAddress, RouteDeclaration, ResolvedServiceRoute } from '../types.js';
 type Config = BasicConfig;
-export declare const getParentRoute: <C extends Config, T extends BasicContext<C>>(context: T, route: CommonRoute) => Promise<CommonRoute | null>;
-export declare const overrideParams: (route: CommonRoute, overrides?: Partial<CommonRoute>, filter?: string[]) => void;
-export declare const resolve: <C extends Config, T extends BasicContext<C>>(route: CommonRoute) => (context: T) => Promise<CommonRoute>;
-export declare const prependBase: (route: CommonRoute) => string;
+export declare const getParentRoute: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => RouteDeclaration | null;
+export declare const overrideParams: (route: RouteDeclaration, overrides?: Partial<RouteDeclaration>, filter?: string[]) => void;
+/**
+ * Pick the service route this declaration answers on: the one it names, else the default of its
+ * app type, else the first of its app type.
+ *
+ * @throws {SyntaxError}
+ */
+export declare const resolveService: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => ResolvedServiceRoute;
+/**
+ * The full path: every ancestor's declared segment, then this one. Walks the parent chain through
+ * the context, so a declaration always states only what it contributes.
+ */
+export declare const resolvePath: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => string;
+/** `base` + the full path — what a server mounts and a client requests. */
+export declare const resolveMount: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => string;
+/**
+ * Where the route answers. A backend caller reaching a service over its INTERNAL host is inside the
+ * cluster, so that hop is never TLS.
+ */
+export declare const resolveAddress: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => RouteAddress;
+/** Does this route belong to the service the asking context IS? */
+export declare const isLocalRoute: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => boolean;
+export declare const prependBase: (route: RouteDeclaration, path: string) => string;
 export {};
 //# sourceMappingURL=route.d.ts.map

package/build/utils/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/utils/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAc,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAwC,MAAM,aAAa,CAAA;AAKpF,KAAK,MAAM,GAAG,WAAW,CAAA;AAEzB,eAAO,MAAM,cAAc,GAAU,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,WAAW,KAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAkB5I,CAAA;AAED,eAAO,MAAM,cAAc,UAAW,WAAW,cAAc,OAAO,CAAC,WAAW,CAAC,WAAW,MAAM,EAAE,SAOrG,CAAA;AAED,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,SAAS,WAAW,eAAqB,CAAC,yBA8D5G,CAAA;AAcD,eAAO,MAAM,WAAW,UAAW,WAAW,WAO7C,CAAA"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/utils/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAc,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAkC,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAKvH,KAAK,MAAM,GAAG,WAAW,CAAA;AAWzB,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAC/D,CAAC,SAAS,gBAAgB,KAClC,gBAAgB,GAAG,IAWrB,CAAA;AAED,eAAO,MAAM,cAAc,UAAW,gBAAgB,cAAc,OAAO,CAAC,gBAAgB,CAAC,WAAW,MAAM,EAAE,SAO/G,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAC/D,CAAC,SAAS,gBAAgB,KAClC,oBA4BF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAC5D,CAAC,SAAS,gBAAgB,KAClC,MASF,CAAA;AAED,2EAA2E;AAC3E,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAC7D,CAAC,SAAS,gBAAgB,KAClC,MAOF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAC/D,CAAC,SAAS,gBAAgB,KAClC,YAYF,CAAA;AAED,mEAAmE;AACnE,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAC7D,CAAC,SAAS,gBAAgB,KAClC,OAAyE,CAAA;AAgB5E,eAAO,MAAM,WAAW,UAAW,gBAAgB,QAAQ,MAAM,WAGvD,CAAA"}

package/build/utils/route.js

@@ -1,24 +1,17 @@
 import { isServiceRoute, isServiceRouteResolved } from './service.js';
 import { normalizePath } from '../helper.js';
-import { SEP } from '../consts.js';
-export const getParentRoute = async (context, route) => {
-    if (route.parent != null) {
-        const parent = context.module(route.parent);
-        assertCycle(context, route, parent.route.route);
-        if (parent.route == null) {
-            throw new SyntaxError('Parent module doesn\'t provide a route');
-        }
-        if (!parent.route.route.resolved) {
-            if (parent.resolve != null) {
-                await parent.resolve();
-            }
-            else {
-                return await parent.route.resolve(context);
-            }
-        }
-        return parent.route.route;
+import { RouteProtocols, SEP } from '../consts.js';
+const carrier = (context, alias) => context.entrypoint(alias);
+export const getParentRoute = (context, route) => {
+    if (route.parent == null) {
+        return null;
+    }
+    const parent = carrier(context, route.parent);
+    if (parent.route == null) {
+        throw new SyntaxError('Parent entrypoint doesn\'t provide a route');
     }
-    return null;
+    assertCycle(context, route, parent.route.route);
+    return parent.route.route;
 };
 export const overrideParams = (route, overrides, filter) => {
     Object.entries(overrides ?? {}).forEach(([key, value]) => {
@@ -28,59 +21,72 @@ export const overrideParams = (route, overrides, filter) => {
         }
     });
 };
-export const resolve = (route) => async (context) => {
-    if (route.resolved)
-        return route;
-    route.resolved = true;
+/**
+ * Pick the service route this declaration answers on: the one it names, else the default of its
+ * app type, else the first of its app type.
+ *
+ * @throws {SyntaxError}
+ */
+export const resolveService = (context, route) => {
     if (context.cfg.services == null) {
         throw new SyntaxError('Services aren\'t configured to resolve routes');
     }
-    const firstGuessService = context.cfg.services[route.service ?? context.cfg.service];
-    if (firstGuessService != null && !isServiceRoute(firstGuessService)) {
+    const named = context.cfg.services[route.service ?? context.cfg.service];
+    if (named != null && !isServiceRoute(named)) {
         throw new SyntaxError('Service is not a valid service route');
     }
-    const service = firstGuessService?.type === route.type ? firstGuessService
-        : Object.values(context.cfg.services).find((service) => {
-            const _service = service;
-            return _service.default === true && _service.type === route.type;
-        }) ?? Object.values(context.cfg.services).find((service) => {
-            const _service = service;
-            return _service.type === route.type;
-        });
+    const service = named?.type === route.type ? named
+        : Object.values(context.cfg.services).find((candidate) => {
+            const _candidate = candidate;
+            return _candidate.default === true && _candidate.type === route.type;
+        }) ?? Object.values(context.cfg.services).find((candidate) => candidate.type === route.type);
     if (!isServiceRoute(service)) {
         throw new SyntaxError('Service is not a valid service route');
     }
-    if (!service.resolved && service.host != null) {
-        service.resolved = true;
-    }
     if (!isServiceRouteResolved(service)) {
         throw new SyntaxError('Service route is not resolved');
     }
-    overrideParams(route, service, ['host', 'port', 'service', 'base']);
-    // Internal host access is non secure only
-    // it's required for server side client routes
-    if ("internalHost" in route) {
-        if (route.internalHost === route.host) {
-            route.secure = false;
-        }
-    }
-    else if ("internalHost" in service) {
-        if (service.internalHost === route.host) {
-            route.secure = false;
-        }
-    }
-    const parent = await getParentRoute(context, route);
-    if (parent != null) {
-        route.path = (parent.path.startsWith(SEP) ? SEP : '')
-            + normalizePath(normalizePath(parent.path) + SEP + normalizePath(route.path));
+    return service;
+};
+/**
+ * The full path: every ancestor's declared segment, then this one. Walks the parent chain through
+ * the context, so a declaration always states only what it contributes.
+ */
+export const resolvePath = (context, route) => {
+    const parent = getParentRoute(context, route);
+    if (parent == null) {
+        return route.path;
     }
-    // Moved base resolution to the final service
-    // if (parent == null && route.base != null && route.base.trim() !== '') {
-    //   route.path = SEP + normalizePath(route.base) + SEP + normalizePath(route.path)
-    //   // route.path = route.base.startsWith(SEP) ? SEP + route.path : route.path
-    // }
-    return route;
+    const parentPath = resolvePath(context, parent);
+    return (parentPath.startsWith(SEP) ? SEP : '')
+        + normalizePath(normalizePath(parentPath) + SEP + normalizePath(route.path));
+};
+/** `base` + the full path — what a server mounts and a client requests. */
+export const resolveMount = (context, route) => {
+    const path = resolvePath(context, route);
+    const base = route.base ?? resolveService(context, route).base;
+    return base != null && base.trim() !== ''
+        ? SEP + normalizePath(base) + SEP + normalizePath(path)
+        : path;
 };
+/**
+ * Where the route answers. A backend caller reaching a service over its INTERNAL host is inside the
+ * cluster, so that hop is never TLS.
+ */
+export const resolveAddress = (context, route) => {
+    const service = resolveService(context, route);
+    const host = route.host ?? service.host;
+    const internalHost = route.internalHost ?? service.internalHost;
+    return {
+        host,
+        port: route.port ?? service.port,
+        base: route.base ?? service.base,
+        secure: internalHost != null && internalHost === host ? false : route.secure ?? true,
+        protocol: route.protocol ?? RouteProtocols.WEB,
+    };
+};
+/** Does this route belong to the service the asking context IS? */
+export const isLocalRoute = (context, route) => (route.service ?? context.cfg.service) === context.cfg.service;
 /**
  * @throws {SyntaxError}
  */
@@ -89,15 +95,10 @@ const assertCycle = (context, route, parent) => {
         if (parent.parent === route.alias) {
             throw new SyntaxError(`Route parentship cycle detected. Parent: ${parent.alias} has his child as ancestor ${route.alias}`);
         }
-        parent = context.module(parent.parent).route.route;
-    }
-};
-export const prependBase = (route) => {
-    let path = route.path;
-    if (route.base != null && route.base.trim() !== '') {
-        path = SEP + normalizePath(route.base) + SEP + normalizePath(route.path);
-        // route.path = route.base.startsWith(SEP) ? SEP + route.path : route.path
+        parent = carrier(context, parent.parent).route.route;
     }
-    return path;
 };
+export const prependBase = (route, path) => route.base != null && route.base.trim() !== ''
+    ? SEP + normalizePath(route.base) + SEP + normalizePath(path)
+    : path;
 //# sourceMappingURL=route.js.map

package/build/utils/route.js.map

@@ -1 +1 @@
-{"version":3,"file":"route.js","sourceRoot":"","sources":["../../src/utils/route.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"route.js","sourceRoot":"","sources":["../../src/utils/route.ts"],"names":[],"mappings":"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"}

package/build/utils/service.d.ts

@@ -1,4 +1,5 @@
 import type { ResolvedServiceRoute, CommonServiceRoute } from '../types.js';
 export declare const isServiceRoute: (obj?: Object) => obj is CommonServiceRoute;
+/** A service route is usable exactly when it knows the host it answers on. */
 export declare const isServiceRouteResolved: (route: CommonServiceRoute) => route is ResolvedServiceRoute;
 //# sourceMappingURL=service.d.ts.map

package/build/utils/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/utils/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAE3E,eAAO,MAAM,cAAc,SAAU,MAAM,KAAG,GAAG,IAAI,kBAEM,CAAA;AAE3D,eAAO,MAAM,sBAAsB,UAAW,kBAAkB,KAAG,KAAK,IAAI,oBACnD,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/utils/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAE3E,eAAO,MAAM,cAAc,SAAU,MAAM,KAAG,GAAG,IAAI,kBAEM,CAAA;AAE3D,8EAA8E;AAC9E,eAAO,MAAM,sBAAsB,UAAW,kBAAkB,KAAG,KAAK,IAAI,oBAC5B,CAAA"}

package/build/utils/service.js

@@ -1,5 +1,6 @@
 import { AppType } from '@owlmeans/context';
 export const isServiceRoute = (obj) => obj != null && ('type' in obj) && ('service' in obj)
     && (Object.values(AppType).includes(obj.type));
-export const isServiceRouteResolved = (route) => route.resolved === true;
+/** A service route is usable exactly when it knows the host it answers on. */
+export const isServiceRouteResolved = (route) => route.host != null && route.host.trim() !== '';
 //# sourceMappingURL=service.js.map

package/build/utils/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/utils/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAG3C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAA6B,EAAE,CACxE,GAAG,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC;OACjD,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAe,CAAC,CAAC,CAAA;AAE3D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAyB,EAAiC,EAAE,CACjG,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAA"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/utils/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAG3C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAA6B,EAAE,CACxE,GAAG,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC;OACjD,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAe,CAAC,CAAC,CAAA;AAE3D,8EAA8E;AAC9E,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAyB,EAAiC,EAAE,CACjG,KAAK,CAAC,IAAI,IAAI,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/route",
-  "version": "0.1.18-rc.2",
+  "version": "0.1.18-rc.21",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -28,7 +28,7 @@
     }
   },
   "dependencies": {
-    "@owlmeans/context": "^0.1.18-rc.2"
+    "@owlmeans/context": "^0.1.18-rc.20"
   },
   "devDependencies": {
     "@owlmeans/dep-config": "workspace:*",

package/src/consts.ts

@@ -11,7 +11,13 @@ export const SEP = '/'
 
 export const PARAM = ':'
 
+/**
+ * How a route is carried. The protocol picks the transport that answers it — an application binds
+ * one by registering a service under `transportAlias(protocol)` — so a caller writes `call()` and
+ * never learns whether an HTTP request, a socket frame or a queued job did the work.
+ */
 export enum RouteProtocols {
   WEB = 'http',
-  SOCKET = 'ws'
+  SOCKET = 'ws',
+  QUEUE = 'queue'
 }

package/src/helper.ts

@@ -1,10 +1,10 @@
 import { AppType } from '@owlmeans/context'
 import { RouteMethod, RouteProtocols, SEP } from './consts.js'
 import { createRoute, makeRouteModel } from './model.js'
-import type { CommonRouteModel, RouteOptions } from './types.js'
+import type { RouteModel, RouteOptions } from './types.js'
 import type { CreateRouteSignature } from './utils/types.js'
 
-export const route: CreateRouteSignature<CommonRouteModel> = (alias, path, opts?) =>
+export const route: CreateRouteSignature<RouteModel> = (alias, path, opts?) =>
   makeRouteModel(createRoute(alias, path, opts))
 
 export const normalizePath = (path: string): string => {
@@ -43,6 +43,19 @@ export const socket = (opts?: RouteOptions | string | null, secondary?: RouteOpt
   return route
 }
 
+/**
+ * A backend route carried by the queue rather than by HTTP. Everything else about it is a normal
+ * backend route — it has a path, a parent, guards and a filter — so the same declaration is served
+ * with `bind(...)` and called with `call()`; only the transport underneath differs.
+ */
+export const job = (opts?: RouteOptions | string | null, secondary?: RouteOptions): Partial<RouteOptions> => {
+  const route = backend(opts, secondary)
+
+  route.protocol = RouteProtocols.QUEUE
+
+  return route
+}
+
 export const frontend = (opts?: RouteOptions | string | null, def?: RouteOptions | boolean): Partial<RouteOptions> => {
   if (typeof def === 'boolean') {
     opts = typeof opts === 'string' ? { parent: opts, default: def } : { default: def, ...(opts ?? {}) }

package/src/model.ts

@@ -1,24 +1,18 @@
-import type { CommonRoute, CommonRouteModel } from './types.js'
+import type { RouteDeclaration, RouteModel } from './types.js'
 import type { CreateRouteSignature } from './utils/types.js'
-import { resolve } from './utils/route.js'
-import { AppType, BasicConfig, BasicContext } from '@owlmeans/context'
+import { AppType } from '@owlmeans/context'
 
-export const makeRouteModel = (route: CommonRoute): CommonRouteModel => {
-  const model: CommonRouteModel = {
-    route,
-    resolve: ctx => resolve(route)(ctx as unknown as BasicContext<BasicConfig>)
-  }
-
-  return model
-}
+export const makeRouteModel = (route: RouteDeclaration): RouteModel => ({ route })
 
-export const createRoute: CreateRouteSignature<CommonRoute> = (alias, path, opts?) => {
-  const route: CommonRoute = {
+export const createRoute: CreateRouteSignature<RouteDeclaration> = (alias, path, opts?) => {
+  const options = typeof opts === 'string' ? { parent: opts } : opts
+  const { parent, ...rest } = options ?? {}
+  const route: RouteDeclaration = {
     alias,
     type: AppType.Backend,
     path,
-    resolved: false,
-    ...(typeof opts === 'string' ? { parent: opts } : opts)
+    ...rest,
+    ...(parent == null ? {} : { parent: typeof parent === 'string' ? parent : parent.alias }),
   }
 
   return route

package/src/types.ts

@@ -1,7 +1,22 @@
-import type { AppType, BasicContext, BasicConfig } from '@owlmeans/context'
+import type { AppType, EntrypointReference } from '@owlmeans/context'
 import type { RouteProtocols, RouteMethod } from './consts'
 
-export interface CommonRoute extends BasicRoute {
+export interface BasicRoute {
+  type: AppType
+  service?: string
+  host?: string
+  port?: number
+  base?: string
+  internalHost?: string
+  internalPort?: number
+}
+
+/**
+ * The plain, declarative half of a route — what a `route()` call produces and what an application
+ * ships in its contract package. It is never rewritten: `path` stays the segment this route
+ * contributes under its parent, and the address is worked out on demand against a context.
+ */
+export interface RouteDeclaration extends BasicRoute {
   alias: string
   path: string
   parent?: string
@@ -9,6 +24,18 @@ export interface CommonRoute extends BasicRoute {
   method?: RouteMethod
   protocol?: RouteProtocols
   secure?: boolean
+  /**
+   * QUEUE routes only: the queue that carries this entrypoint's jobs. It names an address, not a
+   * process — which queues a given process consumes is configuration, never a declaration.
+   */
+  queue?: string
+  /**
+   * QUEUE routes only: whether the caller waits for the job's return value. `false` resolves as
+   * soon as the job is accepted, which is what a long pipeline wants; the default is to wait.
+   */
+  reply?: boolean
+  /** How long a caller waits for an answer, in milliseconds, when the transport supports it. */
+  timeout?: number
 }
 
 export interface CommonServiceRoute extends BasicRoute {
@@ -17,24 +44,30 @@ export interface CommonServiceRoute extends BasicRoute {
   default?: boolean
 }
 
-export interface BasicRoute {
-  type: AppType
-  service?: string
-  host?: string
-  port?: number
-  base?: string
-  resolved: boolean
+export interface ResolvedServiceRoute extends CommonServiceRoute {
+  host: string
 }
 
-export interface ResolvedServiceRoute extends CommonServiceRoute {
+/** Where a route actually answers, once its service has been picked. */
+export interface RouteAddress {
   host: string
-  resolved: true
+  port?: number
+  base?: string
+  secure: boolean
+  protocol: RouteProtocols
 }
 
-export interface CommonRouteModel {
-  route: CommonRoute
-  resolve: <C extends BasicConfig, T extends BasicContext<C>>(context: T) => Promise<CommonRoute>
+/**
+ * The model wrapping a declaration. It carries no resolution state of its own — every address
+ * question is answered from the declaration plus the context that asks.
+ */
+export interface RouteModel {
+  route: RouteDeclaration
 }
 
-export interface RouteOptions extends Partial<CommonRoute> {
+export type RouteParent = string | EntrypointReference
+
+export interface RouteOptions extends Omit<Partial<RouteDeclaration>, 'parent'> {
+  /** A parent protocol is preferred in application declarations; strings remain adapter input. */
+  parent?: RouteParent
 }