@decocms/blocks 8.1.0-next.3 → 8.1.0-next.5
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/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/protocol/client.d.ts +1 -1
- package/dist/protocol/conformance/cases/reads.d.ts.map +1 -1
- package/dist/protocol/conformance/cases/reads.js +22 -6
- 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 +1 -0
- 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 +3 -3
- package/dist/protocol/conformance/context.d.ts.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 +2 -2
- package/dist/protocol/conformance/index.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/secrets.d.ts.map +1 -1
- package/dist/protocol/secrets.js +9 -2
- package/dist/protocol/secrets.js.map +1 -1
- package/dist/protocol/server/assets.d.ts +1 -1
- package/dist/protocol/server/assets.js +1 -1
- package/dist/protocol/server/methods/read.d.ts.map +1 -1
- package/dist/protocol/server/methods/read.js +5 -2
- package/dist/protocol/server/methods/read.js.map +1 -1
- package/dist/protocol/types.d.ts +23 -0
- package/dist/protocol/types.d.ts.map +1 -1
- package/dist/protocol/types.js +10 -0
- 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/builtins/data.d.ts +21 -5
- package/dist/v8/builtins/data.d.ts.map +1 -1
- package/dist/v8/builtins/data.js +47 -6
- package/dist/v8/builtins/data.js.map +1 -1
- package/dist/v8/builtins/index.d.ts.map +1 -1
- package/dist/v8/builtins/index.js +2 -3
- package/dist/v8/builtins/index.js.map +1 -1
- package/dist/v8/canonical.d.ts +0 -28
- package/dist/v8/canonical.d.ts.map +1 -1
- package/dist/v8/canonical.js +0 -19
- 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 +34 -2
- package/dist/v8/cli/check/index.js.map +1 -1
- package/dist/v8/cli/index.d.ts +2 -1
- package/dist/v8/cli/index.d.ts.map +1 -1
- package/dist/v8/cli/index.js +2 -1
- package/dist/v8/cli/index.js.map +1 -1
- package/dist/v8/cli/run.d.ts.map +1 -1
- package/dist/v8/cli/run.js +3 -10
- package/dist/v8/cli/run.js.map +1 -1
- package/dist/v8/cli/schema/builtinSchemas.d.ts.map +1 -1
- package/dist/v8/cli/schema/builtinSchemas.js +48 -28
- package/dist/v8/cli/schema/builtinSchemas.js.map +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/schema/tsProgram.d.ts +10 -0
- package/dist/v8/cli/schema/tsProgram.d.ts.map +1 -1
- package/dist/v8/cli/schema/tsProgram.js +31 -0
- package/dist/v8/cli/schema/tsProgram.js.map +1 -1
- package/dist/v8/cli/schema/typeToSchema.d.ts.map +1 -1
- package/dist/v8/cli/schema/typeToSchema.js +15 -1
- package/dist/v8/cli/schema/typeToSchema.js.map +1 -1
- package/dist/v8/cli/serve/server.d.ts +1 -5
- package/dist/v8/cli/serve/server.d.ts.map +1 -1
- package/dist/v8/cli/serve/server.js +76 -62
- package/dist/v8/cli/serve/server.js.map +1 -1
- package/dist/v8/cms.d.ts +5 -2
- package/dist/v8/cms.d.ts.map +1 -1
- package/dist/v8/cms.js +187 -25
- package/dist/v8/cms.js.map +1 -1
- package/dist/v8/content.d.ts +22 -6
- package/dist/v8/content.d.ts.map +1 -1
- package/dist/v8/content.js +78 -40
- package/dist/v8/content.js.map +1 -1
- package/dist/v8/draft.d.ts +9 -12
- package/dist/v8/draft.d.ts.map +1 -1
- package/dist/v8/draft.js +30 -4
- package/dist/v8/draft.js.map +1 -1
- package/dist/v8/draftChanges.d.ts +26 -0
- package/dist/v8/draftChanges.d.ts.map +1 -0
- package/dist/v8/draftChanges.js +102 -0
- package/dist/v8/draftChanges.js.map +1 -0
- package/dist/v8/hosts.d.ts +55 -0
- package/dist/v8/hosts.d.ts.map +1 -0
- package/dist/v8/hosts.js +197 -0
- package/dist/v8/hosts.js.map +1 -0
- package/dist/v8/index.d.ts +4 -3
- package/dist/v8/index.d.ts.map +1 -1
- package/dist/v8/index.js +3 -2
- package/dist/v8/index.js.map +1 -1
- package/dist/v8/remoteLoader.d.ts +1 -1
- package/dist/v8/remoteLoader.d.ts.map +1 -1
- package/dist/v8/remoteLoader.js +32 -257
- package/dist/v8/remoteLoader.js.map +1 -1
- package/dist/v8/settings.d.ts +34 -0
- package/dist/v8/settings.d.ts.map +1 -0
- package/dist/v8/settings.js +143 -0
- package/dist/v8/settings.js.map +1 -0
- package/dist/v8/telemetry.d.ts +13 -3
- package/dist/v8/telemetry.d.ts.map +1 -1
- package/dist/v8/telemetry.js +31 -32
- package/dist/v8/telemetry.js.map +1 -1
- package/dist/v8/types.d.ts +74 -9
- package/dist/v8/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +3 -3
- package/src/protocol/client.ts +1 -1
- package/src/protocol/conformance/cases/reads.ts +24 -6
- package/src/protocol/conformance/cases/writes.ts +1 -0
- package/src/protocol/conformance/contentHashFixtures.ts +0 -57
- package/src/protocol/conformance/context.ts +3 -3
- package/src/protocol/conformance/index.ts +2 -7
- package/src/protocol/index.ts +2 -8
- package/src/protocol/secrets.ts +10 -2
- package/src/protocol/server/assets.ts +1 -1
- package/src/protocol/server/methods/read.ts +5 -2
- package/src/protocol/types.ts +21 -1
- package/src/v8/boundedJson.ts +47 -0
- package/src/v8/builtins/data.ts +56 -7
- package/src/v8/builtins/index.ts +2 -3
- package/src/v8/canonical.ts +0 -36
- package/src/v8/cli/check/index.ts +48 -2
- package/src/v8/cli/index.ts +2 -1
- package/src/v8/cli/run.ts +4 -9
- package/src/v8/cli/schema/builtinSchemas.ts +49 -28
- package/src/v8/cli/schema/generate.ts +4 -1
- package/src/v8/cli/schema/tsProgram.ts +27 -0
- package/src/v8/cli/schema/typeToSchema.ts +18 -1
- package/src/v8/cli/serve/server.ts +78 -77
- package/src/v8/cms.ts +234 -30
- package/src/v8/content.ts +87 -43
- package/src/v8/draft.ts +31 -9
- package/src/v8/draftChanges.ts +117 -0
- package/src/v8/hosts.ts +184 -0
- package/src/v8/index.ts +6 -8
- package/src/v8/remoteLoader.ts +39 -290
- package/src/v8/settings.ts +178 -0
- package/src/v8/telemetry.ts +43 -40
- package/src/v8/types.ts +68 -9
package/dist/v8/cms.js
CHANGED
|
@@ -7,19 +7,30 @@
|
|
|
7
7
|
* cache. See /next/api-reference#one-instance-per-process.
|
|
8
8
|
*/
|
|
9
9
|
import { runInBackground } from "./background.js";
|
|
10
|
+
import { SETTINGS_BLOCK, SETTINGS_TYPE } from "./builtins/data.js";
|
|
10
11
|
import { builtIns } from "./builtins/index.js";
|
|
11
12
|
import { secretBlock } from "./builtins/secret.js";
|
|
12
13
|
import { CMSClient } from "./client.js";
|
|
13
14
|
import { ContentStore, isLoader, isSnapshot } from "./content.js";
|
|
14
|
-
import { parseDraftPointer } from "./draft.js";
|
|
15
|
+
import { draftCookieFor, endsPreview, parseDraftPointer, readDraftPointer } from "./draft.js";
|
|
16
|
+
import { allowsHost, parseHostPattern } from "./hosts.js";
|
|
15
17
|
import { clearGlobals, contentIdentity, fnv1a, readEnv } from "./identity.js";
|
|
18
|
+
import { isPlainObject } from "./json.js";
|
|
16
19
|
import { remoteLoader, resetRemoteLoaders } from "./remoteLoader.js";
|
|
17
|
-
import {
|
|
20
|
+
import { defaultSettings, isStatic, parseCodeHosts, parseCodeSources, readSettings, } from "./settings.js";
|
|
21
|
+
import { resolveDestination, setCurrentTelemetry, TelemetryPipeline, telemetryLimits, } from "./telemetry.js";
|
|
18
22
|
import { forceVariants } from "./variants.js";
|
|
19
23
|
const INSTANCE_PREFIX = "decocms.blocks.cms:";
|
|
20
24
|
const MIN_INTERVAL = 60_000;
|
|
21
25
|
/** Each check runs one interval, plus or minus up to this much, after the previous one. */
|
|
22
26
|
const JITTER = 10_000;
|
|
27
|
+
/** How often telemetry reads its settings again when the release hasn't changed (date rules). */
|
|
28
|
+
const TELEMETRY_SETTINGS_MS = 60_000;
|
|
29
|
+
/**
|
|
30
|
+
* The state one content root shares across `createCMS` calls: the content
|
|
31
|
+
* store, caps, telemetry and secret key. Each call gets its own handle
|
|
32
|
+
* holding its own block map (see `CMSHandle`).
|
|
33
|
+
*/
|
|
23
34
|
class CMSInstance {
|
|
24
35
|
config;
|
|
25
36
|
fingerprint;
|
|
@@ -29,7 +40,15 @@ class CMSInstance {
|
|
|
29
40
|
/** The built-ins with a `secret` that holds this instance's key (the first call's). */
|
|
30
41
|
#builtIns;
|
|
31
42
|
#telemetry;
|
|
32
|
-
#
|
|
43
|
+
#caps;
|
|
44
|
+
/** The hosts a draft pointer may name (`preview.sources`): code only, never content. */
|
|
45
|
+
#sources;
|
|
46
|
+
/** Settings of a `CMS` block with nothing to run, per release snapshot. */
|
|
47
|
+
#staticSettings = new WeakMap();
|
|
48
|
+
/** The release and time telemetry last read its section. */
|
|
49
|
+
#telemetryRead;
|
|
50
|
+
/** One handle per block map, so the same config returns the same object. */
|
|
51
|
+
#handles = new WeakMap();
|
|
33
52
|
/**
|
|
34
53
|
* When the next check is due. The first is on the first `forRelease()` or `forDraft()`, not
|
|
35
54
|
* at construction: Workers read `Date.now()` as 0 at module scope.
|
|
@@ -37,10 +56,14 @@ class CMSInstance {
|
|
|
37
56
|
#nextCheck;
|
|
38
57
|
constructor(config, interval) {
|
|
39
58
|
this.config = config;
|
|
40
|
-
this.#blocks = config.blocks;
|
|
41
59
|
this.#interval = interval;
|
|
42
60
|
this.#store = new ContentStore(contentOf(config));
|
|
43
61
|
this.fingerprint = fingerprintOf(config, interval);
|
|
62
|
+
this.#caps = {
|
|
63
|
+
hosts: parseCodeHosts(config.preview),
|
|
64
|
+
limits: telemetryLimits(config.telemetry),
|
|
65
|
+
};
|
|
66
|
+
this.#sources = parseCodeSources(config.preview);
|
|
44
67
|
const destination = resolveDestination(config.telemetry, config.site);
|
|
45
68
|
if (destination !== null) {
|
|
46
69
|
this.#telemetry = new TelemetryPipeline(destination);
|
|
@@ -51,44 +74,130 @@ class CMSInstance {
|
|
|
51
74
|
const secret = secretBlock(config.secrets?.key, (value) => telemetry?.redact(value));
|
|
52
75
|
this.#builtIns = Object.freeze({ ...builtIns, secret });
|
|
53
76
|
}
|
|
54
|
-
forRelease() {
|
|
77
|
+
forRelease(blocks) {
|
|
55
78
|
this.#scheduleUpdate();
|
|
56
79
|
const telemetry = this.#telemetry;
|
|
57
80
|
if (telemetry === undefined)
|
|
58
|
-
return this.#client(() => this.#store.release());
|
|
59
|
-
return this.#client(() => this.#store.release().then((snapshot) => {
|
|
81
|
+
return this.#client(blocks, () => this.#store.release());
|
|
82
|
+
return this.#client(blocks, () => this.#store.release().then(async (snapshot) => {
|
|
60
83
|
telemetry.useRelease(snapshot);
|
|
84
|
+
await this.#followTelemetrySettings(blocks, telemetry, snapshot);
|
|
61
85
|
return snapshot;
|
|
62
86
|
}));
|
|
63
87
|
}
|
|
64
88
|
/**
|
|
65
|
-
* The
|
|
66
|
-
*
|
|
67
|
-
*
|
|
89
|
+
* The release's settings, from memory: never a draft, never a fetch. The
|
|
90
|
+
* `CMS` block resolves on each call, so a field with variants is decided
|
|
91
|
+
* where it's called; one with nothing to run is resolved once per release.
|
|
68
92
|
*/
|
|
69
|
-
|
|
93
|
+
settings(blocks) {
|
|
94
|
+
return this.#settingsOf(blocks, this.#store.current());
|
|
95
|
+
}
|
|
96
|
+
async draftPointer(blocks, request) {
|
|
97
|
+
const pointer = readDraftPointer(request);
|
|
98
|
+
if (pointer === null)
|
|
99
|
+
return null;
|
|
100
|
+
return (await this.#previewAllowed(blocks, request)) ? pointer : null;
|
|
101
|
+
}
|
|
102
|
+
async draftCookie(blocks, request) {
|
|
103
|
+
const cookie = draftCookieFor(request);
|
|
104
|
+
if (cookie === null)
|
|
105
|
+
return null;
|
|
106
|
+
// Ending a preview is allowed anywhere, so a cookie set before a host was removed still goes.
|
|
107
|
+
if (endsPreview(request))
|
|
108
|
+
return cookie;
|
|
109
|
+
return (await this.#previewAllowed(blocks, request)) ? cookie : null;
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* The draft, with the variants the pointer forces (even for a `local`
|
|
113
|
+
* pointer, which names no draft). A draft client is a production client
|
|
114
|
+
* reading a draft pointer, so it schedules the release check like any other.
|
|
115
|
+
*/
|
|
116
|
+
forDraft(blocks, pointer) {
|
|
70
117
|
this.#scheduleUpdate();
|
|
118
|
+
const load = () => this.#store.draft(pointer, this.#sources);
|
|
71
119
|
const variants = parseDraftPointer(pointer)?.variants;
|
|
72
120
|
if (variants === undefined)
|
|
73
|
-
return this.#client(
|
|
74
|
-
return this.#client(() =>
|
|
121
|
+
return this.#client(blocks, load);
|
|
122
|
+
return this.#client(blocks, () => load().then((snapshot) => forceVariants(snapshot, variants)));
|
|
75
123
|
}
|
|
76
|
-
forRevision(revision) {
|
|
77
|
-
return this.#client(() => this.#store.revision(revision));
|
|
124
|
+
forRevision(blocks, revision) {
|
|
125
|
+
return this.#client(blocks, () => this.#store.revision(revision));
|
|
78
126
|
}
|
|
79
127
|
update() {
|
|
80
128
|
this.#nextCheck = this.#due();
|
|
81
129
|
return this.#store.update();
|
|
82
130
|
}
|
|
83
|
-
/**
|
|
131
|
+
/** The handle for a block map: this instance, resolving with that map. */
|
|
132
|
+
handle(blocks) {
|
|
133
|
+
let handle = this.#handles.get(blocks);
|
|
134
|
+
if (handle === undefined) {
|
|
135
|
+
handle = new CMSHandle(this, blocks);
|
|
136
|
+
this.#handles.set(blocks, handle);
|
|
137
|
+
}
|
|
138
|
+
return handle;
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* A later `createCMS` call with the same key hands in its (possibly
|
|
142
|
+
* hot-reloaded) content. Its block map stays with its own handle: another
|
|
143
|
+
* bundle in the same process (Next's proxy) must not replace the app's.
|
|
144
|
+
*/
|
|
84
145
|
adopt(config) {
|
|
85
|
-
this.#blocks = config.blocks;
|
|
86
146
|
this.#store.replace(contentOf(config));
|
|
147
|
+
this.#staticSettings = new WeakMap();
|
|
148
|
+
this.#telemetryRead = undefined;
|
|
87
149
|
}
|
|
88
|
-
#
|
|
150
|
+
async #settingsOf(blocks, snapshot) {
|
|
151
|
+
if (snapshot === undefined)
|
|
152
|
+
return defaultSettings(this.#caps);
|
|
153
|
+
const cached = this.#staticSettings.get(snapshot);
|
|
154
|
+
if (cached !== undefined)
|
|
155
|
+
return cached;
|
|
156
|
+
const settings = await readSettings(snapshot, () => new CMSClient({
|
|
157
|
+
load: () => Promise.resolve(snapshot),
|
|
158
|
+
blocks,
|
|
159
|
+
builtIns: this.#builtIns,
|
|
160
|
+
onCollision: (name) => this.#warnCollision(name),
|
|
161
|
+
}), this.#caps);
|
|
162
|
+
// A block map's own cms-settings function may answer differently per call.
|
|
163
|
+
const entry = snapshot.blocks[SETTINGS_BLOCK];
|
|
164
|
+
const fixed = !isPlainObject(entry) || isStatic(entry);
|
|
165
|
+
if (fixed && !Object.hasOwn(blocks, SETTINGS_TYPE)) {
|
|
166
|
+
this.#staticSettings.set(snapshot, settings);
|
|
167
|
+
}
|
|
168
|
+
return settings;
|
|
169
|
+
}
|
|
170
|
+
/** Whether the release's preview hosts allow this request's host. */
|
|
171
|
+
async #previewAllowed(blocks, request) {
|
|
172
|
+
const { hosts } = (await this.settings(blocks)).preview;
|
|
173
|
+
const patterns = hosts
|
|
174
|
+
.map((raw) => parseHostPattern(raw))
|
|
175
|
+
.filter((pattern) => pattern !== null);
|
|
176
|
+
return allowsHost(patterns, request.url);
|
|
177
|
+
}
|
|
178
|
+
/**
|
|
179
|
+
* Telemetry follows the release's `telemetry` section, read outside any
|
|
180
|
+
* request's choices: when the release changes (before its first client
|
|
181
|
+
* runs) and then at most once a minute, so date rules take effect.
|
|
182
|
+
*/
|
|
183
|
+
async #followTelemetrySettings(blocks, telemetry, snapshot) {
|
|
184
|
+
const last = this.#telemetryRead;
|
|
185
|
+
const now = Date.now();
|
|
186
|
+
if (last?.snapshot === snapshot && now - last.at < TELEMETRY_SETTINGS_MS)
|
|
187
|
+
return;
|
|
188
|
+
this.#telemetryRead = { snapshot, at: now };
|
|
189
|
+
const read = this.#settingsOf(blocks, snapshot).then((settings) => {
|
|
190
|
+
if (this.#telemetryRead?.snapshot === snapshot)
|
|
191
|
+
telemetry.apply(settings.telemetry);
|
|
192
|
+
});
|
|
193
|
+
// A new release waits for its rates; a periodic re-read doesn't hold up the request.
|
|
194
|
+
if (last?.snapshot !== snapshot)
|
|
195
|
+
await read;
|
|
196
|
+
}
|
|
197
|
+
#client(blocks, load) {
|
|
89
198
|
return new CMSClient({
|
|
90
199
|
load,
|
|
91
|
-
blocks
|
|
200
|
+
blocks,
|
|
92
201
|
builtIns: this.#builtIns,
|
|
93
202
|
onCollision: (name) => this.#warnCollision(name),
|
|
94
203
|
telemetry: this.#telemetry?.forClient(),
|
|
@@ -117,9 +226,55 @@ class CMSInstance {
|
|
|
117
226
|
"the function wins. Rename the saved block (deco check reports this).");
|
|
118
227
|
}
|
|
119
228
|
}
|
|
229
|
+
/** `Symbol.for`, so a second copy of this module still reads it. */
|
|
230
|
+
const INSTANCE = Symbol.for("decocms.blocks.cms.instance");
|
|
231
|
+
/**
|
|
232
|
+
* What `createCMS` returns: the shared instance plus the block map of this
|
|
233
|
+
* call. Every handle on one content root shares its content, caps, telemetry
|
|
234
|
+
* and secret key; each resolves with the block map it was created with.
|
|
235
|
+
*/
|
|
236
|
+
class CMSHandle {
|
|
237
|
+
#instance;
|
|
238
|
+
#blocks;
|
|
239
|
+
constructor(instance, blocks) {
|
|
240
|
+
this.#instance = instance;
|
|
241
|
+
this.#blocks = blocks;
|
|
242
|
+
}
|
|
243
|
+
/** The shared instance (tests use it to tell whether two handles share one). */
|
|
244
|
+
get [INSTANCE]() {
|
|
245
|
+
return this.#instance;
|
|
246
|
+
}
|
|
247
|
+
forRelease() {
|
|
248
|
+
return this.#instance.forRelease(this.#blocks);
|
|
249
|
+
}
|
|
250
|
+
forDraft(pointer) {
|
|
251
|
+
return this.#instance.forDraft(this.#blocks, pointer);
|
|
252
|
+
}
|
|
253
|
+
forRevision(revision) {
|
|
254
|
+
return this.#instance.forRevision(this.#blocks, revision);
|
|
255
|
+
}
|
|
256
|
+
update() {
|
|
257
|
+
return this.#instance.update();
|
|
258
|
+
}
|
|
259
|
+
settings() {
|
|
260
|
+
return this.#instance.settings(this.#blocks);
|
|
261
|
+
}
|
|
262
|
+
draftPointer(request) {
|
|
263
|
+
return this.#instance.draftPointer(this.#blocks, request);
|
|
264
|
+
}
|
|
265
|
+
draftCookie(request) {
|
|
266
|
+
return this.#instance.draftCookie(this.#blocks, request);
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
/** The shared instance behind a `createCMS` result; `undefined` for anything else. */
|
|
270
|
+
export function instanceOf(cms) {
|
|
271
|
+
const instance = cms[INSTANCE];
|
|
272
|
+
return instance instanceof Object ? instance : undefined;
|
|
273
|
+
}
|
|
120
274
|
/**
|
|
121
|
-
* Creates the CMS
|
|
122
|
-
* Create it once, at module scope, and
|
|
275
|
+
* Creates the CMS: a handle on the one instance this content root has in the
|
|
276
|
+
* process, holding this call's block map. Create it once, at module scope, and
|
|
277
|
+
* ask it for a client per request.
|
|
123
278
|
*/
|
|
124
279
|
export function createCMS(config) {
|
|
125
280
|
validate(config);
|
|
@@ -129,14 +284,18 @@ export function createCMS(config) {
|
|
|
129
284
|
const key = Symbol.for(INSTANCE_PREFIX + identityOf(config));
|
|
130
285
|
const store = globalThis;
|
|
131
286
|
const existing = store[key];
|
|
132
|
-
|
|
287
|
+
// An instance an older copy of this package stored (a dev reload across
|
|
288
|
+
// versions) has no handles: it's replaced rather than adopted.
|
|
289
|
+
if (existing instanceof Object &&
|
|
290
|
+
typeof existing.adopt === "function" &&
|
|
291
|
+
typeof existing.handle === "function") {
|
|
133
292
|
warnOnConflict(existing.fingerprint, fingerprintOf(config, interval));
|
|
134
293
|
existing.adopt(config);
|
|
135
|
-
return existing;
|
|
294
|
+
return existing.handle(config.blocks);
|
|
136
295
|
}
|
|
137
296
|
const instance = new CMSInstance(config, interval);
|
|
138
297
|
store[key] = instance;
|
|
139
|
-
return instance;
|
|
298
|
+
return instance.handle(config.blocks);
|
|
140
299
|
}
|
|
141
300
|
/** Clears every stored CMS instance, so a test starts clean. */
|
|
142
301
|
export function resetForTests() {
|
|
@@ -144,7 +303,7 @@ export function resetForTests() {
|
|
|
144
303
|
resetRemoteLoaders();
|
|
145
304
|
setCurrentTelemetry(undefined);
|
|
146
305
|
}
|
|
147
|
-
/** With `site` and `token`, the content is the fallback of hosted releases
|
|
306
|
+
/** With `site` and `token`, the content is the fallback of hosted releases. */
|
|
148
307
|
function contentOf(config) {
|
|
149
308
|
if (!config.site || !config.token)
|
|
150
309
|
return config.content;
|
|
@@ -160,6 +319,8 @@ function validate(config) {
|
|
|
160
319
|
if (!isLoader(config.content) && !isSnapshot(config.content)) {
|
|
161
320
|
throw new TypeError("createCMS: `content` must be the content module ({ revision, blocks }) or a loader with load()");
|
|
162
321
|
}
|
|
322
|
+
parseCodeHosts(config.preview);
|
|
323
|
+
parseCodeSources(config.preview);
|
|
163
324
|
}
|
|
164
325
|
function resolveInterval(configured) {
|
|
165
326
|
const env = readEnv("DECO_CONTENT_INTERVAL");
|
|
@@ -192,6 +353,7 @@ function fingerprintOf(config, interval) {
|
|
|
192
353
|
return {
|
|
193
354
|
interval,
|
|
194
355
|
telemetry: stableJson(config.telemetry ?? null),
|
|
356
|
+
preview: stableJson(config.preview ?? null),
|
|
195
357
|
secrets: config.secrets?.key ? fnv1a(config.secrets.key) : "",
|
|
196
358
|
};
|
|
197
359
|
}
|
package/dist/v8/cms.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cms.js","sourceRoot":"","sources":["../../src/v8/cms.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cms.js","sourceRoot":"","sources":["../../src/v8/cms.ts"],"names":[],"mappings":"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"}
|
package/dist/v8/content.d.ts
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
|
+
import type { HostPattern } from "./hosts.ts";
|
|
1
2
|
import type { Loader, Snapshot } from "./types.ts";
|
|
2
3
|
export declare function isLoader(content: unknown): content is Loader;
|
|
4
|
+
/**
|
|
5
|
+
* An internal hook a built-in loader (`remoteLoader`) has: the release it
|
|
6
|
+
* would return right now, from memory, or `undefined` when that takes a load.
|
|
7
|
+
* `cms.settings()` reads through it, so it never fetches.
|
|
8
|
+
*/
|
|
9
|
+
export declare const PEEK_RELEASE: unique symbol;
|
|
10
|
+
/** The release a source holds in memory: the snapshot itself, or what a loader can peek. */
|
|
11
|
+
export declare function peekRelease(source: Snapshot | Loader): Snapshot | undefined;
|
|
3
12
|
export declare function isSnapshot(content: unknown): content is Snapshot;
|
|
4
13
|
export declare class ContentStore {
|
|
5
14
|
#private;
|
|
@@ -13,13 +22,20 @@ export declare class ContentStore {
|
|
|
13
22
|
*/
|
|
14
23
|
release(): Promise<Snapshot>;
|
|
15
24
|
/**
|
|
16
|
-
* The draft a pointer names
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
25
|
+
* The draft a pointer names: its changes, fetched from a host in `sources`,
|
|
26
|
+
* layered over the release. A pointer that doesn't parse, or any failure, is
|
|
27
|
+
* `LOADER_FAILED`, never a silent fallback to the release. A pointer whose
|
|
28
|
+
* version is `local` names no draft: the release, with nothing fetched. The
|
|
29
|
+
* changes are keyed by the pointer without its `__variant` parameters (every
|
|
30
|
+
* variant of one draft shares one fetch) and reused for a minute.
|
|
31
|
+
*/
|
|
32
|
+
draft(pointer: string, sources: readonly HostPattern[]): Promise<Snapshot>;
|
|
33
|
+
/**
|
|
34
|
+
* The current release as it is in memory, without loading anything: the
|
|
35
|
+
* content module, what a built-in loader holds, or the release this store
|
|
36
|
+
* last loaded. `undefined` before a custom loader's first load.
|
|
21
37
|
*/
|
|
22
|
-
|
|
38
|
+
current(): Snapshot | undefined;
|
|
23
39
|
/** A release revision this store has served, or the release when it's unknown (drafts included). */
|
|
24
40
|
revision(revision: string): Promise<Snapshot>;
|
|
25
41
|
/** Asks the source for newer content; never throws, and concurrent calls share one check. */
|
package/dist/v8/content.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../../src/v8/content.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../../src/v8/content.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAenD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,MAAM,CAM5D;AAED;;;;GAIG;AACH,eAAO,MAAM,YAAY,EAAE,OAAO,MAAiD,CAAC;AAEpF,4FAA4F;AAC5F,wBAAgB,WAAW,CAAC,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,CAI3E;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,QAAQ,CAOhE;AAED,qBAAa,YAAY;;IASvB,YAAY,MAAM,EAAE,QAAQ,GAAG,MAAM,EAEpC;IAED,6EAA6E;IAC7E,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAa3B;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,WAAW,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiCzE;IAED;;;;OAIG;IACH,OAAO,IAAI,QAAQ,GAAG,SAAS,CAE9B;IAED,oGAAoG;IACpG,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAG5C;IAED,6FAA6F;IAC7F,MAAM,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC,CAwBtC;IAED;;;;;OAKG;IACH,OAAO,CAAC,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAcvC;CAqBF;AAMD;;;GAGG;AACH,qBAAa,UAAU,CAAC,CAAC,EAAE,CAAC;;IAIxB,QAAQ,CAAC,KAAK,EAAE,MAAM;IACtB,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM;IAFrC,YACW,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAgB,EAC3C;IAEJ,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,SAAS,CAOzB;IAED,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAS1B;IAED,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAInB;IAED,KAAK,IAAI,IAAI,CAGZ;CACF"}
|
package/dist/v8/content.js
CHANGED
|
@@ -3,26 +3,39 @@
|
|
|
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") &&
|
|
23
23
|
content !== null &&
|
|
24
24
|
typeof content.load === "function");
|
|
25
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* An internal hook a built-in loader (`remoteLoader`) has: the release it
|
|
28
|
+
* would return right now, from memory, or `undefined` when that takes a load.
|
|
29
|
+
* `cms.settings()` reads through it, so it never fetches.
|
|
30
|
+
*/
|
|
31
|
+
export const PEEK_RELEASE = Symbol.for("decocms.blocks.peekRelease");
|
|
32
|
+
/** The release a source holds in memory: the snapshot itself, or what a loader can peek. */
|
|
33
|
+
export function peekRelease(source) {
|
|
34
|
+
if (!isLoader(source))
|
|
35
|
+
return source;
|
|
36
|
+
const peek = source[PEEK_RELEASE];
|
|
37
|
+
return typeof peek === "function" ? peek.call(source) : undefined;
|
|
38
|
+
}
|
|
26
39
|
export function isSnapshot(content) {
|
|
27
40
|
return (isPlainObject(content) &&
|
|
28
41
|
typeof content.revision === "string" &&
|
|
@@ -35,6 +48,8 @@ export class ContentStore {
|
|
|
35
48
|
#updating;
|
|
36
49
|
#drafts = new BoundedMap(CACHED_DRAFTS);
|
|
37
50
|
#served = new BoundedMap(SERVED_REVISIONS);
|
|
51
|
+
/** The release this store last handed a client, for a loader that can't peek. */
|
|
52
|
+
#latest;
|
|
38
53
|
constructor(source) {
|
|
39
54
|
this.#source = source;
|
|
40
55
|
}
|
|
@@ -52,9 +67,9 @@ export class ContentStore {
|
|
|
52
67
|
if (!isLoader(source))
|
|
53
68
|
return Promise.resolve(this.#serve(source));
|
|
54
69
|
if (!this.updatable)
|
|
55
|
-
return this.#load(source
|
|
70
|
+
return this.#load(source).then((snapshot) => this.#serve(snapshot));
|
|
56
71
|
if (this.#release === undefined) {
|
|
57
|
-
const pending = this.#load(source
|
|
72
|
+
const pending = this.#load(source).then((snapshot) => this.#serve(snapshot));
|
|
58
73
|
this.#release = pending;
|
|
59
74
|
// A failed load isn't cached: the next client tries again.
|
|
60
75
|
pending.catch(() => {
|
|
@@ -65,36 +80,56 @@ export class ContentStore {
|
|
|
65
80
|
return this.#release;
|
|
66
81
|
}
|
|
67
82
|
/**
|
|
68
|
-
* The draft a pointer names
|
|
69
|
-
*
|
|
70
|
-
*
|
|
71
|
-
*
|
|
72
|
-
*
|
|
83
|
+
* The draft a pointer names: its changes, fetched from a host in `sources`,
|
|
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.
|
|
73
89
|
*/
|
|
74
|
-
draft(pointer) {
|
|
75
|
-
const source = this.#source;
|
|
76
|
-
if (!isLoader(source))
|
|
77
|
-
return this.release();
|
|
90
|
+
draft(pointer, sources) {
|
|
78
91
|
const parsed = parseDraftPointer(pointer);
|
|
79
92
|
if (parsed === null) {
|
|
80
93
|
return Promise.reject(errors.loaderFailed(`invalid draft pointer "${truncate(pointer)}"`));
|
|
81
94
|
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
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, sources).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;
|
|
96
124
|
});
|
|
97
|
-
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* The current release as it is in memory, without loading anything: the
|
|
128
|
+
* content module, what a built-in loader holds, or the release this store
|
|
129
|
+
* last loaded. `undefined` before a custom loader's first load.
|
|
130
|
+
*/
|
|
131
|
+
current() {
|
|
132
|
+
return peekRelease(this.#source) ?? this.#latest;
|
|
98
133
|
}
|
|
99
134
|
/** A release revision this store has served, or the release when it's unknown (drafts included). */
|
|
100
135
|
revision(revision) {
|
|
@@ -113,8 +148,9 @@ export class ContentStore {
|
|
|
113
148
|
const updated = result?.updated === true;
|
|
114
149
|
if (updated) {
|
|
115
150
|
this.#release = undefined;
|
|
116
|
-
//
|
|
117
|
-
//
|
|
151
|
+
// `#latest` stays: settings keep the release that was serving until
|
|
152
|
+
// the next one loads, never the defaults (which may allow every host).
|
|
153
|
+
// Drafts are fetched again, so a preview follows the release too.
|
|
118
154
|
this.#drafts.clear();
|
|
119
155
|
}
|
|
120
156
|
return { updated };
|
|
@@ -138,8 +174,8 @@ export class ContentStore {
|
|
|
138
174
|
const previous = this.#source;
|
|
139
175
|
if (source === previous) {
|
|
140
176
|
// The same loader (a hosted remoteLoader that adopted new fallback content): re-read it.
|
|
141
|
-
// Cached drafts were layered over the old content, so they go too.
|
|
142
177
|
this.#release = undefined;
|
|
178
|
+
this.#latest = undefined;
|
|
143
179
|
this.#drafts.clear();
|
|
144
180
|
return;
|
|
145
181
|
}
|
|
@@ -147,17 +183,18 @@ export class ContentStore {
|
|
|
147
183
|
this.#served.delete(previous.revision);
|
|
148
184
|
this.#source = source;
|
|
149
185
|
this.#release = undefined;
|
|
186
|
+
this.#latest = undefined;
|
|
150
187
|
this.#drafts.clear();
|
|
151
188
|
}
|
|
152
|
-
async #load(loader
|
|
189
|
+
async #load(loader) {
|
|
153
190
|
let snapshot;
|
|
154
191
|
try {
|
|
155
|
-
snapshot =
|
|
192
|
+
snapshot = await loader.load();
|
|
156
193
|
}
|
|
157
194
|
catch (error) {
|
|
158
195
|
if (isResolutionError(error))
|
|
159
196
|
throw error;
|
|
160
|
-
throw errors.loaderFailed(
|
|
197
|
+
throw errors.loaderFailed("the content loader failed", error);
|
|
161
198
|
}
|
|
162
199
|
if (!isSnapshot(snapshot)) {
|
|
163
200
|
throw errors.loaderFailed("the content loader returned something other than a snapshot");
|
|
@@ -165,6 +202,7 @@ export class ContentStore {
|
|
|
165
202
|
return snapshot;
|
|
166
203
|
}
|
|
167
204
|
#serve(snapshot) {
|
|
205
|
+
this.#latest = snapshot;
|
|
168
206
|
this.#served.set(snapshot.revision, snapshot);
|
|
169
207
|
return snapshot;
|
|
170
208
|
}
|