@niscorp/moss 0.9.2 → 0.10.0
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/CHANGELOG.md +122 -0
- package/DESIGN.md +58 -55
- package/DOCS.md +280 -170
- package/README.md +5 -5
- package/dist/{chunk-PVZMCEBX.cjs → chunk-3CKBKTXA.cjs} +2 -2
- package/dist/chunk-3CKBKTXA.cjs.map +1 -0
- package/dist/{chunk-FUJRIO4N.js → chunk-3PL4AH4I.js} +4 -4
- package/dist/{chunk-FUJRIO4N.js.map → chunk-3PL4AH4I.js.map} +1 -1
- package/dist/{chunk-QAHDSRPK.js → chunk-4URQHVYG.js} +2 -2
- package/dist/chunk-4URQHVYG.js.map +1 -0
- package/dist/{chunk-6ZWMC2OV.cjs → chunk-6ACVHHFK.cjs} +33 -30
- package/dist/chunk-6ACVHHFK.cjs.map +1 -0
- package/dist/{chunk-IUJ2TRNB.cjs → chunk-7MOEKAVC.cjs} +6 -6
- package/dist/{chunk-IUJ2TRNB.cjs.map → chunk-7MOEKAVC.cjs.map} +1 -1
- package/dist/{chunk-NCQBGK3E.cjs → chunk-BFA76AKR.cjs} +4 -4
- package/dist/chunk-BFA76AKR.cjs.map +1 -0
- package/dist/{chunk-T5BRTFKP.js → chunk-DSVRFAGX.js} +3 -3
- package/dist/{chunk-T5BRTFKP.js.map → chunk-DSVRFAGX.js.map} +1 -1
- package/dist/{chunk-IW3A2YIC.js → chunk-EYWD733E.js} +3 -3
- package/dist/{chunk-IW3A2YIC.js.map → chunk-EYWD733E.js.map} +1 -1
- package/dist/{chunk-IY5BOFLK.cjs → chunk-G4P3XEVM.cjs} +19 -19
- package/dist/chunk-G4P3XEVM.cjs.map +1 -0
- package/dist/{chunk-6QPTMKRE.cjs → chunk-HUP7CZ7X.cjs} +6 -6
- package/dist/{chunk-6QPTMKRE.cjs.map → chunk-HUP7CZ7X.cjs.map} +1 -1
- package/dist/{chunk-VKQPOZDJ.cjs → chunk-LTS4AM6T.cjs} +4 -4
- package/dist/chunk-LTS4AM6T.cjs.map +1 -0
- package/dist/{chunk-UTFOMFCH.js → chunk-MEHCZECW.js} +5 -5
- package/dist/chunk-MEHCZECW.js.map +1 -0
- package/dist/{chunk-WMIJU6ZZ.js → chunk-MYPK5YZR.js} +297 -206
- package/dist/chunk-MYPK5YZR.js.map +1 -0
- package/dist/{chunk-TKXYPO2Y.js → chunk-NUX5MH4I.js} +4 -4
- package/dist/chunk-NUX5MH4I.js.map +1 -0
- package/dist/{chunk-KVXP6OTW.cjs → chunk-UVY5ZPWW.cjs} +373 -282
- package/dist/chunk-UVY5ZPWW.cjs.map +1 -0
- package/dist/{chunk-5ZB7FZ2J.js → chunk-VYYDLGQ2.js} +29 -26
- package/dist/chunk-VYYDLGQ2.js.map +1 -0
- package/dist/{chunk-NRZ3Z2FF.js → chunk-WKZWSWOJ.js} +4 -4
- package/dist/chunk-WKZWSWOJ.js.map +1 -0
- package/dist/{chunk-KMZT6NVL.cjs → chunk-XH6TSWG4.cjs} +7 -7
- package/dist/{chunk-KMZT6NVL.cjs.map → chunk-XH6TSWG4.cjs.map} +1 -1
- package/dist/client.cjs +5 -5
- package/dist/client.js +2 -2
- package/dist/{document-deAs7Dre.d.cts → document-DvhT_HaJ.d.cts} +3 -2
- package/dist/{document-C3aS9uiW.d.ts → document-iKaRinZE.d.ts} +3 -2
- package/dist/{index-CSEo7Tys.d.ts → index-DWj3_0Zg.d.cts} +3 -0
- package/dist/{index-CSEo7Tys.d.cts → index-DWj3_0Zg.d.ts} +3 -0
- package/dist/index.cjs +16 -16
- package/dist/index.d.cts +4 -4
- package/dist/index.d.ts +4 -4
- package/dist/index.js +4 -4
- package/dist/integrations.cjs +27 -18
- package/dist/integrations.cjs.map +1 -1
- package/dist/integrations.d.cts +1 -1
- package/dist/integrations.d.ts +1 -1
- package/dist/integrations.js +25 -16
- package/dist/integrations.js.map +1 -1
- package/dist/node.cjs +9 -9
- package/dist/node.d.cts +2 -2
- package/dist/node.d.ts +2 -2
- package/dist/node.js +5 -5
- package/dist/protocol.cjs +5 -5
- package/dist/protocol.js +1 -1
- package/dist/terminal/dom/index.cjs +3 -3
- package/dist/terminal/dom/index.js +1 -1
- package/dist/terminal/dom/server.cjs +2 -2
- package/dist/terminal/dom/server.js +1 -1
- package/dist/terminal/index.cjs +3 -3
- package/dist/terminal/index.js +2 -2
- package/dist/terminal/ink/index.js.map +1 -1
- package/dist/terminal/react/index.cjs +9 -9
- package/dist/terminal/react/index.cjs.map +1 -1
- package/dist/terminal/react/index.js +4 -4
- package/dist/terminal/react/index.js.map +1 -1
- package/dist/terminal/react/server.cjs +4 -4
- package/dist/terminal/react/server.js +2 -2
- package/dist/terminal/tty/index.cjs +12 -12
- package/dist/terminal/tty/index.cjs.map +1 -1
- package/dist/terminal/tty/index.js +6 -6
- package/dist/terminal/tty/index.js.map +1 -1
- package/dist/terminal/vue/index.cjs +9 -9
- package/dist/terminal/vue/index.cjs.map +1 -1
- package/dist/terminal/vue/index.js +4 -4
- package/dist/terminal/vue/index.js.map +1 -1
- package/dist/terminal/vue/server.cjs +4 -4
- package/dist/terminal/vue/server.js +2 -2
- package/dist/tide.d.cts +1 -1
- package/dist/tide.d.ts +1 -1
- package/dist/unverified.cjs +4 -4
- package/dist/unverified.js +3 -3
- package/dist/vite.cjs +36 -10
- package/dist/vite.cjs.map +1 -1
- package/dist/vite.d.cts +2 -2
- package/dist/vite.d.ts +2 -2
- package/dist/vite.js +31 -5
- package/dist/vite.js.map +1 -1
- package/package.json +13 -13
- package/dist/chunk-5ZB7FZ2J.js.map +0 -1
- package/dist/chunk-6ZWMC2OV.cjs.map +0 -1
- package/dist/chunk-IY5BOFLK.cjs.map +0 -1
- package/dist/chunk-KVXP6OTW.cjs.map +0 -1
- package/dist/chunk-NCQBGK3E.cjs.map +0 -1
- package/dist/chunk-NRZ3Z2FF.js.map +0 -1
- package/dist/chunk-PVZMCEBX.cjs.map +0 -1
- package/dist/chunk-QAHDSRPK.js.map +0 -1
- package/dist/chunk-TKXYPO2Y.js.map +0 -1
- package/dist/chunk-UTFOMFCH.js.map +0 -1
- package/dist/chunk-VKQPOZDJ.cjs.map +0 -1
- package/dist/chunk-WMIJU6ZZ.js.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { entriesOf, receiveManifest, verifiedAtBoot, verifyManifest, withFragments, candidateOf, FRAME_LAYOUT_REF, canvasLayoutRef, functionsIn, charterOverFunctions, refusalOf, functionsWarning, layoutMisfits, freezeDeep, entryMisfits, sessionOn, endlessChains, actionLayoutRef, endShell, GENERATED_ID_PREFIX, layoutNameRefusal, actionOfLayoutRef, withLayoutInPlace, canvasesOf, treeOf, buildShell, SHELL_GONE, draftedIn, attach,
|
|
2
|
-
import { emitterOf, FabricMessageSchema, spanClock } from './chunk-
|
|
3
|
-
import { DEFAULT_TOKEN_KEY, sessionNameOf, SNAPSHOT_ELEMENT_ID, CLOSE_SHELL_FAILED, CLOSE_PROTOCOL_MISMATCH, CLOSE_INVALID_TOKEN, CLOSE_AT_CAPACITY, PROTOCOL_MIN, PROTOCOL, offeredSealed, offeredToken, ClientMessageSchema } from './chunk-
|
|
1
|
+
import { entriesOf, receiveManifest, verifiedAtBoot, verifyManifest, withFragments, candidateOf, FRAME_LAYOUT_REF, canvasLayoutRef, functionsIn, charterOverFunctions, refusalOf, functionsWarning, layoutMisfits, freezeDeep, entryMisfits, sessionOn, endlessChains, actionLayoutRef, endShell, GENERATED_ID_PREFIX, layoutNameRefusal, actionOfLayoutRef, withLayoutInPlace, canvasesOf, treeOf, buildShell, SHELL_GONE, draftedIn, attach, keepGranted, layoutsOf, withVariants, variantLayouts } from './chunk-VYYDLGQ2.js';
|
|
2
|
+
import { emitterOf, FabricMessageSchema, spanClock } from './chunk-4URQHVYG.js';
|
|
3
|
+
import { DEFAULT_TOKEN_KEY, sessionNameOf, SNAPSHOT_ELEMENT_ID, CLOSE_SHELL_FAILED, CLOSE_PROTOCOL_MISMATCH, CLOSE_INVALID_TOKEN, CLOSE_AT_CAPACITY, PROTOCOL_MIN, PROTOCOL, offeredSealed, offeredToken, ClientMessageSchema } from './chunk-NUX5MH4I.js';
|
|
4
4
|
import { z } from 'zod';
|
|
5
5
|
import { randomBytes, createHash, timingSafeEqual, randomUUID } from 'crypto';
|
|
6
6
|
import { createPostgresCache, createPostgresAdapter, resolve, pruneOptional, mutationMisfits, createMemoryCache, seedCache, handleDiscovery, handleQuery, mergeScopePolicies, createScopePolicy, createQueryEngine, scopeGrants, tablesChangedBy } from '@niscorp/vex';
|
|
@@ -37,7 +37,9 @@ var tokenFromCookie = (header, name = DEFAULT_TOKEN_KEY) => {
|
|
|
37
37
|
var ownOriginOf = (origin, host, listed2 = []) => {
|
|
38
38
|
if (origin === void 0 || origin === null || !URL.canParse(origin)) return void 0;
|
|
39
39
|
const asked = new URL(origin);
|
|
40
|
-
const
|
|
40
|
+
const named = host?.toLowerCase();
|
|
41
|
+
const schemePort = asked.protocol === "https:" ? "443" : asked.protocol === "http:" ? "80" : void 0;
|
|
42
|
+
const own = asked.host === named || schemePort !== void 0 && asked.port === "" && `${asked.host}:${schemePort}` === named || listed2.some((entry) => URL.canParse(entry) && new URL(entry).origin === asked.origin);
|
|
41
43
|
return own ? asked : void 0;
|
|
42
44
|
};
|
|
43
45
|
var cookiesAt = (where, key, token, lastsMs) => {
|
|
@@ -162,8 +164,8 @@ var devSession = (token) => {
|
|
|
162
164
|
var DEFAULT_IDENTITY_MAX = 1e4;
|
|
163
165
|
var DEFAULT_IDENTITY_IDLE_MS = 30 * 60 * 1e3;
|
|
164
166
|
var SWEEP_EVERY_MS = 60 * 1e3;
|
|
165
|
-
var
|
|
166
|
-
const
|
|
167
|
+
var createResidentRecords = (max) => {
|
|
168
|
+
const resident = /* @__PURE__ */ new Map();
|
|
167
169
|
const tagged = /* @__PURE__ */ new Map();
|
|
168
170
|
let evicted = 0;
|
|
169
171
|
const untag = (principal, record) => {
|
|
@@ -175,22 +177,22 @@ var createHeldRecords = (max) => {
|
|
|
175
177
|
if (group.size === 0) tagged.delete(tag);
|
|
176
178
|
};
|
|
177
179
|
const forget = (principal) => {
|
|
178
|
-
const entry =
|
|
180
|
+
const entry = resident.get(principal);
|
|
179
181
|
if (entry === void 0) return false;
|
|
180
182
|
untag(principal, entry.record);
|
|
181
|
-
|
|
183
|
+
resident.delete(principal);
|
|
182
184
|
return true;
|
|
183
185
|
};
|
|
184
186
|
const evictOldest = () => {
|
|
185
|
-
const oldest =
|
|
187
|
+
const oldest = resident.keys().next();
|
|
186
188
|
if (oldest.done === true) return;
|
|
187
189
|
forget(oldest.value);
|
|
188
190
|
evicted += 1;
|
|
189
191
|
};
|
|
190
192
|
const remember = (principal, record, at) => {
|
|
191
193
|
forget(principal);
|
|
192
|
-
while (
|
|
193
|
-
|
|
194
|
+
while (resident.size >= max) evictOldest();
|
|
195
|
+
resident.set(principal, { record, since: at, lastSeen: at });
|
|
194
196
|
if (record.tag !== void 0) {
|
|
195
197
|
const group = tagged.get(record.tag) ?? /* @__PURE__ */ new Set();
|
|
196
198
|
group.add(principal);
|
|
@@ -198,16 +200,16 @@ var createHeldRecords = (max) => {
|
|
|
198
200
|
}
|
|
199
201
|
};
|
|
200
202
|
return {
|
|
201
|
-
of: (principal) =>
|
|
203
|
+
of: (principal) => resident.get(principal),
|
|
202
204
|
touch: (principal, entry, at) => {
|
|
203
|
-
|
|
205
|
+
resident.delete(principal);
|
|
204
206
|
entry.lastSeen = at;
|
|
205
|
-
|
|
207
|
+
resident.set(principal, entry);
|
|
206
208
|
},
|
|
207
209
|
forget,
|
|
208
210
|
remember,
|
|
209
211
|
forgetAll: () => {
|
|
210
|
-
|
|
212
|
+
resident.clear();
|
|
211
213
|
tagged.clear();
|
|
212
214
|
},
|
|
213
215
|
forgetTag: (tag) => {
|
|
@@ -216,15 +218,15 @@ var createHeldRecords = (max) => {
|
|
|
216
218
|
return principals;
|
|
217
219
|
},
|
|
218
220
|
forgetIdle: (at, idleMs) => {
|
|
219
|
-
for (const [principal, entry] of [...
|
|
221
|
+
for (const [principal, entry] of [...resident]) {
|
|
220
222
|
if (at - entry.lastSeen >= idleMs) {
|
|
221
223
|
forget(principal);
|
|
222
224
|
evicted += 1;
|
|
223
225
|
}
|
|
224
226
|
}
|
|
225
227
|
},
|
|
226
|
-
list: () => [...
|
|
227
|
-
size: () =>
|
|
228
|
+
list: () => [...resident].map(([principal, entry]) => ({ principal, since: entry.since, lastSeen: entry.lastSeen })),
|
|
229
|
+
size: () => resident.size,
|
|
228
230
|
evicted: () => evicted
|
|
229
231
|
};
|
|
230
232
|
};
|
|
@@ -236,17 +238,17 @@ var createIdentityCache = (ctx) => {
|
|
|
236
238
|
const idleMs = ctx.idleMs ?? DEFAULT_IDENTITY_IDLE_MS;
|
|
237
239
|
const revalidateMs = ctx.revalidateMs ?? 0;
|
|
238
240
|
const now = ctx.now ?? Date.now;
|
|
239
|
-
const
|
|
241
|
+
const records = createResidentRecords(max);
|
|
240
242
|
const pending = /* @__PURE__ */ new Map();
|
|
241
243
|
let resolved = 0;
|
|
242
244
|
let expired = 0;
|
|
243
245
|
const get = async (principal) => {
|
|
244
246
|
const at = now();
|
|
245
|
-
const hit =
|
|
247
|
+
const hit = records.of(principal);
|
|
246
248
|
if (hit !== void 0) {
|
|
247
249
|
const stale = revalidateMs > 0 && at - hit.since >= revalidateMs;
|
|
248
250
|
if (!stale) {
|
|
249
|
-
|
|
251
|
+
records.touch(principal, hit, at);
|
|
250
252
|
return hit.record;
|
|
251
253
|
}
|
|
252
254
|
expired += 1;
|
|
@@ -258,7 +260,7 @@ var createIdentityCache = (ctx) => {
|
|
|
258
260
|
const work = ctx.resolve(principal).then((record) => {
|
|
259
261
|
resolved += 1;
|
|
260
262
|
const wearsForgottenTag = record.tag !== void 0 && forgotten.has(record.tag);
|
|
261
|
-
if (isStillOut() && !wearsForgottenTag)
|
|
263
|
+
if (isStillOut() && !wearsForgottenTag) records.remember(principal, record, now());
|
|
262
264
|
return record;
|
|
263
265
|
}).finally(() => {
|
|
264
266
|
if (isStillOut()) pending.delete(principal);
|
|
@@ -266,26 +268,26 @@ var createIdentityCache = (ctx) => {
|
|
|
266
268
|
pending.set(principal, { work, forgotten });
|
|
267
269
|
return work;
|
|
268
270
|
};
|
|
269
|
-
const sweep2 = idleMs > 0 ? setInterval(() =>
|
|
271
|
+
const sweep2 = idleMs > 0 ? setInterval(() => records.forgetIdle(now(), idleMs), Math.min(SWEEP_EVERY_MS, idleMs)) : void 0;
|
|
270
272
|
sweep2?.unref?.();
|
|
271
273
|
return {
|
|
272
274
|
get,
|
|
273
275
|
invalidate: (principal) => {
|
|
274
276
|
pending.delete(principal);
|
|
275
|
-
return
|
|
277
|
+
return records.forget(principal);
|
|
276
278
|
},
|
|
277
279
|
invalidateAll: () => {
|
|
278
|
-
|
|
280
|
+
records.forgetAll();
|
|
279
281
|
pending.clear();
|
|
280
282
|
},
|
|
281
283
|
invalidateTag: (tag) => {
|
|
282
|
-
const principals =
|
|
284
|
+
const principals = records.forgetTag(tag);
|
|
283
285
|
for (const principal of principals) pending.delete(principal);
|
|
284
286
|
for (const flight of pending.values()) flight.forgotten.add(tag);
|
|
285
287
|
return principals;
|
|
286
288
|
},
|
|
287
|
-
list:
|
|
288
|
-
meter: () => ({ size:
|
|
289
|
+
list: records.list,
|
|
290
|
+
meter: () => ({ size: records.size(), max, resolved, evicted: records.evicted(), expired }),
|
|
289
291
|
stop: () => {
|
|
290
292
|
if (sweep2 !== void 0) clearInterval(sweep2);
|
|
291
293
|
}
|
|
@@ -293,7 +295,7 @@ var createIdentityCache = (ctx) => {
|
|
|
293
295
|
};
|
|
294
296
|
var memoKey = (roles, installed) => `${[...roles].sort().join("\0")}\0\0${installed === void 0 ? "*" : [...installed].sort().join("\0")}`;
|
|
295
297
|
var NOBODY_USER_ID = "anonymous";
|
|
296
|
-
var assignedRoles = (assignments, principal) => principal === null ? ["public"] : assignments
|
|
298
|
+
var assignedRoles = (assignments, principal) => principal === null || assignments === void 0 || !Object.hasOwn(assignments, principal) ? ["public"] : assignments[principal] ?? ["public"];
|
|
297
299
|
var IdentityRecordSchema = z.looseObject({
|
|
298
300
|
roles: z.array(z.string()),
|
|
299
301
|
scope: z.record(z.string(), z.unknown()),
|
|
@@ -580,10 +582,10 @@ var canonical = (value) => {
|
|
|
580
582
|
return `{${keys.map((key) => `${JSON.stringify(key)}:${canonical(Reflect.get(value, key))}`).join(",")}}`;
|
|
581
583
|
};
|
|
582
584
|
var isSeededAs = async (cache, entry) => {
|
|
583
|
-
const
|
|
584
|
-
if (
|
|
585
|
-
if ("mutation" in entry) return
|
|
586
|
-
return
|
|
585
|
+
const cached = await cache.get(entry.fingerprint);
|
|
586
|
+
if (cached === void 0 || cached.protected !== true) return false;
|
|
587
|
+
if ("mutation" in entry) return cached.kind === "mutation" && canonical(cached.mutation) === canonical(entry.mutation);
|
|
588
|
+
return cached.kind === "ok" && canonical(cached.dsl) === canonical(entry.dsl);
|
|
587
589
|
};
|
|
588
590
|
var changesBetween = (before, after) => {
|
|
589
591
|
const removed = [];
|
|
@@ -680,8 +682,10 @@ var sweepUnused = async (pool, unusedMs) => {
|
|
|
680
682
|
return { versions, saves };
|
|
681
683
|
};
|
|
682
684
|
var AGING_EVERY_MS = 36e5;
|
|
683
|
-
var startAging = (pool, unusedMs, everyMs = AGING_EVERY_MS) => {
|
|
685
|
+
var startAging = (pool, unusedMs, { everyMs = AGING_EVERY_MS, sinceStart = false } = {}) => {
|
|
686
|
+
const startedAt = Date.now();
|
|
684
687
|
const sweep2 = async () => {
|
|
688
|
+
if (sinceStart && Date.now() - startedAt < unusedMs) return;
|
|
685
689
|
try {
|
|
686
690
|
const swept = await sweepUnused(pool, unusedMs);
|
|
687
691
|
if (swept.versions > 0) console.log(`[moss] aging: ${swept.versions} version(s) of what was generated and unused for ${unusedMs} ms deleted, and ${swept.saves} save(s) left empty`);
|
|
@@ -691,11 +695,12 @@ var startAging = (pool, unusedMs, everyMs = AGING_EVERY_MS) => {
|
|
|
691
695
|
};
|
|
692
696
|
void sweep2();
|
|
693
697
|
const timer = setInterval(() => void sweep2(), everyMs);
|
|
698
|
+
timer.unref?.();
|
|
694
699
|
return () => clearInterval(timer);
|
|
695
700
|
};
|
|
696
701
|
var isWrittenForRequest = (entry) => entry.kind === "unsatisfiable" || entry.requestHash !== void 0;
|
|
697
702
|
var createEntryCache = (table) => {
|
|
698
|
-
let
|
|
703
|
+
let askedFirst;
|
|
699
704
|
const fromTable = (entry) => entry !== void 0 && isWrittenForRequest(entry) ? entry : void 0;
|
|
700
705
|
const tableEntries = async () => {
|
|
701
706
|
const rows = table.entries !== void 0 ? await table.entries() : await Promise.all((await table.keys()).map(async (key) => ({ key, entry: await table.get(key) })));
|
|
@@ -705,16 +710,16 @@ var createEntryCache = (table) => {
|
|
|
705
710
|
});
|
|
706
711
|
};
|
|
707
712
|
const entries = async () => {
|
|
708
|
-
const first = await
|
|
713
|
+
const first = await askedFirst?.entries() ?? [];
|
|
709
714
|
const answered = new Set(first.map((row) => row.key));
|
|
710
715
|
return [...first, ...(await tableEntries()).filter((row) => !answered.has(row.key))];
|
|
711
716
|
};
|
|
712
717
|
return {
|
|
713
|
-
askFirst: (
|
|
714
|
-
|
|
718
|
+
askFirst: (first) => {
|
|
719
|
+
askedFirst = first;
|
|
715
720
|
},
|
|
716
721
|
cache: {
|
|
717
|
-
get: async (key, scope) => await
|
|
722
|
+
get: async (key, scope) => await askedFirst?.get(key, scope) ?? fromTable(await table.get(key)),
|
|
718
723
|
// Vex stamps an entry it replays by writing it back: one that was not written for a request is not the table's to keep.
|
|
719
724
|
set: async (key, entry) => {
|
|
720
725
|
if (isWrittenForRequest(entry)) await table.set(key, entry);
|
|
@@ -731,7 +736,12 @@ var createDataLayer = async (deps) => {
|
|
|
731
736
|
const table = deps.cache ?? createPostgresCache({ pool: deps.pool });
|
|
732
737
|
await table.init?.();
|
|
733
738
|
const { cache, askFirst } = createEntryCache(table);
|
|
734
|
-
const engine = createQueryEngine({
|
|
739
|
+
const engine = createQueryEngine({
|
|
740
|
+
adapter,
|
|
741
|
+
cache,
|
|
742
|
+
...deps.vexConfig !== void 0 ? { config: deps.vexConfig } : {},
|
|
743
|
+
...deps.upgradedColumns !== void 0 && deps.upgrader !== void 0 ? { upgradedColumns: deps.upgradedColumns, upgrader: deps.upgrader } : {}
|
|
744
|
+
});
|
|
735
745
|
const schema = await engine.introspect();
|
|
736
746
|
return { engine, adapter, schema, grants: scopeGrants(schema.entities.map((e) => e.name)), askFirst };
|
|
737
747
|
};
|
|
@@ -865,7 +875,7 @@ var createExecuteAs = (deps) => async (role, fingerprint, context, scope = {}) =
|
|
|
865
875
|
locked: true,
|
|
866
876
|
scopePolicy: policy,
|
|
867
877
|
policyForReach: (reach) => deps.policyAtReach(roles, reach),
|
|
868
|
-
mutations: { client: deps.db, policy },
|
|
878
|
+
mutations: { client: deps.db, policy, ...deps.checkMovedRows === false ? { checkMovedRows: false } : {} },
|
|
869
879
|
...deps.onExecute !== void 0 ? { onExecute: deps.onExecute } : {}
|
|
870
880
|
},
|
|
871
881
|
{ fingerprint, context },
|
|
@@ -968,7 +978,12 @@ var createVexRoutes = (deps) => {
|
|
|
968
978
|
getPolicy: deps.policy,
|
|
969
979
|
getPolicyForReach: deps.policyAtReach,
|
|
970
980
|
...deps.onExecute !== void 0 ? { onExecute: deps.onExecute } : {},
|
|
971
|
-
mutations: {
|
|
981
|
+
mutations: {
|
|
982
|
+
client: deps.db,
|
|
983
|
+
onWrite: deps.writes.report,
|
|
984
|
+
...deps.answerReadableRows === true ? { answerReadableRows: true } : {},
|
|
985
|
+
...deps.checkMovedRows === false ? { checkMovedRows: false } : {}
|
|
986
|
+
}
|
|
972
987
|
})
|
|
973
988
|
);
|
|
974
989
|
};
|
|
@@ -991,7 +1006,8 @@ var createIntentAnswers = (deps) => {
|
|
|
991
1006
|
generateDsl: writers.generateDsl,
|
|
992
1007
|
mapToShape: writers.mapToShape,
|
|
993
1008
|
...deps.behaviors !== void 0 ? { behaviors: deps.behaviors } : {},
|
|
994
|
-
...deps.vexConfig !== void 0 ? { config: deps.vexConfig } : {}
|
|
1009
|
+
...deps.vexConfig !== void 0 ? { config: deps.vexConfig } : {},
|
|
1010
|
+
...deps.upgradedColumns !== void 0 && deps.upgrader !== void 0 ? { upgradedColumns: deps.upgradedColumns, upgrader: deps.upgrader } : {}
|
|
995
1011
|
});
|
|
996
1012
|
await engine.introspect();
|
|
997
1013
|
return engine;
|
|
@@ -1001,7 +1017,7 @@ var createIntentAnswers = (deps) => {
|
|
|
1001
1017
|
};
|
|
1002
1018
|
return async (writers, asked, caller) => (await engineFor(writers)).execute(
|
|
1003
1019
|
"fingerprint" in asked ? { fingerprint: asked.fingerprint, context: asked.context ?? {} } : { intent: asked.intent, shape: asked.shape, context: asked.context ?? {} },
|
|
1004
|
-
{ scope: caller.scope, scopePolicy: caller.policy }
|
|
1020
|
+
{ scope: caller.scope, scopePolicy: caller.policy, ...caller.policyAtReach !== void 0 ? { policyForReach: caller.policyAtReach } : {} }
|
|
1005
1021
|
);
|
|
1006
1022
|
};
|
|
1007
1023
|
|
|
@@ -1018,7 +1034,7 @@ var prepareEngine = async (config) => {
|
|
|
1018
1034
|
);
|
|
1019
1035
|
});
|
|
1020
1036
|
const grammars = await createGrammarUpgrader({ grammars: config.grammars });
|
|
1021
|
-
const layer = await createDataLayer(config);
|
|
1037
|
+
const layer = await createDataLayer({ ...config, upgrader: grammars });
|
|
1022
1038
|
return {
|
|
1023
1039
|
grammars,
|
|
1024
1040
|
engine: layer.engine,
|
|
@@ -1042,7 +1058,8 @@ var lazyIntentAnswers = (prepared, config) => {
|
|
|
1042
1058
|
schema,
|
|
1043
1059
|
cache: engine.cache,
|
|
1044
1060
|
...config.behaviors !== void 0 ? { behaviors: config.behaviors } : {},
|
|
1045
|
-
...config.vexConfig !== void 0 ? { vexConfig: config.vexConfig } : {}
|
|
1061
|
+
...config.vexConfig !== void 0 ? { vexConfig: config.vexConfig } : {},
|
|
1062
|
+
...config.upgradedColumns !== void 0 ? { upgradedColumns: config.upgradedColumns, upgrader: prepared.grammars } : {}
|
|
1046
1063
|
});
|
|
1047
1064
|
return answers;
|
|
1048
1065
|
};
|
|
@@ -1053,6 +1070,20 @@ var tablesByFeature = (config) => (feature) => {
|
|
|
1053
1070
|
if (kept === void 0) throw new Error(`moss: the data module was asked for the tables of a feature it was never told of ("${feature}").`);
|
|
1054
1071
|
return kept.names;
|
|
1055
1072
|
};
|
|
1073
|
+
var refuseUpgradedOwnedTables = (config) => {
|
|
1074
|
+
const owners = new Map([
|
|
1075
|
+
...(config.featureTables ?? []).flatMap((tables) => tables.names.map((name) => [name, `the feature "${tables.feature}"`])),
|
|
1076
|
+
...ARTIFACT_TABLES.map((name) => [name, "the artifactory"]),
|
|
1077
|
+
...POINTER.tables.map((name) => [name, POINTER.owner])
|
|
1078
|
+
]);
|
|
1079
|
+
const owned = Object.keys(config.upgradedColumns ?? {}).flatMap((table) => {
|
|
1080
|
+
const owner = owners.get(table);
|
|
1081
|
+
return owner === void 0 ? [] : [`"${table}" is ${owner}'s`];
|
|
1082
|
+
});
|
|
1083
|
+
if (owned.length > 0) {
|
|
1084
|
+
throw new Error(`moss: the app's \`upgradedColumns\` name tables it does not own (${owned.join("; ")}). Their owner reads them as stored: name only the app's own tables.`);
|
|
1085
|
+
}
|
|
1086
|
+
};
|
|
1056
1087
|
var createUpgradeStore = (prepared, tablesOf) => async (feature, store) => {
|
|
1057
1088
|
const own = tablesOf(feature);
|
|
1058
1089
|
if (store.schema !== void 0) {
|
|
@@ -1066,6 +1097,7 @@ var createUpgradeStore = (prepared, tablesOf) => async (feature, store) => {
|
|
|
1066
1097
|
await prepared.upgradeStore(store);
|
|
1067
1098
|
};
|
|
1068
1099
|
var createDataWith = (prepared, config) => {
|
|
1100
|
+
refuseUpgradedOwnedTables(config);
|
|
1069
1101
|
const { grammars, engine, grants } = prepared;
|
|
1070
1102
|
const governed = { charter: config.charter, behaviors: { ...config.behaviors, ...config.rowRules } };
|
|
1071
1103
|
const policies = createPolicies({ ...governed, grants });
|
|
@@ -1083,7 +1115,7 @@ var createDataWith = (prepared, config) => {
|
|
|
1083
1115
|
return {
|
|
1084
1116
|
grants,
|
|
1085
1117
|
grammars,
|
|
1086
|
-
|
|
1118
|
+
askEntriesFirst: prepared.askFirst,
|
|
1087
1119
|
fingerprints: async () => await engine.cache.keys?.() ?? [],
|
|
1088
1120
|
policyOf: policies.of,
|
|
1089
1121
|
// Compiled afresh and not taken from the kept ones: the caller owns its
|
|
@@ -1099,9 +1131,10 @@ var createDataWith = (prepared, config) => {
|
|
|
1099
1131
|
db: config.db,
|
|
1100
1132
|
policyFor: (roles) => policies.of(callerOfRoles(roles)),
|
|
1101
1133
|
policyAtReach: (roles, reach) => policies.atReach(callerOfRoles(roles), reach),
|
|
1102
|
-
...onExecute !== void 0 ? { onExecute } : {}
|
|
1134
|
+
...onExecute !== void 0 ? { onExecute } : {},
|
|
1135
|
+
...config.checkMovedRows === false ? { checkMovedRows: false } : {}
|
|
1103
1136
|
}),
|
|
1104
|
-
answerIntent: async (writers, asked, who, scope) => answering()(writers, asked, { policy: policies.of(who), scope }),
|
|
1137
|
+
answerIntent: async (writers, asked, who, scope) => answering()(writers, asked, { policy: policies.of(who), policyAtReach: (reach) => policies.atReach(who, reach), scope }),
|
|
1105
1138
|
ownEntries: async (feature, entries) => ownEntries({ owner: `the feature "${feature}"`, entries, tables: tablesOf(feature) }, onExecute),
|
|
1106
1139
|
artifactEntries: (entries, rules) => ownEntries({ owner: "the artifactory", entries, tables: ARTIFACT_TABLES, rules }, onExecute),
|
|
1107
1140
|
routes: (routing) => createVexRoutes({
|
|
@@ -1112,7 +1145,9 @@ var createDataWith = (prepared, config) => {
|
|
|
1112
1145
|
policy: (c) => policies.of(routing.caller(c)),
|
|
1113
1146
|
policyAtReach: (c, reach) => policies.atReach(routing.caller(c), reach),
|
|
1114
1147
|
...onExecute !== void 0 ? { onExecute } : {},
|
|
1115
|
-
writes
|
|
1148
|
+
writes,
|
|
1149
|
+
...config.answerReadableRows === true ? { answerReadableRows: true } : {},
|
|
1150
|
+
...config.checkMovedRows === false ? { checkMovedRows: false } : {}
|
|
1116
1151
|
}),
|
|
1117
1152
|
upgradeStore: createUpgradeStore(prepared, tablesOf),
|
|
1118
1153
|
onWrite: writes.subscribe,
|
|
@@ -1131,7 +1166,7 @@ var embedSnapshot = (snapshot, principal, path) => {
|
|
|
1131
1166
|
return `<script type="application/json" id="${SNAPSHOT_ELEMENT_ID}">${text}</script>`;
|
|
1132
1167
|
};
|
|
1133
1168
|
var documentHeaders = (principal) => principal === null ? { "cache-control": "no-cache", vary: "Cookie" } : { "cache-control": "private, no-store", vary: "Cookie" };
|
|
1134
|
-
var
|
|
1169
|
+
var screenInRoot = (root) => {
|
|
1135
1170
|
const closing = root.lastIndexOf("</");
|
|
1136
1171
|
if (closing <= 0 || !root.startsWith("<") || root[closing - 1] !== ">" || !root.endsWith(">")) return void 0;
|
|
1137
1172
|
return (screen) => `${root.slice(0, closing)}${screen}${root.slice(closing)}`;
|
|
@@ -1143,8 +1178,8 @@ var renderDocument = async (config) => {
|
|
|
1143
1178
|
const root = config.root ?? DEFAULT_ROOT;
|
|
1144
1179
|
const undrawn = { html: template, headers: documentHeaders(null), drawn: false, principal: null };
|
|
1145
1180
|
if (!template.includes(root)) return undrawn;
|
|
1146
|
-
const
|
|
1147
|
-
if (
|
|
1181
|
+
const inRoot = screenInRoot(root);
|
|
1182
|
+
if (inRoot === void 0) {
|
|
1148
1183
|
console.error(`[moss/document] the root ${root} has no place for a screen \u2014 a root is an empty element, like ${DEFAULT_ROOT}. "${request.path}" is served undrawn.`);
|
|
1149
1184
|
return undrawn;
|
|
1150
1185
|
}
|
|
@@ -1161,7 +1196,7 @@ var renderDocument = async (config) => {
|
|
|
1161
1196
|
});
|
|
1162
1197
|
const screen = await draw(snapshot);
|
|
1163
1198
|
const attributes = Object.entries(config.htmlAttributes?.(snapshot) ?? {}).map(([name, value]) => ` ${name}="${escapeAttribute(value)}"`).join("");
|
|
1164
|
-
const placed = template.replace(root, () => `${
|
|
1199
|
+
const placed = template.replace(root, () => `${inRoot(screen)}${embedSnapshot(snapshot, principal, request.path)}`).replace(/<html([^>]*)>/, (whole, existing) => attributes === "" ? whole : `<html${existing}${attributes}>`);
|
|
1165
1200
|
const head = headOf({ frame: () => snapshot.frame, canvasTree: (id) => snapshot.trees[id] ?? [] });
|
|
1166
1201
|
for (const why of head?.refused ?? []) console.error(`[moss/document] "${request.path}" \u2014 ${why}`);
|
|
1167
1202
|
const html = placeHead(placed, head?.elements, { ...config.site !== void 0 ? { site: config.site } : {}, path: request.path });
|
|
@@ -1335,16 +1370,16 @@ var actionAtRef = (actions, layouts) => (ref) => {
|
|
|
1335
1370
|
return action === void 0 || layout === void 0 ? void 0 : { ...action, layout };
|
|
1336
1371
|
};
|
|
1337
1372
|
var nothingKeptUnder = (ref) => `nothing is kept under "${ref}". A saved layout takes the place of the layout of an action its holder has, under "action/<the action\u2019s id>", or of one the app\u2019s own shell declares: its own under "frame", a canvas\u2019s under "canvas/<the canvas\u2019s id>".`;
|
|
1338
|
-
var targetAt = (ref,
|
|
1339
|
-
if (
|
|
1340
|
-
const action =
|
|
1341
|
-
return action === void 0 ? void 0 : { kit:
|
|
1373
|
+
var targetAt = (ref, checks) => {
|
|
1374
|
+
if (checks.ownShell?.refs.has(ref) === true) return { kit: checks.ownShell.kit };
|
|
1375
|
+
const action = checks.actionAt(ref);
|
|
1376
|
+
return action === void 0 ? void 0 : { kit: checks.kit, action };
|
|
1342
1377
|
};
|
|
1343
1378
|
var refOf = (body) => {
|
|
1344
1379
|
const ref = isRecord(body) ? body["ref"] : void 0;
|
|
1345
1380
|
return typeof ref === "string" ? ref : void 0;
|
|
1346
1381
|
};
|
|
1347
|
-
var readLayout = (body,
|
|
1382
|
+
var readLayout = (body, checks) => {
|
|
1348
1383
|
if (exceedsDepth(body)) return { refusal: depthRefusal() };
|
|
1349
1384
|
const parsed = SavedLayoutSchema.safeParse(body);
|
|
1350
1385
|
if (!parsed.success) {
|
|
@@ -1352,7 +1387,7 @@ var readLayout = (body, heldTo) => {
|
|
|
1352
1387
|
return { refusal: first === void 0 ? "no reason given" : `${first.path.join(".") || "(the body)"}: ${first.message}` };
|
|
1353
1388
|
}
|
|
1354
1389
|
const { ref, layout } = parsed.data;
|
|
1355
|
-
const target = targetAt(ref,
|
|
1390
|
+
const target = targetAt(ref, checks);
|
|
1356
1391
|
if (target === void 0) return { refusal: nothingKeptUnder(ref) };
|
|
1357
1392
|
const misfits = layoutMisfits(layout, target.kit);
|
|
1358
1393
|
if (misfits.length > 0) return { refusal: misfits.join("; ") };
|
|
@@ -1365,10 +1400,10 @@ var readLayout = (body, heldTo) => {
|
|
|
1365
1400
|
if (added.length > 0) return { refusal: added.join("; ") };
|
|
1366
1401
|
return { layout: parsed.data };
|
|
1367
1402
|
};
|
|
1368
|
-
var loaded = (version, { whose,
|
|
1403
|
+
var loaded = (version, { whose, checks, say }) => {
|
|
1369
1404
|
const ref = refOf(version.body);
|
|
1370
|
-
if (ref === void 0 || targetAt(ref,
|
|
1371
|
-
const read2 = version.unread !== void 0 ? { refusal: version.unread } : readLayout(version.body,
|
|
1405
|
+
if (ref === void 0 || targetAt(ref, checks) === void 0) return void 0;
|
|
1406
|
+
const read2 = version.unread !== void 0 ? { refusal: version.unread } : readLayout(version.body, checks);
|
|
1372
1407
|
if ("layout" in read2) return read2.layout;
|
|
1373
1408
|
(say ?? console.error)(`[moss] the layout "${version.id}" ${whose} is left out: ${read2.refusal}`);
|
|
1374
1409
|
return void 0;
|
|
@@ -1380,8 +1415,8 @@ var layoutsInUse = (inForce2, drawnFor) => {
|
|
|
1380
1415
|
for (const version of inForce2.filter(isInUse)) {
|
|
1381
1416
|
const ref = refOf(version.body);
|
|
1382
1417
|
if (ref === void 0) continue;
|
|
1383
|
-
const
|
|
1384
|
-
if (
|
|
1418
|
+
const latest = marked.get(ref);
|
|
1419
|
+
if (latest === void 0 || isLater(version, latest)) marked.set(ref, version);
|
|
1385
1420
|
}
|
|
1386
1421
|
const layouts = {};
|
|
1387
1422
|
for (const version of marked.values()) {
|
|
@@ -1392,12 +1427,12 @@ var layoutsInUse = (inForce2, drawnFor) => {
|
|
|
1392
1427
|
};
|
|
1393
1428
|
var generatedId = () => `${GENERATED_ID_PREFIX}${randomUUID()}`;
|
|
1394
1429
|
var VEX_ROUTE = /^\/api\/(?:[A-Za-z0-9_-]+\/)?vex$/;
|
|
1395
|
-
var endpointRefusals = async (endpoints,
|
|
1430
|
+
var endpointRefusals = async (endpoints, checks) => {
|
|
1396
1431
|
const refusals = [];
|
|
1397
1432
|
for (const [name, endpoint] of Object.entries(endpoints ?? {})) {
|
|
1398
1433
|
if ("fn" in endpoint) {
|
|
1399
1434
|
if (endpoint.fn.includes("{{")) refusals.push(`endpoint "${name}" names a function that is worked out when it is called, and what is generated names one written out`);
|
|
1400
|
-
else if (!
|
|
1435
|
+
else if (!checks.mayCall(endpoint.fn)) refusals.push(`endpoint "${name}" calls the function "${endpoint.fn}", which its owner\u2019s roles do not grant`);
|
|
1401
1436
|
continue;
|
|
1402
1437
|
}
|
|
1403
1438
|
if (endpoint.method !== "POST" || !VEX_ROUTE.test(endpoint.url)) {
|
|
@@ -1409,10 +1444,10 @@ var endpointRefusals = async (endpoints, heldTo) => {
|
|
|
1409
1444
|
refusals.push(`endpoint "${name}" names no fingerprint`);
|
|
1410
1445
|
continue;
|
|
1411
1446
|
}
|
|
1412
|
-
const entry =
|
|
1447
|
+
const entry = checks.entryOf(fingerprint);
|
|
1413
1448
|
if (entry === void 0) refusals.push(`endpoint "${name}" replays "${fingerprint}", which is no entry the app ships or was handed, nor a read its owner saved`);
|
|
1414
1449
|
else if ("mutation" in entry) refusals.push(`endpoint "${name}" replays "${fingerprint}", which is a write, and what is generated only reads`);
|
|
1415
|
-
else if (!(await
|
|
1450
|
+
else if (!(await checks.replayable()).has(fingerprint)) refusals.push(`endpoint "${name}" replays "${fingerprint}", which its owner may not replay`);
|
|
1416
1451
|
}
|
|
1417
1452
|
return refusals;
|
|
1418
1453
|
};
|
|
@@ -1431,29 +1466,29 @@ var layoutRefusals = (layout, kit) => {
|
|
|
1431
1466
|
return [...layout === void 0 || typeof layout === "string" ? [] : layoutMisfits(layout, kit), ...named === void 0 ? [] : [`it ${named}`]];
|
|
1432
1467
|
};
|
|
1433
1468
|
var passedOrRefused = (body, refusals) => refusals.length > 0 ? { refusal: refusals.join("; ") } : { body };
|
|
1434
|
-
var readAction = async (body, id,
|
|
1469
|
+
var readAction = async (body, id, checks) => {
|
|
1435
1470
|
const parsed = parsedUnder(ActionDefinitionSchema, body, id);
|
|
1436
1471
|
if ("refusal" in parsed) return parsed;
|
|
1437
1472
|
const action = parsed.body;
|
|
1438
1473
|
return passedOrRefused(action, [
|
|
1439
|
-
...layoutRefusals(action.layout,
|
|
1440
|
-
...await endpointRefusals(action.endpoints,
|
|
1441
|
-
...auditAction(action, { catalog:
|
|
1474
|
+
...layoutRefusals(action.layout, checks.kit),
|
|
1475
|
+
...await endpointRefusals(action.endpoints, checks),
|
|
1476
|
+
...auditAction(action, { catalog: checks.catalog() }).issues
|
|
1442
1477
|
]);
|
|
1443
1478
|
};
|
|
1444
|
-
var readFragment = async (body, id,
|
|
1479
|
+
var readFragment = async (body, id, checks) => {
|
|
1445
1480
|
const parsed = parsedUnder(ActionFragmentSchema, body, id, { kind: "fragment" });
|
|
1446
1481
|
if ("refusal" in parsed) return parsed;
|
|
1447
1482
|
const fragment = parsed.body;
|
|
1448
|
-
return passedOrRefused(fragment, [...layoutRefusals(fragment.layout,
|
|
1483
|
+
return passedOrRefused(fragment, [...layoutRefusals(fragment.layout, checks.kit), ...await endpointRefusals(fragment.endpoints, checks)]);
|
|
1449
1484
|
};
|
|
1450
1485
|
var generatedIn = (inForce2, kind) => inForce2.filter((version) => version.kind === kind && version.body !== null);
|
|
1451
1486
|
var catalogOfGenerated = (inForce2) => generatedIn(inForce2, "action").map((version) => ({ id: version.id, input: isRecord(version.body) && isRecord(version.body["input"]) ? version.body["input"] : {} }));
|
|
1452
|
-
var generatedInForce = async (inForce2,
|
|
1487
|
+
var generatedInForce = async (inForce2, checks, whose) => {
|
|
1453
1488
|
const passed = async (kind, read2) => {
|
|
1454
1489
|
const kept = {};
|
|
1455
1490
|
for (const version of generatedIn(inForce2, kind)) {
|
|
1456
|
-
const answered = version.unread !== void 0 ? { refusal: version.unread } : await read2(version.body, version.id,
|
|
1491
|
+
const answered = version.unread !== void 0 ? { refusal: version.unread } : await read2(version.body, version.id, checks);
|
|
1457
1492
|
if ("body" in answered) kept[version.id] = answered.body;
|
|
1458
1493
|
else if (whose !== void 0) console.error(`[moss] the ${kind} "${version.id}" ${whose} is left out: ${answered.refusal}`);
|
|
1459
1494
|
}
|
|
@@ -1461,6 +1496,19 @@ var generatedInForce = async (inForce2, heldTo, whose) => {
|
|
|
1461
1496
|
};
|
|
1462
1497
|
return { actions: await passed("action", readAction), fragments: await passed("fragment", readFragment) };
|
|
1463
1498
|
};
|
|
1499
|
+
var refuseUnrunnable = (entries, compile2, heading) => {
|
|
1500
|
+
if (compile2 === void 0) return;
|
|
1501
|
+
const unrunnable = entries.flatMap((entry) => {
|
|
1502
|
+
if (!("dsl" in entry)) return [];
|
|
1503
|
+
try {
|
|
1504
|
+
compile2(entry.dsl);
|
|
1505
|
+
return [];
|
|
1506
|
+
} catch (error) {
|
|
1507
|
+
return [` "${entry.fingerprint}": ${error instanceof Error ? error.message : String(error)}`];
|
|
1508
|
+
}
|
|
1509
|
+
});
|
|
1510
|
+
if (unrunnable.length > 0) throw new Error([heading, ...unrunnable].join("\n"));
|
|
1511
|
+
};
|
|
1464
1512
|
var compileEntries = async (entries) => {
|
|
1465
1513
|
const compiled = createMemoryCache();
|
|
1466
1514
|
await seedCache(compiled, entries);
|
|
@@ -1471,7 +1519,8 @@ var mergedEntries = (own, sets) => {
|
|
|
1471
1519
|
for (const entry of [...own, ...[...sets.values()].flat()]) byFingerprint.set(entry.fingerprint, entry);
|
|
1472
1520
|
return Object.freeze([...byFingerprint.values()]);
|
|
1473
1521
|
};
|
|
1474
|
-
var createEntriesInForce = (own) => {
|
|
1522
|
+
var createEntriesInForce = (own, compileRead) => {
|
|
1523
|
+
refuseUnrunnable(own, compileRead, "Seeded reads that do not run \u2014 refusing to serve:");
|
|
1475
1524
|
let sets = /* @__PURE__ */ new Map();
|
|
1476
1525
|
let list = mergedEntries(own, sets);
|
|
1477
1526
|
let byFingerprint = new Map(list.map((entry) => [entry.fingerprint, entry]));
|
|
@@ -1481,9 +1530,10 @@ var createEntriesInForce = (own) => {
|
|
|
1481
1530
|
return {
|
|
1482
1531
|
list: () => list,
|
|
1483
1532
|
byFingerprint: () => byFingerprint,
|
|
1484
|
-
|
|
1533
|
+
hasSet: (source) => sets.has(source),
|
|
1485
1534
|
withSet: (source, handed) => mergedEntries(own, new Map([...sets, [source, handed]])),
|
|
1486
1535
|
takeSet: (source, handed, taken) => {
|
|
1536
|
+
refuseUnrunnable(handed, compileRead, "Refresh refused \u2014 seeded reads that do not run:");
|
|
1487
1537
|
sets = new Map([...sets, [source, handed]]);
|
|
1488
1538
|
list = mergedEntries(own, sets);
|
|
1489
1539
|
byFingerprint = new Map(list.map((entry) => [entry.fingerprint, entry]));
|
|
@@ -1511,8 +1561,8 @@ var compiledRead = async (fingerprint, read2) => {
|
|
|
1511
1561
|
return entry;
|
|
1512
1562
|
};
|
|
1513
1563
|
var shippedRefusal = (fingerprint) => `"${fingerprint}" is the fingerprint of an entry the app ships or was handed, and a read somebody generated never answers in its place`;
|
|
1514
|
-
var readSaved = async (body, fingerprint,
|
|
1515
|
-
if (
|
|
1564
|
+
var readSaved = async (body, fingerprint, checks) => {
|
|
1565
|
+
if (checks.isAppEntry(fingerprint)) return { refusal: shippedRefusal(fingerprint) };
|
|
1516
1566
|
if (exceedsDepth(body)) return { refusal: depthRefusal() };
|
|
1517
1567
|
const parsed = SavedReadSchema.safeParse(body);
|
|
1518
1568
|
if (!parsed.success) {
|
|
@@ -1520,16 +1570,16 @@ var readSaved = async (body, fingerprint, heldTo) => {
|
|
|
1520
1570
|
return { refusal: first === void 0 ? "no reason given" : `${first.path.join(".") || "(the body)"}: ${first.message}` };
|
|
1521
1571
|
}
|
|
1522
1572
|
try {
|
|
1523
|
-
|
|
1573
|
+
checks.sources.compile(parsed.data.dsl);
|
|
1524
1574
|
await compiledRead(fingerprint, parsed.data);
|
|
1525
1575
|
} catch (error) {
|
|
1526
1576
|
return { refusal: sentenceOf(error) };
|
|
1527
1577
|
}
|
|
1528
1578
|
return { body: parsed.data };
|
|
1529
1579
|
};
|
|
1530
|
-
var readWritten = async (fingerprint,
|
|
1531
|
-
if (
|
|
1532
|
-
const entry = await
|
|
1580
|
+
var readWritten = async (fingerprint, checks) => {
|
|
1581
|
+
if (checks.isAppEntry(fingerprint)) return { refusal: shippedRefusal(fingerprint) };
|
|
1582
|
+
const entry = await checks.sources.written(fingerprint);
|
|
1533
1583
|
if (entry === void 0 || entry.requestHash === void 0) return { refusal: `vex holds no query it wrote under "${fingerprint}"` };
|
|
1534
1584
|
if (entry.kind !== "ok") return { refusal: `vex found no query to answer under "${fingerprint}"` };
|
|
1535
1585
|
if (entry.shape !== void 0 && entry.mapping === void 0) {
|
|
@@ -1545,7 +1595,7 @@ var readWritten = async (fingerprint, heldTo) => {
|
|
|
1545
1595
|
...entry.refresh !== void 0 ? { refresh: entry.refresh } : {}
|
|
1546
1596
|
},
|
|
1547
1597
|
fingerprint,
|
|
1548
|
-
|
|
1598
|
+
checks
|
|
1549
1599
|
);
|
|
1550
1600
|
};
|
|
1551
1601
|
var answeredRead = async (fingerprint, body) => {
|
|
@@ -1553,11 +1603,11 @@ var answeredRead = async (fingerprint, body) => {
|
|
|
1553
1603
|
const parsed = SavedReadSchema.safeParse(body);
|
|
1554
1604
|
return parsed.success ? compiledRead(fingerprint, parsed.data) : void 0;
|
|
1555
1605
|
};
|
|
1556
|
-
var readsInForce = async (inForce2,
|
|
1606
|
+
var readsInForce = async (inForce2, checks, whose) => {
|
|
1557
1607
|
const reads = /* @__PURE__ */ new Map();
|
|
1558
1608
|
for (const version of inForce2) {
|
|
1559
1609
|
if (version.kind !== "read" || version.body === null) continue;
|
|
1560
|
-
const read2 = version.unread !== void 0 ? { refusal: version.unread } : await readSaved(version.body, version.id,
|
|
1610
|
+
const read2 = version.unread !== void 0 ? { refusal: version.unread } : await readSaved(version.body, version.id, checks);
|
|
1561
1611
|
if ("body" in read2) reads.set(version.id, read2.body);
|
|
1562
1612
|
else if (whose !== void 0) console.error(`[moss] the read "${version.id}" ${whose} is left out: ${read2.refusal}`);
|
|
1563
1613
|
}
|
|
@@ -1584,18 +1634,18 @@ var listed = (version, kind) => ({
|
|
|
1584
1634
|
body: version.body
|
|
1585
1635
|
});
|
|
1586
1636
|
var withoutMark = ({ use: _mark, ...layout }) => layout;
|
|
1587
|
-
var checked = async (kind, id, body,
|
|
1637
|
+
var checked = async (kind, id, body, checks) => {
|
|
1588
1638
|
if (kind === "layout") {
|
|
1589
|
-
const read3 = readLayout(body,
|
|
1639
|
+
const read3 = readLayout(body, checks.layouts);
|
|
1590
1640
|
if ("refusal" in read3) throw new Error(`moss: the layout for "${refOf(body) ?? "(no ref)"}" is refused: ${read3.refusal}`);
|
|
1591
1641
|
return read3.layout;
|
|
1592
1642
|
}
|
|
1593
1643
|
if (kind === "read") {
|
|
1594
|
-
const read3 =
|
|
1644
|
+
const read3 = checks.reads === void 0 ? { refusal: "no read is saved here" } : body === void 0 ? await readWritten(id, checks.reads) : await readSaved(body, id, checks.reads);
|
|
1595
1645
|
if ("refusal" in read3) throw new Error(`moss: the read "${id}" is refused: ${read3.refusal}`);
|
|
1596
1646
|
return read3.body;
|
|
1597
1647
|
}
|
|
1598
|
-
const read2 = await (kind === "action" ? readAction : readFragment)(body, id,
|
|
1648
|
+
const read2 = await (kind === "action" ? readAction : readFragment)(body, id, checks.generated);
|
|
1599
1649
|
if ("refusal" in read2) throw new Error(`moss: the ${kind} is refused: ${read2.refusal}`);
|
|
1600
1650
|
return read2.body;
|
|
1601
1651
|
};
|
|
@@ -1612,19 +1662,19 @@ var unmarked = (versions, inForce2) => {
|
|
|
1612
1662
|
const layouts = versions.filter((version) => version.kind === "layout");
|
|
1613
1663
|
const marked = markedRefs(layouts);
|
|
1614
1664
|
const saved = new Set(layouts.map((version) => version.id));
|
|
1615
|
-
const takenOut = inForce2.flatMap((
|
|
1665
|
+
const takenOut = inForce2.flatMap((version) => isInUse(version) && saved.has(version.id) ? [refOf(version.body)] : []);
|
|
1616
1666
|
const decided = /* @__PURE__ */ new Set([...marked, ...takenOut]);
|
|
1617
|
-
return inForce2.flatMap((
|
|
1618
|
-
const ref = refOf(
|
|
1619
|
-
if (!isInUse(
|
|
1620
|
-
return [{ kind: "layout", id:
|
|
1667
|
+
return inForce2.flatMap((version) => {
|
|
1668
|
+
const ref = refOf(version.body);
|
|
1669
|
+
if (!isInUse(version) || version.unread !== void 0 || !isRecord(version.body) || ref === void 0 || !decided.has(ref) || saved.has(version.id)) return [];
|
|
1670
|
+
return [{ kind: "layout", id: version.id, body: withoutMark(version.body), copiedFrom: version.save }];
|
|
1621
1671
|
});
|
|
1622
1672
|
};
|
|
1623
1673
|
var idsOf = (versions) => versions.map(({ kind, id }) => ({ kind, id }));
|
|
1624
|
-
var savingFor = ({
|
|
1625
|
-
const
|
|
1626
|
-
if (
|
|
1627
|
-
return
|
|
1674
|
+
var savingFor = ({ owner, whose, kinds, written, defaults }, nobody) => {
|
|
1675
|
+
const requireOwner = () => {
|
|
1676
|
+
if (owner === void 0) throw new Error(nobody);
|
|
1677
|
+
return owner;
|
|
1628
1678
|
};
|
|
1629
1679
|
const ofKind = (kind) => {
|
|
1630
1680
|
const known = kinds.find((one) => one === kind);
|
|
@@ -1636,13 +1686,13 @@ var savingFor = ({ holder, whose, kinds, written, defaults }, nobody) => {
|
|
|
1636
1686
|
if (!asked.success) throw new Error("moss: a save holds one or several artifacts, each `{ kind, id?, body }` and nothing else.");
|
|
1637
1687
|
return asked.data.map((artifact) => ({ ...artifact, kind: ofKind(artifact.kind) }));
|
|
1638
1688
|
};
|
|
1639
|
-
const checkedEach = async (asked, inForce2,
|
|
1689
|
+
const checkedEach = async (asked, inForce2, checks) => {
|
|
1640
1690
|
const versions = [];
|
|
1641
1691
|
for (const { kind, id: named2, body } of asked) {
|
|
1642
1692
|
if (defaults !== void 0 && named2 === void 0 && kind !== "layout" && kind !== "read") throw new Error(`moss: a published ${kind} is given its id by whoever publishes it: name it.`);
|
|
1643
1693
|
const id = named2 ?? NEW_ID[kind]();
|
|
1644
1694
|
if (kind === "read" && body !== void 0) throw new Error(`moss: the read "${id}" is refused: it is what vex wrote for the request. Leave the body out.`);
|
|
1645
|
-
versions.push({ kind, id, body: await checked(kind, id, body,
|
|
1695
|
+
versions.push({ kind, id, body: await checked(kind, id, body, checks), copiedFrom: null });
|
|
1646
1696
|
}
|
|
1647
1697
|
const named = (kind) => kind !== "read" && (defaults === void 0 || kind === "layout");
|
|
1648
1698
|
const notTheirs = asked.find(({ kind, id }) => id !== void 0 && named(kind) && !inForce2.some((version) => version.kind === kind && version.id === id));
|
|
@@ -1659,25 +1709,25 @@ var savingFor = ({ holder, whose, kinds, written, defaults }, nobody) => {
|
|
|
1659
1709
|
written();
|
|
1660
1710
|
return save2;
|
|
1661
1711
|
};
|
|
1662
|
-
return {
|
|
1712
|
+
return { requireOwner, ofKind, askedOf, checkedEach, write };
|
|
1663
1713
|
};
|
|
1664
1714
|
var savedArtifacts = (deps) => {
|
|
1665
|
-
const {
|
|
1666
|
-
const {
|
|
1715
|
+
const { owner, whose, kinds, defaults } = deps;
|
|
1716
|
+
const { requireOwner, ofKind, askedOf, checkedEach, write } = savingFor(deps, "moss: nobody is signed in to this session, and a save is somebody\u2019s.");
|
|
1667
1717
|
return {
|
|
1668
1718
|
save: async (artifacts) => {
|
|
1669
|
-
const
|
|
1719
|
+
const ownerOf = requireOwner();
|
|
1670
1720
|
const asked = askedOf(artifacts);
|
|
1671
|
-
const { saved,
|
|
1721
|
+
const { saved, checks } = await ownerOf();
|
|
1672
1722
|
const inForce2 = await saved.inForce();
|
|
1673
|
-
const versions = await checkedEach(asked, inForce2, await
|
|
1723
|
+
const versions = await checkedEach(asked, inForce2, await checks(inForce2));
|
|
1674
1724
|
await defaults?.verify(versions, inForce2);
|
|
1675
1725
|
return { save: await write(saved, versions, inForce2), artifacts: idsOf(versions) };
|
|
1676
1726
|
},
|
|
1677
1727
|
list: async (kind) => {
|
|
1678
1728
|
const only = kind === void 0 ? void 0 : ofKind(kind);
|
|
1679
|
-
if (
|
|
1680
|
-
const inForce2 = await (await
|
|
1729
|
+
if (owner === void 0) return [];
|
|
1730
|
+
const inForce2 = await (await owner()).saved.inForce();
|
|
1681
1731
|
return inForce2.flatMap((version) => {
|
|
1682
1732
|
const known = kinds.find((one) => one === version.kind);
|
|
1683
1733
|
return version.body !== null && known !== void 0 && (only === void 0 || known === only) ? [listed(version, known)] : [];
|
|
@@ -1685,26 +1735,26 @@ var savedArtifacts = (deps) => {
|
|
|
1685
1735
|
},
|
|
1686
1736
|
history: async (kind, id) => {
|
|
1687
1737
|
const known = ofKind(kind);
|
|
1688
|
-
if (
|
|
1689
|
-
return (await (await
|
|
1738
|
+
if (owner === void 0) return [];
|
|
1739
|
+
return (await (await owner()).saved.history(known, id)).map((version) => listed(version, known));
|
|
1690
1740
|
},
|
|
1691
1741
|
restore: async (kind, id, save2) => {
|
|
1692
|
-
const
|
|
1742
|
+
const ownerOf = requireOwner();
|
|
1693
1743
|
const known = ofKind(kind);
|
|
1694
|
-
const { saved,
|
|
1744
|
+
const { saved, checks } = await ownerOf();
|
|
1695
1745
|
const version = SaveIdSchema.safeParse(save2).success ? (await saved.history(known, id, save2))[0] : void 0;
|
|
1696
1746
|
if (version === void 0) throw new Error(`moss: no ${known} "${id}" ${whose} was saved in "${save2}".`);
|
|
1697
1747
|
if (version.unread !== void 0) throw new Error(`moss: the ${known} "${id}" saved in "${save2}" cannot be read: ${version.unread}`);
|
|
1698
1748
|
const inForce2 = await saved.inForce();
|
|
1699
|
-
const body = version.body === null ? null : await checked(known, id, version.body, await
|
|
1749
|
+
const body = version.body === null ? null : await checked(known, id, version.body, await checks(inForce2));
|
|
1700
1750
|
const restored = { kind: known, id, body, copiedFrom: version.save };
|
|
1701
1751
|
await defaults?.verify([restored], inForce2);
|
|
1702
1752
|
return { save: await write(saved, [restored], inForce2) };
|
|
1703
1753
|
},
|
|
1704
1754
|
reset: async (kind, id) => {
|
|
1705
|
-
const
|
|
1755
|
+
const ownerOf = requireOwner();
|
|
1706
1756
|
const known = ofKind(kind);
|
|
1707
|
-
const { saved } = await
|
|
1757
|
+
const { saved } = await ownerOf();
|
|
1708
1758
|
const inForce2 = await saved.inForce();
|
|
1709
1759
|
if (!inForce2.some((version) => version.kind === known && version.id === id && version.body !== null)) throw new Error(`moss: no ${known} "${id}" ${whose} is in force.`);
|
|
1710
1760
|
return { save: await write(saved, [{ kind: known, id, body: null, copiedFrom: null }], inForce2) };
|
|
@@ -1719,15 +1769,15 @@ var laidOver = (inForce2, drafted = []) => drafted.length === 0 ? inForce2 : [
|
|
|
1719
1769
|
...drafted.map((one) => ({ ...one, save: "draft", copiedFrom: null, createdAt: LATER_THAN_ANY_SAVE }))
|
|
1720
1770
|
];
|
|
1721
1771
|
var draftSaving = (deps) => {
|
|
1722
|
-
const {
|
|
1772
|
+
const { requireOwner, ofKind, askedOf, checkedEach, write } = savingFor(deps, "moss: nobody is signed in to this session, and a draft is somebody\u2019s to save.");
|
|
1723
1773
|
return {
|
|
1724
|
-
// The draft with these added to it. Each is checked beside what is in force for its
|
|
1774
|
+
// The draft with these added to it. Each is checked beside what is in force for its owner with the draft laid over.
|
|
1725
1775
|
add: async (artifacts, drafted) => {
|
|
1726
|
-
const
|
|
1776
|
+
const ownerOf = requireOwner();
|
|
1727
1777
|
const asked = askedOf(artifacts);
|
|
1728
|
-
const { saved,
|
|
1778
|
+
const { saved, checks } = await ownerOf();
|
|
1729
1779
|
const inForce2 = laidOver(await saved.inForce(), drafted);
|
|
1730
|
-
const versions = await checkedEach(asked, inForce2, await
|
|
1780
|
+
const versions = await checkedEach(asked, inForce2, await checks(inForce2));
|
|
1731
1781
|
const added = versions.map(({ kind, id, body }) => ({ kind, id, body }));
|
|
1732
1782
|
const marked = new Set(markedRefs(added));
|
|
1733
1783
|
const kept = drafted.flatMap((one) => {
|
|
@@ -1739,15 +1789,15 @@ var draftSaving = (deps) => {
|
|
|
1739
1789
|
return { drafted: [...kept, ...added], added: idsOf(versions) };
|
|
1740
1790
|
},
|
|
1741
1791
|
save: async (drafted) => {
|
|
1742
|
-
const
|
|
1792
|
+
const ownerOf = requireOwner();
|
|
1743
1793
|
if (drafted.length === 0) throw new Error("moss: the draft holds nothing to save.");
|
|
1744
|
-
const { saved,
|
|
1794
|
+
const { saved, checks } = await ownerOf();
|
|
1745
1795
|
const inForce2 = await saved.inForce();
|
|
1746
|
-
const
|
|
1796
|
+
const laidOverChecks = await checks(laidOver(inForce2, drafted));
|
|
1747
1797
|
const versions = [];
|
|
1748
1798
|
for (const one of drafted) {
|
|
1749
1799
|
const kind = ofKind(one.kind);
|
|
1750
|
-
versions.push({ kind, id: one.id, body: await checked(kind, one.id, one.body,
|
|
1800
|
+
versions.push({ kind, id: one.id, body: await checked(kind, one.id, one.body, laidOverChecks), copiedFrom: null });
|
|
1751
1801
|
}
|
|
1752
1802
|
return { save: await write(saved, versions, inForce2), artifacts: idsOf(versions) };
|
|
1753
1803
|
}
|
|
@@ -1839,7 +1889,7 @@ var createPublishedMemo = () => {
|
|
|
1839
1889
|
let read2;
|
|
1840
1890
|
let said = /* @__PURE__ */ new Set();
|
|
1841
1891
|
return {
|
|
1842
|
-
|
|
1892
|
+
current: () => read2,
|
|
1843
1893
|
keep: (promise) => {
|
|
1844
1894
|
read2 = promise;
|
|
1845
1895
|
},
|
|
@@ -1855,20 +1905,20 @@ var createPublishedMemo = () => {
|
|
|
1855
1905
|
};
|
|
1856
1906
|
};
|
|
1857
1907
|
var hasDefaults = (defaults) => Object.keys(defaults.actions).length > 0 || Object.keys(defaults.fragments).length > 0 || defaults.reads.size > 0;
|
|
1858
|
-
var checkedDefaults = async (versions,
|
|
1859
|
-
const reads =
|
|
1908
|
+
var checkedDefaults = async (versions, defaults, whose) => {
|
|
1909
|
+
const reads = defaults.reads === void 0 ? /* @__PURE__ */ new Map() : await readsInForce(versions, defaults.reads, whose);
|
|
1860
1910
|
const checks = {
|
|
1861
|
-
kit:
|
|
1911
|
+
kit: defaults.kit,
|
|
1862
1912
|
entryOf: (fingerprint) => {
|
|
1863
1913
|
const read2 = reads.get(fingerprint);
|
|
1864
|
-
return
|
|
1914
|
+
return defaults.entryOf(fingerprint) ?? (read2 === void 0 ? void 0 : seedOf(fingerprint, read2));
|
|
1865
1915
|
},
|
|
1866
|
-
replayable: async () => /* @__PURE__ */ new Set([...
|
|
1916
|
+
replayable: async () => /* @__PURE__ */ new Set([...defaults.fingerprints(), ...reads.keys()]),
|
|
1867
1917
|
mayCall: () => true,
|
|
1868
|
-
catalog: () => [...Object.values(
|
|
1918
|
+
catalog: () => [...Object.values(defaults.built).map((action) => ({ id: action.id, input: action.input ?? {} })), ...catalogOfGenerated(versions)]
|
|
1869
1919
|
};
|
|
1870
1920
|
const passed = await generatedInForce(versions, checks, whose);
|
|
1871
|
-
return { passed, reads, verified: verifyManifest(
|
|
1921
|
+
return { passed, reads, verified: verifyManifest(defaults.candidate({ ...defaults.built, ...passed.actions }, passed.fragments)) };
|
|
1872
1922
|
};
|
|
1873
1923
|
var narrowedBy = (filter, ids, installed) => {
|
|
1874
1924
|
const answered = new Set(filter(ids, installed));
|
|
@@ -1946,8 +1996,8 @@ var createSetOwners = () => {
|
|
|
1946
1996
|
return {
|
|
1947
1997
|
ownerRefusalOf,
|
|
1948
1998
|
claim: (source, owner, handedOver) => {
|
|
1949
|
-
const
|
|
1950
|
-
if (
|
|
1999
|
+
const claimed = owners.get(source);
|
|
2000
|
+
if (claimed !== void 0) throw new Error(`moss: the set "${source}" is ${claimed}'s, and ${owner} claims it too. A set has one writer.`);
|
|
1951
2001
|
if (handedOver) throw new Error(`moss: the set "${source}" was handed over by the app, and ${owner} claims it. A set has one writer.`);
|
|
1952
2002
|
owners.set(source, owner);
|
|
1953
2003
|
},
|
|
@@ -1989,11 +2039,11 @@ var tell = (listener, ...told) => {
|
|
|
1989
2039
|
};
|
|
1990
2040
|
var createRunningManifest = (config) => {
|
|
1991
2041
|
const { shipped } = config;
|
|
1992
|
-
const entries = createEntriesInForce(entriesOf(shipped));
|
|
2042
|
+
const entries = createEntriesInForce(entriesOf(shipped), config.compileSeeded);
|
|
1993
2043
|
let defaults = NO_DEFAULTS;
|
|
1994
2044
|
const usage = createUsage(config.touchEveryMs ?? TOUCH_EVERY_MS);
|
|
1995
2045
|
let functionIds;
|
|
1996
|
-
const candidate = (actions,
|
|
2046
|
+
const candidate = (actions, listed2 = entries.list(), fragments = defaults.fragments) => withFragments({ ...candidateOf(shipped, { actions, entries: listed2 }, config.grants), ...functionIds === void 0 ? {} : { functionIds } }, fragments);
|
|
1997
2047
|
const own = shipped.actions;
|
|
1998
2048
|
const loaders = /* @__PURE__ */ new Map();
|
|
1999
2049
|
const owners = createSetOwners();
|
|
@@ -2022,7 +2072,7 @@ var createRunningManifest = (config) => {
|
|
|
2022
2072
|
const kitOf2 = (shell) => shell === void 0 ? ofTheApp ??= componentsOf2(config.shells) : componentsOf2([shell]);
|
|
2023
2073
|
const ownShell = shipped.shell;
|
|
2024
2074
|
const ownShellRefs = new Set(ownShell === void 0 ? [] : Object.keys(shellWithStoredLayouts(ownShell).layouts));
|
|
2025
|
-
const
|
|
2075
|
+
const layoutChecksOf = ({ actions, layouts }, shell) => {
|
|
2026
2076
|
const kit = kitOf2(shell);
|
|
2027
2077
|
return {
|
|
2028
2078
|
kit,
|
|
@@ -2056,11 +2106,11 @@ var createRunningManifest = (config) => {
|
|
|
2056
2106
|
if (warning !== void 0) console.warn(warning);
|
|
2057
2107
|
};
|
|
2058
2108
|
const grantedFunctionsOf = (roles) => (names) => resolvePrincipal(shipped.charter, names, roles, "functions");
|
|
2059
|
-
const
|
|
2060
|
-
const
|
|
2109
|
+
const readChecks = readSources === void 0 ? void 0 : { isAppEntry: (fingerprint) => entries.byFingerprint().has(fingerprint), sources: readSources };
|
|
2110
|
+
const checksWithGenerated = async (granted, versions, who, shell, whose) => {
|
|
2061
2111
|
let replayable;
|
|
2062
2112
|
let catalog;
|
|
2063
|
-
const reads = new Map([...defaults.reads, ...
|
|
2113
|
+
const reads = new Map([...defaults.reads, ...readChecks === void 0 ? [] : await readsInForce(versions, readChecks, whose)]);
|
|
2064
2114
|
const checks = {
|
|
2065
2115
|
kit: kitOf2(shell),
|
|
2066
2116
|
entryOf: (fingerprint) => {
|
|
@@ -2069,12 +2119,12 @@ var createRunningManifest = (config) => {
|
|
|
2069
2119
|
},
|
|
2070
2120
|
replayable: () => replayable ??= (async () => /* @__PURE__ */ new Set([...await who.replayable?.() ?? [], ...reads.keys()]))(),
|
|
2071
2121
|
mayCall: (name) => who.roles !== void 0 && resolvePrincipal(shipped.charter, [name], who.roles, "functions").has(name),
|
|
2072
|
-
catalog: () => catalog ??= [...Object.values(
|
|
2122
|
+
catalog: () => catalog ??= [...Object.values(granted.actions).map((action) => ({ id: action.id, input: action.input ?? {} })), ...catalogOfGenerated(versions)]
|
|
2073
2123
|
};
|
|
2074
2124
|
const passed = await generatedInForce(versions, checks, whose);
|
|
2075
2125
|
const stored = actionsWithStoredLayouts(passed.actions);
|
|
2076
|
-
const all = Object.keys(passed.actions).length === 0 ?
|
|
2077
|
-
return { all, fragments: passed.fragments,
|
|
2126
|
+
const all = Object.keys(passed.actions).length === 0 ? granted : { actions: { ...granted.actions, ...stored.actions }, layouts: { ...granted.layouts, ...stored.layouts } };
|
|
2127
|
+
return { all, fragments: passed.fragments, checks: { layouts: layoutChecksOf(all, shell), generated: checks, ...readChecks !== void 0 ? { reads: readChecks } : {} } };
|
|
2078
2128
|
};
|
|
2079
2129
|
const listeners = /* @__PURE__ */ new Set();
|
|
2080
2130
|
const listenersFor = /* @__PURE__ */ new Set();
|
|
@@ -2082,11 +2132,11 @@ var createRunningManifest = (config) => {
|
|
|
2082
2132
|
const sessionDeps = (principal, callerOf, shell) => ({
|
|
2083
2133
|
whose: "of yours",
|
|
2084
2134
|
kinds,
|
|
2085
|
-
|
|
2135
|
+
owner: principal === null ? void 0 : async () => {
|
|
2086
2136
|
await publishedNow();
|
|
2087
2137
|
const caller = await callerOf();
|
|
2088
|
-
const
|
|
2089
|
-
return { saved: caller.saved,
|
|
2138
|
+
const granted = roleMemo.storedLayoutsFor(caller.roles, caller.installed);
|
|
2139
|
+
return { saved: caller.saved, checks: async (inForce3) => (await checksWithGenerated(granted, inForce3, caller, shell)).checks };
|
|
2090
2140
|
},
|
|
2091
2141
|
written: () => {
|
|
2092
2142
|
if (principal !== null) for (const listener of [...listenersFor]) tell(listener, principal);
|
|
@@ -2094,17 +2144,17 @@ var createRunningManifest = (config) => {
|
|
|
2094
2144
|
});
|
|
2095
2145
|
let pointer;
|
|
2096
2146
|
const memo = createPublishedMemo();
|
|
2097
|
-
const
|
|
2147
|
+
const defaultsChecks = () => ({
|
|
2098
2148
|
kit: kitOf2(),
|
|
2099
2149
|
entryOf: (fingerprint) => entries.byFingerprint().get(fingerprint),
|
|
2100
2150
|
fingerprints: () => entries.byFingerprint().keys(),
|
|
2101
|
-
reads:
|
|
2151
|
+
reads: readChecks,
|
|
2102
2152
|
built: mergedActions(own, sets),
|
|
2103
2153
|
candidate: (actions, fragments) => candidate(actions, entries.list(), fragments)
|
|
2104
2154
|
});
|
|
2105
2155
|
const applyPublished = async (versions) => {
|
|
2106
2156
|
const over = sets;
|
|
2107
|
-
const { passed, reads, verified } = await checkedDefaults(versions,
|
|
2157
|
+
const { passed, reads, verified } = await checkedDefaults(versions, defaultsChecks(), "published for everybody");
|
|
2108
2158
|
if (sets !== over) return applyPublished(versions);
|
|
2109
2159
|
const refusal = refusalOf(verified, "boot");
|
|
2110
2160
|
if (refusal !== void 0) memo.sayOnce(`[moss] what is published for everybody is left out, and the build\u2019s copies stand: ${refusal}`);
|
|
@@ -2116,8 +2166,8 @@ var createRunningManifest = (config) => {
|
|
|
2116
2166
|
dropMemos();
|
|
2117
2167
|
};
|
|
2118
2168
|
const publishedNow = () => {
|
|
2119
|
-
const
|
|
2120
|
-
if (
|
|
2169
|
+
const current = memo.current();
|
|
2170
|
+
if (current !== void 0) return current;
|
|
2121
2171
|
const read2 = (async () => {
|
|
2122
2172
|
const versions = await config.published?.() ?? [];
|
|
2123
2173
|
await applyPublished(versions);
|
|
@@ -2189,7 +2239,7 @@ var createRunningManifest = (config) => {
|
|
|
2189
2239
|
},
|
|
2190
2240
|
cacheEntries: async () => [...await entries.compiled()].map(([key, entry]) => ({ key, entry })),
|
|
2191
2241
|
claim: (source, owner) => {
|
|
2192
|
-
owners.claim(source, owner, sets.has(source) || entries.
|
|
2242
|
+
owners.claim(source, owner, sets.has(source) || entries.hasSet(source));
|
|
2193
2243
|
return {
|
|
2194
2244
|
replace: (actions) => applySets(/* @__PURE__ */ new Map([[source, actions]]), true),
|
|
2195
2245
|
setLoader: (load) => {
|
|
@@ -2222,12 +2272,12 @@ var createRunningManifest = (config) => {
|
|
|
2222
2272
|
const versions = own2.length === 0 && drafted === void 0 ? [] : laidOver(own2, drafted);
|
|
2223
2273
|
const everybodysVersions = await publishedNow();
|
|
2224
2274
|
const whose = `of ${principal ?? "nobody"}`;
|
|
2225
|
-
const theirOwn = await
|
|
2226
|
-
const drawable = theirOwn.
|
|
2227
|
-
const theirs2 = layoutsInUse(versions, { whose,
|
|
2275
|
+
const theirOwn = await checksWithGenerated(roleMemo.storedLayoutsFor(roles, installed), versions, { replayable, roles }, shell, whose);
|
|
2276
|
+
const drawable = theirOwn.checks.layouts;
|
|
2277
|
+
const theirs2 = layoutsInUse(versions, { whose, checks: drawable });
|
|
2228
2278
|
const variants = roleMemo.variantsFor(roles);
|
|
2229
2279
|
const underVariants = { ...drawable, actionAt: (ref) => variants.has(actionOfLayoutRef(ref) ?? "") ? void 0 : drawable.actionAt(ref) };
|
|
2230
|
-
const everybodys = layoutsInUse(everybodysVersions, { whose: "published for everybody",
|
|
2280
|
+
const everybodys = layoutsInUse(everybodysVersions, { whose: "published for everybody", checks: underVariants, say: memo.sayOnce });
|
|
2231
2281
|
const laidOverShell = { ...drawableIn(defaults.fragments, kitOf2(shell), memo.sayOnce), ...theirOwn.fragments };
|
|
2232
2282
|
const fragments = Object.keys(laidOverShell).length === 0 ? shell.fragments : { ...shell.fragments, ...laidOverShell };
|
|
2233
2283
|
const { layouts: ofShell, ...named } = shellWithStoredLayouts(shell);
|
|
@@ -2245,20 +2295,20 @@ var createRunningManifest = (config) => {
|
|
|
2245
2295
|
},
|
|
2246
2296
|
sessionArtifacts: (principal, callerOf) => savedArtifacts(sessionDeps(principal, callerOf)),
|
|
2247
2297
|
draftSavingFor: (shell, principal, callerOf) => draftSaving(sessionDeps(principal, callerOf, shell)),
|
|
2248
|
-
//
|
|
2298
|
+
// Checked against every action in force with the layout it is built with: who has
|
|
2249
2299
|
// which is asked when a shell is built for them.
|
|
2250
2300
|
publishedArtifacts: (saved, publisher) => savedArtifacts({
|
|
2251
2301
|
whose: "published for everybody",
|
|
2252
2302
|
kinds,
|
|
2253
|
-
|
|
2303
|
+
owner: async () => {
|
|
2254
2304
|
const who = await publisher();
|
|
2255
|
-
return { saved,
|
|
2305
|
+
return { saved, checks: async (inForce3) => (await checksWithGenerated(actionsWithStoredLayouts(mergedActions(own, sets)), inForce3, who)).checks };
|
|
2256
2306
|
},
|
|
2257
2307
|
defaults: {
|
|
2258
2308
|
verify: async (versions, inForce3) => {
|
|
2259
|
-
const kept = inForce3.filter((
|
|
2309
|
+
const kept = inForce3.filter((current) => !versions.some((version) => version.kind === current.kind && version.id === current.id));
|
|
2260
2310
|
const asked = versions.map((version) => ({ ...version, save: "", createdAt: "" }));
|
|
2261
|
-
const refusal = refusalOf((await checkedDefaults([...kept, ...asked],
|
|
2311
|
+
const refusal = refusalOf((await checkedDefaults([...kept, ...asked], defaultsChecks(), void 0)).verified, "publish");
|
|
2262
2312
|
if (refusal !== void 0) throw new Error(refusal);
|
|
2263
2313
|
}
|
|
2264
2314
|
},
|
|
@@ -2304,14 +2354,14 @@ var callerScope = (scope) => {
|
|
|
2304
2354
|
};
|
|
2305
2355
|
var PAGE = 500;
|
|
2306
2356
|
var VERSION_COLUMNS = ["save", "kind", "id", "body", "grammar", "copied_from", "created_at"];
|
|
2307
|
-
var
|
|
2357
|
+
var laterVersion = {
|
|
2308
2358
|
and: [
|
|
2309
2359
|
{ eq: ["artifacts.kind", "held.kind"] },
|
|
2310
2360
|
{ eq: ["artifacts.id", "held.id"] },
|
|
2311
2361
|
{ or: [{ gt: ["artifacts.created_at", "held.created_at"] }, { and: [{ eq: ["artifacts.created_at", "held.created_at"] }, { gt: ["artifacts.save", "held.save"] }] }] }
|
|
2312
2362
|
]
|
|
2313
2363
|
};
|
|
2314
|
-
var
|
|
2364
|
+
var afterCursor = {
|
|
2315
2365
|
or: [{ gt: ["held.kind", { $context: "after_kind" }] }, { and: [{ eq: ["held.kind", { $context: "after_kind" }] }, { gt: ["held.id", { $context: "after_id" }] }] }]
|
|
2316
2366
|
};
|
|
2317
2367
|
var inForce = {
|
|
@@ -2320,7 +2370,7 @@ var inForce = {
|
|
|
2320
2370
|
dsl: {
|
|
2321
2371
|
from: [{ as: "held", query: { from: ["artifacts"], fields: VERSION_COLUMNS.map((column) => `artifacts.${column}`) } }],
|
|
2322
2372
|
fields: VERSION_COLUMNS.map((column) => `held.${column}`),
|
|
2323
|
-
filter: { and: [{ not: { exists: { from: ["artifacts"], filter:
|
|
2373
|
+
filter: { and: [{ not: { exists: { from: ["artifacts"], filter: laterVersion } } }, afterCursor] },
|
|
2324
2374
|
sort: [
|
|
2325
2375
|
{ field: "held.kind", dir: "asc" },
|
|
2326
2376
|
{ field: "held.id", dir: "asc" }
|
|
@@ -2433,6 +2483,7 @@ var DEFAULT_REVALIDATE_MS = 60 * 1e3;
|
|
|
2433
2483
|
var MAX_INTERVAL_MS2 = 2 ** 31 - 1;
|
|
2434
2484
|
var createRevalidation = (config) => {
|
|
2435
2485
|
const live = /* @__PURE__ */ new Map();
|
|
2486
|
+
const revalidateMs = config.revalidateMs ?? DEFAULT_REVALIDATE_MS;
|
|
2436
2487
|
const expire = (connection) => {
|
|
2437
2488
|
live.delete(connection);
|
|
2438
2489
|
const told = () => connection.send(JSON.stringify({ type: "error", code: "invalid_token", message: "The session token no longer resolves to this principal." }));
|
|
@@ -2445,30 +2496,59 @@ var createRevalidation = (config) => {
|
|
|
2445
2496
|
}
|
|
2446
2497
|
}
|
|
2447
2498
|
};
|
|
2499
|
+
const asking = /* @__PURE__ */ new Set();
|
|
2500
|
+
const question = async (token, presenting) => {
|
|
2501
|
+
for (const { connection } of presenting) asking.add(connection);
|
|
2502
|
+
try {
|
|
2503
|
+
const resolved = await config.session(token);
|
|
2504
|
+
for (const { connection, principal } of presenting) if (resolved !== principal && live.has(connection)) expire(connection);
|
|
2505
|
+
} finally {
|
|
2506
|
+
for (const { connection } of presenting) asking.delete(connection);
|
|
2507
|
+
}
|
|
2508
|
+
};
|
|
2448
2509
|
const revalidate = async () => {
|
|
2510
|
+
const byToken = /* @__PURE__ */ new Map();
|
|
2449
2511
|
let asked = 0;
|
|
2450
|
-
const
|
|
2451
|
-
|
|
2452
|
-
if (credential === null) continue;
|
|
2512
|
+
for (const [connection, credential] of live) {
|
|
2513
|
+
if (credential === null || asking.has(connection)) continue;
|
|
2453
2514
|
asked += 1;
|
|
2454
|
-
|
|
2455
|
-
|
|
2456
|
-
|
|
2457
|
-
|
|
2458
|
-
|
|
2459
|
-
|
|
2460
|
-
|
|
2461
|
-
|
|
2462
|
-
|
|
2463
|
-
|
|
2515
|
+
byToken.set(credential.token, [...byToken.get(credential.token) ?? [], { connection, principal: credential.principal }]);
|
|
2516
|
+
}
|
|
2517
|
+
let due;
|
|
2518
|
+
const passDue = new Promise((resolve2) => {
|
|
2519
|
+
due = setTimeout(() => resolve2(false), revalidateMs);
|
|
2520
|
+
due.unref?.();
|
|
2521
|
+
});
|
|
2522
|
+
const unanswered = [];
|
|
2523
|
+
try {
|
|
2524
|
+
await Promise.all(
|
|
2525
|
+
[...byToken].map(async ([token, presenting]) => {
|
|
2526
|
+
const answer = question(token, presenting);
|
|
2527
|
+
try {
|
|
2528
|
+
if (!await Promise.race([answer.then(() => true), passDue])) {
|
|
2529
|
+
answer.catch(
|
|
2530
|
+
(error) => console.error("[moss/socket] the session verifier could not be asked about a token after its pass went on. Its connections stay open and are asked again:", error)
|
|
2531
|
+
);
|
|
2532
|
+
}
|
|
2533
|
+
} catch (error) {
|
|
2534
|
+
unanswered.push(...presenting.map(() => error));
|
|
2535
|
+
}
|
|
2536
|
+
})
|
|
2537
|
+
);
|
|
2538
|
+
} finally {
|
|
2539
|
+
clearTimeout(due);
|
|
2464
2540
|
}
|
|
2465
2541
|
if (unanswered.length > 0) {
|
|
2466
2542
|
console.error(`[moss/socket] the session verifier could not be asked about ${unanswered.length} of ${asked} connection(s). They stay open and are asked again:`, unanswered[0]);
|
|
2467
2543
|
}
|
|
2468
2544
|
};
|
|
2469
2545
|
let passing = false;
|
|
2546
|
+
let dueWhilePassing = false;
|
|
2470
2547
|
const pass = async () => {
|
|
2471
|
-
if (passing)
|
|
2548
|
+
if (passing) {
|
|
2549
|
+
dueWhilePassing = true;
|
|
2550
|
+
return;
|
|
2551
|
+
}
|
|
2472
2552
|
passing = true;
|
|
2473
2553
|
try {
|
|
2474
2554
|
await revalidate();
|
|
@@ -2476,16 +2556,19 @@ var createRevalidation = (config) => {
|
|
|
2476
2556
|
console.error("[moss/socket] a revalidation pass failed, and the next one starts over:", error);
|
|
2477
2557
|
} finally {
|
|
2478
2558
|
passing = false;
|
|
2559
|
+
if (dueWhilePassing && sweeper !== void 0) {
|
|
2560
|
+
dueWhilePassing = false;
|
|
2561
|
+
void pass();
|
|
2562
|
+
}
|
|
2479
2563
|
}
|
|
2480
2564
|
};
|
|
2481
|
-
const revalidateMs = config.revalidateMs ?? DEFAULT_REVALIDATE_MS;
|
|
2482
2565
|
let sweeper;
|
|
2483
2566
|
if (revalidateMs > 0 && revalidateMs <= MAX_INTERVAL_MS2) {
|
|
2484
2567
|
sweeper = setInterval(() => void pass(), revalidateMs);
|
|
2485
2568
|
sweeper.unref?.();
|
|
2486
2569
|
}
|
|
2487
2570
|
return {
|
|
2488
|
-
|
|
2571
|
+
track: (connection, credential) => {
|
|
2489
2572
|
live.set(connection, credential);
|
|
2490
2573
|
},
|
|
2491
2574
|
release: (connection) => {
|
|
@@ -2527,7 +2610,7 @@ var authenticateUpgrade = async (url, upgrade, config, foreignPageWarning) => {
|
|
|
2527
2610
|
const key = parameters.key ?? DEFAULT_TOKEN_KEY;
|
|
2528
2611
|
const page = upgrade === void 0 ? void 0 : ownOriginOf(upgrade.origin, upgrade.host, config.origins);
|
|
2529
2612
|
const secure = page?.protocol === "https:";
|
|
2530
|
-
const
|
|
2613
|
+
const fromCookie = page === void 0 ? null : sessionTokenOf(upgrade?.cookie, { port: page.port, secure }, key);
|
|
2531
2614
|
const sealing = page !== void 0 && parameters.sealed === "1";
|
|
2532
2615
|
if (page === void 0 && parameters.sealed === "1" && typeof upgrade?.origin === "string" && !foreignPageWarning.warned) {
|
|
2533
2616
|
foreignPageWarning.warned = true;
|
|
@@ -2540,12 +2623,12 @@ var authenticateUpgrade = async (url, upgrade, config, foreignPageWarning) => {
|
|
|
2540
2623
|
const sealLost = sealing && sealedOffer !== null && hadSeal === null;
|
|
2541
2624
|
const seal = !sealing || sealLost ? null : hadSeal ?? (upgrade?.answer === void 0 ? null : newSeal());
|
|
2542
2625
|
const offered = offeredToken(upgrade?.offered) ?? (sealedOffer === null || hadSeal === null ? null : await openSealed(hadSeal, sealedOffer));
|
|
2543
|
-
const carried = offered ?? (parameters.leave === "1" ? null :
|
|
2626
|
+
const carried = offered ?? (parameters.leave === "1" ? null : fromCookie?.token ?? null);
|
|
2544
2627
|
const principal = carried === null ? null : await config.session(carried);
|
|
2545
2628
|
if (offered !== null && principal === null) return "invalid_token";
|
|
2546
2629
|
const token = principal === null ? null : carried;
|
|
2547
2630
|
const cookies = [
|
|
2548
|
-
...page === void 0 || offered === null && (
|
|
2631
|
+
...page === void 0 || offered === null && (fromCookie?.token ?? null) === token ? [] : token === null ? fromCookie?.clear ?? [] : sessionCookies(page.origin, token, { key, lastsMs: await config.sessionLastsMs?.(token) ?? null }),
|
|
2549
2632
|
...seal !== null && hadSeal === null ? [sealCookie(seal, { secure, path: new URL(url, "http://nisc.local").pathname })] : []
|
|
2550
2633
|
];
|
|
2551
2634
|
return { token, principal, cookies, seal, sealLost };
|
|
@@ -2675,8 +2758,8 @@ var served = async (config, connection, send, close, opening, who) => {
|
|
|
2675
2758
|
close.whenClosed(() => session.detach(connection));
|
|
2676
2759
|
return session;
|
|
2677
2760
|
};
|
|
2678
|
-
var open = async (
|
|
2679
|
-
const { config, foreignPageWarning, revalidation, anonymousShells } =
|
|
2761
|
+
var open = async (state, url, connection, send, span, found) => {
|
|
2762
|
+
const { config, foreignPageWarning, revalidation, anonymousShells } = state;
|
|
2680
2763
|
const params = parametersOf(url);
|
|
2681
2764
|
const mismatch = protocolRefusal(params);
|
|
2682
2765
|
if (mismatch !== void 0) {
|
|
@@ -2705,7 +2788,7 @@ var open = async (held, url, connection, send, span, found) => {
|
|
|
2705
2788
|
connection.close(CLOSE_AT_CAPACITY, "at capacity");
|
|
2706
2789
|
return;
|
|
2707
2790
|
}
|
|
2708
|
-
revalidation.
|
|
2791
|
+
revalidation.track(connection, token !== null && token !== "" && principal !== null ? { token, principal } : null);
|
|
2709
2792
|
const close = closeOf(connection);
|
|
2710
2793
|
close.whenClosed(() => revalidation.release(connection));
|
|
2711
2794
|
close.whenClosed(() => anonymousShells.release(connection));
|
|
@@ -2718,13 +2801,13 @@ var createSocket = (config) => {
|
|
|
2718
2801
|
const emit = emitterOf(config.telemetry);
|
|
2719
2802
|
const revalidation = createRevalidation(config);
|
|
2720
2803
|
const anonymousShells = createAnonymousShellLimit(config.anonymousShellMax ?? DEFAULT_ANONYMOUS_SHELL_MAX);
|
|
2721
|
-
const
|
|
2804
|
+
const state = { config, foreignPageWarning: { warned: false }, revalidation, anonymousShells };
|
|
2722
2805
|
const accept = async (url, connection) => {
|
|
2723
2806
|
const send = (message) => connection.send(JSON.stringify(message));
|
|
2724
2807
|
const span = spanOf(emit);
|
|
2725
2808
|
const found = { principal: false };
|
|
2726
2809
|
try {
|
|
2727
|
-
await open(
|
|
2810
|
+
await open(state, url, connection, send, span, found);
|
|
2728
2811
|
} catch (error) {
|
|
2729
2812
|
console.error("[moss/socket] refused a session:", error);
|
|
2730
2813
|
span?.("socket.upgrade", "error", found.principal);
|
|
@@ -2930,7 +3013,7 @@ var takeComposition = (live, made) => {
|
|
|
2930
3013
|
live.entries = made.entries;
|
|
2931
3014
|
takeLayouts(live, made);
|
|
2932
3015
|
takeCanvases(live, made);
|
|
2933
|
-
|
|
3016
|
+
keepGranted(live.functions, made.grantedFunctions);
|
|
2934
3017
|
};
|
|
2935
3018
|
var adoptDraft = async (host, live, next) => {
|
|
2936
3019
|
for (; ; ) {
|
|
@@ -3140,8 +3223,8 @@ var hostConfig = (deps, shell, kept) => {
|
|
|
3140
3223
|
};
|
|
3141
3224
|
return {
|
|
3142
3225
|
composition: async (principal, drafted) => {
|
|
3143
|
-
const { resolved, saved, ...
|
|
3144
|
-
const who = { principal, ...
|
|
3226
|
+
const { resolved, saved, ...caller } = await callerOf(principal);
|
|
3227
|
+
const who = { principal, ...caller, ...principal === null ? {} : { saved, ...drafted === void 0 ? {} : { drafted } } };
|
|
3145
3228
|
return { roles: resolved.roles, scope: resolved.scope, ...await running.artifactsFor(shell, who) };
|
|
3146
3229
|
},
|
|
3147
3230
|
artifacts: (principal) => running.sessionArtifacts(principal, () => callerOf(principal)),
|
|
@@ -3225,11 +3308,13 @@ var buildShellHosts = (deps) => {
|
|
|
3225
3308
|
var createInternalWire = (server) => (token) => async (url, init) => {
|
|
3226
3309
|
const isVex = url.split("?")[0]?.endsWith("/vex") === true;
|
|
3227
3310
|
const follower = isVex && init?.signal !== void 0 ? createWireFollower(init.signal) : void 0;
|
|
3311
|
+
const headers = new Headers(init?.headers);
|
|
3312
|
+
if (token !== null) headers.set("authorization", `Bearer ${token}`);
|
|
3228
3313
|
const res = await server.request(
|
|
3229
3314
|
url,
|
|
3230
3315
|
{
|
|
3231
3316
|
method: init?.method ?? "GET",
|
|
3232
|
-
headers
|
|
3317
|
+
headers,
|
|
3233
3318
|
...init?.body !== void 0 ? { body: init.body } : {}
|
|
3234
3319
|
},
|
|
3235
3320
|
follower === void 0 ? void 0 : { [VEX_LIVE_ENV]: follower.live }
|
|
@@ -3269,7 +3354,7 @@ var mountRoutes = (server, { app, session, credentials, identity, running, data
|
|
|
3269
3354
|
var INVALID_TOKEN = { refused: { status: 401, error: "invalid_token", message: "The session token did not resolve to a principal." } };
|
|
3270
3355
|
var authenticateRequest = async (deps, header, request) => {
|
|
3271
3356
|
if (header === void 0) return { principal: null, resolved: await deps.resolve(null) };
|
|
3272
|
-
const token = header.
|
|
3357
|
+
const token = header.replace(/^bearer +/i, "");
|
|
3273
3358
|
const credential = deps.credentials.find(({ prefix }) => token.startsWith(prefix));
|
|
3274
3359
|
if (credential !== void 0) {
|
|
3275
3360
|
const answer = await credential.principalOf(token, request);
|
|
@@ -3321,9 +3406,9 @@ var operatorPrefix = (runtime) => {
|
|
|
3321
3406
|
var buildSignals = ({ fabric, identity, reset, adopt: adopt2, adoptAll: adoptAll2, deliver }) => {
|
|
3322
3407
|
const origin = randomBytes(8).toString("hex");
|
|
3323
3408
|
const applyInvalidateIdentity = (principal) => {
|
|
3324
|
-
const
|
|
3409
|
+
const forgotten = identity.invalidate(principal);
|
|
3325
3410
|
reset(principal);
|
|
3326
|
-
return
|
|
3411
|
+
return forgotten;
|
|
3327
3412
|
};
|
|
3328
3413
|
const applyInvalidateTag = (tag) => {
|
|
3329
3414
|
const forgotten = identity.invalidateTag(tag).length;
|
|
@@ -3341,9 +3426,9 @@ var buildSignals = ({ fabric, identity, reset, adopt: adopt2, adoptAll: adoptAll
|
|
|
3341
3426
|
});
|
|
3342
3427
|
return {
|
|
3343
3428
|
invalidateIdentity: (principal) => {
|
|
3344
|
-
const
|
|
3429
|
+
const forgotten = applyInvalidateIdentity(principal);
|
|
3345
3430
|
publish({ kind: "invalidate-identity", principal });
|
|
3346
|
-
return
|
|
3431
|
+
return forgotten;
|
|
3347
3432
|
},
|
|
3348
3433
|
invalidateTag: (tag) => {
|
|
3349
3434
|
const forgotten = applyInvalidateTag(tag);
|
|
@@ -3438,10 +3523,13 @@ var buildData = (app, runtime) => createData({
|
|
|
3438
3523
|
featureTables: featureTablesOf(app),
|
|
3439
3524
|
tables: runtime.tables,
|
|
3440
3525
|
grammars: app.grammars,
|
|
3526
|
+
upgradedColumns: app.upgradedColumns,
|
|
3441
3527
|
charter: app.charter,
|
|
3442
3528
|
behaviors: app.behaviors,
|
|
3443
3529
|
rowRules: rowRulesBeside(app.behaviors),
|
|
3444
|
-
telemetry: runtime.telemetry
|
|
3530
|
+
telemetry: runtime.telemetry,
|
|
3531
|
+
answerReadableRows: runtime.answerReadableRows,
|
|
3532
|
+
checkMovedRows: runtime.checkMovedRows
|
|
3445
3533
|
});
|
|
3446
3534
|
var assembleServer = async (deps) => {
|
|
3447
3535
|
const stops = [];
|
|
@@ -3462,7 +3550,7 @@ var assemble = async ({ app, runtime, session, revokeSessions, data }, stops) =>
|
|
|
3462
3550
|
`moss: \`runtime.artifactsUnusedMs\` is how long what a person generated may go unused before it is deleted: a whole number of milliseconds, at least ${2 * TOUCH_EVERY_MS} (two hours), or left out, and nothing is deleted.`
|
|
3463
3551
|
);
|
|
3464
3552
|
}
|
|
3465
|
-
stops.push(startAging(runtime.pool, runtime.artifactsUnusedMs));
|
|
3553
|
+
stops.push(startAging(runtime.pool, runtime.artifactsUnusedMs, { sinceStart: runtime.artifactsUnusedSinceStart === true }));
|
|
3466
3554
|
}
|
|
3467
3555
|
const identity = buildIdentity(app, runtime, data);
|
|
3468
3556
|
stops.push(identity.stop);
|
|
@@ -3532,10 +3620,13 @@ var buildRunningManifest = async (app, runtime, data, saved) => {
|
|
|
3532
3620
|
// Polled on the clock a socket's credential is re-verified on.
|
|
3533
3621
|
pointer: { read: data.pointer.read, move: data.pointer.move, ...runtime.sessionRevalidateMs !== void 0 ? { everyMs: runtime.sessionRevalidateMs } : {} },
|
|
3534
3622
|
shells: [...app.shell !== void 0 ? [app.shell] : [], ...Object.values(app.pages ?? {})],
|
|
3535
|
-
...saved !== void 0 ? { published: saved.published().inForce, reads: { written: data.vexEntry, compile: data.compileQuery, savedOf: saved.of } } : {}
|
|
3623
|
+
...saved !== void 0 ? { published: saved.published().inForce, reads: { written: data.vexEntry, compile: data.compileQuery, savedOf: saved.of } } : {},
|
|
3624
|
+
// Only where the app names upgradedColumns: vex refuses some reads of those when it compiles a read, and a seeded
|
|
3625
|
+
// read is otherwise first compiled at its first replay. An app that names none boots as before.
|
|
3626
|
+
...app.upgradedColumns !== void 0 ? { compileSeeded: data.compileQuery } : {}
|
|
3536
3627
|
});
|
|
3537
3628
|
data.dropOnChange(running.onChange);
|
|
3538
|
-
data.
|
|
3629
|
+
data.askEntriesFirst({ get: running.cacheEntry, entries: running.cacheEntries });
|
|
3539
3630
|
await running.cacheEntries();
|
|
3540
3631
|
return running;
|
|
3541
3632
|
};
|
|
@@ -3590,5 +3681,5 @@ var subscribeReactions = ({ app, onWrite, deliver }) => {
|
|
|
3590
3681
|
};
|
|
3591
3682
|
|
|
3592
3683
|
export { MOSS_SEQUENCE, createServer, exportDocuments, migrateTables, mintDevToken, mintSession, renderDocument, revokeAllFor, sessionCookies, tableStatus };
|
|
3593
|
-
//# sourceMappingURL=chunk-
|
|
3594
|
-
//# sourceMappingURL=chunk-
|
|
3684
|
+
//# sourceMappingURL=chunk-MYPK5YZR.js.map
|
|
3685
|
+
//# sourceMappingURL=chunk-MYPK5YZR.js.map
|