@substrat-run/adapter-cloudflare 0.146.0 → 0.148.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/dist/control-plane-do.d.ts +75 -6
- package/dist/control-plane-do.d.ts.map +1 -1
- package/dist/control-plane-do.js +80 -13
- package/dist/control-plane-do.js.map +1 -1
- package/dist/host.d.ts +182 -6
- package/dist/host.d.ts.map +1 -1
- package/dist/host.js +624 -62
- package/dist/host.js.map +1 -1
- package/dist/route-resolver.d.ts +2 -0
- package/dist/route-resolver.d.ts.map +1 -1
- package/dist/route-resolver.js +20 -0
- package/dist/route-resolver.js.map +1 -1
- package/dist/scope-do.d.ts.map +1 -1
- package/dist/scope-do.js +68 -3
- package/dist/scope-do.js.map +1 -1
- package/package.json +9 -9
package/dist/route-resolver.d.ts
CHANGED
|
@@ -27,6 +27,8 @@ export interface RouteRowLike {
|
|
|
27
27
|
/** The dispatched code's declared outgoing peer calls (#1706) as JSON text, on the
|
|
28
28
|
* same terms as `outbound_json`: null for a version pushed before the declaration. */
|
|
29
29
|
calls_json?: string | null;
|
|
30
|
+
/** `scopeStores` from the same manifest. Absent on a resolver that predates it. */
|
|
31
|
+
scope_stores_json?: string | null;
|
|
30
32
|
/** Whether the scope is the real install (#2005), decided by the control-plane DO. Absent
|
|
31
33
|
* from one that predates the field, which resolves `primary: true` — the skew window
|
|
32
34
|
* `routeTarget` documents. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-resolver.d.ts","sourceRoot":"","sources":["../src/route-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,UAAU,EACf,KAAK,WAAW,EACjB,MAAM,yBAAyB,CAAC;AAEjC;;;;;;;;;;;GAWG;AAEH,uEAAuE;AACvE,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,uEAAuE;IACvE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B;;mFAE+E;IAC/E,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B;2FACuF;IACvF,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;mCAE+B;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;0EACsE;IACtE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAOD,MAAM,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"route-resolver.d.ts","sourceRoot":"","sources":["../src/route-resolver.ts"],"names":[],"mappings":"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"}
|
package/dist/route-resolver.js
CHANGED
|
@@ -1,4 +1,23 @@
|
|
|
1
1
|
import { callDepthMessage, callsDeclares, PEER_CALL_DEPTH_MAX, previewCallerMessage, routeTarget, undeclaredCallMessage, } from '@substrat-run/contracts';
|
|
2
|
+
function scopeStoresOf(json) {
|
|
3
|
+
if (!json)
|
|
4
|
+
return [];
|
|
5
|
+
try {
|
|
6
|
+
const parsed = JSON.parse(json);
|
|
7
|
+
if (!Array.isArray(parsed))
|
|
8
|
+
return [];
|
|
9
|
+
return parsed.flatMap((entry) => {
|
|
10
|
+
if (typeof entry !== 'object' || entry === null)
|
|
11
|
+
return [];
|
|
12
|
+
const binding = Reflect.get(entry, 'binding');
|
|
13
|
+
const kind = Reflect.get(entry, 'kind');
|
|
14
|
+
return typeof binding === 'string' && typeof kind === 'string' ? [{ binding, kind }] : [];
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
catch {
|
|
18
|
+
return [];
|
|
19
|
+
}
|
|
20
|
+
}
|
|
2
21
|
/** A hostname row → what the router dispatches on. Shared with `CloudflareScopeHost`
|
|
3
22
|
* so the two cannot drift on what "resolvable" means. */
|
|
4
23
|
export function toRouteTarget(row) {
|
|
@@ -43,6 +62,7 @@ export function toRouteTarget(row) {
|
|
|
43
62
|
region: row.region,
|
|
44
63
|
outboundHosts,
|
|
45
64
|
calls,
|
|
65
|
+
scopeStores: scopeStoresOf(row.scope_stores_json),
|
|
46
66
|
// #2005: absent only from a control-plane DO that predates the field, which the schema
|
|
47
67
|
// defaults to `true` — see RouteRowLike.
|
|
48
68
|
primary: row.primary,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-resolver.js","sourceRoot":"","sources":["../src/route-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACpB,WAAW,EACX,qBAAqB,GAGtB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"route-resolver.js","sourceRoot":"","sources":["../src/route-resolver.ts"],"names":[],"mappings":"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"}
|
package/dist/scope-do.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope-do.d.ts","sourceRoot":"","sources":["../src/scope-do.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"scope-do.d.ts","sourceRoot":"","sources":["../src/scope-do.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AA8DnD,OAAO,EA2DL,KAAK,SAAS,EAsBd,KAAK,kBAAkB,EAEvB,KAAK,gBAAgB,EAqGtB,MAAM,sBAAsB,CAAC;AAoD9B,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAGtD,OAAO,EAsBL,kBAAkB,EA4EnB,MAAM,sBAAsB,CAAC;AA0B9B;;;;;;;;;;;;;GAaG;AAEH,MAAM,WAAW,UAAU;IACzB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAoFD,oFAAoF;AACpF,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;AAkkB5E;;;GAGG;AACH,MAAM,MAAM,yBAAyB,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;AAmBtD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,SAAS,CAOxD;AAED,gHAAgH;AAChH,OAAO,EAAE,kBAAkB,EAAE,CAAC;AA2B9B,wBAAgB,aAAa,CAC3B,OAAO,EAAE,kBAAkB,EAAE,EAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,GACxD,KAAK,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,UAAU,KAAK,aAAa,CAAC,UAAU,CAAC,CAipO7E"}
|
package/dist/scope-do.js
CHANGED
|
@@ -7,7 +7,7 @@ import { isUpgradeRequest, readSubscription, LIVE_DECIDE_ATTEMPTS, LIVE_FANOUT_L
|
|
|
7
7
|
import { replyOf } from './do-reply.js';
|
|
8
8
|
import { OperationQueue } from './serialization.js';
|
|
9
9
|
import { assertNoWorkerdStorage, doScopedSql, doBuiltColumnsOf, doRedactionSql, doSpineSql } from './sql.js';
|
|
10
|
-
import { actorOf, admitPeer, collectPeers, switchPeer, peerSubjectRef, subjectGrantState, assertNoSecret, CAPABILITY_DDL, COPY_ORIGIN_DDL, ENTITY_STATE_MOVES_DDL, SWITCH_FENCES_DDL, TABLE_OWNERS_DDL, assertMigrationLeavesLedgerAlone, recordOwnershipSteps, runMigrationStatements, splitSqlStatements, executableSqlStatements, blankSqlComments, CAPABILITY_EXCHANGE_OPERATION, CAPABILITY_BECOME_MINT_OPERATION, becomeMintCheck, mintBecomeCapabilityAsPrincipal, revokeBecomeCapabilityAsPrincipal, readBecomeLinkStates, ENTITY_UNBIND_OPERATION, allowedFor, unbindEntityHolderBounded, capabilityAttachmentWriteRefused, createCapabilityVerbs, createEntityEdgeVerbs, createEntityStateVerbs, createTrashedReads, CONTINUATION_POSITION_CAP, visibleContinuation, searchStateWhere, uncheckedView, addStatePlans, addUpdatedStampPlans, watchUpdatedStamps, assertNoCallerPurge, isUnreachableParent, PURGE_BATCH, heldPurgePass, lifecycleRefusal, purgeHeldBy, purgeDueOf, purgeOnlyKeysOf, runPurgePass, refuseTrashedTarget, assertBoundOperations, registerTrashTargets, withheldKeysFor, statefulTablesOf, afterMigration, afterRuntimeDdl, derivesAnything, repairDerivedObjects, StateColumnLost, exchangeCapability, guardSecrets, mintBecomeCapability, redactSecrets, redactSecretText, moduleLog, asyncInvocationId, asyncLinePass, resolveCapabilitySession, revokeCapabilityAsPlatform, readCapabilityPage, domainEventOf, facetEvents, readDeadLetters, readLifecycleFlow, readOperationSeries, readHistory, readInvocation, readUndrainedOutbox, walkEventCause, walkEventEffects, } from '@substrat-run/kernel';
|
|
10
|
+
import { actorOf, admitPeer, collectPeers, switchPeer, peerSubjectRef, subjectGrantState, assertNoSecret, CAPABILITY_DDL, UPLOAD_LINK_DDL, createAttachmentVerbs, inspectUploadLink, redeemUploadLinkInTransaction, COPY_ORIGIN_DDL, ENTITY_STATE_MOVES_DDL, SWITCH_FENCES_DDL, TABLE_OWNERS_DDL, assertMigrationLeavesLedgerAlone, recordOwnershipSteps, runMigrationStatements, splitSqlStatements, executableSqlStatements, blankSqlComments, CAPABILITY_EXCHANGE_OPERATION, CAPABILITY_BECOME_MINT_OPERATION, becomeMintCheck, mintBecomeCapabilityAsPrincipal, revokeBecomeCapabilityAsPrincipal, readBecomeLinkStates, ENTITY_UNBIND_OPERATION, allowedFor, unbindEntityHolderBounded, capabilityAttachmentWriteRefused, createCapabilityVerbs, createEntityEdgeVerbs, createEntityStateVerbs, createTrashedReads, CONTINUATION_POSITION_CAP, visibleContinuation, searchStateWhere, uncheckedView, addStatePlans, addUpdatedStampPlans, watchUpdatedStamps, assertNoCallerPurge, isUnreachableParent, PURGE_BATCH, heldPurgePass, lifecycleRefusal, purgeHeldBy, purgeDueOf, purgeOnlyKeysOf, runPurgePass, refuseTrashedTarget, assertBoundOperations, registerTrashTargets, withheldKeysFor, statefulTablesOf, afterMigration, afterRuntimeDdl, derivesAnything, repairDerivedObjects, StateColumnLost, exchangeCapability, guardSecrets, mintBecomeCapability, redactSecrets, redactSecretText, moduleLog, asyncInvocationId, asyncLinePass, resolveCapabilitySession, revokeCapabilityAsPlatform, readCapabilityPage, domainEventOf, facetEvents, readDeadLetters, readLifecycleFlow, readOperationSeries, readHistory, readInvocation, readUndrainedOutbox, walkEventCause, walkEventEffects, } from '@substrat-run/kernel';
|
|
11
11
|
import { COPY_RESTORE_FENCE_LAPSED, copyRestoreFenceLapsed } from '@substrat-run/kernel';
|
|
12
12
|
import { createDoTupleChecker, createLocalControlPlaneReader, scopeTupleReader } from './checker.js';
|
|
13
13
|
import { settlePlatformRequestIn } from '@substrat-run/kernel';
|
|
@@ -365,6 +365,9 @@ const KERNEL_DDL = `
|
|
|
365
365
|
-- an exchange trades that secret for. Shared with the pure adapter from
|
|
366
366
|
-- @substrat-run/kernel so the two cannot part company; the column comments are there.
|
|
367
367
|
${CAPABILITY_DDL}
|
|
368
|
+
-- Upload links: a short-lived, single-use URL that lets a caller with no session upload ONE
|
|
369
|
+
-- file to ONE entity. Shared with the pure adapter from @substrat-run/kernel.
|
|
370
|
+
${UPLOAD_LINK_DDL}
|
|
368
371
|
-- #1686: where a copied scope's data came from, and the event id its own events start above.
|
|
369
372
|
-- Shared with the other adapter from @substrat-run/kernel; the column comments are there.
|
|
370
373
|
${COPY_ORIGIN_DDL}
|
|
@@ -752,6 +755,8 @@ export function defineScopeDO(modules, bareOps) {
|
|
|
752
755
|
erasurePlans = [];
|
|
753
756
|
/** entityType → the declared attachment gate (#473): read key + write key (default: read). */
|
|
754
757
|
attachmentTargets = new Map();
|
|
758
|
+
/** entityType → the `uploadLinks` policy its `attachmentTargets` entry declares; absent = no links. */
|
|
759
|
+
uploadLinkPolicies = new Map();
|
|
755
760
|
/**
|
|
756
761
|
* entityType → the declared live-read gate (#938): the key a subscriber must hold
|
|
757
762
|
* ON THAT ENTITY before a change to it is announced. Absent = announced to nobody;
|
|
@@ -923,6 +928,13 @@ export function defineScopeDO(modules, bareOps) {
|
|
|
923
928
|
`(${existing.read}/${existing.write}) vs (${gate.read}/${gate.write})`);
|
|
924
929
|
}
|
|
925
930
|
this.attachmentTargets.set(target.entityType, gate);
|
|
931
|
+
if (target.uploadLinks) {
|
|
932
|
+
const known = this.uploadLinkPolicies.get(target.entityType);
|
|
933
|
+
if (known && JSON.stringify(known) !== JSON.stringify(target.uploadLinks)) {
|
|
934
|
+
throw new Error(`conflicting uploadLinks policies for attachment target '${target.entityType}'`);
|
|
935
|
+
}
|
|
936
|
+
this.uploadLinkPolicies.set(target.entityType, target.uploadLinks);
|
|
937
|
+
}
|
|
926
938
|
}
|
|
927
939
|
// Live-read targets (#938): entityType → the read key a subscriber must pass ON
|
|
928
940
|
// THAT ENTITY before a change to it is announced. Validated exactly like the
|
|
@@ -2833,6 +2845,23 @@ export function defineScopeDO(modules, bareOps) {
|
|
|
2833
2845
|
attachmentList(...args) {
|
|
2834
2846
|
return thrownForRpc(() => this.listAttachments(...args));
|
|
2835
2847
|
}
|
|
2848
|
+
/**
|
|
2849
|
+
* Redeem an upload link: the attachment write of `attachmentAdd`, with the link spent in the
|
|
2850
|
+
* same transaction. Its OWN verb, never a trailing argument on `attachmentAdd`: a DO that
|
|
2851
|
+
* predates it fails the call (no such RPC method) instead of ignoring the secret and
|
|
2852
|
+
* writing an attachment a link never paid for. The write is checked as `record.createdBy`,
|
|
2853
|
+
* which the kernel holds to the link's minter inside the transaction.
|
|
2854
|
+
*/
|
|
2855
|
+
attachmentRedeemUploadLinkReply(record, secret, tenantId, scopeId) {
|
|
2856
|
+
return replyOf(() => this.addAttachment(record, record.createdBy, tenantId, scopeId, undefined, secret));
|
|
2857
|
+
}
|
|
2858
|
+
/** Look an upload link up without spending it — what the route judges a body against. */
|
|
2859
|
+
uploadLinkInspectReply(secret, _tenantId, _scopeId) {
|
|
2860
|
+
return replyOf(async () => {
|
|
2861
|
+
await this.ensureMigrations();
|
|
2862
|
+
return await this.queue.enqueue(() => inspectUploadLink({ sql: doSpineSql(this.sql), now: instant.parse(new Date().toISOString()) }, secret));
|
|
2863
|
+
});
|
|
2864
|
+
}
|
|
2836
2865
|
attachmentListReply(...args) {
|
|
2837
2866
|
return replyOf(() => this.listAttachments(...args));
|
|
2838
2867
|
}
|
|
@@ -2858,7 +2887,9 @@ export function defineScopeDO(modules, bareOps) {
|
|
|
2858
2887
|
async addAttachment(record, principal, tenantId, scopeId,
|
|
2859
2888
|
// #476: when set, the gate is checked as this CONNECTION (not `principal`, which is
|
|
2860
2889
|
// then only the ctx.principal placeholder the connector door passes).
|
|
2861
|
-
connectionId
|
|
2890
|
+
connectionId,
|
|
2891
|
+
// An upload-link redemption: the link is spent in this same transaction.
|
|
2892
|
+
uploadLinkSecret) {
|
|
2862
2893
|
await this.ensureMigrations();
|
|
2863
2894
|
const parsed = attachmentRecord.parse(record);
|
|
2864
2895
|
const gate = this.attachmentGate(parsed.entity.entityType);
|
|
@@ -2885,6 +2916,13 @@ export function defineScopeDO(modules, bareOps) {
|
|
|
2885
2916
|
// #1575: queue its text extraction in the same transaction — a `pending` row
|
|
2886
2917
|
// and a job run. Nothing is extracted here, so nothing here can fail the upload.
|
|
2887
2918
|
enqueueAttachmentText(doSpineSql(this.sql), parsed.id, ulid(), new Date().toISOString());
|
|
2919
|
+
if (uploadLinkSecret !== undefined) {
|
|
2920
|
+
await redeemUploadLinkInTransaction({
|
|
2921
|
+
sql: doSpineSql(this.sql),
|
|
2922
|
+
now: instant.parse(new Date().toISOString()),
|
|
2923
|
+
emit: (event) => kernelEmit(ctx, event),
|
|
2924
|
+
}, uploadLinkSecret, parsed);
|
|
2925
|
+
}
|
|
2888
2926
|
});
|
|
2889
2927
|
}
|
|
2890
2928
|
catch (err) {
|
|
@@ -2895,7 +2933,16 @@ export function defineScopeDO(modules, bareOps) {
|
|
|
2895
2933
|
}
|
|
2896
2934
|
// #1525: null. An attachment RPC carries no invocation, exactly as its denial
|
|
2897
2935
|
// records none — so the deliveries it drains name no call rather than a wrong one.
|
|
2898
|
-
|
|
2936
|
+
// The row has COMMITTED, so a failed drain must not reach the caller as a refusal:
|
|
2937
|
+
// the host deletes the bytes on a refusal, which would leave this row without them
|
|
2938
|
+
// (and a redeemed link spent). An undelivered event stays in the outbox with no
|
|
2939
|
+
// delivery row, so the next drain in this scope delivers it.
|
|
2940
|
+
try {
|
|
2941
|
+
await this.settleCommitted(tenantId, scopeId, liveSince, null);
|
|
2942
|
+
}
|
|
2943
|
+
catch (err) {
|
|
2944
|
+
console.error('substrat: consumer drain failed after an attachment committed', err);
|
|
2945
|
+
}
|
|
2899
2946
|
return parsed;
|
|
2900
2947
|
});
|
|
2901
2948
|
}
|
|
@@ -6046,6 +6093,24 @@ export function defineScopeDO(modules, bareOps) {
|
|
|
6046
6093
|
assertWrites: (verb) => assertImpersonationWrites(impersonation, verb),
|
|
6047
6094
|
minted,
|
|
6048
6095
|
}),
|
|
6096
|
+
// Upload links: mint / revoke / list, written once in the kernel — the same four things
|
|
6097
|
+
// `capabilities` is handed, and the same consumer-is-system-actor rule.
|
|
6098
|
+
attachments: createAttachmentVerbs({
|
|
6099
|
+
sql: doSpineSql(sql),
|
|
6100
|
+
subject: systemActor ? { kind: 'system', id: systemActor.system } : subject,
|
|
6101
|
+
now: at,
|
|
6102
|
+
check: runCheck,
|
|
6103
|
+
emit: (event) => writeEvent(event, 'kernel'),
|
|
6104
|
+
assertWrites: (verb) => assertImpersonationWrites(impersonation, verb),
|
|
6105
|
+
minted,
|
|
6106
|
+
targetOf: (entityType) => {
|
|
6107
|
+
const gate = this.attachmentTargets.get(entityType);
|
|
6108
|
+
if (!gate)
|
|
6109
|
+
return undefined;
|
|
6110
|
+
const uploadLinks = this.uploadLinkPolicies.get(entityType);
|
|
6111
|
+
return uploadLinks ? { write: gate.write, uploadLinks } : { write: gate.write };
|
|
6112
|
+
},
|
|
6113
|
+
}),
|
|
6049
6114
|
// K-16 / #1864: link and relink, written once in the kernel over the raw spine seam.
|
|
6050
6115
|
...createEntityEdgeVerbs({
|
|
6051
6116
|
sql: doSpineSql(sql),
|