@owlmeans/api 0.1.18-rc.40 → 0.1.18-rc.42

package/README.md

@@ -12,7 +12,7 @@ HTTP API client service for OwlMeans client contexts — carries entrypoint call
 ## Installation
 
 ```bash
-bun add @owlmeans/api@^0.1.18-rc.40
+bun add @owlmeans/api@^0.1.18-rc.42
 ```
 
 ## Usage
@@ -41,6 +41,14 @@ Creates an HTTP client service. `alias` defaults to `DEFAULT_ALIAS` (`'web-clien
 
 Registers the API client in the context.
 
+### Request bodies
+
+Objects and arrays go as JSON. A string, number or boolean body on a `POST` without a
+`content-type`, or under a JSON `content-type` on any method, is `JSON.stringify`'d, so the server
+parses back the same value (`'abc'` travels as `"abc"`). A string that already is JSON text is sent
+as it is — except under a `type: 'string'` body contract, where only a JSON string literal counts
+as serialized and `'123'` arrives as the string `'123'`.
+
 ### Error Classes
 
 - `ApiError` — base API error
@@ -65,7 +73,7 @@ This package ships embedded agent skills under `agent-meta/`. After installing y
 your project's skill store (`.agents/skills/`):
 
 ```sh
-npx @owlmeans/agent-skills@^0.1.18-rc.41
+npx @owlmeans/agent-skills@^0.1.18-rc.44
 ```
 
 The embedded files are version-matched to this package release. Do not edit them

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/api",
-  "version": "0.1.18-rc.40",
-  "generatedAt": "2026-09-28T02:06:37.895Z",
+  "version": "0.1.18-rc.42",
+  "generatedAt": "2026-09-30T09:41:02.842Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

package/agent-meta/skills/api/SKILL.md

@@ -8,7 +8,7 @@ user-invocable: false
 # @owlmeans/api
 
 **Layer:** Core
-**Install:** `"@owlmeans/api": "^0.1.18-rc.40"` in `dependencies`
+**Install:** `"@owlmeans/api": "^0.1.18-rc.42"` in `dependencies`
 
 ## Key Exports
 
@@ -51,8 +51,27 @@ These live on the request the caller passes and are forwarded to the transport:
   peer hangs forever unless a caller bounds it.
 - `signal` — an `AbortSignal`, which aborts the request in flight.
 - `headers` — a `content-type` of `application/x-www-form-urlencoded` makes the body serialize
-  through `qs` instead of JSON. A string body on a `POST` with no `content-type` gets
-  `application/json` and is sent verbatim rather than re-quoted.
+  through `qs` instead of JSON; any other `content-type` the caller sets is kept.
+
+## Request bodies
+
+The body travels as JSON the server parses back to the value the caller passed:
+
+| Body | On the wire |
+|---|---|
+| Object or array | JSON, serialized by axios — as always |
+| String, number or boolean on a `POST` with no `content-type` | `content-type: application/json`, `JSON.stringify`'d (`'abc'` → `"abc"`, `42`, `true`) |
+| String, number or boolean under a JSON `content-type` (`application/json`, `*+json`), any method | `JSON.stringify`'d |
+| A string that already IS JSON text (`'{"a":1}'`, `'"abc"'`) | Sent as it is — a caller that serialized it itself keeps working |
+| Any scalar under another `content-type` (`text/plain`), or with none on a non-`POST` | Untouched |
+
+Under a body schema of `type: 'string'` (the protocol's contract, read from the entrypoint's
+`filter.body`) a string is always a value: `'123'`, `'true'` or `'{…}'` arrive as those strings,
+and only a JSON string literal counts as pre-serialized. Without a string contract a string that
+parses as JSON is taken as serialized, so send a plain string that looks like JSON through a
+`type: 'string'` contract. The caller's `headers` object is never rewritten. A bare unquoted string
+under `application/json` is invalid JSON — `@owlmeans/server-api` answers it 400 — which is why it
+is never sent.
 
 ## Reading the answer
 

package/build/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAM3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAa3D,KAAK,MAAM,GAAG,iBAAiB,CAAA;AAE/B,UAAU,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;CACnE;AAED,eAAO,MAAM,gBAAgB,WAAW,MAAM,KAAmB,SA+FhE,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,UAAS,MAAM,KAAmB,CAU/G,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAO3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAW3D,KAAK,MAAM,GAAG,iBAAiB,CAAA;AAE/B,UAAU,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;CACnE;AAED,eAAO,MAAM,gBAAgB,WAAW,MAAM,KAAmB,SAsFhE,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,UAAS,MAAM,KAAmB,CAU/G,CAAA"}

package/build/service.js

@@ -2,10 +2,9 @@ import { assertContext, createService } from '@owlmeans/context';
 import { extractParams } from '@owlmeans/client-route';
 import axios from 'axios';
 import { DEFAULT_ALIAS, UNAUTHORIZED_ERROR } from './consts.js';
+import { requestBodyOf } from './utils/body.js';
 import { processResponse } from './utils/handler.js';
-import qs from 'qs';
 import { makeSecurityHelper } from '@owlmeans/config';
-import { RouteMethod } from '@owlmeans/route';
 import { AUTH_HEADER, DEF_AUTH_SRV, TOKEN_UPDATE } from '@owlmeans/auth-common';
 /** Whether a request carried an authentication header of its own. */
 const presented = (headers) => headers != null && Object.entries(headers).some(([key, value]) => key.toLowerCase() === AUTH_HEADER && value != null && value !== '');
@@ -31,22 +30,18 @@ export const createApiService = (alias = DEFAULT_ALIAS) => {
             // The entrypoint answers where it lives — host, port, base, protocol and whether the hop is
             // TLS — from its declaration and the service it names. A per-request host still overrides it.
             const url = helper.makeUrl(module.address(), path, { host: request.host, base: request.base, forceUnsecure: request.unsecure });
-            let transformer = undefined;
-            let body = request.body != null && Object.entries((request.headers ?? {})).find(([key, value]) => key.toLowerCase() === 'content-type' && value?.includes('application/x-www-form-urlencoded')) ? qs.stringify(request.body) : request.body;
-            // @TODO Probably this hack needs to be made a little bit less dirty
-            if (typeof body === 'string' && route.method === RouteMethod.POST) {
-                if (Object.keys(request.headers).every(key => key.toLowerCase() !== 'content-type')) {
-                    request.headers['content-type'] = 'application/json';
-                    // It fixes the case when final rest api under application/json can't
-                    // properly accept canonized jsoned string value (put into quotes)
-                    transformer = data => data;
-                }
-            }
+            // A scalar JSON body (a string, a number, a boolean) is serialized here, so the server parses
+            // back the value the caller sent; objects and arrays are left to axios.
+            const body = requestBodyOf(request.body, request.headers, route.method, module.filter?.body);
+            const transformer = body.verbatim ? data => data : undefined;
+            const requestHeaders = body.contentType != null
+                ? { ...request.headers, 'content-type': body.contentType }
+                : request.headers;
             const response = await axios.request({
                 url, method: route.method,
                 params: request.query,
-                data: body,
-                headers: request.headers,
+                data: body.data,
+                headers: requestHeaders,
                 transformRequest: transformer,
                 validateStatus: () => true,
                 // Per-request timeout (ms); axios aborts the request and rejects on expiry.

package/build/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEhE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAEtD,OAAO,KAAuB,MAAM,OAAO,CAAA;AAG3C,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAG/E,qEAAqE;AACrE,MAAM,SAAS,GAAG,CAAC,OAAiC,EAAW,EAAE,CAC/D,OAAO,IAAI,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAC7C,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,WAAW,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,KAAK,EAAE,CACrF,CAAA;AAOH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAK,GAAW,aAAa,EAAa,EAAE;IAC3E,MAAM,QAAQ,GAAG,eAAe,KAAK,EAAE,CAAA;IACvC,MAAM,MAAM,GAAc,aAAa,CAAY,KAAK,EAAE;QACxD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;YAChC,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAC9B,OAAM;YACR,CAAC;YACD,MAAM,OAAO,GAAG,aAAa,CAAkB,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;YACpE,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAmB,OAAO,CAAC,KAAK,CAAC,CAAA;YAClE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAA;YAChC,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;YACxB,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;YAClC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBAEnC,IAAI,OAAO,CAAC,MAAM,CAAC,KAAY,CAAC,IAAI,IAAI,EAAE,CAAC;oBACzC,MAAM,IAAI,WAAW,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAA;gBACtD,CAAC;gBACD,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,KAAY,CAAC,EAAE,CAAC,CAAA;YACrE,CAAC,EAAE,IAAI,CAAC,CAAA;YAER,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;YAE1C,4FAA4F;YAC5F,8FAA8F;YAC9F,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CACxB,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EACtB,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,QAAQ,EAAE,CAC5E,CAAA;YAED,IAAI,WAAW,GAAwC,SAAS,CAAA;YAEhE,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAC7E,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CACf,GAAG,CAAC,WAAW,EAAE,KAAK,cAAc,IAAI,KAAK,EAAE,QAAQ,CAAC,mCAAmC,CAAC,CAC/F,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAA;YAE7C,oEAAoE;YACpE,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;gBAClE,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC,EAAE,CAAC;oBACpF,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAA;oBACpD,qEAAqE;oBACrE,kEAAkE;oBAClE,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAA;gBAC5B,CAAC;YACH,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC;gBACnC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM;gBACzB,MAAM,EAAE,OAAO,CAAC,KAAK;gBACrB,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,gBAAgB,EAAE,WAAW;gBAC7B,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI;gBAC1B,4EAA4E;gBAC5E,uEAAuE;gBACvE,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,6EAA6E;gBAC7E,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAA;YAEF,8EAA8E;YAC9E,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAuB,CAAA;YAChD,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAClE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAc,YAAY,CAAC,CAAA;gBACvD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAW,CAAA;gBAClD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,IAAI,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;YACzE,CAAC;iBAAM,IACL,QAAQ,CAAC,MAAM,KAAK,kBAAkB;mBACnC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;mBAC1B,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EACnC,CAAC;gBACD;;;;;;;;;;;mBAWG;gBACH,MAAM,OAAO,CAAC,OAAO,CAAc,YAAY,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YACpE,CAAC;YAED,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;YAEhC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAQ,CAAA;QAC3D,CAAC;KACF,EAAE,OAAO,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE;QACvB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAA;IAC5B,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAyC,GAAM,EAAE,KAAK,GAAW,aAAa,EAAK,EAAE;IAClH,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;IAEvC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IAE5B,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;QAC/B,GAAG,CAAC,GAAG,CAAC,UAAU,GAAG,KAAK,CAAA;IAC5B,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}

package/build/utils/body.d.ts

@@ -0,0 +1,34 @@
+import { RouteMethod } from '@owlmeans/route';
+export declare const JSON_CONTENT_TYPE = "application/json";
+/** The request's own `content-type`, whatever case its key is written in. */
+export declare const contentTypeOf: (headers?: Record<string, unknown>) => string | undefined;
+/** `application/json` or a `+json` suffix type, with or without parameters. */
+export declare const isJsonContentType: (type?: string) => boolean;
+/**
+ * The JSON text a scalar body travels as, so the server parses it back to the same value.
+ *
+ * A number or a boolean is `JSON.stringify`'d. A string is a value unless it is already JSON text:
+ * one that does not parse is quoted; one that parses is sent as it is (the caller serialized it
+ * itself) — except under a body schema of `type: 'string'`, where only a JSON string literal
+ * counts as serialized and `123`, `true` or `{…}` are the text the caller means.
+ */
+export declare const jsonScalarBody: (body: string | number | boolean, schema?: object) => string;
+export interface RequestBody {
+    /** What axios is handed as `data`. */
+    data: unknown;
+    /** A `content-type` the request lacked and must carry. */
+    contentType?: string;
+    /** `data` is final text — axios must not transform it again. */
+    verbatim: boolean;
+}
+/**
+ * What a request's body becomes on the wire.
+ *
+ * - A `x-www-form-urlencoded` request: the body through `qs`.
+ * - A string, number or boolean under a JSON `content-type` — the caller's, or `application/json`
+ *   supplied for a `POST` that names none — becomes JSON text ({@link jsonScalarBody}).
+ * - Anything else — objects, arrays, a scalar under another content type — goes to axios as it is,
+ *   which serializes an object or an array as JSON.
+ */
+export declare const requestBodyOf: (body: unknown, headers: Record<string, unknown> | undefined, method?: RouteMethod, schema?: object) => RequestBody;
+//# sourceMappingURL=body.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../src/utils/body.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,eAAO,MAAM,iBAAiB,qBAAqB,CAAA;AAInD,6EAA6E;AAC7E,eAAO,MAAM,aAAa,aAAc,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,MAAM,GAAG,SAM1E,CAAA;AAED,+EAA+E;AAC/E,eAAO,MAAM,iBAAiB,UAAW,MAAM,KAAG,OAC+B,CAAA;AAoBjF;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,MAAM,GAAG,OAAO,WAAW,MAAM,KAAG,MAQjF,CAAA;AAED,MAAM,WAAW,WAAW;IAC1B,sCAAsC;IACtC,IAAI,EAAE,OAAO,CAAA;IACb,0DAA0D;IAC1D,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,gEAAgE;IAChE,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,SAClB,OAAO,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,WAAW,WAAW,WAAW,MAAM,KACjG,WAgBF,CAAA"}

package/build/utils/body.js

@@ -0,0 +1,71 @@
+import qs from 'qs';
+import { RouteMethod } from '@owlmeans/route';
+export const JSON_CONTENT_TYPE = 'application/json';
+const FORM_CONTENT_TYPE = 'application/x-www-form-urlencoded';
+/** The request's own `content-type`, whatever case its key is written in. */
+export const contentTypeOf = (headers) => {
+    const value = Object.entries(headers ?? {}).find(([key]) => key.toLowerCase() === 'content-type')?.[1];
+    if (value == null || value === '') {
+        return undefined;
+    }
+    return Array.isArray(value) ? value.join(', ') : `${value}`;
+};
+/** `application/json` or a `+json` suffix type, with or without parameters. */
+export const isJsonContentType = (type) => type != null && /^application\/(?:[^\s;]+\+)?json\s*(?:;|$)/i.test(type.trim());
+/** A JSON value no serializer quotes for us: a string, a number or a boolean. */
+const isScalar = (value) => typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';
+/** Does the entrypoint's body schema declare a string? */
+const stringContract = (schema) => {
+    const type = schema?.type;
+    return (Array.isArray(type) ? type : [type]).includes('string');
+};
+const parse = (text) => {
+    try {
+        return { json: true, value: JSON.parse(text) };
+    }
+    catch {
+        return { json: false };
+    }
+};
+/**
+ * The JSON text a scalar body travels as, so the server parses it back to the same value.
+ *
+ * A number or a boolean is `JSON.stringify`'d. A string is a value unless it is already JSON text:
+ * one that does not parse is quoted; one that parses is sent as it is (the caller serialized it
+ * itself) — except under a body schema of `type: 'string'`, where only a JSON string literal
+ * counts as serialized and `123`, `true` or `{…}` are the text the caller means.
+ */
+export const jsonScalarBody = (body, schema) => {
+    if (typeof body !== 'string') {
+        return JSON.stringify(body);
+    }
+    const parsed = parse(body);
+    const serialized = parsed.json && (!stringContract(schema) || typeof parsed.value === 'string');
+    return serialized ? body : JSON.stringify(body);
+};
+/**
+ * What a request's body becomes on the wire.
+ *
+ * - A `x-www-form-urlencoded` request: the body through `qs`.
+ * - A string, number or boolean under a JSON `content-type` — the caller's, or `application/json`
+ *   supplied for a `POST` that names none — becomes JSON text ({@link jsonScalarBody}).
+ * - Anything else — objects, arrays, a scalar under another content type — goes to axios as it is,
+ *   which serializes an object or an array as JSON.
+ */
+export const requestBodyOf = (body, headers, method, schema) => {
+    const type = contentTypeOf(headers);
+    if (body != null && type?.includes(FORM_CONTENT_TYPE) === true) {
+        return { data: qs.stringify(body), verbatim: false };
+    }
+    if (!isScalar(body)) {
+        return { data: body, verbatim: false };
+    }
+    if (type == null && method === RouteMethod.POST) {
+        return { data: jsonScalarBody(body, schema), contentType: JSON_CONTENT_TYPE, verbatim: true };
+    }
+    if (isJsonContentType(type)) {
+        return { data: jsonScalarBody(body, schema), verbatim: true };
+    }
+    return { data: body, verbatim: false };
+};
+//# sourceMappingURL=body.js.map

package/build/utils/body.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/api",
-  "version": "0.1.18-rc.40",
+  "version": "0.1.18-rc.42",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -29,10 +29,10 @@
     }
   },
   "dependencies": {
-    "@owlmeans/auth-common": "^0.1.18-rc.40",
-    "@owlmeans/client-config": "^0.1.18-rc.38",
-    "@owlmeans/client-route": "^0.1.18-rc.41",
-    "@owlmeans/config": "^0.1.18-rc.38",
+    "@owlmeans/auth-common": "^0.1.18-rc.42",
+    "@owlmeans/client-config": "^0.1.18-rc.39",
+    "@owlmeans/client-route": "^0.1.18-rc.43",
+    "@owlmeans/config": "^0.1.18-rc.39",
     "@owlmeans/context": "^0.1.18-rc.32",
     "@owlmeans/error": "^0.1.18-rc.36",
     "@owlmeans/entrypoint": "^0.1.18-rc.37",
@@ -42,6 +42,7 @@
   },
   "devDependencies": {
     "@owlmeans/dep-config": "workspace:*",
+    "@owlmeans/resource": "^0.1.18-rc.37",
     "@types/qs": "^6.9.16",
     "nodemon": "^3.1.14",
     "typescript": "^7.0.2"

package/src/service.ts

@@ -6,11 +6,10 @@ import axios, { AxiosHeaders } from 'axios'
 import type { AxiosRequestTransformer } from 'axios'
 import type { CommonEntrypoint } from '@owlmeans/entrypoint'
 import { DEFAULT_ALIAS, UNAUTHORIZED_ERROR } from './consts.js'
+import { requestBodyOf } from './utils/body.js'
 import { processResponse } from './utils/handler.js'
 import { BasicClientConfig } from '@owlmeans/client-config'
-import qs from 'qs'
 import { makeSecurityHelper } from '@owlmeans/config'
-import { RouteMethod } from '@owlmeans/route'
 import { AUTH_HEADER, DEF_AUTH_SRV, TOKEN_UPDATE } from '@owlmeans/auth-common'
 import type { AuthService } from '@owlmeans/auth-common'
 
@@ -54,28 +53,19 @@ export const createApiService = (alias: string = DEFAULT_ALIAS): ApiClient => {
         { host: request.host, base: request.base, forceUnsecure: request.unsecure }
       )
 
-      let transformer: AxiosRequestTransformer | undefined = undefined
-
-      let body = request.body != null && Object.entries((request.headers ?? {})).find(
-        ([key, value]) =>
-          key.toLowerCase() === 'content-type' && value?.includes('application/x-www-form-urlencoded')
-      ) ? qs.stringify(request.body) : request.body
-
-      // @TODO Probably this hack needs to be made a little bit less dirty
-      if (typeof body === 'string' && route.method === RouteMethod.POST) {
-        if (Object.keys(request.headers).every(key => key.toLowerCase() !== 'content-type')) {
-          request.headers['content-type'] = 'application/json'
-          // It fixes the case when final rest api under application/json can't
-          // properly accept canonized jsoned string value (put into quotes)
-          transformer = data => data
-        }
-      }
+      // A scalar JSON body (a string, a number, a boolean) is serialized here, so the server parses
+      // back the value the caller sent; objects and arrays are left to axios.
+      const body = requestBodyOf(request.body, request.headers, route.method, module.filter?.body)
+      const transformer: AxiosRequestTransformer | undefined = body.verbatim ? data => data : undefined
+      const requestHeaders = body.contentType != null
+        ? { ...request.headers, 'content-type': body.contentType }
+        : request.headers
 
       const response = await axios.request({
         url, method: route.method,
         params: request.query,
-        data: body,
-        headers: request.headers,
+        data: body.data,
+        headers: requestHeaders,
         transformRequest: transformer,
         validateStatus: () => true,
         // Per-request timeout (ms); axios aborts the request and rejects on expiry.

package/src/utils/body.ts

@@ -0,0 +1,93 @@
+import qs from 'qs'
+import { RouteMethod } from '@owlmeans/route'
+
+export const JSON_CONTENT_TYPE = 'application/json'
+
+const FORM_CONTENT_TYPE = 'application/x-www-form-urlencoded'
+
+/** The request's own `content-type`, whatever case its key is written in. */
+export const contentTypeOf = (headers?: Record<string, unknown>): string | undefined => {
+  const value = Object.entries(headers ?? {}).find(([key]) => key.toLowerCase() === 'content-type')?.[1]
+  if (value == null || value === '') {
+    return undefined
+  }
+  return Array.isArray(value) ? value.join(', ') : `${value}`
+}
+
+/** `application/json` or a `+json` suffix type, with or without parameters. */
+export const isJsonContentType = (type?: string): boolean =>
+  type != null && /^application\/(?:[^\s;]+\+)?json\s*(?:;|$)/i.test(type.trim())
+
+/** A JSON value no serializer quotes for us: a string, a number or a boolean. */
+const isScalar = (value: unknown): value is string | number | boolean =>
+  typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean'
+
+/** Does the entrypoint's body schema declare a string? */
+const stringContract = (schema?: object): boolean => {
+  const type = (schema as { type?: unknown } | undefined)?.type
+  return (Array.isArray(type) ? type : [type]).includes('string')
+}
+
+const parse = (text: string): { json: true, value: unknown } | { json: false } => {
+  try {
+    return { json: true, value: JSON.parse(text) }
+  } catch {
+    return { json: false }
+  }
+}
+
+/**
+ * The JSON text a scalar body travels as, so the server parses it back to the same value.
+ *
+ * A number or a boolean is `JSON.stringify`'d. A string is a value unless it is already JSON text:
+ * one that does not parse is quoted; one that parses is sent as it is (the caller serialized it
+ * itself) — except under a body schema of `type: 'string'`, where only a JSON string literal
+ * counts as serialized and `123`, `true` or `{…}` are the text the caller means.
+ */
+export const jsonScalarBody = (body: string | number | boolean, schema?: object): string => {
+  if (typeof body !== 'string') {
+    return JSON.stringify(body)
+  }
+  const parsed = parse(body)
+  const serialized = parsed.json && (!stringContract(schema) || typeof parsed.value === 'string')
+
+  return serialized ? body : JSON.stringify(body)
+}
+
+export interface RequestBody {
+  /** What axios is handed as `data`. */
+  data: unknown
+  /** A `content-type` the request lacked and must carry. */
+  contentType?: string
+  /** `data` is final text — axios must not transform it again. */
+  verbatim: boolean
+}
+
+/**
+ * What a request's body becomes on the wire.
+ *
+ * - A `x-www-form-urlencoded` request: the body through `qs`.
+ * - A string, number or boolean under a JSON `content-type` — the caller's, or `application/json`
+ *   supplied for a `POST` that names none — becomes JSON text ({@link jsonScalarBody}).
+ * - Anything else — objects, arrays, a scalar under another content type — goes to axios as it is,
+ *   which serializes an object or an array as JSON.
+ */
+export const requestBodyOf = (
+  body: unknown, headers: Record<string, unknown> | undefined, method?: RouteMethod, schema?: object
+): RequestBody => {
+  const type = contentTypeOf(headers)
+  if (body != null && type?.includes(FORM_CONTENT_TYPE) === true) {
+    return { data: qs.stringify(body), verbatim: false }
+  }
+  if (!isScalar(body)) {
+    return { data: body, verbatim: false }
+  }
+  if (type == null && method === RouteMethod.POST) {
+    return { data: jsonScalarBody(body, schema), contentType: JSON_CONTENT_TYPE, verbatim: true }
+  }
+  if (isJsonContentType(type)) {
+    return { data: jsonScalarBody(body, schema), verbatim: true }
+  }
+
+  return { data: body, verbatim: false }
+}

package/tests/body.spec.ts

@@ -0,0 +1,125 @@
+import { afterAll, beforeAll, describe, expect, test } from 'bun:test'
+import { provideResponse } from '@owlmeans/entrypoint'
+import type { AbstractRequest } from '@owlmeans/entrypoint'
+import { RouteMethod } from '@owlmeans/route'
+import { createApiService } from '../src/service.js'
+import { contentTypeOf, isJsonContentType, jsonScalarBody, requestBodyOf } from '../src/utils/body.js'
+
+const STRING = { type: 'string' }
+
+describe('what a request body becomes', () => {
+  test('a scalar on a POST without a content type is JSON text', () => {
+    expect(requestBodyOf('abc', {}, RouteMethod.POST)).toEqual({ data: '"abc"', contentType: 'application/json', verbatim: true })
+    expect(requestBodyOf('', {}, RouteMethod.POST).data).toBe('""')
+    expect(requestBodyOf(5, {}, RouteMethod.POST).data).toBe('5')
+    expect(requestBodyOf(0, {}, RouteMethod.POST).data).toBe('0')
+    expect(requestBodyOf(true, {}, RouteMethod.POST).data).toBe('true')
+    expect(requestBodyOf(false, {}, RouteMethod.POST).data).toBe('false')
+  })
+
+  test('a scalar under an explicit JSON content type is JSON text, on any method', () => {
+    expect(requestBodyOf('abc', { 'Content-Type': 'application/json; charset=utf-8' }, RouteMethod.PUT))
+      .toEqual({ data: '"abc"', verbatim: true })
+    expect(requestBodyOf(7, { 'content-type': 'application/merge-patch+json' }, RouteMethod.PATCH).data).toBe('7')
+  })
+
+  test('already-serialized JSON text is sent as it is', () => {
+    expect(requestBodyOf('{"a":1}', {}, RouteMethod.POST).data).toBe('{"a":1}')
+    expect(requestBodyOf('[1,2]', {}, RouteMethod.POST).data).toBe('[1,2]')
+    expect(requestBodyOf('"abc"', {}, RouteMethod.POST).data).toBe('"abc"')
+    expect(requestBodyOf('"abc"', {}, RouteMethod.POST, STRING).data).toBe('"abc"')
+  })
+
+  test('under a string body schema, JSON-looking text is the string the caller means', () => {
+    expect(jsonScalarBody('123', STRING)).toBe('"123"')
+    expect(jsonScalarBody('true', STRING)).toBe('"true"')
+    expect(jsonScalarBody('null', { type: ['string', 'null'] })).toBe('"null"')
+    expect(jsonScalarBody('{"a":1}', STRING)).toBe('"{\\"a\\":1}"')
+    expect(jsonScalarBody('123', { type: 'number' })).toBe('123')
+  })
+
+  test('objects, arrays and everything outside JSON behave as before', () => {
+    const object = { a: 1 }
+    expect(requestBodyOf(object, {}, RouteMethod.POST)).toEqual({ data: object, verbatim: false })
+    expect(requestBodyOf([1], {}, RouteMethod.POST)).toEqual({ data: [1], verbatim: false })
+    expect(requestBodyOf(undefined, {}, RouteMethod.POST)).toEqual({ data: undefined, verbatim: false })
+    expect(requestBodyOf('abc', { 'content-type': 'text/plain' }, RouteMethod.POST)).toEqual({ data: 'abc', verbatim: false })
+    expect(requestBodyOf('abc', {}, RouteMethod.PUT)).toEqual({ data: 'abc', verbatim: false })
+    expect(requestBodyOf({ a: '1', b: ['x'] }, { 'content-type': 'application/x-www-form-urlencoded' }, RouteMethod.POST).data)
+      .toBe('a=1&b%5B0%5D=x')
+  })
+
+  test('the content-type header is read whatever its case', () => {
+    expect(contentTypeOf({ 'CONTENT-TYPE': 'application/json' })).toBe('application/json')
+    expect(contentTypeOf({ accept: 'application/json' })).toBeUndefined()
+    expect(isJsonContentType('application/vnd.api+json')).toBe(true)
+    expect(isJsonContentType('application/jsonp')).toBe(false)
+    expect(isJsonContentType('text/plain')).toBe(false)
+  })
+})
+
+/**
+ * The real client over real HTTP: an echo server answers the bytes and the content type it
+ * received, so what a Fastify JSON parser would read is exactly what is asserted here.
+ */
+describe('the API client on the wire', () => {
+  let server: ReturnType<typeof Bun.serve>
+
+  beforeAll(() => {
+    server = Bun.serve({
+      port: 0,
+      fetch: async request => Response.json({ type: request.headers.get('content-type'), raw: await request.text() }),
+    })
+  })
+
+  afterAll(() => { server.stop(true) })
+
+  const send = async (
+    body: unknown, opts: { method?: RouteMethod, headers?: Record<string, string>, schema?: object } = {}
+  ): Promise<{ type: string | null, raw: string }> => {
+    const client = createApiService('test-client')
+    client.ctx = {
+      cfg: { service: 'api-tests', security: { unsecure: true }, services: {} },
+      entrypoint: () => ({
+        alias: 'echo',
+        route: { route: { method: opts.method ?? RouteMethod.POST } },
+        filter: opts.schema != null ? { body: opts.schema } : undefined,
+        path: () => '/echo',
+        address: () => ({ host: '127.0.0.1', port: server.port, secure: false }),
+      }),
+      hasService: () => false,
+    } as never
+    const reply = provideResponse<{ type: string | null, raw: string }>()
+    const request = { alias: 'echo', params: {}, query: {}, headers: opts.headers ?? {}, body, path: '/echo' } as AbstractRequest
+    await client.handler(request, reply)
+    if (reply.error != null) {
+      throw reply.error
+    }
+    return reply.value!
+  }
+
+  test('a bare string, number or boolean arrives as valid JSON of the same value', async () => {
+    for (const value of ['abc', '', 'a "quoted" word', 42, 0, true, false]) {
+      const received = await send(value)
+      expect(received.type).toStartWith('application/json')
+      expect(JSON.parse(received.raw)).toEqual(value)
+    }
+  })
+
+  test('a string contract carries JSON-looking text as a string', async () => {
+    expect(JSON.parse((await send('123', { schema: STRING })).raw)).toBe('123')
+  })
+
+  test('objects, arrays and serialized text arrive as before', async () => {
+    expect(await send({ a: 1 })).toEqual({ type: expect.stringContaining('application/json'), raw: '{"a":1}' })
+    expect((await send(['x'])).raw).toBe('["x"]')
+    expect((await send('{"a":1}')).raw).toBe('{"a":1}')
+    expect(await send('plain', { headers: { 'content-type': 'text/plain' } })).toEqual({ type: 'text/plain', raw: 'plain' })
+  })
+
+  test('the caller\'s headers are not rewritten', async () => {
+    const headers: Record<string, string> = {}
+    await send('abc', { headers })
+    expect(headers).toEqual({})
+  })
+})

package/tests/handler.spec.ts

@@ -4,6 +4,7 @@ import type { AxiosResponse } from 'axios'
 import type { AbstractResponse } from '@owlmeans/entrypoint'
 import { EntrypointOutcome } from '@owlmeans/entrypoint'
 import { ResilientError } from '@owlmeans/error'
+import { RecordExists, UnknownRecordError } from '@owlmeans/resource'
 import {
   ApiClientError, ApiStatusError, ServerAuthError, ServerCrashedError, httpStatusOf, incidentIdOf,
   INCIDENT_ID_HEADER,
@@ -143,6 +144,41 @@ describe('a development body stays its typed class', () => {
     expect(error.status).toBe(409)
     expect(error.incidentId).toBe(INCIDENT)
   })
+
+  test('a storage refusal (404 absent record, 409 taken key) rebuilds into its own class', () => {
+    for (const [refusal, code] of [
+      [new UnknownRecordError('shelf/3'), 404], [new RecordExists('isbn'), 409],
+    ] as const) {
+      const body = ResilientError.marshal(refusal, { includeStack: true, incidentId: INCIDENT }).message
+      const { error } = respond(code, body, { [INCIDENT_ID_HEADER]: INCIDENT })
+      expect(error!.constructor).toBe(refusal.constructor)
+      expect(error!.message).toBe(refusal.message)
+      expect(httpStatusOf(error)).toBe(code)
+      expect(incidentIdOf(error)).toBe(INCIDENT)
+    }
+    const body = ResilientError.marshal(new UnknownRecordError('shelf/3')).message
+    expect((respond(404, body).error as UnknownRecordError).id).toBe('shelf/3')
+  })
+
+  test('a class this process never registered still answers the status the server sent', () => {
+    const body = `ApiSpecUnregisteredRefusal${ResilientError.separator}spec:unregistered:x`
+    const { error } = respond(404, body, { [INCIDENT_ID_HEADER]: INCIDENT })
+    expect(error).not.toBeInstanceOf(ServerCrashedError)
+    expect(httpStatusOf(error)).toBe(404)
+    expect(incidentIdOf(error)).toBe(INCIDENT)
+  })
+})
+
+describe('a production body of a storage refusal keeps the declared status', () => {
+  test('404 and 409 become status errors, not a crash', () => {
+    for (const code of [404, 409]) {
+      const { error } = respond(code, INCIDENT)
+      expect(error).toBeInstanceOf(ApiStatusError)
+      expect(error).not.toBeInstanceOf(ServerCrashedError)
+      expect(error!.message).toBe(`api:client:status:${code}:${INCIDENT}`)
+      expect(httpStatusOf(error)).toBe(code)
+    }
+  })
 })
 
 describe('marshal round trips', () => {