@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
package/dist/v8/content.js
CHANGED
|
@@ -1,23 +1,17 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* The content side of a CMS: one source (the content module or a `Loader`)
|
|
3
|
-
* the caches every client shares
|
|
4
|
-
*
|
|
2
|
+
* The content side of a CMS: one source (the content module or a `Loader`)
|
|
3
|
+
* and the caches every client shares. Clients only ever see whole
|
|
4
|
+
* `{ revision, blocks }` snapshots.
|
|
5
5
|
*
|
|
6
6
|
* A draft is the release with a draft's changes layered over it (see
|
|
7
|
-
* ./draftChanges.ts).
|
|
8
|
-
* `forRevision(revision)` takes a revision string a client may hand back, so
|
|
9
|
-
* it must only ever reach published content, never a draft someone loaded
|
|
10
|
-
* with a pointer.
|
|
7
|
+
* ./draftChanges.ts).
|
|
11
8
|
*/
|
|
12
9
|
import { formatDraftPointer, parseDraftPointer } from "./draft.js";
|
|
13
|
-
import { fetchDraftChanges, LOCAL_VERSION, layerDraft } from "./draftChanges.js";
|
|
10
|
+
import { DEFAULT_DRAFT_HOSTS, fetchDraftChanges, LOCAL_VERSION, layerDraft, } from "./draftChanges.js";
|
|
14
11
|
import { errors, isResolutionError } from "./errors.js";
|
|
15
12
|
import { isPlainObject } from "./json.js";
|
|
16
|
-
const SERVED_REVISIONS = 16;
|
|
17
13
|
/** Fetched drafts kept per CMS. */
|
|
18
14
|
const CACHED_DRAFTS = 3;
|
|
19
|
-
/** How long a fetched draft is reused before it's fetched again, so its token is checked again. */
|
|
20
|
-
const DRAFT_TTL_MS = 60_000;
|
|
21
15
|
export function isLoader(content) {
|
|
22
16
|
return ((typeof content === "object" || typeof content === "function") &&
|
|
23
17
|
content !== null &&
|
|
@@ -40,18 +34,23 @@ export function isSnapshot(content) {
|
|
|
40
34
|
return (isPlainObject(content) &&
|
|
41
35
|
typeof content.revision === "string" &&
|
|
42
36
|
isPlainObject(content.blocks) &&
|
|
43
|
-
(content.aliases === undefined || isPlainObject(content.aliases))
|
|
37
|
+
(content.aliases === undefined || isPlainObject(content.aliases)) &&
|
|
38
|
+
(content.schemaHash === undefined || typeof content.schemaHash === "string") &&
|
|
39
|
+
(content.committedAt === undefined || typeof content.committedAt === "string"));
|
|
44
40
|
}
|
|
45
41
|
export class ContentStore {
|
|
46
42
|
#source;
|
|
47
43
|
#release;
|
|
48
44
|
#updating;
|
|
49
45
|
#drafts = new BoundedMap(CACHED_DRAFTS);
|
|
50
|
-
|
|
46
|
+
/** Draft reads in flight, so concurrent renders of one draft share one request. */
|
|
47
|
+
#draftReads = new Map();
|
|
48
|
+
#draftHosts;
|
|
51
49
|
/** The release this store last handed a client, for a loader that can't peek. */
|
|
52
50
|
#latest;
|
|
53
|
-
constructor(source) {
|
|
51
|
+
constructor(source, draftHosts = DEFAULT_DRAFT_HOSTS) {
|
|
54
52
|
this.#source = source;
|
|
53
|
+
this.#draftHosts = draftHosts;
|
|
55
54
|
}
|
|
56
55
|
/** Whether the source can change while the process runs (has `update()`). */
|
|
57
56
|
get updatable() {
|
|
@@ -80,14 +79,15 @@ export class ContentStore {
|
|
|
80
79
|
return this.#release;
|
|
81
80
|
}
|
|
82
81
|
/**
|
|
83
|
-
* The draft a pointer names: its changes, fetched from a host
|
|
82
|
+
* The draft a pointer names: its changes, fetched from a draft host,
|
|
84
83
|
* layered over the release. A pointer that doesn't parse, or any failure, is
|
|
85
84
|
* `LOADER_FAILED`, never a silent fallback to the release. A pointer whose
|
|
86
85
|
* version is `local` names no draft: the release, with nothing fetched. The
|
|
87
86
|
* changes are keyed by the pointer without its `__variant` parameters (every
|
|
88
|
-
* variant of one draft shares one
|
|
87
|
+
* variant of one draft shares one body) and revalidated on every read: a
|
|
88
|
+
* `304` reuses the body held, a `200` replaces it.
|
|
89
89
|
*/
|
|
90
|
-
draft(pointer
|
|
90
|
+
draft(pointer) {
|
|
91
91
|
const parsed = parseDraftPointer(pointer);
|
|
92
92
|
if (parsed === null) {
|
|
93
93
|
return Promise.reject(errors.loaderFailed(`invalid draft pointer "${truncate(pointer)}"`));
|
|
@@ -96,29 +96,39 @@ export class ContentStore {
|
|
|
96
96
|
return this.release();
|
|
97
97
|
const { host, path, version } = parsed;
|
|
98
98
|
const key = formatDraftPointer({ host, path, version });
|
|
99
|
-
let
|
|
100
|
-
if (
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
99
|
+
let read = this.#draftReads.get(key);
|
|
100
|
+
if (read === undefined) {
|
|
101
|
+
const held = this.#drafts.get(key);
|
|
102
|
+
read = fetchDraftChanges(parsed, { domains: this.#draftHosts, etag: held?.etag }).then((result) => {
|
|
103
|
+
if (result.status === 304 && held !== undefined)
|
|
104
|
+
return held;
|
|
105
|
+
if (result.status === 304)
|
|
106
|
+
throw new Error("draft changes: 304 without a held body");
|
|
107
|
+
const entry = {
|
|
108
|
+
changes: result.changes,
|
|
109
|
+
etag: result.etag,
|
|
110
|
+
views: new WeakMap(),
|
|
111
|
+
};
|
|
112
|
+
this.#drafts.set(key, entry);
|
|
113
|
+
return entry;
|
|
113
114
|
});
|
|
114
|
-
|
|
115
|
+
const pending = read;
|
|
116
|
+
this.#draftReads.set(key, pending);
|
|
117
|
+
const settle = () => {
|
|
118
|
+
if (this.#draftReads.get(key) === pending)
|
|
119
|
+
this.#draftReads.delete(key);
|
|
120
|
+
};
|
|
121
|
+
pending.then(settle, settle);
|
|
115
122
|
}
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
|
|
123
|
+
const changes = read.catch((error) => {
|
|
124
|
+
throw errors.loaderFailed("the draft's changes couldn't be fetched", error);
|
|
125
|
+
});
|
|
126
|
+
return Promise.all([this.release(), changes]).then(([base, entry]) => {
|
|
127
|
+
let view = entry.views.get(base);
|
|
119
128
|
if (view === undefined) {
|
|
120
|
-
view
|
|
121
|
-
|
|
129
|
+
// OPEN: the view is keyed by the body's ETag (the pointer outlives later saves); the version without one.
|
|
130
|
+
view = layerDraft(base, entry.changes, entry.etag ?? version);
|
|
131
|
+
entry.views.set(base, view);
|
|
122
132
|
}
|
|
123
133
|
return view;
|
|
124
134
|
});
|
|
@@ -131,11 +141,6 @@ export class ContentStore {
|
|
|
131
141
|
current() {
|
|
132
142
|
return peekRelease(this.#source) ?? this.#latest;
|
|
133
143
|
}
|
|
134
|
-
/** A release revision this store has served, or the release when it's unknown (drafts included). */
|
|
135
|
-
revision(revision) {
|
|
136
|
-
const served = this.#served.get(revision);
|
|
137
|
-
return served === undefined ? this.release() : Promise.resolve(served);
|
|
138
|
-
}
|
|
139
144
|
/** Asks the source for newer content; never throws, and concurrent calls share one check. */
|
|
140
145
|
update() {
|
|
141
146
|
const source = this.#source;
|
|
@@ -179,8 +184,6 @@ export class ContentStore {
|
|
|
179
184
|
this.#drafts.clear();
|
|
180
185
|
return;
|
|
181
186
|
}
|
|
182
|
-
if (isSnapshot(previous))
|
|
183
|
-
this.#served.delete(previous.revision);
|
|
184
187
|
this.#source = source;
|
|
185
188
|
this.#release = undefined;
|
|
186
189
|
this.#latest = undefined;
|
|
@@ -203,7 +206,6 @@ export class ContentStore {
|
|
|
203
206
|
}
|
|
204
207
|
#serve(snapshot) {
|
|
205
208
|
this.#latest = snapshot;
|
|
206
|
-
this.#served.set(snapshot.revision, snapshot);
|
|
207
209
|
return snapshot;
|
|
208
210
|
}
|
|
209
211
|
}
|
package/dist/v8/content.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content.js","sourceRoot":"","sources":["../../src/v8/content.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"content.js","sourceRoot":"","sources":["../../src/v8/content.ts"],"names":[],"mappings":"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"}
|
package/dist/v8/draft.d.ts
CHANGED
|
@@ -25,7 +25,7 @@ export declare function parseDraftPointer(raw: string | null | undefined): Draft
|
|
|
25
25
|
export declare function formatDraftPointer(pointer: DraftPointer): string;
|
|
26
26
|
/**
|
|
27
27
|
* The draft pointer a request carries: `?__draft=` from the URL first, then
|
|
28
|
-
* the `
|
|
28
|
+
* the `__deco_draft` cookie. `null` when neither is present, or when the URL
|
|
29
29
|
* says `?__draft=off`. The value is returned as is; `cms.forDraft` validates it.
|
|
30
30
|
*/
|
|
31
31
|
export declare function readDraftPointer(request: RequestLike): string | null;
|
package/dist/v8/draft.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** The draft cookie's name. Not exported from the package: reading it directly would skip the host check. */
|
|
2
|
-
const DRAFT_COOKIE = "
|
|
2
|
+
const DRAFT_COOKIE = "__deco_draft";
|
|
3
3
|
const DRAFT_PARAM = "__draft";
|
|
4
4
|
const DRAFT_OFF = "off";
|
|
5
5
|
/** Lowercase DNS name; a single label (`localhost`) is allowed. */
|
|
@@ -146,7 +146,7 @@ function normalizeIPv6Host(authority) {
|
|
|
146
146
|
}
|
|
147
147
|
/**
|
|
148
148
|
* The draft pointer a request carries: `?__draft=` from the URL first, then
|
|
149
|
-
* the `
|
|
149
|
+
* the `__deco_draft` cookie. `null` when neither is present, or when the URL
|
|
150
150
|
* says `?__draft=off`. The value is returned as is; `cms.forDraft` validates it.
|
|
151
151
|
*/
|
|
152
152
|
export function readDraftPointer(request) {
|
package/dist/v8/draft.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draft.js","sourceRoot":"","sources":["../../src/v8/draft.ts"],"names":[],"mappings":"AAaA,6GAA6G;AAC7G,MAAM,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"draft.js","sourceRoot":"","sources":["../../src/v8/draft.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,67 @@
|
|
|
1
|
-
import { type HostPattern } from "./hosts.ts";
|
|
2
1
|
import type { DraftPointer, Snapshot } from "./types.ts";
|
|
3
2
|
/** The version a pointer has when it names no draft: `deco serve`'s working tree. */
|
|
4
3
|
export declare const LOCAL_VERSION = "local";
|
|
5
|
-
declare const FORMAT = 1;
|
|
6
4
|
/** What a draft changed compared with production: whole blocks, and deletions. */
|
|
7
5
|
export interface DraftChanges {
|
|
8
|
-
format: typeof FORMAT;
|
|
9
6
|
set: Record<string, unknown>;
|
|
10
7
|
delete: string[];
|
|
11
8
|
}
|
|
12
|
-
/**
|
|
13
|
-
export
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
9
|
+
/** A draft read: new changes (and their ETag), or `304`, the held body is current. */
|
|
10
|
+
export type DraftRead = {
|
|
11
|
+
status: 200;
|
|
12
|
+
changes: DraftChanges;
|
|
13
|
+
etag: string | null;
|
|
14
|
+
} | {
|
|
15
|
+
status: 304;
|
|
16
|
+
};
|
|
17
|
+
/**
|
|
18
|
+
* The domains a draft pointer's host may fall under, the defaults v7 shipped.
|
|
19
|
+
* Deco operates every one of them, so the defaults add no SSRF surface. An
|
|
20
|
+
* entry starting with a dot matches any host that ends with it, on a label
|
|
21
|
+
* boundary (`evil-decocms.com` doesn't pass `.decocms.com`); any other entry
|
|
22
|
+
* matches that exact host. The first entry that matches decides whether a
|
|
23
|
+
* port and plain `http` are allowed.
|
|
24
|
+
*/
|
|
25
|
+
export declare const DEFAULT_DRAFT_HOSTS: readonly string[];
|
|
26
|
+
/**
|
|
27
|
+
* `createCMS`'s `preview.draftHosts`, trimmed and lowercased, or the defaults
|
|
28
|
+
* when it's left out. Throws a `TypeError` on anything but a list of
|
|
29
|
+
* non-empty strings.
|
|
30
|
+
*/
|
|
31
|
+
export declare function parseDraftHosts(preview: {
|
|
32
|
+
draftHosts?: unknown;
|
|
33
|
+
} | undefined): readonly string[];
|
|
34
|
+
/**
|
|
35
|
+
* The origin a pointer's host is fetched from, or `null` when no draft host
|
|
36
|
+
* admits it. Loopback domains (and `local.studio.decocms.com`) may
|
|
37
|
+
* carry a port; a public domain may not, so a pointer can't aim the fetch at
|
|
38
|
+
* an odd port. Loopback hosts are `http`; everything else is `https`.
|
|
39
|
+
*/
|
|
40
|
+
export declare function previewApiOrigin(authority: string, domains?: readonly string[]): string | null;
|
|
41
|
+
/**
|
|
42
|
+
* The URL the SDK fetches for a pointer: the origin its host is admitted
|
|
43
|
+
* under, the version as `v`. `null` when no draft host admits the host.
|
|
44
|
+
*/
|
|
45
|
+
export declare function draftChangesUrl(pointer: DraftPointer, domains?: readonly string[]): string | null;
|
|
46
|
+
/**
|
|
47
|
+
* Reads a draft's changes, revalidating `etag` (the ETag of the body the
|
|
48
|
+
* caller holds) when given. Rejects on a host no draft host admits
|
|
49
|
+
* (without fetching), on a `304` to a request that sent no ETag, and on any
|
|
50
|
+
* other failure.
|
|
51
|
+
*/
|
|
52
|
+
export declare function fetchDraftChanges(pointer: DraftPointer, options?: {
|
|
53
|
+
domains?: readonly string[];
|
|
54
|
+
etag?: string | null;
|
|
55
|
+
}): Promise<DraftRead>;
|
|
56
|
+
/** Validates a draft changes response; throws on any unexpected shape. */
|
|
17
57
|
export declare function parseDraftChanges(body: unknown): DraftChanges;
|
|
18
58
|
/**
|
|
19
59
|
* The draft as a snapshot: production's entries, with the changed ones
|
|
20
60
|
* replaced whole and the deleted ones gone. A shallow copy: every unchanged
|
|
21
61
|
* entry is production's own object, and production is never mutated. Its
|
|
22
|
-
* revision is an opaque identity of the pair,
|
|
62
|
+
* revision, `<base revision>~<view>`, is an opaque identity of the pair,
|
|
63
|
+
* never a release's; `view` names the draft body (its ETag), so each save
|
|
64
|
+
* re-keys what's cached by revision.
|
|
23
65
|
*/
|
|
24
|
-
export declare function layerDraft(base: Snapshot, changes: DraftChanges,
|
|
25
|
-
export {};
|
|
66
|
+
export declare function layerDraft(base: Snapshot, changes: DraftChanges, view: string): Snapshot;
|
|
26
67
|
//# sourceMappingURL=draftChanges.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draftChanges.d.ts","sourceRoot":"","sources":["../../src/v8/draftChanges.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"draftChanges.d.ts","sourceRoot":"","sources":["../../src/v8/draftChanges.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEzD,qFAAqF;AACrF,eAAO,MAAM,aAAa,UAAU,CAAC;AAKrC,kFAAkF;AAClF,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,sFAAsF;AACtF,MAAM,MAAM,SAAS,GACjB;IAAE,MAAM,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC3D;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,CAAC;AAEpB;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,EAAE,SAAS,MAAM,EAMhD,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,GAAG,SAAS,MAAM,EAAE,CAUhG;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,SAAS,MAAM,EAAwB,GAC/C,MAAM,GAAG,IAAI,CAcf;AAWD;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,SAAS,MAAM,EAAwB,GAC/C,MAAM,GAAG,IAAI,CAKf;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAO,GAClE,OAAO,CAAC,SAAS,CAAC,CAmCpB;AAED,0EAA0E;AAC1E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,YAAY,CAa7D;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,CAexF"}
|
package/dist/v8/draftChanges.js
CHANGED
|
@@ -2,59 +2,142 @@
|
|
|
2
2
|
* Draft changes (see /next/content-delivery#draft-previews): what a draft
|
|
3
3
|
* pointer's address answers, and how the CMS layers it over production.
|
|
4
4
|
*
|
|
5
|
-
* - The pointer's host must
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
5
|
+
* - The pointer's host must fall under one of the draft hosts (the same rule
|
|
6
|
+
* as v7's preview API domains): by default `*.decocms.com` (Studio, the
|
|
7
|
+
* delivery CDN, `local.studio.decocms.com`) and the loopback hosts;
|
|
8
|
+
* `createCMS({ preview: { draftHosts } })` replaces the list. Any other host
|
|
9
|
+
* is refused before anything is fetched.
|
|
10
|
+
* - `GET <scheme>://<host><path>?v=<version>`: the scheme comes from the
|
|
11
|
+
* domain that admitted the host, never from the pointer: plain `http` only
|
|
12
|
+
* for loopback hosts. The pointer's `__variant` parameters are already gone (the parser
|
|
9
13
|
* lifts them out), no cookies or credentials are sent, and redirects aren't
|
|
10
14
|
* followed (a response that was redirected anyway is refused).
|
|
11
|
-
* -
|
|
12
|
-
* `
|
|
13
|
-
*
|
|
15
|
+
* - Every read revalidates: with a body this process already holds, it sends
|
|
16
|
+
* `If-None-Match` with that body's ETag, and a `304` reuses the body. Only
|
|
17
|
+
* a 200 or that 304 is accepted, within 10 s; a 200 is up to 16 MiB, shaped
|
|
18
|
+
* exactly `{ set: { <name>: <block JSON> }, delete: [<name>…] }` with `set`
|
|
19
|
+
* and `delete` disjoint.
|
|
14
20
|
*/
|
|
15
21
|
import { readBoundedJson, timeoutSignal } from "./boundedJson.js";
|
|
16
|
-
import { allowsHost } from "./hosts.js";
|
|
17
22
|
import { isPlainObject } from "./json.js";
|
|
18
23
|
/** The version a pointer has when it names no draft: `deco serve`'s working tree. */
|
|
19
24
|
export const LOCAL_VERSION = "local";
|
|
20
|
-
const FORMAT = 1;
|
|
21
25
|
const TIMEOUT_MS = 10_000;
|
|
22
26
|
const MAX_BYTES = 16 * 1024 * 1024;
|
|
23
|
-
/**
|
|
24
|
-
|
|
25
|
-
|
|
27
|
+
/**
|
|
28
|
+
* The domains a draft pointer's host may fall under, the defaults v7 shipped.
|
|
29
|
+
* Deco operates every one of them, so the defaults add no SSRF surface. An
|
|
30
|
+
* entry starting with a dot matches any host that ends with it, on a label
|
|
31
|
+
* boundary (`evil-decocms.com` doesn't pass `.decocms.com`); any other entry
|
|
32
|
+
* matches that exact host. The first entry that matches decides whether a
|
|
33
|
+
* port and plain `http` are allowed.
|
|
34
|
+
*/
|
|
35
|
+
export const DEFAULT_DRAFT_HOSTS = [
|
|
36
|
+
"local.studio.decocms.com", // the Studio dev origin (https, with a port)
|
|
37
|
+
"localhost",
|
|
38
|
+
"127.0.0.1",
|
|
39
|
+
".localhost",
|
|
40
|
+
".decocms.com", // Studio, its preview deployments and delivery.decocms.com
|
|
41
|
+
];
|
|
42
|
+
/**
|
|
43
|
+
* `createCMS`'s `preview.draftHosts`, trimmed and lowercased, or the defaults
|
|
44
|
+
* when it's left out. Throws a `TypeError` on anything but a list of
|
|
45
|
+
* non-empty strings.
|
|
46
|
+
*/
|
|
47
|
+
export function parseDraftHosts(preview) {
|
|
48
|
+
const domains = preview?.draftHosts;
|
|
49
|
+
if (domains === undefined)
|
|
50
|
+
return DEFAULT_DRAFT_HOSTS;
|
|
51
|
+
if (!Array.isArray(domains) ||
|
|
52
|
+
domains.some((domain) => typeof domain !== "string" || domain.trim() === "")) {
|
|
53
|
+
throw new TypeError("createCMS: `preview.draftHosts` must be a list of hosts");
|
|
54
|
+
}
|
|
55
|
+
return domains.map((domain) => domain.trim().toLowerCase());
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* The origin a pointer's host is fetched from, or `null` when no draft host
|
|
59
|
+
* admits it. Loopback domains (and `local.studio.decocms.com`) may
|
|
60
|
+
* carry a port; a public domain may not, so a pointer can't aim the fetch at
|
|
61
|
+
* an odd port. Loopback hosts are `http`; everything else is `https`.
|
|
62
|
+
*/
|
|
63
|
+
export function previewApiOrigin(authority, domains = DEFAULT_DRAFT_HOSTS) {
|
|
64
|
+
const lower = authority.toLowerCase();
|
|
65
|
+
const end = lower.startsWith("[") ? lower.indexOf("]") + 1 : -1;
|
|
66
|
+
const host = end > 0 ? lower.slice(0, end) : lower.split(":")[0];
|
|
67
|
+
const rest = end > 0 ? lower.slice(end) : lower.slice(host.length);
|
|
68
|
+
const port = rest.startsWith(":") ? rest.slice(1) : undefined;
|
|
69
|
+
if (!host)
|
|
70
|
+
return null;
|
|
71
|
+
const domain = domains.find((d) => d.startsWith(".") ? host.length > d.length && host.endsWith(d) : host === d);
|
|
72
|
+
if (domain === undefined)
|
|
73
|
+
return null;
|
|
74
|
+
const insecure = isLoopbackDomain(domain);
|
|
75
|
+
if (port !== undefined && !insecure && domain !== "local.studio.decocms.com")
|
|
76
|
+
return null;
|
|
77
|
+
return `${insecure ? "http" : "https"}://${host}${port === undefined ? "" : `:${port}`}`;
|
|
78
|
+
}
|
|
79
|
+
function isLoopbackDomain(domain) {
|
|
80
|
+
return (domain === "localhost" ||
|
|
81
|
+
domain === "127.0.0.1" ||
|
|
82
|
+
domain === "[::1]" ||
|
|
83
|
+
domain.endsWith(".localhost"));
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* The URL the SDK fetches for a pointer: the origin its host is admitted
|
|
87
|
+
* under, the version as `v`. `null` when no draft host admits the host.
|
|
88
|
+
*/
|
|
89
|
+
export function draftChangesUrl(pointer, domains = DEFAULT_DRAFT_HOSTS) {
|
|
90
|
+
const origin = previewApiOrigin(pointer.host, domains);
|
|
91
|
+
if (origin === null)
|
|
92
|
+
return null;
|
|
26
93
|
const separator = pointer.path.includes("?") ? "&" : "?";
|
|
27
|
-
return `${
|
|
94
|
+
return `${origin}${pointer.path}${separator}v=${encodeURIComponent(pointer.version)}`;
|
|
28
95
|
}
|
|
29
|
-
/**
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
96
|
+
/**
|
|
97
|
+
* Reads a draft's changes, revalidating `etag` (the ETag of the body the
|
|
98
|
+
* caller holds) when given. Rejects on a host no draft host admits
|
|
99
|
+
* (without fetching), on a `304` to a request that sent no ETag, and on any
|
|
100
|
+
* other failure.
|
|
101
|
+
*/
|
|
102
|
+
export async function fetchDraftChanges(pointer, options = {}) {
|
|
103
|
+
const url = draftChangesUrl(pointer, options.domains);
|
|
104
|
+
if (url === null) {
|
|
105
|
+
throw new Error(`draft pointer names "${pointer.host}", which isn't under a draft host ` +
|
|
106
|
+
"(createCMS({ preview: { draftHosts } })); nothing was fetched");
|
|
34
107
|
}
|
|
108
|
+
const headers = { accept: "application/json" };
|
|
109
|
+
if (options.etag)
|
|
110
|
+
headers["if-none-match"] = options.etag;
|
|
35
111
|
const response = await fetch(url, {
|
|
36
|
-
headers
|
|
112
|
+
headers,
|
|
37
113
|
redirect: "manual",
|
|
38
114
|
signal: timeoutSignal(TIMEOUT_MS),
|
|
39
115
|
});
|
|
40
116
|
// Some fetch polyfills (React Native, whatwg-fetch) ignore `redirect: "manual"`
|
|
41
117
|
// and follow anyway: refuse a response that came from anywhere else.
|
|
42
|
-
if (response.redirected ||
|
|
118
|
+
if (response.redirected ||
|
|
119
|
+
(response.url && new URL(response.url).origin !== new URL(url).origin)) {
|
|
43
120
|
await response.body?.cancel();
|
|
44
121
|
throw new Error("draft changes: the pointer's address redirected; nothing was read");
|
|
45
122
|
}
|
|
123
|
+
if (response.status === 304 && options.etag) {
|
|
124
|
+
await response.body?.cancel();
|
|
125
|
+
return { status: 304 };
|
|
126
|
+
}
|
|
46
127
|
if (response.status !== 200) {
|
|
47
128
|
await response.body?.cancel();
|
|
48
129
|
throw new Error(`draft changes: HTTP ${response.status}`);
|
|
49
130
|
}
|
|
50
|
-
|
|
131
|
+
const etag = response.headers.get("etag");
|
|
132
|
+
const changes = parseDraftChanges(await readBoundedJson(response, "draft changes", MAX_BYTES));
|
|
133
|
+
return { status: 200, changes, etag };
|
|
51
134
|
}
|
|
52
|
-
/** Validates a draft changes response; throws on
|
|
135
|
+
/** Validates a draft changes response; throws on any unexpected shape. */
|
|
53
136
|
export function parseDraftChanges(body) {
|
|
54
137
|
const invalid = (why) => new Error(`draft changes: ${why}`);
|
|
55
|
-
if (!isPlainObject(body)
|
|
56
|
-
throw invalid("
|
|
57
|
-
if (Object.keys(body).some((key) => key !== "
|
|
138
|
+
if (!isPlainObject(body))
|
|
139
|
+
throw invalid("expected an object");
|
|
140
|
+
if (Object.keys(body).some((key) => key !== "set" && key !== "delete")) {
|
|
58
141
|
throw invalid("unexpected field");
|
|
59
142
|
}
|
|
60
143
|
const { set, delete: deleted } = body;
|
|
@@ -63,8 +146,6 @@ export function parseDraftChanges(body) {
|
|
|
63
146
|
if (!Array.isArray(deleted) || deleted.some((name) => typeof name !== "string")) {
|
|
64
147
|
throw invalid("delete must be a list of names");
|
|
65
148
|
}
|
|
66
|
-
if (new Set(deleted).size !== deleted.length)
|
|
67
|
-
throw invalid("delete repeats a name");
|
|
68
149
|
if (deleted.some((name) => Object.hasOwn(set, name)))
|
|
69
150
|
throw invalid("set and delete overlap");
|
|
70
151
|
return body;
|
|
@@ -73,9 +154,11 @@ export function parseDraftChanges(body) {
|
|
|
73
154
|
* The draft as a snapshot: production's entries, with the changed ones
|
|
74
155
|
* replaced whole and the deleted ones gone. A shallow copy: every unchanged
|
|
75
156
|
* entry is production's own object, and production is never mutated. Its
|
|
76
|
-
* revision is an opaque identity of the pair,
|
|
157
|
+
* revision, `<base revision>~<view>`, is an opaque identity of the pair,
|
|
158
|
+
* never a release's; `view` names the draft body (its ETag), so each save
|
|
159
|
+
* re-keys what's cached by revision.
|
|
77
160
|
*/
|
|
78
|
-
export function layerDraft(base, changes,
|
|
161
|
+
export function layerDraft(base, changes, view) {
|
|
79
162
|
const blocks = { ...base.blocks };
|
|
80
163
|
for (const name of changes.delete)
|
|
81
164
|
delete blocks[name];
|
|
@@ -88,15 +171,9 @@ export function layerDraft(base, changes, version) {
|
|
|
88
171
|
configurable: true,
|
|
89
172
|
});
|
|
90
173
|
}
|
|
91
|
-
const
|
|
174
|
+
const layered = { revision: `${base.revision}~${view}`, blocks };
|
|
92
175
|
if (base.aliases !== undefined)
|
|
93
|
-
|
|
94
|
-
return
|
|
95
|
-
}
|
|
96
|
-
function isLoopback(authority) {
|
|
97
|
-
const host = authority.startsWith("[")
|
|
98
|
-
? authority.slice(0, authority.indexOf("]") + 1)
|
|
99
|
-
: authority.split(":")[0];
|
|
100
|
-
return (host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "[::1]");
|
|
176
|
+
layered.aliases = base.aliases;
|
|
177
|
+
return layered;
|
|
101
178
|
}
|
|
102
179
|
//# sourceMappingURL=draftChanges.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draftChanges.js","sourceRoot":"","sources":["../../src/v8/draftChanges.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"draftChanges.js","sourceRoot":"","sources":["../../src/v8/draftChanges.ts"],"names":[],"mappings":"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"}
|
package/dist/v8/identity.d.ts
CHANGED
|
@@ -12,8 +12,6 @@ import type { Loader, Snapshot } from "./types.ts";
|
|
|
12
12
|
export declare function contentIdentity(content: Snapshot | Loader): string;
|
|
13
13
|
/** FNV-1a, 32-bit: a non-cryptographic fingerprint that keeps secrets out of keys and logs. */
|
|
14
14
|
export declare function fnv1a(input: string): string;
|
|
15
|
-
/** Reads an environment variable where there is one (Node, Bun, Workers with nodejs_compat). */
|
|
16
|
-
export declare function readEnv(name: string): string | undefined;
|
|
17
15
|
/** Clears every global instance whose registry key starts with `prefix`. */
|
|
18
16
|
export declare function clearGlobals(prefix: string): void;
|
|
19
17
|
//# sourceMappingURL=identity.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../src/v8/identity.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAMlE;AAkBD,+FAA+F;AAC/F,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAO3C;AAED,
|
|
1
|
+
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../src/v8/identity.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAMlE;AAkBD,+FAA+F;AAC/F,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAO3C;AAED,4EAA4E;AAC5E,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAKjD"}
|