@decocms/blocks 8.1.0-next.5 → 8.1.0-next.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/protocol/client.d.ts +0 -2
- package/dist/protocol/client.d.ts.map +1 -1
- package/dist/protocol/client.js +0 -2
- package/dist/protocol/client.js.map +1 -1
- package/dist/protocol/conformance/cases/guards.d.ts.map +1 -1
- package/dist/protocol/conformance/cases/guards.js +10 -173
- package/dist/protocol/conformance/cases/guards.js.map +1 -1
- package/dist/protocol/conformance/cases/reads.d.ts.map +1 -1
- package/dist/protocol/conformance/cases/reads.js +4 -49
- package/dist/protocol/conformance/cases/reads.js.map +1 -1
- package/dist/protocol/conformance/cases/writes.d.ts.map +1 -1
- package/dist/protocol/conformance/cases/writes.js +3 -21
- package/dist/protocol/conformance/cases/writes.js.map +1 -1
- package/dist/protocol/conformance/context.d.ts +1 -26
- package/dist/protocol/conformance/context.d.ts.map +1 -1
- package/dist/protocol/conformance/context.js +4 -13
- package/dist/protocol/conformance/context.js.map +1 -1
- package/dist/protocol/conformance/index.js +3 -3
- package/dist/protocol/errors.d.ts +5 -9
- package/dist/protocol/errors.d.ts.map +1 -1
- package/dist/protocol/errors.js +4 -4
- package/dist/protocol/errors.js.map +1 -1
- package/dist/protocol/index.d.ts +1 -1
- package/dist/protocol/index.d.ts.map +1 -1
- package/dist/protocol/index.js +1 -1
- package/dist/protocol/index.js.map +1 -1
- package/dist/protocol/params.d.ts.map +1 -1
- package/dist/protocol/params.js +0 -4
- package/dist/protocol/params.js.map +1 -1
- package/dist/protocol/server/assets.d.ts +2 -3
- package/dist/protocol/server/assets.d.ts.map +1 -1
- package/dist/protocol/server/assets.js +2 -9
- package/dist/protocol/server/assets.js.map +1 -1
- package/dist/protocol/server/content.d.ts +2 -3
- package/dist/protocol/server/content.d.ts.map +1 -1
- package/dist/protocol/server/content.js +10 -22
- package/dist/protocol/server/content.js.map +1 -1
- package/dist/protocol/server/core.d.ts +8 -11
- package/dist/protocol/server/core.d.ts.map +1 -1
- package/dist/protocol/server/core.js +8 -24
- package/dist/protocol/server/core.js.map +1 -1
- package/dist/protocol/server/handler.d.ts.map +1 -1
- package/dist/protocol/server/handler.js +11 -23
- package/dist/protocol/server/handler.js.map +1 -1
- package/dist/protocol/server/http.d.ts +6 -4
- package/dist/protocol/server/http.d.ts.map +1 -1
- package/dist/protocol/server/http.js +1 -18
- package/dist/protocol/server/http.js.map +1 -1
- package/dist/protocol/server/index.d.ts +0 -1
- package/dist/protocol/server/index.d.ts.map +1 -1
- package/dist/protocol/server/index.js.map +1 -1
- package/dist/protocol/server/methods/apply.d.ts +2 -2
- package/dist/protocol/server/methods/apply.d.ts.map +1 -1
- package/dist/protocol/server/methods/apply.js +23 -71
- package/dist/protocol/server/methods/apply.js.map +1 -1
- package/dist/protocol/server/methods/read.d.ts +0 -6
- package/dist/protocol/server/methods/read.d.ts.map +1 -1
- package/dist/protocol/server/methods/read.js +4 -31
- package/dist/protocol/server/methods/read.js.map +1 -1
- package/dist/protocol/server/rpc.d.ts +1 -1
- package/dist/protocol/server/rpc.d.ts.map +1 -1
- package/dist/protocol/server/rpc.js +9 -39
- package/dist/protocol/server/rpc.js.map +1 -1
- package/dist/protocol/storage/fs/index.d.ts +0 -3
- package/dist/protocol/storage/fs/index.d.ts.map +1 -1
- package/dist/protocol/storage/fs/index.js +0 -5
- package/dist/protocol/storage/fs/index.js.map +1 -1
- package/dist/protocol/storage/memory.d.ts +1 -6
- package/dist/protocol/storage/memory.d.ts.map +1 -1
- package/dist/protocol/storage/memory.js +1 -30
- package/dist/protocol/storage/memory.js.map +1 -1
- package/dist/protocol/storage.d.ts +7 -50
- package/dist/protocol/storage.d.ts.map +1 -1
- package/dist/protocol/storage.js +1 -1
- package/dist/protocol/storage.js.map +1 -1
- package/dist/protocol/types.d.ts +0 -34
- package/dist/protocol/types.d.ts.map +1 -1
- package/dist/protocol/types.js +0 -10
- package/dist/protocol/types.js.map +1 -1
- package/dist/v8/canonical.d.ts +0 -7
- package/dist/v8/canonical.d.ts.map +1 -1
- package/dist/v8/canonical.js +0 -9
- package/dist/v8/canonical.js.map +1 -1
- package/dist/v8/cli/content.d.ts +24 -3
- package/dist/v8/cli/content.d.ts.map +1 -1
- package/dist/v8/cli/content.js +70 -5
- package/dist/v8/cli/content.js.map +1 -1
- package/dist/v8/cli/run.js +1 -1
- package/dist/v8/cli/run.js.map +1 -1
- package/dist/v8/cms.d.ts.map +1 -1
- package/dist/v8/cms.js +18 -25
- package/dist/v8/cms.js.map +1 -1
- package/dist/v8/content.d.ts +5 -7
- package/dist/v8/content.d.ts.map +1 -1
- package/dist/v8/content.js +47 -45
- package/dist/v8/content.js.map +1 -1
- package/dist/v8/draft.d.ts +1 -1
- package/dist/v8/draft.js +2 -2
- package/dist/v8/draft.js.map +1 -1
- package/dist/v8/draftChanges.d.ts +52 -11
- package/dist/v8/draftChanges.d.ts.map +1 -1
- package/dist/v8/draftChanges.js +115 -38
- package/dist/v8/draftChanges.js.map +1 -1
- package/dist/v8/identity.d.ts +0 -2
- package/dist/v8/identity.d.ts.map +1 -1
- package/dist/v8/identity.js +0 -10
- package/dist/v8/identity.js.map +1 -1
- package/dist/v8/remoteLoader.d.ts +2 -4
- package/dist/v8/remoteLoader.d.ts.map +1 -1
- package/dist/v8/remoteLoader.js +106 -87
- package/dist/v8/remoteLoader.js.map +1 -1
- package/dist/v8/settings.d.ts +0 -7
- package/dist/v8/settings.d.ts.map +1 -1
- package/dist/v8/settings.js +0 -10
- package/dist/v8/settings.js.map +1 -1
- package/dist/v8/telemetry.d.ts +7 -3
- package/dist/v8/telemetry.d.ts.map +1 -1
- package/dist/v8/telemetry.js +28 -69
- package/dist/v8/telemetry.js.map +1 -1
- package/dist/v8/types.d.ts +46 -18
- package/dist/v8/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/protocol/client.ts +0 -3
- package/src/protocol/conformance/cases/guards.ts +10 -188
- package/src/protocol/conformance/cases/reads.ts +7 -65
- package/src/protocol/conformance/cases/writes.ts +7 -36
- package/src/protocol/conformance/context.ts +6 -31
- package/src/protocol/conformance/index.ts +3 -3
- package/src/protocol/errors.ts +5 -10
- package/src/protocol/index.ts +0 -2
- package/src/protocol/params.ts +0 -4
- package/src/protocol/server/assets.ts +2 -12
- package/src/protocol/server/content.ts +10 -24
- package/src/protocol/server/core.ts +12 -34
- package/src/protocol/server/handler.ts +11 -30
- package/src/protocol/server/http.ts +1 -19
- package/src/protocol/server/index.ts +0 -1
- package/src/protocol/server/methods/apply.ts +22 -82
- package/src/protocol/server/methods/read.ts +4 -36
- package/src/protocol/server/rpc.ts +7 -47
- package/src/protocol/storage/fs/index.ts +0 -8
- package/src/protocol/storage/memory.ts +1 -36
- package/src/protocol/storage.ts +7 -39
- package/src/protocol/types.ts +0 -37
- package/src/v8/canonical.ts +0 -11
- package/src/v8/cli/content.ts +85 -5
- package/src/v8/cli/run.ts +1 -1
- package/src/v8/cms.ts +18 -26
- package/src/v8/content.ts +55 -48
- package/src/v8/draft.ts +2 -2
- package/src/v8/draftChanges.ts +132 -41
- package/src/v8/identity.ts +0 -10
- package/src/v8/remoteLoader.ts +111 -106
- package/src/v8/settings.ts +1 -15
- package/src/v8/telemetry.ts +33 -69
- package/src/v8/types.ts +47 -16
- package/dist/protocol/server/auth.d.ts +0 -31
- package/dist/protocol/server/auth.d.ts.map +0 -1
- package/dist/protocol/server/auth.js +0 -32
- package/dist/protocol/server/auth.js.map +0 -1
- package/src/protocol/server/auth.ts +0 -49
|
@@ -1,19 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The shared state of one content handler: its storage, options and caches.
|
|
3
3
|
*/
|
|
4
|
-
import { ContentProtocolError, invalidBlock, notFound, unavailable
|
|
4
|
+
import { ContentProtocolError, invalidBlock, notFound, unavailable } from "../errors.js";
|
|
5
5
|
import { blockNameFromFile } from "../keys.js";
|
|
6
6
|
import { StorageInvalidFileError, StorageNotFoundError, StorageUnavailableError, } from "../storage.js";
|
|
7
|
-
import { DEFAULT_LIMITS } from "../types.js";
|
|
8
7
|
import { BodyCache } from "./bodyCache.js";
|
|
8
|
+
const MiB = 1024 * 1024;
|
|
9
|
+
/** `blocks.apply`'s own guards: names (set plus delete) in one call. Internal, not advertised. */
|
|
10
|
+
export const MAX_OPS_PER_APPLY = 500;
|
|
11
|
+
/** Bytes of one stored entry. */
|
|
12
|
+
export const MAX_BLOCK_BYTES = 1 * MiB;
|
|
13
|
+
/** Bytes of one HTTP request body, uncompressed. */
|
|
14
|
+
export const MAX_REQUEST_BYTES = 8 * MiB;
|
|
9
15
|
const DEFAULT_POLL_MS = { "working-tree": 2000, git: 30000 };
|
|
10
16
|
const DEFAULT_RETRY_DELAY = { minMs: 50, maxMs: 200 };
|
|
11
17
|
export class Core {
|
|
12
18
|
storage;
|
|
13
19
|
options;
|
|
14
20
|
cache;
|
|
15
|
-
/** Requests in flight per scoped request key, so simultaneous duplicates commit once. */
|
|
16
|
-
inflight = new Map();
|
|
17
21
|
/** The last parsed schema, by version: the secret guard reads it on every write. */
|
|
18
22
|
parsedSchema = null;
|
|
19
23
|
constructor(storage, options) {
|
|
@@ -34,29 +38,9 @@ export class Core {
|
|
|
34
38
|
async description() {
|
|
35
39
|
return this.storage.describe();
|
|
36
40
|
}
|
|
37
|
-
/** The effective limits: the lowest of the defaults, the storage's and the options'. */
|
|
38
|
-
limits(description) {
|
|
39
|
-
const out = { ...DEFAULT_LIMITS };
|
|
40
|
-
for (const source of [description.limits, this.options.limits]) {
|
|
41
|
-
if (!source)
|
|
42
|
-
continue;
|
|
43
|
-
for (const key of Object.keys(out)) {
|
|
44
|
-
const value = source[key];
|
|
45
|
-
if (typeof value === "number" && value > 0 && value < out[key])
|
|
46
|
-
out[key] = value;
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
return out;
|
|
50
|
-
}
|
|
51
41
|
pollIntervalMs(description) {
|
|
52
42
|
return (this.options.pollIntervalMs ?? description.pollIntervalMs ?? DEFAULT_POLL_MS[description.kind]);
|
|
53
43
|
}
|
|
54
|
-
/** Refuses a `ref` on a storage without branches. */
|
|
55
|
-
checkRef(description, ref) {
|
|
56
|
-
if (ref !== undefined && description.refs === null) {
|
|
57
|
-
throw unsupported("this endpoint has no branches; omit ref");
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
44
|
}
|
|
61
45
|
/** Maps storage errors to protocol errors; anything unknown is rethrown. */
|
|
62
46
|
export function toProtocolError(error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/protocol/server/core.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/protocol/server/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/protocol/server/handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/protocol/server/handler.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,qBAAqB,EAA2B,MAAM,WAAW,CAAC;AAUhF,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAKrE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,cAAc,EACvB,OAAO,GAAE,qBAA0B,GAClC,cAAc,CA4ChB"}
|
|
@@ -4,50 +4,39 @@
|
|
|
4
4
|
*
|
|
5
5
|
* `POST <endpoint>` with `Content-Type: application/json` and a body that's
|
|
6
6
|
* one request object or a batch array. Errors come back in the JSON-RPC
|
|
7
|
-
* `error` object with HTTP 200, except a
|
|
8
|
-
* and
|
|
9
|
-
* requests that aren't the protocol at all: a method other than POST (405),
|
|
7
|
+
* `error` object with HTTP 200, except a body over the size limit (413),
|
|
8
|
+
* which applies to the whole batch, and requests that aren't the protocol at all: a method other than POST (405),
|
|
10
9
|
* or a body that isn't JSON or uses an unsupported encoding (415). Those carry
|
|
11
10
|
* a JSON-RPC error body too, with a `null` id.
|
|
12
11
|
* Responses are gzip-compressed when the request accepts it.
|
|
13
12
|
*
|
|
14
13
|
* The handler is path-agnostic: mount it where the endpoint lives (`/rpc` on
|
|
15
|
-
* the local server).
|
|
16
|
-
*
|
|
17
|
-
* that mounts it
|
|
14
|
+
* the local server). The handler doesn't authenticate: who may call it, and
|
|
15
|
+
* transport security that depends on where it runs — CORS, `Host` checks,
|
|
16
|
+
* Chrome's local-network preflight — belong to the server that mounts it
|
|
17
|
+
* (`deco serve` on loopback; Studio behind its own session).
|
|
18
18
|
*/
|
|
19
|
-
import {
|
|
20
|
-
import {
|
|
21
|
-
import { Core } from "./core.js";
|
|
19
|
+
import { invalidRequest, limitExceeded, parseError } from "../errors.js";
|
|
20
|
+
import { Core, MAX_REQUEST_BYTES } from "./core.js";
|
|
22
21
|
import { BodyEncodingError, BodyTooLargeError, isJsonContentType, jsonResponse, readBody, } from "./http.js";
|
|
23
22
|
import { dispatch } from "./rpc.js";
|
|
24
23
|
const errorBody = (error) => JSON.stringify({ jsonrpc: "2.0", id: null, error: error.toJSON() });
|
|
25
24
|
export function createContentHandler(storage, options = {}) {
|
|
26
|
-
assertAuthOptions(options);
|
|
27
25
|
const core = new Core(storage, options);
|
|
28
26
|
return async (request) => {
|
|
29
27
|
if (request.method !== "POST") {
|
|
30
28
|
return jsonResponse(request, errorBody(invalidRequest("use POST")), 405, { allow: "POST" });
|
|
31
29
|
}
|
|
32
|
-
const auth = await authenticate(request, options);
|
|
33
|
-
if (!auth.ok) {
|
|
34
|
-
return auth.reason === "unauthorized"
|
|
35
|
-
? jsonResponse(request, errorBody(unauthorized()), 401, {
|
|
36
|
-
"www-authenticate": 'Bearer realm="deco-content"',
|
|
37
|
-
})
|
|
38
|
-
: jsonResponse(request, errorBody(forbidden()));
|
|
39
|
-
}
|
|
40
30
|
if (!isJsonContentType(request)) {
|
|
41
31
|
return jsonResponse(request, errorBody(invalidRequest("Content-Type must be application/json")), 415);
|
|
42
32
|
}
|
|
43
|
-
const limits = core.limits(await core.description());
|
|
44
33
|
let bytes;
|
|
45
34
|
try {
|
|
46
|
-
bytes = await readBody(request,
|
|
35
|
+
bytes = await readBody(request, MAX_REQUEST_BYTES);
|
|
47
36
|
}
|
|
48
37
|
catch (error) {
|
|
49
38
|
if (error instanceof BodyTooLargeError) {
|
|
50
|
-
return jsonResponse(request, errorBody(limitExceeded(`the request body is over ${
|
|
39
|
+
return jsonResponse(request, errorBody(limitExceeded(`the request body is over ${MAX_REQUEST_BYTES} bytes`, {
|
|
51
40
|
limit: "maxRequestBytes",
|
|
52
41
|
})), 413);
|
|
53
42
|
}
|
|
@@ -63,8 +52,7 @@ export function createContentHandler(storage, options = {}) {
|
|
|
63
52
|
catch {
|
|
64
53
|
return jsonResponse(request, errorBody(parseError()));
|
|
65
54
|
}
|
|
66
|
-
|
|
67
|
-
return jsonResponse(request, response);
|
|
55
|
+
return jsonResponse(request, await dispatch(core, body));
|
|
68
56
|
};
|
|
69
57
|
}
|
|
70
58
|
//# sourceMappingURL=handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/protocol/server/handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/protocol/server/handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAA6B,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEpG,OAAO,EAA8B,IAAI,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,QAAQ,GACT,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAIpC,MAAM,SAAS,GAAG,CAAC,KAA2B,EAAE,EAAE,CAChD,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAEtE,MAAM,UAAU,oBAAoB,CAClC,OAAuB,EACvB,OAAO,GAA0B,EAAE;IAEnC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAExC,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC9B,OAAO,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9F,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO,YAAY,CACjB,OAAO,EACP,SAAS,CAAC,cAAc,CAAC,uCAAuC,CAAC,CAAC,EAClE,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,IAAI,KAAiB,CAAC;QACtB,IAAI,CAAC;YACH,KAAK,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,iBAAiB,EAAE,CAAC;gBACvC,OAAO,YAAY,CACjB,OAAO,EACP,SAAS,CACP,aAAa,CAAC,4BAA4B,iBAAiB,QAAQ,EAAE;oBACnE,KAAK,EAAE,iBAAiB;iBACzB,CAAC,CACH,EACD,GAAG,CACJ,CAAC;YACJ,CAAC;YACD,IAAI,KAAK,YAAY,iBAAiB,EAAE,CAAC;gBACvC,OAAO,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QAED,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7E,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,YAAY,CAAC,OAAO,EAAE,MAAM,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* HTTP plumbing for the content handler: bounded body reads (gzip request
|
|
3
|
+
* bodies included) and gzip responses. Web-standard APIs
|
|
4
|
+
* only (Request, Response, CompressionStream), so it runs on Node, Bun,
|
|
5
|
+
* Workers and Deno.
|
|
6
|
+
*/
|
|
1
7
|
/** The body was larger than allowed (after decompression). */
|
|
2
8
|
export declare class BodyTooLargeError extends Error {
|
|
3
9
|
readonly limit: number;
|
|
@@ -17,8 +23,4 @@ export declare function readBody(request: Request, limit: number): Promise<Uint8
|
|
|
17
23
|
export declare function jsonResponse(request: Request, body: string, status?: number, headers?: Record<string, string>): Response;
|
|
18
24
|
/** True when the request's `Content-Type` is JSON (`application/json`, any parameters). */
|
|
19
25
|
export declare function isJsonContentType(request: Request): boolean;
|
|
20
|
-
/** The bearer token of the request, or `null` without one. */
|
|
21
|
-
export declare function bearerToken(request: Request): string | null;
|
|
22
|
-
/** Compares two strings in time independent of where they differ. */
|
|
23
|
-
export declare function timingSafeEqualStrings(a: string, b: string): Promise<boolean>;
|
|
24
26
|
//# sourceMappingURL=http.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/protocol/server/http.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/protocol/server/http.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,8DAA8D;AAC9D,qBAAa,iBAAkB,SAAQ,KAAK;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAAlC,YAAqB,KAAK,EAAE,MAAM,EAGjC;CACF;AAED,4EAA4E;AAC5E,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AA6BD;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAmBnF;AAiBD,oEAAoE;AACpE,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,SAAM,EACZ,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACnC,QAAQ,CAkBV;AAED,2FAA2F;AAC3F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG3D"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* HTTP plumbing for the content handler: bounded body reads (gzip request
|
|
3
|
-
* bodies included)
|
|
3
|
+
* bodies included) and gzip responses. Web-standard APIs
|
|
4
4
|
* only (Request, Response, CompressionStream), so it runs on Node, Bun,
|
|
5
5
|
* Workers and Deno.
|
|
6
6
|
*/
|
|
7
|
-
import { sha256Hex } from "../canonical.js";
|
|
8
7
|
/** The body was larger than allowed (after decompression). */
|
|
9
8
|
export class BodyTooLargeError extends Error {
|
|
10
9
|
limit;
|
|
@@ -114,20 +113,4 @@ export function isJsonContentType(request) {
|
|
|
114
113
|
const type = request.headers.get("content-type");
|
|
115
114
|
return type !== null && type.split(";")[0].trim().toLowerCase() === "application/json";
|
|
116
115
|
}
|
|
117
|
-
/** The bearer token of the request, or `null` without one. */
|
|
118
|
-
export function bearerToken(request) {
|
|
119
|
-
const header = request.headers.get("authorization");
|
|
120
|
-
if (!header)
|
|
121
|
-
return null;
|
|
122
|
-
const match = /^Bearer\s+(\S+)\s*$/i.exec(header);
|
|
123
|
-
return match?.[1] ?? null;
|
|
124
|
-
}
|
|
125
|
-
/** Compares two strings in time independent of where they differ. */
|
|
126
|
-
export async function timingSafeEqualStrings(a, b) {
|
|
127
|
-
const [ha, hb] = await Promise.all([sha256Hex(a), sha256Hex(b)]);
|
|
128
|
-
let diff = 0;
|
|
129
|
-
for (let i = 0; i < ha.length; i++)
|
|
130
|
-
diff |= ha.charCodeAt(i) ^ hb.charCodeAt(i);
|
|
131
|
-
return diff === 0;
|
|
132
|
-
}
|
|
133
116
|
//# sourceMappingURL=http.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/protocol/server/http.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/protocol/server/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
* `ContentStorage`. Web-standard APIs only, so it runs on Node, Bun, Workers
|
|
6
6
|
* and Deno. (`deco serve`'s asset uploads use `./assets`, which isn't public.)
|
|
7
7
|
*/
|
|
8
|
-
export type { AuthOptions, AuthorizeResult } from "./auth.ts";
|
|
9
8
|
export type { ContentHandlerOptions } from "./core.ts";
|
|
10
9
|
export { type ContentHandler, createContentHandler } from "./handler.ts";
|
|
11
10
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/protocol/server/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/protocol/server/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,KAAK,cAAc,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/protocol/server/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/protocol/server/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAuB,oBAAoB,EAAE,MAAM,cAAc,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { BlocksApplyParams, BlocksApplyResult } from "../../types.ts";
|
|
2
|
-
import type
|
|
3
|
-
export declare function blocksApply(core: Core, params: BlocksApplyParams
|
|
2
|
+
import { type Core } from "../core.ts";
|
|
3
|
+
export declare function blocksApply(core: Core, params: BlocksApplyParams): Promise<BlocksApplyResult>;
|
|
4
4
|
//# sourceMappingURL=apply.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../../src/protocol/server/methods/apply.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../../src/protocol/server/methods/apply.ts"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,EAAY,MAAM,gBAAgB,CAAC;AAErF,OAAO,EAAE,KAAK,IAAI,EAAsC,MAAM,YAAY,CAAC;AAoM3E,wBAAsB,WAAW,CAC/B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAwC5B"}
|
|
@@ -7,38 +7,37 @@
|
|
|
7
7
|
* 3. `set` wins when a name is in both `set` and `delete`.
|
|
8
8
|
* 4. Validated first: names, value shapes, sizes and the secret guard are
|
|
9
9
|
* checked before anything is written, and every violation is reported.
|
|
10
|
-
* 5. Preconditions are optional: a failed `ifMatch`
|
|
11
|
-
*
|
|
10
|
+
* 5. Preconditions are optional: a failed `ifMatch` writes nothing and
|
|
11
|
+
* returns a Conflict; without one the last writer wins.
|
|
12
12
|
*
|
|
13
13
|
* 6. Two spellings of one name are one entry: a guard compares against the
|
|
14
14
|
* entry under any spelling, and the result reports `null` for every other
|
|
15
15
|
* spelling the commit deleted.
|
|
16
16
|
*
|
|
17
|
-
* A commit attempt that finds storage moved (files
|
|
18
|
-
* key reserved meanwhile) is retried against a new snapshot after a jittered
|
|
17
|
+
* A commit attempt that finds storage moved (files or the schema) is retried against a new snapshot after a jittered
|
|
19
18
|
* backoff, rechecking every guard, up to `maxCommitAttempts` times.
|
|
20
19
|
*/
|
|
21
|
-
import {
|
|
22
|
-
import { conflict, invalidBlock, invalidParams, limitExceeded, readOnly, unavailable, unsupported, } from "../../errors.js";
|
|
20
|
+
import { conflict, invalidBlock, limitExceeded, readOnly, unavailable, } from "../../errors.js";
|
|
23
21
|
import { blockFileName, blockNameFromFile, checkBlockName, checkDeletedName, fullyDecodeFileName, isBlockFileName, serializeBlock, spellingKey, } from "../../keys.js";
|
|
24
22
|
import { checkSecrets } from "../../secrets.js";
|
|
25
23
|
import { loadCurrentContent } from "../content.js";
|
|
26
|
-
import {
|
|
24
|
+
import { MAX_BLOCK_BYTES, MAX_OPS_PER_APPLY } from "../core.js";
|
|
25
|
+
import { parseSchema } from "./read.js";
|
|
27
26
|
const utf8 = new TextEncoder();
|
|
28
|
-
function normalize(params
|
|
27
|
+
function normalize(params) {
|
|
29
28
|
const set = Object.entries(params.set ?? {});
|
|
30
29
|
const setNames = new Set(set.map(([name]) => name));
|
|
31
30
|
const deleteNames = [...new Set(params.delete ?? [])].filter((name) => !setNames.has(name));
|
|
32
31
|
const ops = set.length + deleteNames.length;
|
|
33
|
-
if (ops >
|
|
34
|
-
throw limitExceeded(`${ops} names in one blocks.apply; the limit is ${
|
|
32
|
+
if (ops > MAX_OPS_PER_APPLY) {
|
|
33
|
+
throw limitExceeded(`${ops} names in one blocks.apply; the limit is ${MAX_OPS_PER_APPLY}`, {
|
|
35
34
|
limit: "maxOpsPerApply",
|
|
36
35
|
});
|
|
37
36
|
}
|
|
38
37
|
return { set, delete: deleteNames, ifMatch: Object.entries(params.ifMatch ?? {}) };
|
|
39
38
|
}
|
|
40
39
|
/** Checks everything that doesn't depend on stored content. */
|
|
41
|
-
function validateStatic(apply,
|
|
40
|
+
function validateStatic(apply, meta) {
|
|
42
41
|
const violations = [];
|
|
43
42
|
const bodies = new Map();
|
|
44
43
|
const bySpelling = new Map();
|
|
@@ -61,11 +60,11 @@ function validateStatic(apply, limits, meta) {
|
|
|
61
60
|
continue;
|
|
62
61
|
}
|
|
63
62
|
const body = serializeBlock(value);
|
|
64
|
-
if (utf8.encode(body).byteLength >
|
|
63
|
+
if (utf8.encode(body).byteLength > MAX_BLOCK_BYTES) {
|
|
65
64
|
violations.push({
|
|
66
65
|
name,
|
|
67
66
|
rule: "too-large",
|
|
68
|
-
message: `the entry is over ${
|
|
67
|
+
message: `the entry is over ${MAX_BLOCK_BYTES} bytes`,
|
|
69
68
|
});
|
|
70
69
|
continue;
|
|
71
70
|
}
|
|
@@ -177,11 +176,8 @@ function resultFromVersions(apply, revision, fileVersions, deletedFiles) {
|
|
|
177
176
|
}
|
|
178
177
|
return { revision, versions };
|
|
179
178
|
}
|
|
180
|
-
function
|
|
181
|
-
|
|
182
|
-
}
|
|
183
|
-
async function loadSchema(core, params, limits) {
|
|
184
|
-
const stored = await readSchema(core, params.ref, limits.maxSchemaBytes);
|
|
179
|
+
async function loadSchema(core) {
|
|
180
|
+
const stored = await core.storage.readSchema();
|
|
185
181
|
if (stored === null)
|
|
186
182
|
return { version: null, meta: null };
|
|
187
183
|
if (core.parsedSchema?.version !== stored.version) {
|
|
@@ -189,57 +185,16 @@ async function loadSchema(core, params, limits) {
|
|
|
189
185
|
}
|
|
190
186
|
return { version: stored.version, meta: core.parsedSchema.meta };
|
|
191
187
|
}
|
|
192
|
-
function
|
|
188
|
+
export async function blocksApply(core, params) {
|
|
189
|
+
const description = await core.description();
|
|
193
190
|
if (description.readOnly)
|
|
194
191
|
throw readOnly();
|
|
195
|
-
|
|
196
|
-
if (params.requestKey !== undefined && (!description.idempotency || !core.storage.getReceipt)) {
|
|
197
|
-
throw unsupported("this endpoint doesn't support request keys; omit requestKey");
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
export async function blocksApply(core, params, scope) {
|
|
201
|
-
const description = await core.description();
|
|
202
|
-
checkFeatures(description, core, params);
|
|
203
|
-
if (params.requestKey === undefined)
|
|
204
|
-
return applyOnce(core, params, description, null);
|
|
205
|
-
const digest = await applyRequestDigest(params);
|
|
206
|
-
const key = canonicalJson([scope, description.root, params.ref ?? null, params.requestKey]);
|
|
207
|
-
// Simultaneous duplicates: wait for the first, then find its receipt.
|
|
208
|
-
for (let pending = core.inflight.get(key); pending; pending = core.inflight.get(key)) {
|
|
209
|
-
await pending.catch(() => { });
|
|
210
|
-
}
|
|
211
|
-
const run = applyOnce(core, params, description, { key, digest });
|
|
212
|
-
core.inflight.set(key, run);
|
|
213
|
-
try {
|
|
214
|
-
return await run;
|
|
215
|
-
}
|
|
216
|
-
finally {
|
|
217
|
-
if (core.inflight.get(key) === run)
|
|
218
|
-
core.inflight.delete(key);
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
async function applyOnce(core, params, description, receipt) {
|
|
222
|
-
const limits = core.limits(description);
|
|
223
|
-
const apply = normalize(params, limits);
|
|
192
|
+
const apply = normalize(params);
|
|
224
193
|
for (let attempt = 1; attempt <= core.maxCommitAttempts; attempt++) {
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
if (stored) {
|
|
229
|
-
if (stored.digest !== receipt.digest) {
|
|
230
|
-
throw invalidParams("requestKey was already used for a different request");
|
|
231
|
-
}
|
|
232
|
-
return receiptResult(apply, stored);
|
|
233
|
-
}
|
|
234
|
-
}
|
|
235
|
-
const schema = await loadSchema(core, params, limits);
|
|
236
|
-
if (params.ifSchemaMatch !== undefined && params.ifSchemaMatch !== schema.version) {
|
|
237
|
-
throw conflict({ schema: { expected: params.ifSchemaMatch, actual: schema.version } });
|
|
238
|
-
}
|
|
239
|
-
const { violations, bodies } = validateStatic(apply, limits, schema.meta);
|
|
240
|
-
const { snapshot, content } = await loadCurrentContent(core.storage, params.ref, {
|
|
194
|
+
const schema = await loadSchema(core);
|
|
195
|
+
const { violations, bodies } = validateStatic(apply, schema.meta);
|
|
196
|
+
const { snapshot, content } = await loadCurrentContent(core.storage, {
|
|
241
197
|
readAll: false,
|
|
242
|
-
limits,
|
|
243
198
|
cache: core.cache,
|
|
244
199
|
});
|
|
245
200
|
const bySpelling = entriesBySpelling(content);
|
|
@@ -250,19 +205,16 @@ async function applyOnce(core, params, description, receipt) {
|
|
|
250
205
|
if (mismatches)
|
|
251
206
|
throw conflict({ entries: mismatches });
|
|
252
207
|
const { put, delete: deletes, expected } = plan(content, bySpelling, apply, bodies);
|
|
253
|
-
if (Object.keys(put).length === 0 && deletes.length === 0
|
|
208
|
+
if (Object.keys(put).length === 0 && deletes.length === 0) {
|
|
254
209
|
return resultFromVersions(apply, snapshot.revision, {}, []);
|
|
255
210
|
}
|
|
256
|
-
// The schema the
|
|
257
|
-
const dependsOnSchema = params.ifSchemaMatch !== undefined || apply.set.length > 0;
|
|
211
|
+
// The schema the secret check used must still be current at commit time.
|
|
258
212
|
const result = await core.storage.commit({
|
|
259
|
-
ref: params.ref,
|
|
260
213
|
base: snapshot,
|
|
261
214
|
put,
|
|
262
215
|
delete: deletes,
|
|
263
216
|
expected,
|
|
264
|
-
...(
|
|
265
|
-
receipt: receipt ?? undefined,
|
|
217
|
+
...(apply.set.length > 0 ? { expectedSchemaVersion: schema.version } : {}),
|
|
266
218
|
});
|
|
267
219
|
if (result.status === "committed") {
|
|
268
220
|
return resultFromVersions(apply, result.revision, result.versions, deletes);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../../src/protocol/server/methods/apply.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../../src/protocol/server/methods/apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,6 @@
|
|
|
1
1
|
import { type BlocksListResult, type DecoMeta, type DescribeResult, type ReadParams, type SchemaGetResult } from "../../types.ts";
|
|
2
2
|
import type { Core } from "../core.ts";
|
|
3
3
|
export declare function describe(core: Core): Promise<DescribeResult>;
|
|
4
|
-
/** Reads and parses the schema, enforcing the schema byte limit. */
|
|
5
|
-
export declare function readSchema(core: Core, ref: string | undefined, maxSchemaBytes: number): Promise<{
|
|
6
|
-
version: string;
|
|
7
|
-
resolvedRef: string | null;
|
|
8
|
-
text: string;
|
|
9
|
-
} | null>;
|
|
10
4
|
/** Parses schema text; a file caught mid-write is reported as Unavailable, never served torn. */
|
|
11
5
|
export declare function parseSchema(text: string): DecoMeta;
|
|
12
6
|
export declare function schemaGet(core: Core, params: ReadParams): Promise<SchemaGetResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../../src/protocol/server/methods/read.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,QAAQ,EACb,KAAK,cAAc,EAGnB,KAAK,UAAU,EAEf,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAmBvC,wBAAsB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../../src/protocol/server/methods/read.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,QAAQ,EACb,KAAK,cAAc,EAGnB,KAAK,UAAU,EAEf,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAmBvC,wBAAsB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,CAAC,CA8BlE;AAED,iGAAiG;AACjG,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAWlD;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAiBxF;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAyB1F"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* The three read methods: `describe`, `schema.get` and `blocks.list`.
|
|
3
3
|
*/
|
|
4
4
|
import { publicKeyDerFromPem } from "../../ciphertext.js";
|
|
5
|
-
import {
|
|
5
|
+
import { unavailable } from "../../errors.js";
|
|
6
6
|
import { ASSETS_URL_PREFIX, PROTOCOL_NAME, PROTOCOL_VERSION, SCHEMA_FORMAT, } from "../../types.js";
|
|
7
7
|
import { loadCurrentContent } from "../content.js";
|
|
8
8
|
const DEFAULT_SERVER = { name: "deco-blocks", version: "unknown" };
|
|
@@ -38,13 +38,7 @@ export async function describe(core) {
|
|
|
38
38
|
readOnly,
|
|
39
39
|
root: description.root,
|
|
40
40
|
schemaFormat: SCHEMA_FORMAT,
|
|
41
|
-
refs: description.refs,
|
|
42
|
-
writes: {
|
|
43
|
-
idempotency: core.storage.getReceipt ? description.idempotency : null,
|
|
44
|
-
schemaPreconditions: true,
|
|
45
|
-
},
|
|
46
41
|
pollIntervalMs: core.pollIntervalMs(description),
|
|
47
|
-
limits: core.limits(description),
|
|
48
42
|
preview: core.options.preview ?? null,
|
|
49
43
|
assets: readOnly || description.assets === null
|
|
50
44
|
? null
|
|
@@ -56,16 +50,6 @@ export async function describe(core) {
|
|
|
56
50
|
secrets: publicKey === null ? null : { publicKey },
|
|
57
51
|
};
|
|
58
52
|
}
|
|
59
|
-
/** Reads and parses the schema, enforcing the schema byte limit. */
|
|
60
|
-
export async function readSchema(core, ref, maxSchemaBytes) {
|
|
61
|
-
const stored = await core.storage.readSchema({ ref });
|
|
62
|
-
if (stored === null)
|
|
63
|
-
return null;
|
|
64
|
-
if (new TextEncoder().encode(stored.text).byteLength > maxSchemaBytes) {
|
|
65
|
-
throw limitExceeded(`the schema is over ${maxSchemaBytes} bytes`, { limit: "maxSchemaBytes" });
|
|
66
|
-
}
|
|
67
|
-
return stored;
|
|
68
|
-
}
|
|
69
53
|
/** Parses schema text; a file caught mid-write is reported as Unavailable, never served torn. */
|
|
70
54
|
export function parseSchema(text) {
|
|
71
55
|
let schema;
|
|
@@ -81,24 +65,16 @@ export function parseSchema(text) {
|
|
|
81
65
|
return schema;
|
|
82
66
|
}
|
|
83
67
|
export async function schemaGet(core, params) {
|
|
84
|
-
const
|
|
85
|
-
core.checkRef(description, params.ref);
|
|
86
|
-
const limits = core.limits(description);
|
|
87
|
-
const stored = await core.storage.readSchema({ ref: params.ref });
|
|
68
|
+
const stored = await core.storage.readSchema();
|
|
88
69
|
if (stored === null) {
|
|
89
70
|
// No schema yet is a state, not an error. The snapshot still refuses a
|
|
90
71
|
// site with no .deco folder (NotFound) and reports the resolved branch.
|
|
91
|
-
const snapshot = await core.storage.snapshot(
|
|
72
|
+
const snapshot = await core.storage.snapshot();
|
|
92
73
|
return { notModified: false, version: null, resolvedRef: snapshot.resolvedRef, schema: null };
|
|
93
74
|
}
|
|
94
75
|
if (params.ifNoneMatch !== undefined && params.ifNoneMatch === stored.version) {
|
|
95
76
|
return { notModified: true, version: stored.version };
|
|
96
77
|
}
|
|
97
|
-
if (new TextEncoder().encode(stored.text).byteLength > limits.maxSchemaBytes) {
|
|
98
|
-
throw limitExceeded(`the schema is over ${limits.maxSchemaBytes} bytes`, {
|
|
99
|
-
limit: "maxSchemaBytes",
|
|
100
|
-
});
|
|
101
|
-
}
|
|
102
78
|
return {
|
|
103
79
|
notModified: false,
|
|
104
80
|
version: stored.version,
|
|
@@ -107,10 +83,7 @@ export async function schemaGet(core, params) {
|
|
|
107
83
|
};
|
|
108
84
|
}
|
|
109
85
|
export async function blocksList(core, params) {
|
|
110
|
-
const
|
|
111
|
-
core.checkRef(description, params.ref);
|
|
112
|
-
const limits = core.limits(description);
|
|
113
|
-
const { snapshot, content } = await loadCurrentContent(core.storage, params.ref, { readAll: true, limits, cache: core.cache }, (s) => params.ifNoneMatch !== undefined && params.ifNoneMatch === s.revision);
|
|
86
|
+
const { snapshot, content } = await loadCurrentContent(core.storage, { readAll: true, cache: core.cache }, (s) => params.ifNoneMatch !== undefined && params.ifNoneMatch === s.revision);
|
|
114
87
|
if (content === null) {
|
|
115
88
|
return { notModified: true, revision: snapshot.revision, resolvedRef: snapshot.resolvedRef };
|
|
116
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/protocol/server/methods/read.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/protocol/server/methods/read.ts"],"names":[],"mappings":"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"}
|