@decocms/blocks 8.1.0-next.4 → 8.1.0-next.6
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 +1 -3
- 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 +24 -53
- 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 -20
- package/dist/protocol/conformance/cases/writes.js.map +1 -1
- package/dist/protocol/conformance/contentHashFixtures.d.ts +0 -29
- package/dist/protocol/conformance/contentHashFixtures.d.ts.map +1 -1
- package/dist/protocol/conformance/contentHashFixtures.js +0 -30
- package/dist/protocol/conformance/contentHashFixtures.js.map +1 -1
- package/dist/protocol/conformance/context.d.ts +4 -29
- 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.d.ts +1 -1
- package/dist/protocol/conformance/index.d.ts.map +1 -1
- package/dist/protocol/conformance/index.js +4 -4
- package/dist/protocol/conformance/index.js.map +1 -1
- 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 +3 -5
- package/dist/protocol/index.d.ts.map +1 -1
- package/dist/protocol/index.js +3 -5
- 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 +7 -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 +23 -34
- package/dist/protocol/types.d.ts.map +1 -1
- package/dist/protocol/types.js +10 -10
- package/dist/protocol/types.js.map +1 -1
- package/dist/v8/boundedJson.d.ts +11 -0
- package/dist/v8/boundedJson.d.ts.map +1 -0
- package/dist/v8/boundedJson.js +44 -0
- package/dist/v8/boundedJson.js.map +1 -0
- package/dist/v8/canonical.d.ts +0 -35
- package/dist/v8/canonical.d.ts.map +1 -1
- package/dist/v8/canonical.js +0 -28
- package/dist/v8/canonical.js.map +1 -1
- package/dist/v8/cli/check/index.d.ts +5 -0
- package/dist/v8/cli/check/index.d.ts.map +1 -1
- package/dist/v8/cli/check/index.js +21 -1
- package/dist/v8/cli/check/index.js.map +1 -1
- package/dist/v8/cli/run.js +1 -1
- package/dist/v8/cli/schema/generate.d.ts +3 -1
- package/dist/v8/cli/schema/generate.d.ts.map +1 -1
- package/dist/v8/cli/schema/generate.js +2 -1
- package/dist/v8/cli/schema/generate.js.map +1 -1
- package/dist/v8/cli/serve/server.d.ts +1 -1
- package/dist/v8/cli/serve/server.d.ts.map +1 -1
- package/dist/v8/cli/serve/server.js +63 -23
- package/dist/v8/cli/serve/server.js.map +1 -1
- package/dist/v8/cms.d.ts.map +1 -1
- package/dist/v8/cms.js +7 -6
- package/dist/v8/cms.js.map +1 -1
- package/dist/v8/content.d.ts +6 -5
- package/dist/v8/content.d.ts.map +1 -1
- package/dist/v8/content.js +49 -39
- package/dist/v8/content.js.map +1 -1
- package/dist/v8/draft.d.ts +1 -1
- package/dist/v8/draft.d.ts.map +1 -1
- package/dist/v8/draft.js +24 -2
- package/dist/v8/draft.js.map +1 -1
- package/dist/v8/draftChanges.d.ts +44 -0
- package/dist/v8/draftChanges.d.ts.map +1 -0
- package/dist/v8/draftChanges.js +157 -0
- package/dist/v8/draftChanges.js.map +1 -0
- package/dist/v8/remoteLoader.d.ts +1 -1
- package/dist/v8/remoteLoader.d.ts.map +1 -1
- package/dist/v8/remoteLoader.js +19 -256
- package/dist/v8/remoteLoader.js.map +1 -1
- package/dist/v8/settings.d.ts.map +1 -1
- package/dist/v8/settings.js +9 -6
- package/dist/v8/settings.js.map +1 -1
- package/dist/v8/telemetry.d.ts +4 -0
- package/dist/v8/telemetry.d.ts.map +1 -1
- package/dist/v8/telemetry.js +49 -14
- package/dist/v8/telemetry.js.map +1 -1
- package/dist/v8/types.d.ts +20 -12
- package/dist/v8/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/protocol/client.ts +1 -4
- package/src/protocol/conformance/cases/guards.ts +10 -188
- package/src/protocol/conformance/cases/reads.ts +29 -69
- package/src/protocol/conformance/cases/writes.ts +7 -35
- package/src/protocol/conformance/contentHashFixtures.ts +0 -57
- package/src/protocol/conformance/context.ts +9 -34
- package/src/protocol/conformance/index.ts +4 -9
- package/src/protocol/errors.ts +5 -10
- package/src/protocol/index.ts +2 -10
- 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 +7 -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 +21 -38
- package/src/v8/boundedJson.ts +47 -0
- package/src/v8/canonical.ts +0 -47
- package/src/v8/cli/check/index.ts +25 -1
- package/src/v8/cli/run.ts +1 -1
- package/src/v8/cli/schema/generate.ts +4 -1
- package/src/v8/cli/serve/server.ts +65 -29
- package/src/v8/cms.ts +7 -8
- package/src/v8/content.ts +55 -42
- package/src/v8/draft.ts +20 -2
- package/src/v8/draftChanges.ts +172 -0
- package/src/v8/remoteLoader.ts +23 -289
- package/src/v8/settings.ts +13 -6
- package/src/v8/telemetry.ts +58 -13
- package/src/v8/types.ts +23 -13
- 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
|
@@ -3,20 +3,20 @@
|
|
|
3
3
|
* the caches every client shares, and the release revisions this process has
|
|
4
4
|
* served. Clients only ever see whole `{ revision, blocks }` snapshots.
|
|
5
5
|
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
6
|
+
* A draft is the release with a draft's changes layered over it (see
|
|
7
|
+
* ./draftChanges.ts). Drafts are never recorded as served:
|
|
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.
|
|
9
11
|
*/
|
|
10
12
|
import { formatDraftPointer, parseDraftPointer } from "./draft.js";
|
|
13
|
+
import { fetchDraftChanges, LOCAL_VERSION, layerDraft } from "./draftChanges.js";
|
|
11
14
|
import { errors, isResolutionError } from "./errors.js";
|
|
12
15
|
import { isPlainObject } from "./json.js";
|
|
13
16
|
const SERVED_REVISIONS = 16;
|
|
14
|
-
/**
|
|
17
|
+
/** Fetched drafts kept per CMS. */
|
|
15
18
|
const CACHED_DRAFTS = 3;
|
|
16
|
-
/**
|
|
17
|
-
* How long a loaded draft is reused before `load(pointer)` runs again, so a
|
|
18
|
-
* loader's own checks (a hosted grant's expiry) apply on a warm server too.
|
|
19
|
-
*/
|
|
19
|
+
/** How long a fetched draft is reused before it's fetched again, so its token is checked again. */
|
|
20
20
|
const DRAFT_TTL_MS = 60_000;
|
|
21
21
|
export function isLoader(content) {
|
|
22
22
|
return ((typeof content === "object" || typeof content === "function") &&
|
|
@@ -67,9 +67,9 @@ export class ContentStore {
|
|
|
67
67
|
if (!isLoader(source))
|
|
68
68
|
return Promise.resolve(this.#serve(source));
|
|
69
69
|
if (!this.updatable)
|
|
70
|
-
return this.#load(source
|
|
70
|
+
return this.#load(source).then((snapshot) => this.#serve(snapshot));
|
|
71
71
|
if (this.#release === undefined) {
|
|
72
|
-
const pending = this.#load(source
|
|
72
|
+
const pending = this.#load(source).then((snapshot) => this.#serve(snapshot));
|
|
73
73
|
this.#release = pending;
|
|
74
74
|
// A failed load isn't cached: the next client tries again.
|
|
75
75
|
pending.catch(() => {
|
|
@@ -80,36 +80,48 @@ export class ContentStore {
|
|
|
80
80
|
return this.#release;
|
|
81
81
|
}
|
|
82
82
|
/**
|
|
83
|
-
* The draft a pointer names
|
|
84
|
-
*
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
*
|
|
83
|
+
* The draft a pointer names: its changes, fetched from a preview API domain,
|
|
84
|
+
* layered over the release. A pointer that doesn't parse, or any failure, is
|
|
85
|
+
* `LOADER_FAILED`, never a silent fallback to the release. A pointer whose
|
|
86
|
+
* version is `local` names no draft: the release, with nothing fetched. The
|
|
87
|
+
* changes are keyed by the pointer without its `__variant` parameters (every
|
|
88
|
+
* variant of one draft shares one fetch) and reused for a minute.
|
|
88
89
|
*/
|
|
89
90
|
draft(pointer) {
|
|
90
|
-
const source = this.#source;
|
|
91
|
-
if (!isLoader(source))
|
|
92
|
-
return this.release();
|
|
93
91
|
const parsed = parseDraftPointer(pointer);
|
|
94
92
|
if (parsed === null) {
|
|
95
93
|
return Promise.reject(errors.loaderFailed(`invalid draft pointer "${truncate(pointer)}"`));
|
|
96
94
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
95
|
+
if (parsed.version === LOCAL_VERSION)
|
|
96
|
+
return this.release();
|
|
97
|
+
const { host, path, version } = parsed;
|
|
98
|
+
const key = formatDraftPointer({ host, path, version });
|
|
99
|
+
let entry = this.#drafts.get(key);
|
|
100
|
+
if (entry === undefined || Date.now() - entry.at >= DRAFT_TTL_MS) {
|
|
101
|
+
const fetched = {
|
|
102
|
+
changes: fetchDraftChanges(parsed).catch((error) => {
|
|
103
|
+
throw errors.loaderFailed("the draft's changes couldn't be fetched", error);
|
|
104
|
+
}),
|
|
105
|
+
at: Date.now(),
|
|
106
|
+
views: new WeakMap(),
|
|
107
|
+
};
|
|
108
|
+
this.#drafts.set(key, fetched);
|
|
109
|
+
// A failure isn't reused: the next client fetches again.
|
|
110
|
+
fetched.changes.catch(() => {
|
|
111
|
+
if (this.#drafts.get(key) === fetched)
|
|
112
|
+
this.#drafts.delete(key);
|
|
113
|
+
});
|
|
114
|
+
entry = fetched;
|
|
115
|
+
}
|
|
116
|
+
const { changes, views } = entry;
|
|
117
|
+
return Promise.all([this.release(), changes]).then(([base, draft]) => {
|
|
118
|
+
let view = views.get(base);
|
|
119
|
+
if (view === undefined) {
|
|
120
|
+
view = layerDraft(base, draft, version);
|
|
121
|
+
views.set(base, view);
|
|
122
|
+
}
|
|
123
|
+
return view;
|
|
111
124
|
});
|
|
112
|
-
return entry.pending;
|
|
113
125
|
}
|
|
114
126
|
/**
|
|
115
127
|
* The current release as it is in memory, without loading anything: the
|
|
@@ -138,8 +150,7 @@ export class ContentStore {
|
|
|
138
150
|
this.#release = undefined;
|
|
139
151
|
// `#latest` stays: settings keep the release that was serving until
|
|
140
152
|
// the next one loads, never the defaults (which may allow every host).
|
|
141
|
-
//
|
|
142
|
-
// draft; that copy is as stale as the release now.
|
|
153
|
+
// Drafts are fetched again, so a preview follows the release too.
|
|
143
154
|
this.#drafts.clear();
|
|
144
155
|
}
|
|
145
156
|
return { updated };
|
|
@@ -163,7 +174,6 @@ export class ContentStore {
|
|
|
163
174
|
const previous = this.#source;
|
|
164
175
|
if (source === previous) {
|
|
165
176
|
// The same loader (a hosted remoteLoader that adopted new fallback content): re-read it.
|
|
166
|
-
// Cached drafts were layered over the old content, so they go too.
|
|
167
177
|
this.#release = undefined;
|
|
168
178
|
this.#latest = undefined;
|
|
169
179
|
this.#drafts.clear();
|
|
@@ -176,15 +186,15 @@ export class ContentStore {
|
|
|
176
186
|
this.#latest = undefined;
|
|
177
187
|
this.#drafts.clear();
|
|
178
188
|
}
|
|
179
|
-
async #load(loader
|
|
189
|
+
async #load(loader) {
|
|
180
190
|
let snapshot;
|
|
181
191
|
try {
|
|
182
|
-
snapshot =
|
|
192
|
+
snapshot = await loader.load();
|
|
183
193
|
}
|
|
184
194
|
catch (error) {
|
|
185
195
|
if (isResolutionError(error))
|
|
186
196
|
throw error;
|
|
187
|
-
throw errors.loaderFailed(
|
|
197
|
+
throw errors.loaderFailed("the content loader failed", error);
|
|
188
198
|
}
|
|
189
199
|
if (!isSnapshot(snapshot)) {
|
|
190
200
|
throw errors.loaderFailed("the content loader returned something other than a snapshot");
|
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.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draft.d.ts","sourceRoot":"","sources":["../../src/v8/draft.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,YAAY,EAAiB,WAAW,EAAE,MAAM,YAAY,CAAC;AAkB3E;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,GAAG,IAAI,CAoBrF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAiBhE;
|
|
1
|
+
{"version":3,"file":"draft.d.ts","sourceRoot":"","sources":["../../src/v8/draft.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,YAAY,EAAiB,WAAW,EAAE,MAAM,YAAY,CAAC;AAkB3E;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,GAAG,IAAI,CAoBrF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAiBhE;AA8ED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAMpE;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAMlE;AAED,wGAAwG;AACxG,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAEzD"}
|
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. */
|
|
@@ -110,6 +110,8 @@ function plainVariant({ block, path, index }) {
|
|
|
110
110
|
return { block, path, index };
|
|
111
111
|
}
|
|
112
112
|
function normalizeHost(authority) {
|
|
113
|
+
if (authority.startsWith("["))
|
|
114
|
+
return normalizeIPv6Host(authority);
|
|
113
115
|
const parts = authority.toLowerCase().split(":");
|
|
114
116
|
if (parts.length > 2)
|
|
115
117
|
return null;
|
|
@@ -122,9 +124,29 @@ function normalizeHost(authority) {
|
|
|
122
124
|
return null;
|
|
123
125
|
return `${host}:${port}`;
|
|
124
126
|
}
|
|
127
|
+
/** `[addr]` or `[addr]:port`, the address in the compressed, lowercase form a URL gives it. */
|
|
128
|
+
function normalizeIPv6Host(authority) {
|
|
129
|
+
const end = authority.indexOf("]");
|
|
130
|
+
const address = authority.slice(0, end + 1);
|
|
131
|
+
const rest = authority.slice(end + 1);
|
|
132
|
+
if (end === -1 || !/^\[[0-9a-fA-F:.]+\]$/.test(address))
|
|
133
|
+
return null;
|
|
134
|
+
if (rest !== "" && (!rest.startsWith(":") || !PORT_RE.test(rest.slice(1))))
|
|
135
|
+
return null;
|
|
136
|
+
if (rest !== "" && Number(rest.slice(1)) > 65535)
|
|
137
|
+
return null;
|
|
138
|
+
let host;
|
|
139
|
+
try {
|
|
140
|
+
host = new URL(`http://${address}/`).hostname;
|
|
141
|
+
}
|
|
142
|
+
catch {
|
|
143
|
+
return null;
|
|
144
|
+
}
|
|
145
|
+
return `${host}${rest}`;
|
|
146
|
+
}
|
|
125
147
|
/**
|
|
126
148
|
* The draft pointer a request carries: `?__draft=` from the URL first, then
|
|
127
|
-
* the `
|
|
149
|
+
* the `__deco_draft` cookie. `null` when neither is present, or when the URL
|
|
128
150
|
* says `?__draft=off`. The value is returned as is; `cms.forDraft` validates it.
|
|
129
151
|
*/
|
|
130
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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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import type { DraftPointer, Snapshot } from "./types.ts";
|
|
2
|
+
/** The version a pointer has when it names no draft: `deco serve`'s working tree. */
|
|
3
|
+
export declare const LOCAL_VERSION = "local";
|
|
4
|
+
declare const FORMAT = 1;
|
|
5
|
+
/** What a draft changed compared with production: whole blocks, and deletions. */
|
|
6
|
+
export interface DraftChanges {
|
|
7
|
+
format: typeof FORMAT;
|
|
8
|
+
set: Record<string, unknown>;
|
|
9
|
+
delete: string[];
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* The domains a draft pointer's host may fall under, the defaults v7 shipped.
|
|
13
|
+
* Deco operates every one of them, so the defaults add no SSRF surface. An
|
|
14
|
+
* entry starting with a dot matches any host that ends with it, on a label
|
|
15
|
+
* boundary (`evil-decocms.com` doesn't pass `.decocms.com`); any other entry
|
|
16
|
+
* matches that exact host. The first entry that matches decides whether a
|
|
17
|
+
* port and plain `http` are allowed.
|
|
18
|
+
*/
|
|
19
|
+
export declare const DEFAULT_PREVIEW_API_DOMAINS: readonly string[];
|
|
20
|
+
/**
|
|
21
|
+
* The origin a pointer's host is fetched from, or `null` when no preview API
|
|
22
|
+
* domain admits it. Loopback domains (and `local.studio.decocms.com`) may
|
|
23
|
+
* carry a port; a public domain may not, so a pointer can't aim the fetch at
|
|
24
|
+
* an odd port. Loopback hosts are `http`; everything else is `https`.
|
|
25
|
+
*/
|
|
26
|
+
export declare function previewApiOrigin(authority: string): string | null;
|
|
27
|
+
/**
|
|
28
|
+
* The URL the SDK fetches for a pointer: the origin its host is admitted
|
|
29
|
+
* under, the version as `v`. `null` when no preview API domain admits the host.
|
|
30
|
+
*/
|
|
31
|
+
export declare function draftChangesUrl(pointer: DraftPointer): string | null;
|
|
32
|
+
/** Fetches a draft's changes; rejects on a host no preview API domain admits (without fetching) or on any failure. */
|
|
33
|
+
export declare function fetchDraftChanges(pointer: DraftPointer): Promise<DraftChanges>;
|
|
34
|
+
/** Validates a draft changes response; throws on an unknown format or any unexpected shape. */
|
|
35
|
+
export declare function parseDraftChanges(body: unknown): DraftChanges;
|
|
36
|
+
/**
|
|
37
|
+
* The draft as a snapshot: production's entries, with the changed ones
|
|
38
|
+
* replaced whole and the deleted ones gone. A shallow copy: every unchanged
|
|
39
|
+
* entry is production's own object, and production is never mutated. Its
|
|
40
|
+
* revision is an opaque identity of the pair, never a release's.
|
|
41
|
+
*/
|
|
42
|
+
export declare function layerDraft(base: Snapshot, changes: DraftChanges, version: string): Snapshot;
|
|
43
|
+
export {};
|
|
44
|
+
//# sourceMappingURL=draftChanges.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"draftChanges.d.ts","sourceRoot":"","sources":["../../src/v8/draftChanges.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEzD,qFAAqF;AACrF,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC,QAAA,MAAM,MAAM,IAAI,CAAC;AAIjB,kFAAkF;AAClF,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,OAAO,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,EAAE,SAAS,MAAM,EAMxD,CAAC;AAWF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAcjE;AAWD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,CAKpE;AAED,sHAAsH;AACtH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA2BpF;AAED,+FAA+F;AAC/F,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,YAAY,CAc7D;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,QAAQ,CAe3F"}
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Draft changes (see /next/content-delivery#draft-previews): what a draft
|
|
3
|
+
* pointer's address answers, and how the CMS layers it over production.
|
|
4
|
+
*
|
|
5
|
+
* - The pointer's host must fall under one of the preview API domains (the
|
|
6
|
+
* same rule as v7): by default `*.decocms.com` (Studio, its PR previews,
|
|
7
|
+
* `local.studio.decocms.com`) and the loopback hosts; `DECO_PREVIEW_API_DOMAINS`
|
|
8
|
+
* replaces the list. Any other host is refused before anything is fetched.
|
|
9
|
+
* - `GET <scheme>://<host><path>&v=<version>`: the scheme comes from the
|
|
10
|
+
* domain that admitted the host, never from the pointer: plain `http` only
|
|
11
|
+
* for loopback hosts. The pointer's `__variant` parameters are already gone (the parser
|
|
12
|
+
* lifts them out), no cookies or credentials are sent, and redirects aren't
|
|
13
|
+
* followed (a response that was redirected anyway is refused).
|
|
14
|
+
* - Only a 200 is accepted, within 10 s and up to 16 MiB, shaped exactly
|
|
15
|
+
* `{ format: 1, set: { <name>: <block JSON> }, delete: [<name>…] }` with
|
|
16
|
+
* `set` and `delete` disjoint.
|
|
17
|
+
*/
|
|
18
|
+
import { readBoundedJson, timeoutSignal } from "./boundedJson.js";
|
|
19
|
+
import { readEnv } from "./identity.js";
|
|
20
|
+
import { isPlainObject } from "./json.js";
|
|
21
|
+
/** The version a pointer has when it names no draft: `deco serve`'s working tree. */
|
|
22
|
+
export const LOCAL_VERSION = "local";
|
|
23
|
+
const FORMAT = 1;
|
|
24
|
+
const TIMEOUT_MS = 10_000;
|
|
25
|
+
const MAX_BYTES = 16 * 1024 * 1024;
|
|
26
|
+
/**
|
|
27
|
+
* The domains a draft pointer's host may fall under, the defaults v7 shipped.
|
|
28
|
+
* Deco operates every one of them, so the defaults add no SSRF surface. An
|
|
29
|
+
* entry starting with a dot matches any host that ends with it, on a label
|
|
30
|
+
* boundary (`evil-decocms.com` doesn't pass `.decocms.com`); any other entry
|
|
31
|
+
* matches that exact host. The first entry that matches decides whether a
|
|
32
|
+
* port and plain `http` are allowed.
|
|
33
|
+
*/
|
|
34
|
+
export const DEFAULT_PREVIEW_API_DOMAINS = [
|
|
35
|
+
"local.studio.decocms.com", // the Studio dev origin (https, with a port)
|
|
36
|
+
"localhost",
|
|
37
|
+
"127.0.0.1",
|
|
38
|
+
".localhost",
|
|
39
|
+
".decocms.com", // Studio and its preview deployments
|
|
40
|
+
];
|
|
41
|
+
/** `DECO_PREVIEW_API_DOMAINS` (a comma list) when set, else the defaults. */
|
|
42
|
+
function previewApiDomains() {
|
|
43
|
+
const configured = (readEnv("DECO_PREVIEW_API_DOMAINS") ?? "")
|
|
44
|
+
.split(",")
|
|
45
|
+
.map((domain) => domain.trim().toLowerCase())
|
|
46
|
+
.filter(Boolean);
|
|
47
|
+
return configured.length > 0 ? configured : DEFAULT_PREVIEW_API_DOMAINS;
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* The origin a pointer's host is fetched from, or `null` when no preview API
|
|
51
|
+
* domain admits it. Loopback domains (and `local.studio.decocms.com`) may
|
|
52
|
+
* carry a port; a public domain may not, so a pointer can't aim the fetch at
|
|
53
|
+
* an odd port. Loopback hosts are `http`; everything else is `https`.
|
|
54
|
+
*/
|
|
55
|
+
export function previewApiOrigin(authority) {
|
|
56
|
+
const lower = authority.toLowerCase();
|
|
57
|
+
const end = lower.startsWith("[") ? lower.indexOf("]") + 1 : -1;
|
|
58
|
+
const host = end > 0 ? lower.slice(0, end) : lower.split(":")[0];
|
|
59
|
+
const rest = end > 0 ? lower.slice(end) : lower.slice(host.length);
|
|
60
|
+
const port = rest.startsWith(":") ? rest.slice(1) : undefined;
|
|
61
|
+
if (!host)
|
|
62
|
+
return null;
|
|
63
|
+
const domain = previewApiDomains().find((d) => d.startsWith(".") ? host.length > d.length && host.endsWith(d) : host === d);
|
|
64
|
+
if (domain === undefined)
|
|
65
|
+
return null;
|
|
66
|
+
const insecure = isLoopbackDomain(domain);
|
|
67
|
+
if (port !== undefined && !insecure && domain !== "local.studio.decocms.com")
|
|
68
|
+
return null;
|
|
69
|
+
return `${insecure ? "http" : "https"}://${host}${port === undefined ? "" : `:${port}`}`;
|
|
70
|
+
}
|
|
71
|
+
function isLoopbackDomain(domain) {
|
|
72
|
+
return (domain === "localhost" ||
|
|
73
|
+
domain === "127.0.0.1" ||
|
|
74
|
+
domain === "[::1]" ||
|
|
75
|
+
domain.endsWith(".localhost"));
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* The URL the SDK fetches for a pointer: the origin its host is admitted
|
|
79
|
+
* under, the version as `v`. `null` when no preview API domain admits the host.
|
|
80
|
+
*/
|
|
81
|
+
export function draftChangesUrl(pointer) {
|
|
82
|
+
const origin = previewApiOrigin(pointer.host);
|
|
83
|
+
if (origin === null)
|
|
84
|
+
return null;
|
|
85
|
+
const separator = pointer.path.includes("?") ? "&" : "?";
|
|
86
|
+
return `${origin}${pointer.path}${separator}v=${encodeURIComponent(pointer.version)}`;
|
|
87
|
+
}
|
|
88
|
+
/** Fetches a draft's changes; rejects on a host no preview API domain admits (without fetching) or on any failure. */
|
|
89
|
+
export async function fetchDraftChanges(pointer) {
|
|
90
|
+
const url = draftChangesUrl(pointer);
|
|
91
|
+
if (url === null) {
|
|
92
|
+
throw new Error(`draft pointer names "${pointer.host}", which isn't under a preview API domain ` +
|
|
93
|
+
"(DECO_PREVIEW_API_DOMAINS); nothing was fetched");
|
|
94
|
+
}
|
|
95
|
+
const response = await fetch(url, {
|
|
96
|
+
headers: { accept: "application/json" },
|
|
97
|
+
redirect: "manual",
|
|
98
|
+
signal: timeoutSignal(TIMEOUT_MS),
|
|
99
|
+
});
|
|
100
|
+
// Some fetch polyfills (React Native, whatwg-fetch) ignore `redirect: "manual"`
|
|
101
|
+
// and follow anyway: refuse a response that came from anywhere else.
|
|
102
|
+
if (response.redirected ||
|
|
103
|
+
(response.url && new URL(response.url).origin !== new URL(url).origin)) {
|
|
104
|
+
await response.body?.cancel();
|
|
105
|
+
throw new Error("draft changes: the pointer's address redirected; nothing was read");
|
|
106
|
+
}
|
|
107
|
+
if (response.status !== 200) {
|
|
108
|
+
await response.body?.cancel();
|
|
109
|
+
throw new Error(`draft changes: HTTP ${response.status}`);
|
|
110
|
+
}
|
|
111
|
+
return parseDraftChanges(await readBoundedJson(response, "draft changes", MAX_BYTES));
|
|
112
|
+
}
|
|
113
|
+
/** Validates a draft changes response; throws on an unknown format or any unexpected shape. */
|
|
114
|
+
export function parseDraftChanges(body) {
|
|
115
|
+
const invalid = (why) => new Error(`draft changes: ${why}`);
|
|
116
|
+
if (!isPlainObject(body) || body.format !== FORMAT)
|
|
117
|
+
throw invalid("unknown format");
|
|
118
|
+
if (Object.keys(body).some((key) => key !== "format" && key !== "set" && key !== "delete")) {
|
|
119
|
+
throw invalid("unexpected field");
|
|
120
|
+
}
|
|
121
|
+
const { set, delete: deleted } = body;
|
|
122
|
+
if (!isPlainObject(set))
|
|
123
|
+
throw invalid("set must be an object");
|
|
124
|
+
if (!Array.isArray(deleted) || deleted.some((name) => typeof name !== "string")) {
|
|
125
|
+
throw invalid("delete must be a list of names");
|
|
126
|
+
}
|
|
127
|
+
if (new Set(deleted).size !== deleted.length)
|
|
128
|
+
throw invalid("delete repeats a name");
|
|
129
|
+
if (deleted.some((name) => Object.hasOwn(set, name)))
|
|
130
|
+
throw invalid("set and delete overlap");
|
|
131
|
+
return body;
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* The draft as a snapshot: production's entries, with the changed ones
|
|
135
|
+
* replaced whole and the deleted ones gone. A shallow copy: every unchanged
|
|
136
|
+
* entry is production's own object, and production is never mutated. Its
|
|
137
|
+
* revision is an opaque identity of the pair, never a release's.
|
|
138
|
+
*/
|
|
139
|
+
export function layerDraft(base, changes, version) {
|
|
140
|
+
const blocks = { ...base.blocks };
|
|
141
|
+
for (const name of changes.delete)
|
|
142
|
+
delete blocks[name];
|
|
143
|
+
for (const [name, entry] of Object.entries(changes.set)) {
|
|
144
|
+
// defineProperty, so an entry named "__proto__" stays an entry.
|
|
145
|
+
Object.defineProperty(blocks, name, {
|
|
146
|
+
value: entry,
|
|
147
|
+
enumerable: true,
|
|
148
|
+
writable: true,
|
|
149
|
+
configurable: true,
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
const view = { revision: `${base.revision}~${version}`, blocks };
|
|
153
|
+
if (base.aliases !== undefined)
|
|
154
|
+
view.aliases = base.aliases;
|
|
155
|
+
return view;
|
|
156
|
+
}
|
|
157
|
+
//# sourceMappingURL=draftChanges.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"draftChanges.js","sourceRoot":"","sources":["../../src/v8/draftChanges.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ interface RemoteLoaderOptions {
|
|
|
6
6
|
interval?: number;
|
|
7
7
|
}
|
|
8
8
|
/**
|
|
9
|
-
* Hosted releases
|
|
9
|
+
* Hosted releases over a fallback. `createCMS` builds it for you
|
|
10
10
|
* when `site` and `token` are set. With either unset (a dev or test
|
|
11
11
|
* environment without the variables), it's a loader over the fallback alone.
|
|
12
12
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remoteLoader.d.ts","sourceRoot":"","sources":["../../src/v8/remoteLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"remoteLoader.d.ts","sourceRoot":"","sources":["../../src/v8/remoteLoader.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAWnD,UAAU,mBAAmB;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qFAAqF;IACrF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAiKD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAwB9F;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}
|