@venizia/ignis-connectors 0.2.1-5 → 0.2.1-7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/http/common/readers.d.ts +2 -36
- package/dist/cjs/http/common/readers.d.ts.map +1 -1
- package/dist/cjs/http/common/readers.js +3 -72
- package/dist/cjs/http/common/readers.js.map +1 -1
- package/dist/cjs/http/common/types.d.ts +6 -0
- package/dist/cjs/http/common/types.d.ts.map +1 -1
- package/dist/cjs/http/common/wire.d.ts +10 -4
- package/dist/cjs/http/common/wire.d.ts.map +1 -1
- package/dist/cjs/http/common/wire.js +14 -7
- package/dist/cjs/http/common/wire.js.map +1 -1
- package/dist/cjs/http/datasource.d.ts +7 -1
- package/dist/cjs/http/datasource.d.ts.map +1 -1
- package/dist/cjs/http/datasource.js +18 -4
- package/dist/cjs/http/datasource.js.map +1 -1
- package/dist/cjs/http/repository.d.ts +31 -1
- package/dist/cjs/http/repository.d.ts.map +1 -1
- package/dist/cjs/http/repository.js +15 -5
- package/dist/cjs/http/repository.js.map +1 -1
- package/dist/cjs/search/core/controllers/factory.d.ts +56 -2
- package/dist/cjs/search/core/controllers/factory.d.ts.map +1 -1
- package/dist/esm/http/common/readers.d.ts +2 -36
- package/dist/esm/http/common/readers.d.ts.map +1 -1
- package/dist/esm/http/common/readers.js +2 -71
- package/dist/esm/http/common/readers.js.map +1 -1
- package/dist/esm/http/common/types.d.ts +6 -0
- package/dist/esm/http/common/types.d.ts.map +1 -1
- package/dist/esm/http/common/wire.d.ts +10 -4
- package/dist/esm/http/common/wire.d.ts.map +1 -1
- package/dist/esm/http/common/wire.js +14 -7
- package/dist/esm/http/common/wire.js.map +1 -1
- package/dist/esm/http/datasource.d.ts +7 -1
- package/dist/esm/http/datasource.d.ts.map +1 -1
- package/dist/esm/http/datasource.js +18 -4
- package/dist/esm/http/datasource.js.map +1 -1
- package/dist/esm/http/repository.d.ts +31 -1
- package/dist/esm/http/repository.d.ts.map +1 -1
- package/dist/esm/http/repository.js +15 -5
- package/dist/esm/http/repository.js.map +1 -1
- package/dist/esm/search/core/controllers/factory.d.ts +56 -2
- package/dist/esm/search/core/controllers/factory.d.ts.map +1 -1
- package/package.json +3 -3
|
@@ -1,37 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
* What an IGNIS server answers, read the way `HttpDataSource` reads it - exported so another client
|
|
4
|
-
* of the same server shares the parsing instead of copying it.
|
|
5
|
-
*/
|
|
6
|
-
export declare class HttpResponseReader {
|
|
7
|
-
/**
|
|
8
|
-
* A `Content-Range` header as the IGNIS server writes it: `records 0-24/137` -> skip 0, total 137;
|
|
9
|
-
* an empty page, `records *\/137` -> total 137. Anything else, including an absent header or an
|
|
10
|
-
* unknown total, is `undefined`.
|
|
11
|
-
*/
|
|
12
|
-
static parseContentRange(opts: {
|
|
13
|
-
header?: string | null;
|
|
14
|
-
}): {
|
|
15
|
-
skip?: number;
|
|
16
|
-
total: number;
|
|
17
|
-
} | undefined;
|
|
18
|
-
/**
|
|
19
|
-
* The IGNIS error envelope - `{ message, statusCode, normalized: { text, code, args }, requestId,
|
|
20
|
-
* extra, details }` - read off a parsed response body. A server configured with `error.rootKey`
|
|
21
|
-
* wraps it under that key; pass the same `rootKey` to unwrap it. A body without that key, or with a
|
|
22
|
-
* non-object under it (a proxy's `{ error: 'Bad Gateway' }`), is read as it stands.
|
|
23
|
-
*
|
|
24
|
-
* A body that is not a plain object yields `{}`; any other body yields its known fields, each
|
|
25
|
-
* `undefined` when absent or mistyped. An empty string reads as absent.
|
|
26
|
-
*/
|
|
27
|
-
static readErrorEnvelope(opts: {
|
|
28
|
-
body: unknown;
|
|
29
|
-
rootKey?: string;
|
|
30
|
-
}): TResponsedError;
|
|
31
|
-
/** A failed response's envelope. A body that is not JSON yields `{}`, and the status alone still describes it. */
|
|
32
|
-
static readError(opts: {
|
|
33
|
-
response: Response;
|
|
34
|
-
rootKey?: string;
|
|
35
|
-
}): Promise<TResponsedError>;
|
|
36
|
-
}
|
|
1
|
+
/** The reader lives with the server contract, so a client without this connector shares it. */
|
|
2
|
+
export { HttpResponseReader } from '@venizia/ignis-kernel/repository';
|
|
37
3
|
//# sourceMappingURL=readers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readers.d.ts","sourceRoot":"","sources":["../../../../src/http/common/readers.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"readers.d.ts","sourceRoot":"","sources":["../../../../src/http/common/readers.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC"}
|
|
@@ -1,76 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HttpResponseReader = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
* of the same server shares the parsing instead of copying it.
|
|
8
|
-
*/
|
|
9
|
-
class HttpResponseReader {
|
|
10
|
-
/**
|
|
11
|
-
* A `Content-Range` header as the IGNIS server writes it: `records 0-24/137` -> skip 0, total 137;
|
|
12
|
-
* an empty page, `records *\/137` -> total 137. Anything else, including an absent header or an
|
|
13
|
-
* unknown total, is `undefined`.
|
|
14
|
-
*/
|
|
15
|
-
static parseContentRange(opts) {
|
|
16
|
-
const { header } = opts;
|
|
17
|
-
if (!header) {
|
|
18
|
-
return undefined;
|
|
19
|
-
}
|
|
20
|
-
const range = header.match(/(\d+)\s*-\s*(\d+)\s*\/\s*(\d+)/);
|
|
21
|
-
if (range) {
|
|
22
|
-
return { skip: Number(range[1]), total: Number(range[3]) };
|
|
23
|
-
}
|
|
24
|
-
const unsatisfied = header.match(/\*\s*\/\s*(\d+)/);
|
|
25
|
-
if (unsatisfied) {
|
|
26
|
-
return { total: Number(unsatisfied[1]) };
|
|
27
|
-
}
|
|
28
|
-
return undefined;
|
|
29
|
-
}
|
|
30
|
-
/**
|
|
31
|
-
* The IGNIS error envelope - `{ message, statusCode, normalized: { text, code, args }, requestId,
|
|
32
|
-
* extra, details }` - read off a parsed response body. A server configured with `error.rootKey`
|
|
33
|
-
* wraps it under that key; pass the same `rootKey` to unwrap it. A body without that key, or with a
|
|
34
|
-
* non-object under it (a proxy's `{ error: 'Bad Gateway' }`), is read as it stands.
|
|
35
|
-
*
|
|
36
|
-
* A body that is not a plain object yields `{}`; any other body yields its known fields, each
|
|
37
|
-
* `undefined` when absent or mistyped. An empty string reads as absent.
|
|
38
|
-
*/
|
|
39
|
-
static readErrorEnvelope(opts) {
|
|
40
|
-
const { body, rootKey } = opts;
|
|
41
|
-
const wrapped = rootKey && wire_1.HttpWire.isPlainObject(body) ? body[rootKey] : undefined;
|
|
42
|
-
const envelope = wire_1.HttpWire.isPlainObject(wrapped) ? wrapped : body;
|
|
43
|
-
if (!wire_1.HttpWire.isPlainObject(envelope)) {
|
|
44
|
-
return {};
|
|
45
|
-
}
|
|
46
|
-
const { message, statusCode, normalized, requestId, extra, details } = envelope;
|
|
47
|
-
const normalizedRecord = wire_1.HttpWire.isPlainObject(normalized) ? normalized : {};
|
|
48
|
-
const { text, code, args } = normalizedRecord;
|
|
49
|
-
return {
|
|
50
|
-
message: wire_1.HttpWire.toText(message),
|
|
51
|
-
statusCode: typeof statusCode === 'number' ? statusCode : undefined,
|
|
52
|
-
normalized: {
|
|
53
|
-
text: wire_1.HttpWire.toText(text),
|
|
54
|
-
code: wire_1.HttpWire.toText(code),
|
|
55
|
-
args: wire_1.HttpWire.isPlainObject(args) ? { ...args } : undefined,
|
|
56
|
-
},
|
|
57
|
-
requestId: wire_1.HttpWire.toText(requestId),
|
|
58
|
-
extra: wire_1.HttpWire.isPlainObject(extra) ? { ...extra } : undefined,
|
|
59
|
-
details: wire_1.HttpWire.isPlainObject(details) ? { ...details } : undefined,
|
|
60
|
-
};
|
|
61
|
-
}
|
|
62
|
-
/** A failed response's envelope. A body that is not JSON yields `{}`, and the status alone still describes it. */
|
|
63
|
-
static async readError(opts) {
|
|
64
|
-
const text = await opts.response.text().catch(() => '');
|
|
65
|
-
let body;
|
|
66
|
-
try {
|
|
67
|
-
body = text ? JSON.parse(text) : undefined;
|
|
68
|
-
}
|
|
69
|
-
catch {
|
|
70
|
-
return {};
|
|
71
|
-
}
|
|
72
|
-
return HttpResponseReader.readErrorEnvelope({ body, rootKey: opts.rootKey });
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
exports.HttpResponseReader = HttpResponseReader;
|
|
4
|
+
/** The reader lives with the server contract, so a client without this connector shares it. */
|
|
5
|
+
var repository_1 = require("@venizia/ignis-kernel/repository");
|
|
6
|
+
Object.defineProperty(exports, "HttpResponseReader", { enumerable: true, get: function () { return repository_1.HttpResponseReader; } });
|
|
76
7
|
//# sourceMappingURL=readers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readers.js","sourceRoot":"","sources":["../../../../src/http/common/readers.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"readers.js","sourceRoot":"","sources":["../../../../src/http/common/readers.ts"],"names":[],"mappings":";;;AAAA,+FAA+F;AAC/F,+DAAsE;AAA7D,gHAAA,kBAAkB,OAAA"}
|
|
@@ -24,6 +24,8 @@ export type THttpHeaders = Headers | Array<[string, string]> | Record<string, st
|
|
|
24
24
|
* sends the same body twice.
|
|
25
25
|
*/
|
|
26
26
|
export type THttpBody = string | object;
|
|
27
|
+
/** The list-extras request and result types live with the server contract, in kernel. */
|
|
28
|
+
export type { TExtraRequest, TExtraResult } from '@venizia/ignis-kernel/repository';
|
|
27
29
|
/** What one call may add: its own headers (they win over the configured ones) and a signal to abort it. */
|
|
28
30
|
export interface IHttpCallOptions {
|
|
29
31
|
headers?: THttpHeaders;
|
|
@@ -58,11 +60,15 @@ export interface IHttpReadResult<R> {
|
|
|
58
60
|
total?: number;
|
|
59
61
|
skip?: number;
|
|
60
62
|
dataLength: number;
|
|
63
|
+
/** What a list answered beside its rows, when the server marked it with `x-response-extra`. */
|
|
64
|
+
extra?: Record<string, unknown>;
|
|
61
65
|
}
|
|
62
66
|
/** What a write answers: the rows the server returned, and its `x-response-count`. */
|
|
63
67
|
export interface IHttpWriteResult<R> {
|
|
64
68
|
data: R;
|
|
65
69
|
count: number;
|
|
70
|
+
/** What the route answered beside the rows, when the server marked it with `x-response-extra`. */
|
|
71
|
+
extra?: Record<string, unknown>;
|
|
66
72
|
}
|
|
67
73
|
export type THttpQuery<E extends object> = {
|
|
68
74
|
filter?: TFilter<E>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/http/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,+GAA+G;AAC/G,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,0HAA0H;IAC1H,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,8FAA8F;AAC9F,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,mBAAmB,KAAK,UAAU,GAAG,SAAS,CAAC;AAE1F,2EAA2E;AAC3E,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,mBAAmB,KAAK,YAAY,GAAG,SAAS,CAAC;AAE9F,wGAAwG;AACxG,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEtF;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAExC,2GAA2G;AAC3G,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,gGAAgG;IAChG,OAAO,EAAE,MAAM,CAAC;IAEhB,uGAAuG;IACvG,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,mFAAmF;IACnF,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB;;;;OAIG;IACH,eAAe,CAAC,EAAE,oBAAoB,CAAC;IAEvC,uEAAuE;IACvE,SAAS,CAAC,EAAE,UAAU,CAAC;IAEvB,iDAAiD;IACjD,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;IAEvC,+FAA+F;IAC/F,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CAC/E;AAED,wGAAwG;AACxG,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,OAAO,CAAC;IAClB,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/http/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,+GAA+G;AAC/G,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,0HAA0H;IAC1H,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,8FAA8F;AAC9F,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,mBAAmB,KAAK,UAAU,GAAG,SAAS,CAAC;AAE1F,2EAA2E;AAC3E,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,mBAAmB,KAAK,YAAY,GAAG,SAAS,CAAC;AAE9F,wGAAwG;AACxG,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEtF;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAExC,yFAAyF;AACzF,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEpF,2GAA2G;AAC3G,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,gGAAgG;IAChG,OAAO,EAAE,MAAM,CAAC;IAEhB,uGAAuG;IACvG,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,mFAAmF;IACnF,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB;;;;OAIG;IACH,eAAe,CAAC,EAAE,oBAAoB,CAAC;IAEvC,uEAAuE;IACvE,SAAS,CAAC,EAAE,UAAU,CAAC;IAEvB,iDAAiD;IACjD,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;IAEvC,+FAA+F;IAC/F,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CAC/E;AAED,wGAAwG;AACxG,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,OAAO,CAAC;IAClB,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,+FAA+F;IAC/F,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,sFAAsF;AACtF,MAAM,WAAW,gBAAgB,CAAC,CAAC;IACjC,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,MAAM,CAAC;IACd,kGAAkG;IAClG,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,MAAM,IAAI;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
import type { THttpBody, THttpHeaders } from './types';
|
|
1
|
+
import type { TExtraRequest, THttpBody, THttpHeaders } from './types';
|
|
2
2
|
/**
|
|
3
3
|
* What `HttpDataSource` puts on the wire and reads back off it: headers, request bodies, rows and
|
|
4
4
|
* the path an error message names. Internal - not part of the `http` entry.
|
|
5
5
|
*/
|
|
6
6
|
export declare class HttpWire {
|
|
7
|
-
static isPlainObject(value: unknown): value is Record<string, unknown>;
|
|
8
|
-
/** An empty string reads as absent, so a fallback still applies. */
|
|
9
|
-
static toText(value: unknown): string | undefined;
|
|
10
7
|
/**
|
|
11
8
|
* Caller headers as unique lowercase pairs, last spelling winning.
|
|
12
9
|
*
|
|
@@ -51,6 +48,15 @@ export declare class HttpWire {
|
|
|
51
48
|
shape: 'list' | 'one';
|
|
52
49
|
url: string;
|
|
53
50
|
}): R;
|
|
51
|
+
/**
|
|
52
|
+
* The call's headers plus `x-request-extra` for the extras it asks for - `name`, `-name`,
|
|
53
|
+
* `name(key,key)` - and `-*` first when it wants the rows alone, with every default off.
|
|
54
|
+
*/
|
|
55
|
+
static withExtraHeader(opts: {
|
|
56
|
+
headers?: THttpHeaders;
|
|
57
|
+
extra?: TExtraRequest;
|
|
58
|
+
isEveryDefaultOff?: boolean;
|
|
59
|
+
}): THttpHeaders | undefined;
|
|
54
60
|
/**
|
|
55
61
|
* The path a message names - never the host or the query. A server that relays this error would
|
|
56
62
|
* otherwise send an internal host and a filter's values to its own clients. 414/431 add the length.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wire.d.ts","sourceRoot":"","sources":["../../../../src/http/common/wire.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wire.d.ts","sourceRoot":"","sources":["../../../../src/http/common/wire.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEtE;;;GAGG;AACH,qBAAa,QAAQ;IACnB;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,YAAY,CAAA;KAAE,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAsBjF,8GAA8G;IAC9G,MAAM,CAAC,0BAA0B,CAAC,IAAI,EAAE;QACtC,OAAO,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACjC,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,IAAI;IAWR;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE;QAAE,IAAI,CAAC,EAAE,SAAS,CAAA;KAAE,GAAG;QAChD,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,OAAO,CAAC;KACrB;IAmCD,yGAAyG;IACzG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM;IAa9D;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,CAAC;IAiBpF;;;OAGG;IACH,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE;QAC3B,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,KAAK,CAAC,EAAE,aAAa,CAAC;QACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,GAAG,YAAY,GAAG,SAAS;IAY5B;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM;CAYnE"}
|
|
@@ -3,18 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.HttpWire = void 0;
|
|
4
4
|
const common_1 = require("@venizia/ignis-helpers/common");
|
|
5
5
|
const core_1 = require("@venizia/ignis-helpers/core");
|
|
6
|
+
const repository_1 = require("@venizia/ignis-kernel/repository");
|
|
6
7
|
/**
|
|
7
8
|
* What `HttpDataSource` puts on the wire and reads back off it: headers, request bodies, rows and
|
|
8
9
|
* the path an error message names. Internal - not part of the `http` entry.
|
|
9
10
|
*/
|
|
10
11
|
class HttpWire {
|
|
11
|
-
static isPlainObject(value) {
|
|
12
|
-
return (!!value && typeof value === 'object' && Object.getPrototypeOf(value) === Object.prototype);
|
|
13
|
-
}
|
|
14
|
-
/** An empty string reads as absent, so a fallback still applies. */
|
|
15
|
-
static toText(value) {
|
|
16
|
-
return typeof value === 'string' && value !== '' ? value : undefined;
|
|
17
|
-
}
|
|
18
12
|
/**
|
|
19
13
|
* Caller headers as unique lowercase pairs, last spelling winning.
|
|
20
14
|
*
|
|
@@ -114,6 +108,19 @@ class HttpWire {
|
|
|
114
108
|
message: `[read] A list was asked for and the response is neither an array nor a { count, data } envelope | ${HttpWire.describeUrl({ url })}`,
|
|
115
109
|
});
|
|
116
110
|
}
|
|
111
|
+
/**
|
|
112
|
+
* The call's headers plus `x-request-extra` for the extras it asks for - `name`, `-name`,
|
|
113
|
+
* `name(key,key)` - and `-*` first when it wants the rows alone, with every default off.
|
|
114
|
+
*/
|
|
115
|
+
static withExtraHeader(opts) {
|
|
116
|
+
const { headers, extra, isEveryDefaultOff } = opts;
|
|
117
|
+
const value = repository_1.HttpExtraRequest.toHeader({ extra, isEveryDefaultOff });
|
|
118
|
+
if (value === undefined) {
|
|
119
|
+
return headers;
|
|
120
|
+
}
|
|
121
|
+
const extraHeader = [repository_1.HttpExtraRequest.HEADER, value];
|
|
122
|
+
return [...HttpWire.toHeaderEntries({ headers }), extraHeader];
|
|
123
|
+
}
|
|
117
124
|
/**
|
|
118
125
|
* The path a message names - never the host or the query. A server that relays this error would
|
|
119
126
|
* otherwise send an internal host and a filter's values to its own clients. 414/431 add the length.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wire.js","sourceRoot":"","sources":["../../../../src/http/common/wire.ts"],"names":[],"mappings":";;;AAAA,0DAAqD;AACrD,sDAAuD;
|
|
1
|
+
{"version":3,"file":"wire.js","sourceRoot":"","sources":["../../../../src/http/common/wire.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AbstractDataSource } from '@venizia/ignis-kernel/repository';
|
|
2
2
|
import { NodeFetchNetworkRequest } from '@venizia/ignis-helpers/core';
|
|
3
|
-
import type { IAuthToken, IHttpCallOptions, IHttpDataSourceSettings, IHttpReadResult, IHttpRequestContext, IHttpWriteResult, THttpBody } from './common/types';
|
|
3
|
+
import type { IAuthToken, IHttpCallOptions, IHttpDataSourceSettings, TExtraRequest, IHttpReadResult, IHttpRequestContext, IHttpWriteResult, THttpBody } from './common/types';
|
|
4
4
|
/** Reads an IGNIS REST server through the repository contract. Targets IGNIS, not any REST API. */
|
|
5
5
|
export declare class HttpDataSource extends AbstractDataSource<IHttpDataSourceSettings> {
|
|
6
6
|
name: string;
|
|
@@ -82,6 +82,10 @@ export declare class HttpDataSource extends AbstractDataSource<IHttpDataSourceSe
|
|
|
82
82
|
shape?: 'list' | 'one';
|
|
83
83
|
method?: string;
|
|
84
84
|
body?: THttpBody;
|
|
85
|
+
/** Extras the route offers beside its rows, asked for by name (`x-request-extra`). */
|
|
86
|
+
extra?: TExtraRequest;
|
|
87
|
+
/** The rows alone: every default extra off (`-*`), for a read that only counts or probes. */
|
|
88
|
+
isEveryDefaultOff?: boolean;
|
|
85
89
|
} & IHttpCallOptions): Promise<IHttpReadResult<R>>;
|
|
86
90
|
/**
|
|
87
91
|
* A write, and what it answered: the body as the rows, the count from `x-response-count`. The
|
|
@@ -92,6 +96,8 @@ export declare class HttpDataSource extends AbstractDataSource<IHttpDataSourceSe
|
|
|
92
96
|
query?: Record<string, unknown>;
|
|
93
97
|
method: string;
|
|
94
98
|
body?: THttpBody;
|
|
99
|
+
/** Extras the route answers beside its rows, asked for by name (`x-request-extra`). */
|
|
100
|
+
extra?: TExtraRequest;
|
|
95
101
|
} & IHttpCallOptions): Promise<IHttpWriteResult<R>>;
|
|
96
102
|
}
|
|
97
103
|
//# sourceMappingURL=datasource.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../../src/http/datasource.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../../src/http/datasource.ts"],"names":[],"mappings":"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"}
|
|
@@ -203,12 +203,21 @@ class HttpDataSource extends repository_1.AbstractDataSource {
|
|
|
203
203
|
*/
|
|
204
204
|
async read(opts) {
|
|
205
205
|
const url = this.buildUrl(opts);
|
|
206
|
-
const
|
|
206
|
+
const headers = wire_1.HttpWire.withExtraHeader({
|
|
207
|
+
headers: opts.headers,
|
|
208
|
+
extra: opts.extra,
|
|
209
|
+
isEveryDefaultOff: opts.isEveryDefaultOff,
|
|
210
|
+
});
|
|
211
|
+
const response = await this.sendRequest({ ...opts, url, headers });
|
|
207
212
|
if (!response.ok) {
|
|
208
213
|
throw await this.toResponseError({ response, url, verb: 'read' });
|
|
209
214
|
}
|
|
210
215
|
// A 204 or an empty body is no row; a list asked for of it still throws below.
|
|
211
|
-
const
|
|
216
|
+
const parsed = await this.readJsonBody({ response, url, verb: 'read' });
|
|
217
|
+
const { body, extra } = readers_1.HttpResponseReader.readExtra({
|
|
218
|
+
body: parsed,
|
|
219
|
+
headers: response.headers,
|
|
220
|
+
});
|
|
212
221
|
const contentRange = response.headers.get(common_1.HTTP.Headers.CONTENT_RANGE) ?? undefined;
|
|
213
222
|
const range = readers_1.HttpResponseReader.parseContentRange({ header: contentRange });
|
|
214
223
|
const data = wire_1.HttpWire.unwrapRows({ body, shape: opts.shape ?? 'list', url });
|
|
@@ -219,6 +228,7 @@ class HttpDataSource extends repository_1.AbstractDataSource {
|
|
|
219
228
|
total: range?.total,
|
|
220
229
|
skip: range?.skip,
|
|
221
230
|
dataLength: Array.isArray(data) ? data.length : data === null ? 0 : 1,
|
|
231
|
+
extra,
|
|
222
232
|
};
|
|
223
233
|
}
|
|
224
234
|
/**
|
|
@@ -227,12 +237,15 @@ class HttpDataSource extends repository_1.AbstractDataSource {
|
|
|
227
237
|
*/
|
|
228
238
|
async write(opts) {
|
|
229
239
|
const url = this.buildUrl(opts);
|
|
230
|
-
const
|
|
240
|
+
const headers = wire_1.HttpWire.withExtraHeader({ headers: opts.headers, extra: opts.extra });
|
|
241
|
+
const response = await this.sendRequest({ ...opts, url, headers });
|
|
231
242
|
if (!response.ok) {
|
|
232
243
|
throw await this.toResponseError({ response, url, verb: 'write' });
|
|
233
244
|
}
|
|
234
245
|
// A 204, or a route that answers nothing, has no body to parse.
|
|
235
|
-
const
|
|
246
|
+
const parsed = await this.readJsonBody({ response, url, verb: 'write' });
|
|
247
|
+
const { extra } = readers_1.HttpResponseReader.readExtra({ body: parsed, headers: response.headers });
|
|
248
|
+
const data = extra ? parsed.data : parsed;
|
|
236
249
|
const countHeader = response.headers.get(common_1.HTTP.Headers.RESPONSE_COUNT_DATA);
|
|
237
250
|
const counted = countHeader === null ? Number.NaN : Number(countHeader);
|
|
238
251
|
return {
|
|
@@ -244,6 +257,7 @@ class HttpDataSource extends repository_1.AbstractDataSource {
|
|
|
244
257
|
: data === null
|
|
245
258
|
? 0
|
|
246
259
|
: 1,
|
|
260
|
+
...(extra ? { extra } : {}),
|
|
247
261
|
};
|
|
248
262
|
}
|
|
249
263
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../../src/http/datasource.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../../src/http/datasource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AnyType } from '@venizia/ignis-helpers/common';
|
|
2
2
|
import type { IDeletableRepository, IReadableRepository, IUpdatableRepository, TCount, TDataWithRange, TFilter, TSchemaType, TWhere } from '@venizia/ignis-kernel/repository';
|
|
3
3
|
import { AbstractEntity } from '@venizia/ignis-kernel/repository';
|
|
4
|
-
import type { IHttpCallOptions, IHttpWriteResult } from './common/types';
|
|
4
|
+
import type { IHttpCallOptions, IHttpWriteResult, TExtraRequest, TExtraResult } from './common/types';
|
|
5
5
|
import type { HttpDataSource } from './datasource';
|
|
6
6
|
/**
|
|
7
7
|
* What a repository call takes. Only `headers` and `signal` cross HTTP; the shared repository
|
|
@@ -46,16 +46,46 @@ export declare class HttpRepository<E extends object = AnyType, P extends object
|
|
|
46
46
|
where: TWhere<E>;
|
|
47
47
|
options?: THttpRepositoryOptions;
|
|
48
48
|
}): Promise<boolean>;
|
|
49
|
+
/** With `extra`: what the route answered beside the rows, typed by what was asked for. */
|
|
50
|
+
find<R = E, const Extra extends TExtraRequest = TExtraRequest>(opts: {
|
|
51
|
+
filter: TFilter<E>;
|
|
52
|
+
options: THttpRepositoryOptions & {
|
|
53
|
+
shouldQueryRange: true;
|
|
54
|
+
extra: Extra;
|
|
55
|
+
};
|
|
56
|
+
}): Promise<TDataWithRange<R> & {
|
|
57
|
+
extra: TExtraResult<Extra>;
|
|
58
|
+
}>;
|
|
49
59
|
find<R = E>(opts: {
|
|
50
60
|
filter: TFilter<E>;
|
|
51
61
|
options: THttpRepositoryOptions & {
|
|
52
62
|
shouldQueryRange: true;
|
|
53
63
|
};
|
|
54
64
|
}): Promise<TDataWithRange<R>>;
|
|
65
|
+
find<R = E, const Extra extends TExtraRequest = TExtraRequest>(opts: {
|
|
66
|
+
filter?: TFilter<E>;
|
|
67
|
+
options: THttpRepositoryOptions & {
|
|
68
|
+
extra: Extra;
|
|
69
|
+
};
|
|
70
|
+
}): Promise<{
|
|
71
|
+
data: Array<R>;
|
|
72
|
+
extra: TExtraResult<Extra>;
|
|
73
|
+
}>;
|
|
55
74
|
find<R = E>(opts: {
|
|
56
75
|
filter?: TFilter<E>;
|
|
57
76
|
options?: THttpRepositoryOptions;
|
|
58
77
|
}): Promise<Array<R>>;
|
|
78
|
+
/** `extra` or the range decided at run time: the caller narrows the union. */
|
|
79
|
+
find<R = E>(opts: {
|
|
80
|
+
filter?: TFilter<E>;
|
|
81
|
+
options?: THttpRepositoryOptions & {
|
|
82
|
+
shouldQueryRange?: boolean;
|
|
83
|
+
extra?: TExtraRequest;
|
|
84
|
+
};
|
|
85
|
+
}): Promise<Array<R> | TDataWithRange<R> | {
|
|
86
|
+
data: Array<R>;
|
|
87
|
+
extra: TExtraResult<TExtraRequest>;
|
|
88
|
+
}>;
|
|
59
89
|
findOne<R = E>(opts: {
|
|
60
90
|
filter?: TFilter<E>;
|
|
61
91
|
options?: THttpRepositoryOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/http/repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAG7D,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,MAAM,EACN,cAAc,EACd,OAAO,EACP,WAAW,EACX,MAAM,EACP,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAkB,MAAM,kCAAkC,CAAC;AAClF,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/http/repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,7 @@ class HttpRepository {
|
|
|
44
44
|
paths: [this.resource, this.countPath],
|
|
45
45
|
query: { where: opts.where },
|
|
46
46
|
shape: 'one',
|
|
47
|
+
isEveryDefaultOff: true,
|
|
47
48
|
...this.toCallOptions({ options: opts.options }),
|
|
48
49
|
});
|
|
49
50
|
const counted = rs.data?.count;
|
|
@@ -58,6 +59,8 @@ class HttpRepository {
|
|
|
58
59
|
const rs = await this.dataSource.read({
|
|
59
60
|
paths: [this.resource],
|
|
60
61
|
query: { filter: { where: opts.where, limit: 1 } },
|
|
62
|
+
// Rows alone: a default extra would be computed and thrown away on every count or probe.
|
|
63
|
+
isEveryDefaultOff: true,
|
|
61
64
|
...this.toCallOptions({ options: opts.options }),
|
|
62
65
|
});
|
|
63
66
|
if (!rs.hasRange) {
|
|
@@ -73,6 +76,8 @@ class HttpRepository {
|
|
|
73
76
|
const rs = await this.dataSource.read({
|
|
74
77
|
paths: [this.resource],
|
|
75
78
|
query: { filter: { where: opts.where, limit: 1 } },
|
|
79
|
+
// Rows alone: a default extra would be computed and thrown away on every count or probe.
|
|
80
|
+
isEveryDefaultOff: true,
|
|
76
81
|
...this.toCallOptions({ options: opts.options }),
|
|
77
82
|
});
|
|
78
83
|
return rs.dataLength > 0;
|
|
@@ -81,11 +86,12 @@ class HttpRepository {
|
|
|
81
86
|
const rs = await this.dataSource.read({
|
|
82
87
|
paths: [this.resource],
|
|
83
88
|
query: { filter: opts.filter ?? {} },
|
|
89
|
+
extra: opts.options?.extra,
|
|
84
90
|
...this.toCallOptions({ options: opts.options }),
|
|
85
91
|
});
|
|
86
92
|
const data = rs.data ?? [];
|
|
87
93
|
if (!opts.options?.shouldQueryRange) {
|
|
88
|
-
return data;
|
|
94
|
+
return opts.options?.extra ? { data, extra: rs.extra ?? {} } : data;
|
|
89
95
|
}
|
|
90
96
|
if (!rs.hasRange) {
|
|
91
97
|
throw this.getMissingTotalError({
|
|
@@ -103,14 +109,18 @@ class HttpRepository {
|
|
|
103
109
|
dataLength: data.length,
|
|
104
110
|
total: rs.total ?? 0,
|
|
105
111
|
}),
|
|
112
|
+
// Asked for, `extra` is always there - empty when the route offered none.
|
|
113
|
+
...(opts.options?.extra ? { extra: rs.extra ?? {} } : {}),
|
|
106
114
|
};
|
|
107
115
|
}
|
|
108
116
|
async findOne(opts) {
|
|
109
|
-
const rs = await this.
|
|
110
|
-
|
|
111
|
-
|
|
117
|
+
const rs = await this.dataSource.read({
|
|
118
|
+
paths: [this.resource],
|
|
119
|
+
query: { filter: { ...(opts.filter ?? {}), limit: 1 } },
|
|
120
|
+
isEveryDefaultOff: true,
|
|
121
|
+
...this.toCallOptions({ options: opts.options }),
|
|
112
122
|
});
|
|
113
|
-
return rs[0] ?? null;
|
|
123
|
+
return rs.data?.[0] ?? null;
|
|
114
124
|
}
|
|
115
125
|
/** The server answers `null`, never 404, for a missing id. A `where` would be replaced by the id. */
|
|
116
126
|
async findById(opts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/http/repository.ts"],"names":[],"mappings":";;;AACA,0DAAqD;AACrD,sDAAuD;AAWvD,iEAAkF;
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/http/repository.ts"],"names":[],"mappings":"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"}
|