@owlmeans/client-entrypoint 0.1.18-rc.2 → 0.1.18-rc.21

package/build/utils/handler.d.ts

@@ -1,6 +1,6 @@
 import type { AbstractRequest, EntrypointHandler } from '@owlmeans/entrypoint';
-import type { EntrypointCall, ClientEntrypointOptions, EntrypointRef, ClientRequest } from '../types.js';
+import type { EntrypointInvoke, EntrypointUrlOptions, ClientEntrypointOptions, EntrypointRef, ClientRequest } from '../types.js';
 export declare const apiHandler: <T, R extends AbstractRequest = AbstractRequest>(ref: EntrypointRef<T, R>) => EntrypointHandler;
-export declare const apiCall: <T, R extends AbstractRequest = AbstractRequest>(ref: EntrypointRef<T, R>, opts?: ClientEntrypointOptions) => EntrypointCall<T, R>;
-export declare const urlCall: <T, R extends ClientRequest = ClientRequest>(ref: EntrypointRef<T, R>, opts?: ClientEntrypointOptions) => EntrypointCall<T, R>;
+export declare const apiInvoke: <T, R extends AbstractRequest = AbstractRequest>(ref: EntrypointRef<T, R>, opts?: ClientEntrypointOptions) => EntrypointInvoke<T, R>;
+export declare const entrypointUrl: <T, R extends ClientRequest = ClientRequest>(ref: EntrypointRef<T, R>, req?: Partial<R>, opts?: EntrypointUrlOptions) => Promise<string>;
 //# sourceMappingURL=handler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/utils/handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE9E,OAAO,KAAK,EAAoB,cAAc,EAAE,uBAAuB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAW1H,eAAO,MAAM,UAAU,EAAE,CACvB,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAC9C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,iBA0B9B,CAAA;AAED,eAAO,MAAM,OAAO,EAAE,CACpB,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAC9C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,uBAAuB,KAAK,cAAc,CAAC,CAAC,EAAE,CAAC,CAyDvD,CAAA;AAE3B,eAAO,MAAM,OAAO,EAAE,CACpB,CAAC,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,EAC1C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,uBAAuB,KAAK,cAAc,CAAC,CAAC,EAAE,CAAC,CA4BjF,CAAA"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/utils/handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAuB,MAAM,sBAAsB,CAAA;AAEnG,OAAO,KAAK,EAAoB,gBAAgB,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAWlJ,eAAO,MAAM,UAAU,EAAE,CACvB,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAC9C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,iBAqC9B,CAAA;AAED,eAAO,MAAM,SAAS,EAAE,CACtB,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAC9C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,uBAAuB,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAwDvD,CAAA;AAE7B,eAAO,MAAM,aAAa,EAAE,CAC1B,CAAC,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,EAC1C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,MAAM,CAmC3F,CAAA"}

package/build/utils/handler.js

@@ -1,8 +1,8 @@
 import { DEFAULT_KEY } from '@owlmeans/client-config';
-import { EntrypointOutcome, provideResponse } from '@owlmeans/entrypoint';
+import { EntrypointOutcome, provideResponse, transportAlias } from '@owlmeans/entrypoint';
 import { validate } from './entrypoint.js';
 import { extractParams } from '@owlmeans/client-route';
-import { PARAM } from '@owlmeans/route';
+import { PARAM, RouteMethod, RouteProtocols } from '@owlmeans/route';
 import { stringify } from 'qs';
 import { assertContext } from '@owlmeans/context';
 import { makeSecurityHelper } from '@owlmeans/config';
@@ -13,20 +13,28 @@ export const apiHandler = (ref) => async (req, res) => {
         throw new SyntaxError('No webService provided');
     }
     const ep = context.entrypoint(req.alias);
-    const route = await ep.route.resolve(context);
-    let alias = typeof context.cfg.webService === 'string'
+    // A route names the protocol it answers on, and a protocol may be carried by something other than
+    // HTTP — a queue, say. Whatever is bound under this protocol takes the call, so a consumer writes
+    // `ep.call(...)` and never learns which of them ran.
+    const transport = transportAlias(ep.route.route.protocol);
+    if (context.hasService(transport)) {
+        req.path = ep.path();
+        return context.service(transport).handle(req, res);
+    }
+    // Which web client carries this call is decided by the service the route answers on — the one it
+    // names, or the one the context picks for its app type when it names none.
+    const route = ep.service();
+    const alias = typeof context.cfg.webService === 'string'
         ? context.cfg.webService
-        : (route.service != null
-            ? context.cfg.webService[route.service] ?? context.cfg.webService[DEFAULT_KEY]
-            : context.cfg.webService[DEFAULT_KEY]);
+        : context.cfg.webService[route.service] ?? context.cfg.webService[DEFAULT_KEY];
     if (alias == null) {
         throw new SyntaxError(`Can't cast web service alias for ${ep.alias} entrypoint`);
     }
     const service = context.service(alias);
-    req.path = ep.getPath();
+    req.path = ep.path();
     return service.handler(req, res);
 };
-export const apiCall = (ref, opts) => (async (req, res) => {
+export const apiInvoke = (ref, opts) => (async (req) => {
     const ep = ref.ref;
     if (ep == null) {
         throw new SyntaxError('Try to make API call before the entrypoint is created');
@@ -35,19 +43,22 @@ export const apiCall = (ref, opts) => (async (req, res) => {
     if (ctx == null) {
         throw new SyntaxError(`No context provided in apiCall for ${ep.alias} entrypoint`);
     }
-    await ep.route.resolve(ctx);
     if (req?.canceled) {
-        return;
+        return { value: null, outcome: EntrypointOutcome.Ok };
     }
     const request = {
         alias: ep.alias,
         params: req?.params ?? {},
-        body: req?.body,
+        // JSON transports must send a body for mutation methods even when the contract has no
+        // payload.  Keeping that rule here makes every typed caller use `call({ params })`, never
+        // an SDK-specific `{ body: {} }` workaround.
+        body: req?.body ?? ([RouteMethod.POST, RouteMethod.PUT, RouteMethod.PATCH]
+            .includes(ep.route.route.method ?? RouteMethod.GET) ? {} : undefined),
         headers: req?.headers ?? {},
         query: req?.query ?? {},
         host: req?.host,
         base: req?.base,
-        path: ep.getPath(),
+        path: ep.path(),
         timeout: req?.timeout,
         signal: req?.signal,
     };
@@ -67,10 +78,6 @@ export const apiCall = (ref, opts) => (async (req, res) => {
             throw e;
         }
     }
-    if (res != null) {
-        await apiHandler(ref)(request, res);
-        return;
-    }
     const reply = provideResponse();
     if (ctx == null && ep.ctx == null) {
         throw new SyntaxError(`Use entrypoint ${ep.alias} without context`);
@@ -79,28 +86,36 @@ export const apiCall = (ref, opts) => (async (req, res) => {
     if (reply.error != null) {
         throw reply.error;
     }
-    return [reply.value ?? null, reply.outcome ?? EntrypointOutcome.Ok];
+    return { value: reply.value ?? null, outcome: reply.outcome ?? EntrypointOutcome.Ok };
 });
-export const urlCall = ref => async (req, res) => {
+export const entrypointUrl = async (ref, req, opts) => {
     const ep = ref.ref;
     if (ep == null) {
         throw new SyntaxError('Try to make URL before the entrypoint is created');
     }
     const ctx = ep.ctx;
     if (ctx == null) {
-        throw new SyntaxError(`No context provided in urlCall for ${ep.alias} entrypoint`);
+        throw new SyntaxError(`No context provided in entrypointUrl for ${ep.alias} entrypoint`);
     }
-    await ep.route.resolve(ctx);
-    const pathParams = extractParams(ep.getPath());
+    // The base is left off here: an in-service URL is addressed relative to it, and the absolute
+    // branch below has `makeUrl` prepend it.
+    const epPath = ep.path();
+    const pathParams = extractParams(epPath);
     let path = pathParams.reduce((p, param) => {
         return p.replace(`${PARAM}${param}`, `${req?.params?.[param]}`);
-    }, ep.getPath()) + (req?.query != null ? `?${stringify(req?.query)}` : '');
-    if (ep.route.route.service !== null && (ctx.cfg.service !== ep.route.route.service
-        || req?.full === true)) {
+    }, epPath) + (req?.query != null ? `?${stringify(req?.query)}` : '');
+    // A socket address is always absolute, whoever owns the route. `new WebSocket(path)` resolves a
+    // relative value against the PAGE's origin, which in a split deployment is the web host and not
+    // the service that answers the upgrade — so the handshake goes somewhere that never speaks it
+    // and dies on a gateway timeout. Only a same-origin HTTP route benefits from staying relative.
+    const socket = ep.route.route.protocol === RouteProtocols.SOCKET;
+    // Locality is a question about the RESOLVED service, not about what the declaration happens to
+    // name: a route that names no service belongs to the asking context, and addressing it absolutely
+    // would turn in-app navigation into a full page load.
+    if (socket || !ep.isLocal() || opts?.absolute === true) {
         const helper = makeSecurityHelper(ctx);
-        path = helper.makeUrl(ep.route.route, path, { host: req?.host, base: req?.base, forceUnsecure: req?.unsecure });
+        path = helper.makeUrl(ep.address(), path, { host: req?.host, base: req?.base, forceUnsecure: req?.unsecure });
     }
-    res?.resolve(path, EntrypointOutcome.Ok);
-    return [path, EntrypointOutcome.Ok];
+    return path;
 };
 //# sourceMappingURL=handler.js.map

package/build/utils/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/utils/handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/utils/handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAGrD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAEzF,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAKrD,MAAM,CAAC,MAAM,UAAU,GAE4B,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC7E,MAAM,QAAQ,GAAG,iCAAiC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,CAAA;IAClE,MAAM,OAAO,GAAG,aAAa,CAAkB,GAAG,CAAC,GAAG,EAAE,GAAc,EAAE,QAAQ,CAAC,CAAA;IAEjF,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;QACnC,MAAM,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAA;IACjD,CAAC;IAED,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAmB,GAAG,CAAC,KAAK,CAAC,CAAA;IAE1D,kGAAkG;IAClG,kGAAkG;IAClG,qDAAqD;IACrD,MAAM,SAAS,GAAG,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IACzD,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAClC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAA;QAEpB,OAAO,OAAO,CAAC,OAAO,CAAsB,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACzE,CAAC;IAED,iGAAiG;IACjG,2EAA2E;IAC3E,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,EAAE,CAAA;IAE1B,MAAM,KAAK,GAAuB,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,QAAQ;QAC1E,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU;QACxB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;IAEhF,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAClB,MAAM,IAAI,WAAW,CAAC,oCAAoC,EAAE,CAAC,KAAK,aAAa,CAAC,CAAA;IAClF,CAAC;IAED,MAAM,OAAO,GAAc,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAEjD,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAA;IAEpB,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAU,CAAC,CAAA;AACzC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAGpB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IAC5B,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAA;IAClB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;QACf,MAAM,IAAI,WAAW,CAAC,uDAAuD,CAAC,CAAA;IAChF,CAAC;IACD,MAAM,GAAG,GAAG,EAAE,CAAC,GAAG,CAAA;IAClB,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,WAAW,CAAC,sCAAsC,EAAE,CAAC,KAAK,aAAa,CAAC,CAAA;IACpF,CAAC;IAED,IAAI,GAAG,EAAE,QAAQ,EAAE,CAAC;QAClB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,CAAC,EAAE,EAAE,CAAA;IACvD,CAAC;IAED,MAAM,OAAO,GAAoB;QAC/B,KAAK,EAAE,EAAE,CAAC,KAAK;QACf,MAAM,EAAE,GAAG,EAAE,MAAM,IAAI,EAAE;QACzB,sFAAsF;QACtF,0FAA0F;QAC1F,6CAA6C;QAC7C,IAAI,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC;aACvE,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACvE,OAAO,EAAE,GAAG,EAAE,OAAO,IAAI,EAAE;QAC3B,KAAK,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE;QACvB,IAAI,EAAE,GAAG,EAAE,IAAI;QACf,IAAI,EAAE,GAAG,EAAE,IAAI;QACf,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE;QACf,OAAO,EAAE,GAAG,EAAE,OAAO;QACrB,MAAM,EAAE,GAAG,EAAE,MAAM;KACpB,CAAA;IACD,IAAI,GAAG,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;QACzB,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE;YAChB,MAAM,EAAE,CAAA;YACR,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAA;QACzB,CAAC,CAAA;IACH,CAAC;IACD,IAAI,IAAI,EAAE,cAAc,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAA;QAC9B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAChB,MAAM,CAAC,CAAA;QACT,CAAC;IACH,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,EAAW,CAAA;IACxC,IAAI,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QAClC,MAAM,IAAI,WAAW,CAAC,kBAAkB,EAAE,CAAC,KAAK,kBAAkB,CAAC,CAAA;IACrE,CAAC;IACD,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACrC,IAAI,KAAK,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,KAAK,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,iBAAiB,CAAC,EAAE,EAAE,CAAA;AACvF,CAAC,CAA0B,CAAA;AAE7B,MAAM,CAAC,MAAM,aAAa,GAEsE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IACvH,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAA;IAClB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;QACf,MAAM,IAAI,WAAW,CAAC,kDAAkD,CAAC,CAAA;IAC3E,CAAC;IACD,MAAM,GAAG,GAAG,EAAE,CAAC,GAAG,CAAA;IAClB,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,WAAW,CAAC,4CAA4C,EAAE,CAAC,KAAK,aAAa,CAAC,CAAA;IAC1F,CAAC;IAED,6FAA6F;IAC7F,yCAAyC;IACzC,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,EAAE,CAAA;IACxB,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IACxC,IAAI,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACxC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,KAAK,GAAG,KAAK,EAAE,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,CAAC,KAAgC,CAAC,EAAE,CAAC,CAAA;IAC5F,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAEpE,gGAAgG;IAChG,gGAAgG;IAChG,8FAA8F;IAC9F,+FAA+F;IAC/F,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,KAAK,cAAc,CAAC,MAAM,CAAA;IAEhE,+FAA+F;IAC/F,kGAAkG;IAClG,sDAAsD;IACtD,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE,QAAQ,KAAK,IAAI,EAAE,CAAC;QACvD,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;QACtC,IAAI,GAAG,MAAM,CAAC,OAAO,CACnB,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,CACvF,CAAA;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/client-entrypoint",
-  "version": "0.1.18-rc.2",
+  "version": "0.1.18-rc.21",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -28,15 +28,15 @@
     }
   },
   "dependencies": {
-    "@owlmeans/api": "^0.1.18-rc.2",
-    "@owlmeans/client-config": "^0.1.18-rc.2",
-    "@owlmeans/client-context": "^0.1.18-rc.2",
-    "@owlmeans/client-route": "^0.1.18-rc.2",
-    "@owlmeans/config": "^0.1.18-rc.2",
-    "@owlmeans/context": "^0.1.18-rc.2",
-    "@owlmeans/entrypoint": "^0.1.18-rc.2",
-    "@owlmeans/error": "^0.1.18-rc.2",
-    "@owlmeans/route": "^0.1.18-rc.2",
+    "@owlmeans/api": "^0.1.18-rc.21",
+    "@owlmeans/client-config": "^0.1.18-rc.20",
+    "@owlmeans/client-context": "^0.1.18-rc.21",
+    "@owlmeans/client-route": "^0.1.18-rc.21",
+    "@owlmeans/config": "^0.1.18-rc.20",
+    "@owlmeans/context": "^0.1.18-rc.16",
+    "@owlmeans/entrypoint": "^0.1.18-rc.19",
+    "@owlmeans/error": "^0.1.18-rc.16",
+    "@owlmeans/route": "^0.1.18-rc.17",
     "ajv-formats": "^3.0.1",
     "qs": "^6.13.0"
   },

package/src/entrypoint.ts

@@ -1,60 +1,54 @@
-import type { ClientRouteModel } from '@owlmeans/client-route'
 import type { ClientEntrypoint, ClientEntrypointOptions, EntrypointRef, RefedEntrypointHandler } from './types.js'
 import type { AbstractRequest, CommonEntrypoint } from '@owlmeans/entrypoint'
-import { isEntrypoint, makeBasicEntrypoint, normalizeHelperParams, validate } from './utils/entrypoint.js'
-import { isClientRouteModel, route } from '@owlmeans/client-route'
-import { apiCall, apiHandler, urlCall } from './utils/handler.js'
+import { validate } from './utils/entrypoint.js'
+import { route } from '@owlmeans/client-route'
+import { apiInvoke, apiHandler, entrypointUrl } from './utils/handler.js'
 import { AppType } from '@owlmeans/context'
-import type { BasicContext } from '@owlmeans/context'
-import { normalizePath } from '@owlmeans/route'
-import type { CommonRouteModel } from '@owlmeans/route'
 import { provideRequest } from './helper.js'
 
-export const entrypoint = <T, R extends AbstractRequest = AbstractRequest>(
-  arg: CommonEntrypoint | ClientRouteModel | CommonRouteModel,
-  handler?: RefedEntrypointHandler<T, R> | ClientEntrypointOptions | boolean,
-  opts?: ClientEntrypointOptions | boolean
+/** Attach client behaviour to an entrypoint already materialized from a protocol. */
+export const bindMaterializedEntrypoint = <T, R extends AbstractRequest = AbstractRequest>(
+  arg: CommonEntrypoint,
+  handler?: RefedEntrypointHandler<T, R>,
+  opts?: ClientEntrypointOptions,
 ): ClientEntrypoint<T, R> => {
   const entrypointHandle: EntrypointRef<T, R> = { ref: undefined }
 
   let _entrypoint: ClientEntrypoint<T, R>
 
-  ;[handler, opts] = normalizeHelperParams(handler, opts)
-
-  const _handler = handler as RefedEntrypointHandler<T, R> | undefined ??
-    (('route' in arg.route ? arg.route.route.type : arg.route.type)
-      === AppType.Backend ? apiHandler : undefined)
-
-  if (isEntrypoint(arg)) {
-    assertExplicitHandler(arg.route.route.type, handler as RefedEntrypointHandler<T, R>)
-    const routeModel = route(arg.route, opts?.routeOptions)
-    _entrypoint = arg as ClientEntrypoint<T, R>
-    _entrypoint.route = routeModel
-    _entrypoint.guards = opts?.guards ?? arg.guards
-    _entrypoint.filter = opts?.filter ?? arg.filter
-    _entrypoint.gate = opts?.gate ?? arg.gate
-    _entrypoint.gateParams = opts?.gateParams ?? arg.gateParams
-  } else if (isClientRouteModel(arg)) {
-    assertExplicitHandler(arg.route.type, handler as RefedEntrypointHandler<T, R>)
-    _entrypoint = makeBasicEntrypoint(arg, { ...opts }) as ClientEntrypoint<T, R>
-    _entrypoint.route = arg
-  } else {
-    assertExplicitHandler(arg.route.type, handler as RefedEntrypointHandler<T, R>)
-    const _route = route(arg, opts?.routeOptions)
-    _entrypoint = makeBasicEntrypoint(_route, { ...opts }) as ClientEntrypoint<T, R>
-    _entrypoint.route = _route
-  }
-
-  _entrypoint.getPath = (partial?: boolean) =>
-    partial === true ? normalizePath(_entrypoint.route.route.partialPath) : _entrypoint.route.route.path
+  const _handler = handler ?? (arg.route.route.type === AppType.Backend ? apiHandler : undefined)
+
+  assertExplicitHandler(arg.route.route.type, handler)
+  const routeModel = route(arg.route, opts?.routeOptions)
+  _entrypoint = arg as ClientEntrypoint<T, R>
+  _entrypoint.route = routeModel
+  // Binding adds guards, it never swaps them: what the declaration carries still applies.
+  _entrypoint.guards = [...new Set([...(arg.guards ?? []), ...(opts?.guards ?? [])])]
+  _entrypoint.filter = opts?.filter ?? arg.filter
+  _entrypoint.gate = opts?.gate ?? arg.gate
+  _entrypoint.gateParams = opts?.gateParams ?? arg.gateParams
+
+  _entrypoint.url = ((req?: Partial<R>, urlOpts?: { absolute?: boolean }) =>
+    entrypointUrl<T, R>(entrypointHandle, req as never, urlOpts)) as ClientEntrypoint<T, R>['url']
+
+  // An entrypoint carrying a renderer IS a screen: it is addressed by URL, never called over the
+  // wire. Saying so here turns what used to be a URL-shaped answer from `call()` into a report.
+  _entrypoint.invoke = (handler != null
+    ? (async () => {
+      throw new SyntaxError(
+        `Entrypoint ${_entrypoint.alias} renders a screen - address it with url() instead of call()/invoke()`
+      )
+    })
+    : apiInvoke<T, R>(entrypointHandle, opts)) as ClientEntrypoint<T, R>['invoke']
 
-  _entrypoint.call = handler != null ? urlCall<T, R>(entrypointHandle, opts) : apiCall<T, R>(entrypointHandle, opts)
+  _entrypoint.call = (async (req?: Partial<R>) =>
+    (await _entrypoint.invoke(req)).value) as ClientEntrypoint<T, R>['call']
 
   _entrypoint.request = ((request: R): R => {
     if (entrypointHandle.ref == null) {
       throw SyntaxError(`Try to request uninitialized entrypoint ${JSON.stringify(arg)}`)
     }
-    const _request = provideRequest(entrypointHandle.ref.getAlias(), entrypointHandle.ref.getPath()) as R
+    const _request = provideRequest(entrypointHandle.ref.alias, entrypointHandle.ref.path()) as R
 
     request != null && Object.entries(request).forEach(([key, value]) => {
       _request[key as keyof R] = value
@@ -67,13 +61,6 @@ export const entrypoint = <T, R extends AbstractRequest = AbstractRequest>(
 
   _entrypoint.validate = validate(entrypointHandle)
 
-  _entrypoint.reinitializeContext = <T>(context: BasicContext<any>) => {
-    const newEntrypoint = entrypoint(_entrypoint.route, handler, opts)
-    newEntrypoint.ctx = context
-
-    return newEntrypoint as T
-  }
-
   entrypointHandle.ref = _entrypoint
 
   return _entrypoint

package/src/helper.ts

@@ -1,31 +1,7 @@
-import type { ClientEntrypoint, ClientEntrypointOptions, RefedEntrypointHandler } from './types.js'
-import { entrypoint } from './entrypoint.js'
-import { isClientRouteModel } from '@owlmeans/client-route'
-import type { AbstractRequest, CommonEntrypoint } from '@owlmeans/entrypoint'
-import { normalizeHelperParams } from './utils/entrypoint.js'
+import type { RefedEntrypointHandler } from './types.js'
+import type { AbstractRequest } from '@owlmeans/entrypoint'
 import type { JSONSchemaType } from "ajv"
 
-export const elevate = <T = {}, R extends AbstractRequest = AbstractRequest>(
-  entrypoints: (CommonEntrypoint | ClientEntrypoint<T, R>)[],
-  alias: string,
-  handler?: RefedEntrypointHandler<T, R> | ClientEntrypointOptions | boolean,
-  opts?: ClientEntrypointOptions | boolean
-): ClientEntrypoint<T, R>[] => {
-  [handler, opts] = normalizeHelperParams(handler, opts)
-
-  const idx = entrypoints.findIndex(({ route }) => route.route.alias === alias)
-  if (idx === -1) {
-    throw new SyntaxError(`Entrypoint with alias ${alias} not present`)
-  }
-  if (isClientRouteModel(entrypoints[idx].route) && opts?.force !== true) {
-    throw new SyntaxError(`Entrypoint with alias ${alias} is already elevated`)
-  }
-
-  entrypoints[idx] = entrypoint(entrypoints[idx], handler, opts)
-
-  return entrypoints as ClientEntrypoint<T, R>[]
-}
-
 export const stab: RefedEntrypointHandler<{}> = () => () => {
   return void 0 as any
 }

package/src/index.ts

@@ -1,5 +1,5 @@
 
-export * from './helper.js'
 export type * from './types.js'
-export * from './entrypoint.js'
 export * from './errors.js'
+export * from './protocol.js'
+export { pickPerSchema, provideRequest, stab } from './helper.js'

package/src/protocol.ts

@@ -0,0 +1,39 @@
+import { materializeEntrypoint, protocols } from '@owlmeans/entrypoint'
+import type { EntrypointProtocolDeclaration, EntrypointTree } from '@owlmeans/entrypoint'
+import { bindMaterializedEntrypoint } from './entrypoint.js'
+import type {
+  ClientEntrypointOptions, ClientProtocolEntrypoint, RefedEntrypointHandler,
+} from './types.js'
+
+/** Bind a shared protocol to the client context without changing the declaration itself. */
+export const bind = <Protocol extends EntrypointProtocolDeclaration>(
+  protocol: Protocol,
+  options?: ClientEntrypointOptions,
+): ClientProtocolEntrypoint<Protocol> => {
+  const bound = Object.assign(bindMaterializedEntrypoint(
+    materializeEntrypoint(protocol),
+    undefined,
+    options,
+  ), { protocol })
+
+  return bound as ClientProtocolEntrypoint<Protocol>
+}
+
+/** Materialize every protocol in an exported declaration tree for a browser context. */
+export const bindAll = (tree: EntrypointTree): ClientProtocolEntrypoint<EntrypointProtocolDeclaration>[] =>
+  protocols(tree).map(protocol => bind(protocol))
+
+/** Bind a frontend protocol to the component that renders it. */
+export const bindScreen = <Protocol extends EntrypointProtocolDeclaration>(
+  protocol: Protocol,
+  handler: RefedEntrypointHandler,
+  options?: ClientEntrypointOptions,
+): ClientProtocolEntrypoint<Protocol> => {
+  const bound = Object.assign(bindMaterializedEntrypoint(
+    materializeEntrypoint(protocol),
+    handler,
+    options,
+  ), { protocol })
+
+  return bound as ClientProtocolEntrypoint<Protocol>
+}

package/src/types.ts

@@ -1,18 +1,62 @@
 import type { ClientRouteModel, ClientRouteOptions } from '@owlmeans/client-route'
-import type { AbstractRequest, AbstractResponse, CommonEntrypoint, CommonEntrypointOptions, EntrypointHandler, EntrypointOutcome } from '@owlmeans/entrypoint'
+import type {
+  AbstractRequest, CommonEntrypoint, CommonEntrypointOptions, EntrypointHandler,
+  EntrypointOutcome, EntrypointProtocolDeclaration, RegisteredEntrypoint, RequestOf,
+} from '@owlmeans/entrypoint'
 
 export interface ClientEntrypoint<T = {}, R extends ClientRequest = ClientRequest> extends CommonEntrypoint {
   route: ClientRouteModel
+  /**
+   * Address the entrypoint and resolve to what it answered. The reply's error is thrown, so a
+   * caller that only needs the value never inspects an outcome.
+   */
   call: EntrypointCall<T, R>
+  /**
+   * The same round trip as {@link ClientEntrypoint.call}, resolving to the value AND the outcome.
+   * Use it only where the outcome decides what happens next.
+   */
+  invoke: EntrypointInvoke<T, R>
+  /**
+   * Build the URL this entrypoint addresses, with `:params` filled in and the query appended.
+   * Absolute when the route belongs to another service, or when `absolute` is asked for.
+   */
+  url: EntrypointUrl<R>
   validate: EntrypointFilter<R>
-  getPath: (partial?: boolean) => string
   request: (request?: Partial<R>) => R
 }
 
+/**
+ * The context-bound client view of a protocol.  Unlike the legacy `ClientEntrypoint` generic,
+ * its request and reply types are read directly from the declaration and cannot be replaced at a
+ * call site.
+ */
+export type ClientProtocolEntrypoint<Protocol extends EntrypointProtocolDeclaration> =
+  Omit<ClientEntrypoint, 'call' | 'invoke' | 'url' | 'validate' | 'request'>
+  & RegisteredEntrypoint<RequestOf<Protocol>, import('@owlmeans/entrypoint').ResponseOf<Protocol>>
+  & {
+    readonly protocol: Protocol
+  }
+
 export interface EntrypointCall<T, Req extends ClientRequest = ClientRequest> {
-  <
-    Type extends T, R extends Req = Req, P extends AbstractResponse<Type> = AbstractResponse<Type>
-  >(req?: Partial<R>, res?: P): Promise<[Type, EntrypointOutcome]>
+  <Type extends T, R extends Req = Req>(req?: Partial<R>): Promise<Type>
+}
+
+export interface EntrypointInvoke<T, Req extends ClientRequest = ClientRequest> {
+  <Type extends T, R extends Req = Req>(req?: Partial<R>): Promise<EntrypointReply<Type>>
+}
+
+export interface EntrypointReply<T> {
+  value: T
+  outcome: EntrypointOutcome
+}
+
+export interface EntrypointUrl<Req extends ClientRequest = ClientRequest> {
+  <R extends Req = Req>(req?: Partial<R>, opts?: EntrypointUrlOptions): Promise<string>
+}
+
+export interface EntrypointUrlOptions {
+  /** Force a fully qualified URL even when the route belongs to the current service. */
+  absolute?: boolean
 }
 
 export interface EntrypointFilter<Req extends AbstractRequest = AbstractRequest> {
@@ -20,14 +64,9 @@ export interface EntrypointFilter<Req extends AbstractRequest = AbstractRequest>
 }
 
 export interface ClientRequest<T extends {} = {}> extends AbstractRequest<T> {
-  full?: boolean
 }
 
 export interface ClientEntrypointOptions extends CommonEntrypointOptions {
-  /**
-   * Force entrypoint to be elevated even if it is already elevated
-   */
-  force?: boolean
   routeOptions?: ClientRouteOptions
   validateOnCall?: boolean
 }
@@ -36,6 +75,6 @@ export interface EntrypointRef<T, R extends AbstractRequest = AbstractRequest> {
   ref?: ClientEntrypoint<T, R>
 }
 
-export interface RefedEntrypointHandler<T, R extends AbstractRequest = AbstractRequest> {
+export interface RefedEntrypointHandler<T = {}, R extends AbstractRequest = AbstractRequest> {
   (ref: EntrypointRef<T, R>): EntrypointHandler
 }

package/src/utils/entrypoint.ts

@@ -1,12 +1,11 @@
 import Ajv from 'ajv'
 import type { ErrorObject } from 'ajv'
-import type { EntrypointFilter, ClientEntrypointOptions } from '../types.js'
+import type { EntrypointFilter } from '../types.js'
 import { ClientValidationError } from '../errors.js'
 import type { AbstractRequest } from '@owlmeans/entrypoint'
-import type { EntrypointRef, RefedEntrypointHandler } from '../types.js'
+import type { EntrypointRef } from '../types.js'
 import formatsPlugin from 'ajv-formats'
 
-export { entrypoint as makeBasicEntrypoint } from '@owlmeans/entrypoint'
 export { isEntrypoint } from '@owlmeans/entrypoint/utils'
 
 const ajv = new Ajv({ strict: false })
@@ -50,17 +49,3 @@ export const validate: <T, R extends AbstractRequest = AbstractRequest>(ref: Ent
 
     return true
   }
-
-export const normalizeHelperParams = <T, R extends AbstractRequest = AbstractRequest>(
-  handler?: RefedEntrypointHandler<T, R> | ClientEntrypointOptions | boolean,
-  opts?: ClientEntrypointOptions | boolean
-): [RefedEntrypointHandler<T, R> | undefined, ClientEntrypointOptions | undefined] => {
-  if (typeof handler !== 'function' && handler != null) {
-    opts = handler as ClientEntrypointOptions | boolean
-    handler = undefined
-  }
-
-  opts = typeof opts === 'boolean' ? { validateOnCall: opts } : opts
-
-  return [handler, opts]
-}