@agentshouse/mdruntime 0.1.0-cd507e16e5fc0 → 0.1.0-cd71aba4d0215
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/README.md +8 -8
- package/dist/acceptance.d.ts +0 -3
- package/dist/acceptance.d.ts.map +1 -1
- package/dist/acceptance.js +74 -145
- package/dist/act-lanes.d.ts +33 -0
- package/dist/act-lanes.d.ts.map +1 -0
- package/dist/act-lanes.js +177 -0
- package/dist/actions.d.ts +7 -2
- package/dist/actions.d.ts.map +1 -1
- package/dist/actions.js +40 -30
- package/dist/adapter.d.ts +27 -45
- package/dist/adapter.d.ts.map +1 -1
- package/dist/bootstrap.d.ts +1 -1
- package/dist/bootstrap.d.ts.map +1 -1
- package/dist/bootstrap.js +6 -19
- package/dist/change-set.d.ts +4 -0
- package/dist/change-set.d.ts.map +1 -1
- package/dist/change-set.js +6 -0
- package/dist/change.d.ts.map +1 -1
- package/dist/change.js +4 -2
- package/dist/client.d.ts +7 -12
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +29 -14
- package/dist/collection.d.ts +22 -4
- package/dist/collection.d.ts.map +1 -1
- package/dist/collection.js +12 -2
- package/dist/compile.d.ts.map +1 -1
- package/dist/compile.js +15 -21
- package/dist/connection.d.ts.map +1 -1
- package/dist/connection.js +26 -16
- package/dist/conversation-live.d.ts +8 -6
- package/dist/conversation-live.d.ts.map +1 -1
- package/dist/conversation-live.js +7 -6
- package/dist/conversation.d.ts +23 -10
- package/dist/conversation.d.ts.map +1 -1
- package/dist/conversation.js +127 -102
- package/dist/declaration.d.ts +10 -0
- package/dist/declaration.d.ts.map +1 -0
- package/dist/declaration.js +24 -0
- package/dist/discovery.d.ts.map +1 -1
- package/dist/discovery.js +18 -40
- package/dist/durability.d.ts +3 -0
- package/dist/durability.d.ts.map +1 -1
- package/dist/expectation.d.ts +4 -2
- package/dist/expectation.d.ts.map +1 -1
- package/dist/expectation.js +33 -11
- package/dist/failure.d.ts +3 -0
- package/dist/failure.d.ts.map +1 -1
- package/dist/failure.js +6 -0
- package/dist/host.d.ts +17 -2
- package/dist/host.d.ts.map +1 -1
- package/dist/host.js +39 -9
- package/dist/index.d.ts +9 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -3
- package/dist/install.d.ts +1 -3
- package/dist/install.d.ts.map +1 -1
- package/dist/install.js +48 -65
- package/dist/lifecycle.d.ts +1 -1
- package/dist/lifecycle.d.ts.map +1 -1
- package/dist/lifecycle.js +38 -27
- package/dist/listing.d.ts +6 -11
- package/dist/listing.d.ts.map +1 -1
- package/dist/listing.js +25 -62
- package/dist/live.d.ts.map +1 -1
- package/dist/live.js +3 -3
- package/dist/locks.d.ts +2 -4
- package/dist/locks.d.ts.map +1 -1
- package/dist/locks.js +10 -38
- package/dist/lost.d.ts.map +1 -1
- package/dist/lost.js +10 -21
- package/dist/media.d.ts +1 -1
- package/dist/media.d.ts.map +1 -1
- package/dist/media.js +4 -4
- package/dist/memory.d.ts +4 -2
- package/dist/memory.d.ts.map +1 -1
- package/dist/memory.js +38 -21
- package/dist/messages.d.ts +0 -3
- package/dist/messages.d.ts.map +1 -1
- package/dist/messages.js +13 -31
- package/dist/model.d.ts +0 -1
- package/dist/model.d.ts.map +1 -1
- package/dist/model.js +0 -5
- package/dist/models.d.ts +4 -8
- package/dist/models.d.ts.map +1 -1
- package/dist/models.js +97 -136
- package/dist/observation.d.ts.map +1 -1
- package/dist/observation.js +12 -17
- package/dist/opened.d.ts +1 -1
- package/dist/opened.d.ts.map +1 -1
- package/dist/opened.js +5 -5
- package/dist/opening.d.ts.map +1 -1
- package/dist/opening.js +6 -4
- package/dist/outcome.d.ts +3 -0
- package/dist/outcome.d.ts.map +1 -1
- package/dist/outcome.js +15 -0
- package/dist/overlay.d.ts +2 -1
- package/dist/overlay.d.ts.map +1 -1
- package/dist/overlay.js +32 -21
- package/dist/page-metadata.d.ts +8 -0
- package/dist/page-metadata.d.ts.map +1 -0
- package/dist/page-metadata.js +19 -0
- package/dist/parts.d.ts +3 -51
- package/dist/parts.d.ts.map +1 -1
- package/dist/parts.js +14 -111
- package/dist/preparation.d.ts.map +1 -1
- package/dist/preparation.js +22 -15
- package/dist/presence.d.ts +52 -0
- package/dist/presence.d.ts.map +1 -0
- package/dist/presence.js +220 -0
- package/dist/queries.d.ts +1 -1
- package/dist/queries.d.ts.map +1 -1
- package/dist/queries.js +5 -7
- package/dist/query.d.ts +0 -1
- package/dist/query.d.ts.map +1 -1
- package/dist/questions.js +1 -1
- package/dist/queue.d.ts +40 -0
- package/dist/queue.d.ts.map +1 -0
- package/dist/queue.js +455 -0
- package/dist/reach.d.ts.map +1 -1
- package/dist/reach.js +27 -8
- package/dist/react.d.ts +11 -0
- package/dist/react.d.ts.map +1 -1
- package/dist/react.js +15 -1
- package/dist/reads.d.ts +3 -1
- package/dist/reads.d.ts.map +1 -1
- package/dist/reads.js +9 -2
- package/dist/recovery.d.ts +3 -1
- package/dist/recovery.d.ts.map +1 -1
- package/dist/recovery.js +29 -7
- package/dist/refresh.js +2 -2
- package/dist/refusal.d.ts.map +1 -1
- package/dist/refusal.js +5 -4
- package/dist/replica.d.ts +5 -11
- package/dist/replica.d.ts.map +1 -1
- package/dist/replica.js +13 -15
- package/dist/retried.d.ts +30 -0
- package/dist/retried.d.ts.map +1 -0
- package/dist/retried.js +72 -0
- package/dist/room-draft.d.ts +4 -6
- package/dist/room-draft.d.ts.map +1 -1
- package/dist/room-draft.js +36 -52
- package/dist/room-drafts.d.ts.map +1 -1
- package/dist/room-drafts.js +17 -16
- package/dist/rows.d.ts.map +1 -1
- package/dist/rows.js +3 -4
- package/dist/runtime.d.ts +9 -16
- package/dist/runtime.d.ts.map +1 -1
- package/dist/save.d.ts +41 -90
- package/dist/save.d.ts.map +1 -1
- package/dist/save.js +233 -116
- package/dist/saves.d.ts +2 -40
- package/dist/saves.d.ts.map +1 -1
- package/dist/saves.js +107 -702
- package/dist/seed.d.ts.map +1 -1
- package/dist/seed.js +2 -3
- package/dist/shared.d.ts +0 -5
- package/dist/shared.d.ts.map +1 -1
- package/dist/shared.js +4 -90
- package/dist/shown.d.ts +4 -3
- package/dist/shown.d.ts.map +1 -1
- package/dist/shown.js +26 -31
- package/dist/socket/lanes.d.ts +2 -1
- package/dist/socket/lanes.d.ts.map +1 -1
- package/dist/socket/lanes.js +5 -2
- package/dist/socket/session.d.ts +0 -1
- package/dist/socket/session.d.ts.map +1 -1
- package/dist/socket.d.ts +2 -4
- package/dist/socket.d.ts.map +1 -1
- package/dist/socket.js +4 -8
- package/dist/source.d.ts.map +1 -1
- package/dist/source.js +5 -4
- package/dist/store/records.d.ts +3 -3
- package/dist/store/records.d.ts.map +1 -1
- package/dist/store/records.js +4 -5
- package/dist/store/space.d.ts +1 -1
- package/dist/store/space.d.ts.map +1 -1
- package/dist/store/space.js +0 -2
- package/dist/store/watchers.js +1 -2
- package/dist/store.d.ts +10 -5
- package/dist/store.d.ts.map +1 -1
- package/dist/store.js +38 -13
- package/dist/stored.d.ts +1 -1
- package/dist/stored.d.ts.map +1 -1
- package/dist/stored.js +6 -6
- package/dist/surface.d.ts.map +1 -1
- package/dist/surface.js +8 -8
- package/dist/sync.d.ts.map +1 -1
- package/dist/sync.js +86 -78
- package/dist/tables.d.ts +0 -5
- package/dist/tables.d.ts.map +1 -1
- package/dist/tables.js +8 -11
- package/dist/tallies.js +5 -5
- package/dist/validation.d.ts.map +1 -1
- package/dist/validation.js +2 -2
- package/dist/wire.d.ts +40 -4
- package/dist/wire.d.ts.map +1 -1
- package/dist/wire.js +12 -3
- package/package.json +3 -2
- package/dist/attempt.d.ts +0 -16
- package/dist/attempt.d.ts.map +0 -1
- package/dist/attempt.js +0 -70
- package/dist/job.d.ts +0 -33
- package/dist/job.d.ts.map +0 -1
- package/dist/job.js +0 -54
- package/dist/socket/rooms.d.ts +0 -44
- package/dist/socket/rooms.d.ts.map +0 -1
- package/dist/socket/rooms.js +0 -90
- package/dist/store/fences.d.ts +0 -16
- package/dist/store/fences.d.ts.map +0 -1
- package/dist/store/fences.js +0 -26
package/dist/queries.js
CHANGED
|
@@ -13,10 +13,10 @@ import { searchPlanOf } from './search.js';
|
|
|
13
13
|
import { seedApplies, seededResult, watchSeeded } from './seed.js';
|
|
14
14
|
import { capped, MAXIMUM_WINDOW } from './windows.js';
|
|
15
15
|
const QUERY_BYTES = 1 << 20;
|
|
16
|
-
function everyRoom({
|
|
16
|
+
function everyRoom({ presence }, held) {
|
|
17
17
|
return [
|
|
18
18
|
...new Set([
|
|
19
|
-
...
|
|
19
|
+
...presence.rooms().map(({ locator }) => locator),
|
|
20
20
|
...held.rooms.keys(),
|
|
21
21
|
...held.queues.keys(),
|
|
22
22
|
]),
|
|
@@ -29,10 +29,8 @@ function reachedRooms(runtime, plan, held) {
|
|
|
29
29
|
.filter((locator) => (reached === null || reached.has(locator)) && !plan.locked.includes(locator))
|
|
30
30
|
.sort();
|
|
31
31
|
}
|
|
32
|
-
function awaited({ socket }, locator) {
|
|
33
|
-
return (!socket.session.now().roomsListed ||
|
|
34
|
-
(socket.rooms.declared(locator) !== undefined &&
|
|
35
|
-
socket.rooms.discovered(locator)?.replica.admission === 'admitted'));
|
|
32
|
+
function awaited({ socket, presence }, locator) {
|
|
33
|
+
return (!socket.session.now().roomsListed || presence.room(locator)?.replica.admission === 'admitted');
|
|
36
34
|
}
|
|
37
35
|
function coveredRooms(runtime, locators, whole, held) {
|
|
38
36
|
const { store, socket } = runtime;
|
|
@@ -64,7 +62,7 @@ function coveredRooms(runtime, locators, whole, held) {
|
|
|
64
62
|
}
|
|
65
63
|
if (pending.length > 0)
|
|
66
64
|
return { pending };
|
|
67
|
-
return { coverage: { rooms: coverage,
|
|
65
|
+
return { coverage: { rooms: coverage, overlay }, rooms: read };
|
|
68
66
|
}
|
|
69
67
|
function covered(runtime, plan, held) {
|
|
70
68
|
return coveredRooms(runtime, reachedRooms(runtime, plan, held), plan.rooms === null && plan.reach === null, held);
|
package/dist/query.d.ts
CHANGED
package/dist/query.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,QAAQ,EAAE,CAAC;IAChC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzD,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,SAAS,OAAO,EAAE,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEjF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IAC9B,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,QAAQ,EAAE,CAAC;IAChC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzD,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,SAAS,OAAO,EAAE,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEjF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IAC9B,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,GAAG,aAAa,GAAG,QAAQ,CAAC,CAAC;AAEpE,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3D,MAAM,MAAM,aAAa,GAAG;IAAE,OAAO,EAAE,SAAS,WAAW,EAAE,CAAA;CAAE,CAAC;AAEhE,MAAM,MAAM,YAAY,GAAG;IAAE,SAAS,EAAE,SAAS,aAAa,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAElG,MAAM,MAAM,SAAS,GAAG;IAAE,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzF,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG,SAAS,CAAC;AAEjD,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE,CAAC;AAExE,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE,CAAC;AAElE,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,WAAW,GAAG,aAAa,CAAC;AAEvE,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG,SAAS,GAAG;IAC7B,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3B,CAAC;AAEF,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,GAAE,SAAS,GAAG,IAAW,GAAG,IAAI,CAEjG"}
|
package/dist/questions.js
CHANGED
|
@@ -114,7 +114,7 @@ export function questionAsked(questions) {
|
|
|
114
114
|
return questionsOf({ questions })[0]?.asked ?? null;
|
|
115
115
|
}
|
|
116
116
|
export function loneOf(questions) {
|
|
117
|
-
const asked = questions.length === 1 && !questions[0]
|
|
117
|
+
const asked = questions.length === 1 && !questions[0].secret ? questions[0] : undefined;
|
|
118
118
|
const only = asked?.fields.length === 1 ? asked.fields[0] : undefined;
|
|
119
119
|
return asked !== undefined && only !== undefined && entered(only)
|
|
120
120
|
? { question: asked, field: only }
|
package/dist/queue.d.ts
ADDED
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import type { MutationResult } from './adapter.js';
|
|
2
|
+
import { type ChangeBatch } from './change.js';
|
|
3
|
+
import { type HeldReplica, type ReplicaRecord, type Returned, type Slice } from './replica.js';
|
|
4
|
+
import type { Runtime } from './runtime.js';
|
|
5
|
+
import type { SavePlan } from './save.js';
|
|
6
|
+
import type { SaveResult } from './saves.js';
|
|
7
|
+
import type { PendingState, RoomCommit, Store, StoredFile, View, Work } from './store.js';
|
|
8
|
+
export type Queueing = Pick<Runtime, 'store' | 'journal' | 'localSaves'> & {
|
|
9
|
+
readonly socket: Pick<Runtime['socket'], 'continuing'>;
|
|
10
|
+
readonly presence: Pick<Runtime['presence'], 'lost'>;
|
|
11
|
+
};
|
|
12
|
+
export type Restand = {
|
|
13
|
+
readonly locator: string;
|
|
14
|
+
readonly record: ReplicaRecord;
|
|
15
|
+
readonly accepted?: string;
|
|
16
|
+
readonly adopted?: Returned;
|
|
17
|
+
readonly installed?: Pick<RoomCommit, 'published' | 'refreshed'>;
|
|
18
|
+
readonly refused?: true;
|
|
19
|
+
readonly after?: () => void;
|
|
20
|
+
};
|
|
21
|
+
export type Appending = {
|
|
22
|
+
readonly plan: SavePlan;
|
|
23
|
+
readonly files: readonly StoredFile[];
|
|
24
|
+
readonly held: ReadonlyMap<string, {
|
|
25
|
+
readonly replica: HeldReplica;
|
|
26
|
+
readonly confirmed: Slice;
|
|
27
|
+
}>;
|
|
28
|
+
readonly after?: () => Promise<void>;
|
|
29
|
+
};
|
|
30
|
+
type Answer = Extract<MutationResult, {
|
|
31
|
+
kind: 'conflicted' | 'rejected';
|
|
32
|
+
}>;
|
|
33
|
+
export declare function withdrawable(states: ReadonlyMap<string, PendingState>): (batch: ChangeBatch) => boolean;
|
|
34
|
+
export declare function sliceAt(store: Store, record: ReplicaRecord, view: View, queue: readonly ChangeBatch[], extra?: Iterable<string>, moved?: Iterable<string>): Promise<Slice>;
|
|
35
|
+
export declare function settle(runtime: Queueing, locators: readonly string[], decide: (held: ReadonlyMap<string, Work>) => Promise<readonly Restand[]>): Promise<void>;
|
|
36
|
+
export declare function answered(runtime: Queueing, locator: string, head: ChangeBatch, answer: Answer): Promise<void>;
|
|
37
|
+
export declare function unpair(runtime: Queueing): Promise<void>;
|
|
38
|
+
export declare function append(runtime: Queueing, appending: Appending): Promise<SaveResult>;
|
|
39
|
+
export {};
|
|
40
|
+
//# sourceMappingURL=queue.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"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"}
|
package/dist/queue.js
ADDED
|
@@ -0,0 +1,455 @@
|
|
|
1
|
+
import { changeSet, mergeChangeSets } from './change-set.js';
|
|
2
|
+
import { leaving as leavingIn, partnerOf } from './change.js';
|
|
3
|
+
import { composedOf, definitionsAt } from './collection.js';
|
|
4
|
+
import { runtimeError } from './failure.js';
|
|
5
|
+
import { roomDraftRevision } from './identity.js';
|
|
6
|
+
import { landed, movedBy, overlayOf, replaying, slicing, slicingWith, standing, storedRecord, touchedBy, } from './replica.js';
|
|
7
|
+
import { returnedBy, returnedInto } from './room-draft.js';
|
|
8
|
+
import { documentKey } from './rows.js';
|
|
9
|
+
import { stepped } from './turn.js';
|
|
10
|
+
export function withdrawable(states) {
|
|
11
|
+
return (batch) => {
|
|
12
|
+
const state = states.get(batch.id);
|
|
13
|
+
return state !== undefined && state.submission.state !== 'submitted' && !state.lost;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
export async function sliceAt(store, record, view, queue, extra = [], moved = []) {
|
|
17
|
+
const local = await store.open();
|
|
18
|
+
const needed = new Set([...touchedBy(queue), ...extra]);
|
|
19
|
+
const movedPaths = [...new Set([...movedBy(queue, record.locator), ...moved])];
|
|
20
|
+
if (movedPaths.length > 0) {
|
|
21
|
+
for (const { path } of await local.referrers(record.key, view, movedPaths)) {
|
|
22
|
+
needed.add(path);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
const paths = [...needed];
|
|
26
|
+
return stepped(slicing(await local.entries(record.key, view, paths), paths));
|
|
27
|
+
}
|
|
28
|
+
async function landedWhole(store, record, batch, confirmedLayer, current) {
|
|
29
|
+
if (!landed(batch, confirmedLayer, store.composed(record), current))
|
|
30
|
+
return false;
|
|
31
|
+
const partner = partnerOf(batch, record.locator);
|
|
32
|
+
if (partner === null)
|
|
33
|
+
return true;
|
|
34
|
+
const other = await store.replica(partner);
|
|
35
|
+
const half = other?.queue.find((one) => one.id === batch.id);
|
|
36
|
+
if (other === undefined || half === undefined)
|
|
37
|
+
return false;
|
|
38
|
+
return landed(half, await sliceAt(store, other.record, 'confirmed', [half]), store.composed(other.record));
|
|
39
|
+
}
|
|
40
|
+
async function returnedDrafts(store, locator, work, leaving, composition) {
|
|
41
|
+
const written = new Map();
|
|
42
|
+
for (const { batch, returned } of leaving) {
|
|
43
|
+
if (returned === null || batch.between?.destination.room === locator)
|
|
44
|
+
continue;
|
|
45
|
+
for (const saved of work.states.get(batch.id)?.drafts ?? []) {
|
|
46
|
+
const existing = written.get(saved.path) ?? (await store.draft(locator, saved.path));
|
|
47
|
+
written.set(saved.path, {
|
|
48
|
+
locator,
|
|
49
|
+
path: saved.path,
|
|
50
|
+
revision: roomDraftRevision(),
|
|
51
|
+
parts: returnedInto(existing?.parts, saved.parts, composition === undefined ? undefined : definitionsAt(composition, saved.path)),
|
|
52
|
+
returned,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return written;
|
|
57
|
+
}
|
|
58
|
+
async function carriedBack(store, locator, unlanded, written) {
|
|
59
|
+
const back = new Map();
|
|
60
|
+
const taken = [];
|
|
61
|
+
for (const batch of unlanded) {
|
|
62
|
+
const between = batch.between;
|
|
63
|
+
if (between === undefined)
|
|
64
|
+
continue;
|
|
65
|
+
const source = between.source.room;
|
|
66
|
+
const destination = between.destination.room;
|
|
67
|
+
const local = await store.open();
|
|
68
|
+
const arrived = (await local.pending(destination, batch.id)).state?.drafts ?? [];
|
|
69
|
+
for (const { path: to } of arrived) {
|
|
70
|
+
const record = await store.draft(destination, to);
|
|
71
|
+
const path = between.moves.find((move) => move.to === to)?.path;
|
|
72
|
+
if (record === undefined || path === undefined)
|
|
73
|
+
continue;
|
|
74
|
+
const [into, key] = source === locator ? [written, path] : [back, documentKey(source, path)];
|
|
75
|
+
const existing = into.get(key) ?? (await store.draft(source, path));
|
|
76
|
+
const held = await store.record(source);
|
|
77
|
+
taken.push({ locator: destination, path: to });
|
|
78
|
+
into.set(key, {
|
|
79
|
+
locator: source,
|
|
80
|
+
path,
|
|
81
|
+
revision: roomDraftRevision(),
|
|
82
|
+
parts: returnedInto(existing?.parts, record.parts, held === undefined ? undefined : definitionsAt(store.composed(held), path)),
|
|
83
|
+
returned: existing?.returned ?? null,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
const records = [...back.values()];
|
|
88
|
+
const elsewhere = taken.filter((one) => one.locator !== locator);
|
|
89
|
+
const rooms = new Set([...records, ...elsewhere].map((one) => one.locator));
|
|
90
|
+
return {
|
|
91
|
+
taken: taken.filter((one) => one.locator === locator).map(({ path }) => path),
|
|
92
|
+
writes: [...rooms].map((room) => ({
|
|
93
|
+
locator: room,
|
|
94
|
+
roomDrafts: records.filter((record) => record.locator === room),
|
|
95
|
+
consumedRoomDrafts: elsewhere.filter((one) => one.locator === room).map(({ path }) => path),
|
|
96
|
+
})),
|
|
97
|
+
changes: [...rooms].map((room) => changeSet(room, {
|
|
98
|
+
drafts: [...records, ...elsewhere]
|
|
99
|
+
.filter((one) => one.locator === room)
|
|
100
|
+
.map(({ path }) => path),
|
|
101
|
+
})),
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
function confirmedAgain(store, locator) {
|
|
105
|
+
store.installs.change(locator, (held) => ({
|
|
106
|
+
...held,
|
|
107
|
+
confirmations: held.confirmations + 1,
|
|
108
|
+
}));
|
|
109
|
+
}
|
|
110
|
+
function replayed(store, record, confirmedLayer, queue) {
|
|
111
|
+
return stepped(replaying(confirmedLayer, queue, record.locator, store.composed(record)));
|
|
112
|
+
}
|
|
113
|
+
async function overlayDiff(record, before, visible, touched) {
|
|
114
|
+
const kept = before !== undefined && before.record.key === record.key ? before.overlaid : new Set();
|
|
115
|
+
return {
|
|
116
|
+
overlay: {
|
|
117
|
+
set: await stepped(overlayOf(visible, touched)),
|
|
118
|
+
cleared: [...kept].filter((path) => !touched.has(path)),
|
|
119
|
+
},
|
|
120
|
+
touched,
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
function unsent(state, batch, locator) {
|
|
124
|
+
if (state === undefined)
|
|
125
|
+
return false;
|
|
126
|
+
return !leavingIn(batch, locator) || withdrawable(new Map([[batch.id, state]]))(batch);
|
|
127
|
+
}
|
|
128
|
+
async function together(runtime, local, settlements) {
|
|
129
|
+
const settled = new Set(settlements.map(({ locator }) => locator));
|
|
130
|
+
const all = [...settlements];
|
|
131
|
+
for (let wave = settlements; wave.length > 0;) {
|
|
132
|
+
const partnered = new Map();
|
|
133
|
+
for (const { locator, left } of wave) {
|
|
134
|
+
for (const batch of left) {
|
|
135
|
+
const partner = partnerOf(batch, locator);
|
|
136
|
+
if (partner === null ||
|
|
137
|
+
settled.has(partner) ||
|
|
138
|
+
!unsent((await local.pending(partner, batch.id)).state, batch, partner)) {
|
|
139
|
+
continue;
|
|
140
|
+
}
|
|
141
|
+
partnered.set(partner, [...(partnered.get(partner) ?? []), batch]);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
const partners = [];
|
|
145
|
+
for (const [partner, batches] of partnered) {
|
|
146
|
+
settled.add(partner);
|
|
147
|
+
partners.push(await unpairing(runtime, local, partner, batches));
|
|
148
|
+
}
|
|
149
|
+
all.push(...partners);
|
|
150
|
+
wave = partners;
|
|
151
|
+
}
|
|
152
|
+
const answer = await local.commit({
|
|
153
|
+
rooms: all.flatMap(({ commit }) => commit.rooms),
|
|
154
|
+
writes: all.flatMap(({ commit }) => commit.writes),
|
|
155
|
+
});
|
|
156
|
+
return mergeChangeSets(all.map((one) => one.apply(answer)));
|
|
157
|
+
}
|
|
158
|
+
async function settlement(runtime, local, locator, work, record, queue, settling = {}) {
|
|
159
|
+
const { store, journal, localSaves } = runtime;
|
|
160
|
+
const before = work.replica;
|
|
161
|
+
const view = settling.view ?? 'confirmed';
|
|
162
|
+
const previousQueue = work.queue;
|
|
163
|
+
const overrides = settling.changes;
|
|
164
|
+
const read = await sliceAt(store, record, view, queue, [
|
|
165
|
+
...(before !== undefined && before.record.key === record.key ? before.overlaid : []),
|
|
166
|
+
...(overrides?.set.map(({ path }) => path) ?? []),
|
|
167
|
+
...(overrides?.removed ?? []),
|
|
168
|
+
]);
|
|
169
|
+
const confirmedLayer = overrides === undefined
|
|
170
|
+
? read
|
|
171
|
+
: await stepped(slicingWith(read, overrides.set, overrides.removed));
|
|
172
|
+
const composition = store.composed(record);
|
|
173
|
+
const shown = queue.filter((batch) => {
|
|
174
|
+
const held = store.landed.of(locator, batch.id);
|
|
175
|
+
return (held !== undefined &&
|
|
176
|
+
Object.entries(held).some(([path, revision]) => confirmedLayer.revisions[path] !== revision));
|
|
177
|
+
});
|
|
178
|
+
const unshown = queue.filter((batch) => !shown.includes(batch));
|
|
179
|
+
const { withdrawn, kept } = await stepped(standing(confirmedLayer, unshown, withdrawable(work.states), localSaves, locator, composition));
|
|
180
|
+
const founded = kept.filter((batch) => !unshown.includes(batch));
|
|
181
|
+
const queueChanged = kept.length !== previousQueue.length || founded.length > 0;
|
|
182
|
+
const unqueued = shown.map((batch) => ({ batch, landed: true }));
|
|
183
|
+
for (const batch of withdrawn) {
|
|
184
|
+
unqueued.push({ batch, landed: await landedWhole(store, record, batch, confirmedLayer) });
|
|
185
|
+
}
|
|
186
|
+
const returning = [
|
|
187
|
+
...[...unqueued].reverse().map(({ batch, landed: held }) => ({
|
|
188
|
+
batch,
|
|
189
|
+
returned: localSaves || held ? null : returnedBy(),
|
|
190
|
+
})),
|
|
191
|
+
...(settling.leaving ?? []),
|
|
192
|
+
];
|
|
193
|
+
const written = await returnedDrafts(store, locator, work, returning, composition);
|
|
194
|
+
const carried = await carriedBack(store, locator, [
|
|
195
|
+
...[...unqueued].reverse().flatMap(({ batch, landed: held }) => (held ? [] : [batch])),
|
|
196
|
+
...(settling.leaving ?? []).flatMap(({ batch, returned }) => returned === null ? [] : [batch]),
|
|
197
|
+
], written);
|
|
198
|
+
const replayedLayer = await replayed(store, record, confirmedLayer, kept);
|
|
199
|
+
const { overlay } = await overlayDiff(record, before, replayedLayer.visible, replayedLayer.touched);
|
|
200
|
+
const commit = {
|
|
201
|
+
rooms: [
|
|
202
|
+
{
|
|
203
|
+
locator,
|
|
204
|
+
key: record.key,
|
|
205
|
+
record: storedRecord(record),
|
|
206
|
+
roots: record.declaration.typedSelection?.roots ?? [],
|
|
207
|
+
composed: composedOf(composition),
|
|
208
|
+
...settling.commit,
|
|
209
|
+
...(overrides === undefined
|
|
210
|
+
? {}
|
|
211
|
+
: { confirmed: { set: overrides.set, removed: overrides.removed } }),
|
|
212
|
+
overlay,
|
|
213
|
+
},
|
|
214
|
+
],
|
|
215
|
+
writes: [
|
|
216
|
+
{
|
|
217
|
+
locator,
|
|
218
|
+
queue: kept,
|
|
219
|
+
stored: previousQueue,
|
|
220
|
+
founded,
|
|
221
|
+
roomDrafts: [...written.values()],
|
|
222
|
+
consumedRoomDrafts: carried.taken,
|
|
223
|
+
},
|
|
224
|
+
...carried.writes,
|
|
225
|
+
],
|
|
226
|
+
};
|
|
227
|
+
const staying = new Set(kept.map((batch) => batch.id));
|
|
228
|
+
return {
|
|
229
|
+
locator,
|
|
230
|
+
left: previousQueue.filter((batch) => !staying.has(batch.id)),
|
|
231
|
+
commit,
|
|
232
|
+
apply: (answer) => {
|
|
233
|
+
for (const batch of previousQueue) {
|
|
234
|
+
if (!staying.has(batch.id))
|
|
235
|
+
store.landed.drop(locator, batch.id);
|
|
236
|
+
}
|
|
237
|
+
const drafts = [...written.keys(), ...carried.taken];
|
|
238
|
+
for (const { batch, landed: held } of unqueued) {
|
|
239
|
+
const outcome = localSaves ? 'dropped' : held ? 'landed' : 'withdrawn';
|
|
240
|
+
journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
|
|
241
|
+
}
|
|
242
|
+
const changed = answer.changed[locator];
|
|
243
|
+
if (settling.commit?.published !== undefined ||
|
|
244
|
+
settling.commit?.refreshed === true ||
|
|
245
|
+
overrides !== undefined) {
|
|
246
|
+
confirmedAgain(store, locator);
|
|
247
|
+
}
|
|
248
|
+
return mergeChangeSets([
|
|
249
|
+
changeSet(locator, {
|
|
250
|
+
documents: changed === undefined ? [] : changed,
|
|
251
|
+
room: settling.room,
|
|
252
|
+
queue: queueChanged,
|
|
253
|
+
drafts,
|
|
254
|
+
unindexed: answer.indexed[locator] === false,
|
|
255
|
+
due: kept.length > 0 && settling.refused !== true,
|
|
256
|
+
}),
|
|
257
|
+
...carried.changes,
|
|
258
|
+
]);
|
|
259
|
+
},
|
|
260
|
+
};
|
|
261
|
+
}
|
|
262
|
+
async function unpairing(runtime, local, locator, batches) {
|
|
263
|
+
const { store, journal, localSaves } = runtime;
|
|
264
|
+
const ids = new Set(batches.map(({ id }) => id));
|
|
265
|
+
const leaving = batches.map((batch) => ({
|
|
266
|
+
batch,
|
|
267
|
+
returned: !localSaves && leavingIn(batch, locator) ? returnedBy() : null,
|
|
268
|
+
}));
|
|
269
|
+
const outcome = localSaves ? 'dropped' : 'unpaired';
|
|
270
|
+
const work = await store.work(locator);
|
|
271
|
+
const current = work.replica;
|
|
272
|
+
if (current !== undefined) {
|
|
273
|
+
const settled = await settlement(runtime, local, locator, work, current.record, current.queue.filter((one) => !ids.has(one.id)), { leaving });
|
|
274
|
+
return {
|
|
275
|
+
...settled,
|
|
276
|
+
apply(answer) {
|
|
277
|
+
for (const batch of batches)
|
|
278
|
+
journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
|
|
279
|
+
return settled.apply(answer);
|
|
280
|
+
},
|
|
281
|
+
};
|
|
282
|
+
}
|
|
283
|
+
const queue = work.queue.filter((one) => !ids.has(one.id));
|
|
284
|
+
const written = await returnedDrafts(store, locator, work, leaving, undefined);
|
|
285
|
+
const carried = await carriedBack(store, locator, leaving.flatMap(({ batch, returned }) => (returned === null ? [] : [batch])), written);
|
|
286
|
+
return {
|
|
287
|
+
locator,
|
|
288
|
+
left: batches,
|
|
289
|
+
commit: {
|
|
290
|
+
rooms: [],
|
|
291
|
+
writes: [
|
|
292
|
+
{
|
|
293
|
+
locator,
|
|
294
|
+
queue,
|
|
295
|
+
stored: work.queue,
|
|
296
|
+
roomDrafts: [...written.values()],
|
|
297
|
+
consumedRoomDrafts: carried.taken,
|
|
298
|
+
},
|
|
299
|
+
...carried.writes,
|
|
300
|
+
],
|
|
301
|
+
},
|
|
302
|
+
apply() {
|
|
303
|
+
for (const batch of batches)
|
|
304
|
+
journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
|
|
305
|
+
return mergeChangeSets([
|
|
306
|
+
changeSet(locator, {
|
|
307
|
+
queue: true,
|
|
308
|
+
drafts: [...written.keys(), ...carried.taken],
|
|
309
|
+
due: queue.length > 0,
|
|
310
|
+
}),
|
|
311
|
+
...carried.changes,
|
|
312
|
+
]);
|
|
313
|
+
},
|
|
314
|
+
};
|
|
315
|
+
}
|
|
316
|
+
async function orphaned(local) {
|
|
317
|
+
const { queued, moving } = await local.moving();
|
|
318
|
+
const halves = new Map();
|
|
319
|
+
for (const { locator, batch, state } of moving) {
|
|
320
|
+
const partner = partnerOf(batch, locator);
|
|
321
|
+
if (partner === null || queued.get(partner)?.includes(batch.id) === true)
|
|
322
|
+
continue;
|
|
323
|
+
if (unsent(state, batch, locator))
|
|
324
|
+
halves.set(locator, [...(halves.get(locator) ?? []), batch]);
|
|
325
|
+
}
|
|
326
|
+
return halves;
|
|
327
|
+
}
|
|
328
|
+
async function sweep(runtime, local) {
|
|
329
|
+
if (!runtime.socket.continuing())
|
|
330
|
+
return;
|
|
331
|
+
const halves = await orphaned(local);
|
|
332
|
+
if (halves.size === 0)
|
|
333
|
+
return;
|
|
334
|
+
const settlements = [];
|
|
335
|
+
for (const [locator, batches] of halves) {
|
|
336
|
+
settlements.push(await unpairing(runtime, local, locator, batches));
|
|
337
|
+
}
|
|
338
|
+
void runtime.store.changed(await together(runtime, local, settlements));
|
|
339
|
+
}
|
|
340
|
+
async function settled(runtime, local, settlements, steps) {
|
|
341
|
+
const set = await together(runtime, local, settlements);
|
|
342
|
+
for (const step of steps)
|
|
343
|
+
step();
|
|
344
|
+
void runtime.store.changed(set);
|
|
345
|
+
await sweep(runtime, local);
|
|
346
|
+
}
|
|
347
|
+
export function settle(runtime, locators, decide) {
|
|
348
|
+
const { store } = runtime;
|
|
349
|
+
return store.exclusive(async () => {
|
|
350
|
+
const local = await store.open();
|
|
351
|
+
const held = new Map();
|
|
352
|
+
for (const locator of locators)
|
|
353
|
+
held.set(locator, await store.work(locator));
|
|
354
|
+
const decided = await decide(held);
|
|
355
|
+
if (decided.length === 0)
|
|
356
|
+
return;
|
|
357
|
+
const settlements = [];
|
|
358
|
+
for (const { locator, record, accepted, adopted, installed, refused } of decided) {
|
|
359
|
+
const work = held.get(locator) ?? (await store.work(locator));
|
|
360
|
+
settlements.push(await settlement(runtime, local, locator, work, record, work.queue.filter((batch) => batch.id !== accepted), {
|
|
361
|
+
room: true,
|
|
362
|
+
view: installed?.refreshed === true ? 'refreshed' : 'confirmed',
|
|
363
|
+
...(installed === undefined ? {} : { commit: installed }),
|
|
364
|
+
...(adopted === undefined ? {} : { changes: adopted }),
|
|
365
|
+
...(refused === undefined ? {} : { refused }),
|
|
366
|
+
}));
|
|
367
|
+
}
|
|
368
|
+
await settled(runtime, local, settlements, decided.flatMap(({ after }) => (after === undefined ? [] : [after])));
|
|
369
|
+
});
|
|
370
|
+
}
|
|
371
|
+
export function answered(runtime, locator, head, answer) {
|
|
372
|
+
const { store, socket } = runtime;
|
|
373
|
+
return store.exclusive(async () => {
|
|
374
|
+
if (!socket.continuing())
|
|
375
|
+
return;
|
|
376
|
+
const local = await store.open();
|
|
377
|
+
const work = await store.work(locator);
|
|
378
|
+
const current = work.replica;
|
|
379
|
+
if (current === undefined || !current.queue.some((batch) => batch.id === head.id))
|
|
380
|
+
return;
|
|
381
|
+
const confirmedLayer = await sliceAt(store, current.record, 'confirmed', [head]);
|
|
382
|
+
const held = answer.kind === 'conflicted' &&
|
|
383
|
+
(await landedWhole(store, current.record, head, confirmedLayer, answer.affected));
|
|
384
|
+
if (held &&
|
|
385
|
+
partnerOf(head, locator) === null &&
|
|
386
|
+
!landed(head, confirmedLayer, store.composed(current.record))) {
|
|
387
|
+
store.landed.hold(locator, head.id, Object.fromEntries([...touchedBy([head])].map((path) => [path, confirmedLayer.revisions[path]])));
|
|
388
|
+
return;
|
|
389
|
+
}
|
|
390
|
+
const returned = {
|
|
391
|
+
kind: answer.kind,
|
|
392
|
+
code: answer.code,
|
|
393
|
+
fields: answer.fields,
|
|
394
|
+
retryable: answer.retryable,
|
|
395
|
+
};
|
|
396
|
+
await settled(runtime, local, [
|
|
397
|
+
await settlement(runtime, local, locator, work, current.record, current.queue.filter((batch) => batch.id !== head.id), { leaving: [{ batch: head, returned: held ? null : returned }] }),
|
|
398
|
+
], []);
|
|
399
|
+
});
|
|
400
|
+
}
|
|
401
|
+
export function unpair(runtime) {
|
|
402
|
+
return runtime.store.durably((local) => sweep(runtime, local));
|
|
403
|
+
}
|
|
404
|
+
export async function append(runtime, appending) {
|
|
405
|
+
const { plan, files, held, after } = appending;
|
|
406
|
+
if (plan.kind === 'refused')
|
|
407
|
+
return { outcome: 'refused', ...plan.refusal };
|
|
408
|
+
const { store } = runtime;
|
|
409
|
+
const local = await store.open();
|
|
410
|
+
const rooms = [];
|
|
411
|
+
const writes = [];
|
|
412
|
+
for (const { locator, queue, saved, consumed, carried } of plan.rooms) {
|
|
413
|
+
const { replica, confirmed } = held.get(locator);
|
|
414
|
+
const { record } = replica;
|
|
415
|
+
const replayedLayer = await replayed(store, record, confirmed, queue);
|
|
416
|
+
const { overlay } = await overlayDiff(record, replica, replayedLayer.visible, replayedLayer.touched);
|
|
417
|
+
rooms.push({
|
|
418
|
+
locator,
|
|
419
|
+
key: record.key,
|
|
420
|
+
roots: record.declaration.typedSelection?.roots ?? [],
|
|
421
|
+
composed: composedOf(store.composed(record)),
|
|
422
|
+
overlay,
|
|
423
|
+
});
|
|
424
|
+
writes.push({
|
|
425
|
+
locator,
|
|
426
|
+
queue,
|
|
427
|
+
stored: replica.queue,
|
|
428
|
+
saved,
|
|
429
|
+
consumedRoomDrafts: consumed,
|
|
430
|
+
roomDrafts: carried,
|
|
431
|
+
});
|
|
432
|
+
}
|
|
433
|
+
let answer;
|
|
434
|
+
try {
|
|
435
|
+
answer = await local.commit({ rooms, writes, files, whole: true });
|
|
436
|
+
}
|
|
437
|
+
catch {
|
|
438
|
+
return { outcome: 'refused', code: 'durable-write', retryable: true };
|
|
439
|
+
}
|
|
440
|
+
const lost = answer.fenced ?? plan.rooms.find(({ locator }) => runtime.presence.lost(locator))?.locator;
|
|
441
|
+
if (lost !== undefined)
|
|
442
|
+
throw runtimeError('unknown-room', `Unknown Room ${lost}`);
|
|
443
|
+
const [saving] = plan.rooms;
|
|
444
|
+
await Promise.all([
|
|
445
|
+
store.changed(mergeChangeSets(plan.rooms.map(({ locator, consumed, carried }) => changeSet(locator, {
|
|
446
|
+
documents: answer.changed[locator] ?? [],
|
|
447
|
+
queue: true,
|
|
448
|
+
drafts: [...consumed, ...carried.map(({ path }) => path)],
|
|
449
|
+
unindexed: answer.indexed[locator] === false,
|
|
450
|
+
due: locator === saving?.locator,
|
|
451
|
+
})))),
|
|
452
|
+
after?.(),
|
|
453
|
+
]);
|
|
454
|
+
return { outcome: 'saved', identifier: plan.identifier };
|
|
455
|
+
}
|
package/dist/reach.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reach.d.ts","sourceRoot":"","sources":["../src/reach.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAe,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"reach.d.ts","sourceRoot":"","sources":["../src/reach.ts"],"names":[],"mappings":"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"}
|
package/dist/reach.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { selected } from './collection.js';
|
|
1
2
|
import { unheldView } from './conversation.js';
|
|
2
3
|
import { modelTypes, NO_MODEL } from './model.js';
|
|
3
4
|
import { changeOf, digestApplied, digestOf, observing, } from './observation.js';
|
|
4
|
-
import { runtimeError } from './failure.js';
|
|
5
|
+
import { runtimeError, uncaught } from './failure.js';
|
|
5
6
|
import { failure, lockedRoom, ROOM_LOCKED, undeclared, UNREADABLE, } from './outcome.js';
|
|
6
7
|
import { beneath } from './paths.js';
|
|
7
8
|
import { moveTarget, readParts, staleWrite, } from './room-draft.js';
|
|
@@ -19,6 +20,15 @@ const NO_CONVERSATION = {
|
|
|
19
20
|
interrupt: unconversed('conversations/interrupt'),
|
|
20
21
|
kill: unconversed('conversations/kill'),
|
|
21
22
|
delete: unconversed('conversations/delete'),
|
|
23
|
+
takeOut: unconversed('conversations/take-out'),
|
|
24
|
+
decide: unconversed('agent-functions/decide'),
|
|
25
|
+
rename: unconversed('conversations/rename'),
|
|
26
|
+
option: unconversed('conversations/option/set'),
|
|
27
|
+
retry: unconversed('conversations/retry'),
|
|
28
|
+
pins: () => Promise.resolve([]),
|
|
29
|
+
pin: () => Promise.resolve(),
|
|
30
|
+
openedTurns: () => Promise.resolve({}),
|
|
31
|
+
openTurn: () => Promise.resolve(),
|
|
22
32
|
};
|
|
23
33
|
const NO_CHAT_DRAFT = {
|
|
24
34
|
write: () => Promise.resolve(),
|
|
@@ -45,11 +55,11 @@ export function governs(reach, room) {
|
|
|
45
55
|
if (wholly(reach, room.locator)) {
|
|
46
56
|
return { collection: true, selection: room.typedSelection !== null };
|
|
47
57
|
}
|
|
48
|
-
const
|
|
58
|
+
const within = (path) => selected({ selection: room.typedSelection }, path);
|
|
49
59
|
const paths = reach.documents
|
|
50
60
|
.filter((document) => document.room === room.locator)
|
|
51
61
|
.map(({ path }) => path);
|
|
52
|
-
return { collection: paths.some((path) => !
|
|
62
|
+
return { collection: paths.some((path) => !within(path)), selection: paths.some(within) };
|
|
53
63
|
}
|
|
54
64
|
function covers(reach, room, path) {
|
|
55
65
|
return (reach === null ||
|
|
@@ -190,7 +200,7 @@ export function narrowed(runtime, given, port) {
|
|
|
190
200
|
shown = shown.then(() => making.then((value) => {
|
|
191
201
|
if (open)
|
|
192
202
|
deliver(value);
|
|
193
|
-
},
|
|
203
|
+
}, uncaught), uncaught);
|
|
194
204
|
},
|
|
195
205
|
stop() {
|
|
196
206
|
open = false;
|
|
@@ -470,10 +480,19 @@ export function narrowed(runtime, given, port) {
|
|
|
470
480
|
read: (id, options) => conversation().read(id, options),
|
|
471
481
|
create: (input) => conversation().create(input),
|
|
472
482
|
send: (id, operation, draft) => conversation().send(id, operation, draft),
|
|
473
|
-
answer: (id, answer) => conversation().answer(id, answer),
|
|
474
|
-
interrupt: (id) => conversation().interrupt(id),
|
|
475
|
-
kill: (id) => conversation().kill(id),
|
|
476
|
-
delete: (id) => conversation().delete(id),
|
|
483
|
+
answer: (id, answer, operation) => conversation().answer(id, answer, operation),
|
|
484
|
+
interrupt: (id, operation) => conversation().interrupt(id, operation),
|
|
485
|
+
kill: (id, operation) => conversation().kill(id, operation),
|
|
486
|
+
delete: (id, operation) => conversation().delete(id, operation),
|
|
487
|
+
takeOut: (id, message, operation) => conversation().takeOut(id, message, operation),
|
|
488
|
+
decide: (request, decision, operation) => conversation().decide(request, decision, operation),
|
|
489
|
+
rename: (id, name, operation) => conversation().rename(id, name, operation),
|
|
490
|
+
option: (id, option, value, operation) => conversation().option(id, option, value, operation),
|
|
491
|
+
retry: (id, message, operation) => conversation().retry(id, message, operation),
|
|
492
|
+
pins: () => conversation().pins(),
|
|
493
|
+
pin: (figures) => conversation().pin(figures),
|
|
494
|
+
openedTurns: () => conversation().openedTurns(),
|
|
495
|
+
openTurn: (id, turn) => conversation().openTurn(id, turn),
|
|
477
496
|
},
|
|
478
497
|
chatDraft: {
|
|
479
498
|
write: (id, draft, revision) => chatDraft().write(id, draft, revision),
|