@amalgm/shell 0.1.164-main.41447001529 → 0.1.164-main.41474889901
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/apply-window-host.js +18 -2
- package/dist/apply-window-host.js.map +1 -1
- package/dist/apply-window-line.d.ts +3 -2
- package/dist/apply-window-line.js +9 -3
- package/dist/apply-window-line.js.map +1 -1
- package/dist/apply-window-recovery.js +3 -1
- package/dist/apply-window-recovery.js.map +1 -1
- package/dist/apply-window-rows.d.ts +3 -0
- package/dist/apply-window-rows.js +8 -1
- package/dist/apply-window-rows.js.map +1 -1
- package/dist/detection/apply-ownership.js +5 -1
- package/dist/detection/apply-ownership.js.map +1 -1
- package/dist/entity-access-wire.d.ts +2 -1
- package/dist/entity-access-wire.js +2 -18
- package/dist/entity-access-wire.js.map +1 -1
- package/dist/entity-channel-holdings.d.ts +1 -1
- package/dist/entity-channel-holdings.js +1 -1
- package/dist/entity-grant-watch.d.ts +8 -0
- package/dist/entity-grant-watch.js +63 -0
- package/dist/entity-grant-watch.js.map +1 -0
- package/dist/user-ground-host.js +14 -1
- package/dist/user-ground-host.js.map +1 -1
- package/examinations/fixtures/private-wire-authority.js +6 -1
- package/npm-shrinkwrap.json +2 -2
- package/package.json +4 -4
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* gateway forces `to`/`by` keys and `granted_by`/`published_by` to the
|
|
6
6
|
* connected user, so nothing here may name another principal.
|
|
7
7
|
*/
|
|
8
|
+
import { watchGrantSignals } from "./entity-grant-watch.js";
|
|
8
9
|
const isRecordValue = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
|
|
9
10
|
const text = (value, field) => {
|
|
10
11
|
if (typeof value !== "string" || value.length === 0) {
|
|
@@ -130,24 +131,7 @@ export function createEntityAccessPort(wire) {
|
|
|
130
131
|
userIdOf: async (email) => principalOf(await read({ op: "user", email })),
|
|
131
132
|
owned: async () => rowsOf(await read({ op: "owned" }), "owned")
|
|
132
133
|
.map((row) => text(row.entity_id, "entity_id")),
|
|
133
|
-
watchGrants:
|
|
134
|
-
const stop = wire.onFrame((frame) => {
|
|
135
|
-
if (!isRecordValue(frame) || frame.type !== "entity.grant.changed")
|
|
136
|
-
return;
|
|
137
|
-
listener({
|
|
138
|
-
entityId: typeof frame.entity_id === "string" ? frame.entity_id : null,
|
|
139
|
-
revoked: frame.revoked === true,
|
|
140
|
-
});
|
|
141
|
-
});
|
|
142
|
-
try {
|
|
143
|
-
await wire.request({ type: "entity.access.watch" }, ["entity.access.watching"]);
|
|
144
|
-
}
|
|
145
|
-
catch (error) {
|
|
146
|
-
stop();
|
|
147
|
-
throw error;
|
|
148
|
-
}
|
|
149
|
-
return stop;
|
|
150
|
-
},
|
|
134
|
+
watchGrants: (listener) => watchGrantSignals(wire, listener),
|
|
151
135
|
};
|
|
152
136
|
}
|
|
153
137
|
//# sourceMappingURL=entity-access-wire.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-access-wire.js","sourceRoot":"","sources":["../src/entity-access-wire.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"entity-access-wire.js","sourceRoot":"","sources":["../src/entity-access-wire.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export interface EntityChannelRail {
|
|
|
13
13
|
/** Every construct UUID this user may read from this computer, owned first. */
|
|
14
14
|
export declare function readGrantedChannels(access: EntityAccessPort, userId: string): Promise<readonly string[]>;
|
|
15
15
|
/**
|
|
16
|
-
* Follow the grant signal for
|
|
16
|
+
* Follow the grant signal for as long as the host runs. `held` is the set
|
|
17
17
|
* the rail already started with, so a signal for an entity this computer
|
|
18
18
|
* already follows costs nothing.
|
|
19
19
|
*/
|
|
@@ -14,7 +14,7 @@ export async function readGrantedChannels(access, userId) {
|
|
|
14
14
|
return [...new Set([...owned, ...granted.map((grant) => grant.entityId)])];
|
|
15
15
|
}
|
|
16
16
|
/**
|
|
17
|
-
* Follow the grant signal for
|
|
17
|
+
* Follow the grant signal for as long as the host runs. `held` is the set
|
|
18
18
|
* the rail already started with, so a signal for an entity this computer
|
|
19
19
|
* already follows costs nothing.
|
|
20
20
|
*/
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The one watch this computer keeps on its own grant signal. The authority
|
|
3
|
+
* holds a watch per socket, so a dropped wire ends it: the watch is asked again
|
|
4
|
+
* until it answers, and what the gap hid is read again by saying "gap" only
|
|
5
|
+
* after the new watch stands, so no signal falls between.
|
|
6
|
+
*/
|
|
7
|
+
import type { EntityAccessWirePort, GrantSignal } from "./entity-access-wire.js";
|
|
8
|
+
export declare function watchGrantSignals(wire: EntityAccessWirePort, listener: (signal: GrantSignal) => void): Promise<() => void>;
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The one watch this computer keeps on its own grant signal. The authority
|
|
3
|
+
* holds a watch per socket, so a dropped wire ends it: the watch is asked again
|
|
4
|
+
* until it answers, and what the gap hid is read again by saying "gap" only
|
|
5
|
+
* after the new watch stands, so no signal falls between.
|
|
6
|
+
*/
|
|
7
|
+
import { ENTITY_RECORD_RETRY_BASE_MS, ENTITY_RECORD_RETRY_MAX_MS } from "@amalgm/live/records";
|
|
8
|
+
const isGrantFrame = (frame) => typeof frame === "object" && frame !== null && frame.type === "entity.grant.changed";
|
|
9
|
+
export async function watchGrantSignals(wire, listener) {
|
|
10
|
+
const ask = () => wire.request({ type: "entity.access.watch" }, ["entity.access.watching"]);
|
|
11
|
+
const stopFrames = wire.onFrame((frame) => {
|
|
12
|
+
if (!isGrantFrame(frame))
|
|
13
|
+
return;
|
|
14
|
+
listener({
|
|
15
|
+
entityId: typeof frame.entity_id === "string" ? frame.entity_id : null,
|
|
16
|
+
revoked: frame.revoked === true,
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
try {
|
|
20
|
+
await ask();
|
|
21
|
+
}
|
|
22
|
+
catch (error) {
|
|
23
|
+
stopFrames();
|
|
24
|
+
throw error;
|
|
25
|
+
}
|
|
26
|
+
let stopped = false;
|
|
27
|
+
let retry = null;
|
|
28
|
+
let rejoining = false;
|
|
29
|
+
let droppedAgain = false;
|
|
30
|
+
const rejoin = async () => {
|
|
31
|
+
if (rejoining) {
|
|
32
|
+
droppedAgain = true;
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
rejoining = true;
|
|
36
|
+
let delay = ENTITY_RECORD_RETRY_BASE_MS;
|
|
37
|
+
while (!stopped) {
|
|
38
|
+
droppedAgain = false;
|
|
39
|
+
const answered = await ask().then(() => true, () => false);
|
|
40
|
+
if (answered && !droppedAgain)
|
|
41
|
+
break;
|
|
42
|
+
if (answered)
|
|
43
|
+
continue;
|
|
44
|
+
await new Promise((resolve) => {
|
|
45
|
+
retry = setTimeout(resolve, delay);
|
|
46
|
+
retry.unref();
|
|
47
|
+
});
|
|
48
|
+
delay = Math.min(delay * 2, ENTITY_RECORD_RETRY_MAX_MS);
|
|
49
|
+
}
|
|
50
|
+
rejoining = false;
|
|
51
|
+
if (!stopped)
|
|
52
|
+
listener({ entityId: null, revoked: false });
|
|
53
|
+
};
|
|
54
|
+
const stopDrops = wire.onDisconnect(() => void rejoin());
|
|
55
|
+
return () => {
|
|
56
|
+
stopped = true;
|
|
57
|
+
if (retry)
|
|
58
|
+
clearTimeout(retry);
|
|
59
|
+
stopFrames();
|
|
60
|
+
stopDrops();
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=entity-grant-watch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entity-grant-watch.js","sourceRoot":"","sources":["../src/entity-grant-watch.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAI/F,MAAM,YAAY,GAAG,CAAC,KAAc,EAAuD,EAAE,CAC3F,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAK,KAA4B,CAAC,IAAI,KAAK,sBAAsB,CAAC;AAE/G,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAA0B,EAC1B,QAAuC;IAEvC,MAAM,GAAG,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC5F,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACxC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;YAAE,OAAO;QACjC,QAAQ,CAAC;YACP,QAAQ,EAAE,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;YACtE,OAAO,EAAE,KAAK,CAAC,OAAO,KAAK,IAAI;SAChC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,GAAG,EAAE,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,UAAU,EAAE,CAAC;QACb,MAAM,KAAK,CAAC;IACd,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,KAAK,GAA0B,IAAI,CAAC;IACxC,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,MAAM,MAAM,GAAG,KAAK,IAAmB,EAAE;QACvC,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,GAAG,IAAI,CAAC;YACpB,OAAO;QACT,CAAC;QACD,SAAS,GAAG,IAAI,CAAC;QACjB,IAAI,KAAK,GAAG,2BAA2B,CAAC;QACxC,OAAO,CAAC,OAAO,EAAE,CAAC;YAChB,YAAY,GAAG,KAAK,CAAC;YACrB,MAAM,QAAQ,GAAG,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;YAC3D,IAAI,QAAQ,IAAI,CAAC,YAAY;gBAAE,MAAM;YACrC,IAAI,QAAQ;gBAAE,SAAS;YACvB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAClC,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBACnC,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,0BAA0B,CAAC,CAAC;QAC1D,CAAC;QACD,SAAS,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC,OAAO;YAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7D,CAAC,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC;IACzD,OAAO,GAAG,EAAE;QACV,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC/B,UAAU,EAAE,CAAC;QACb,SAAS,EAAE,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/user-ground-host.js
CHANGED
|
@@ -1934,6 +1934,7 @@ export class UserGroundHost {
|
|
|
1934
1934
|
const access = createEntityAccessPort({
|
|
1935
1935
|
request: (frame, acceptedTypes) => this.wire.request({ ...frame }, acceptedTypes),
|
|
1936
1936
|
onFrame: (listener) => this.wire.onEvent(listener),
|
|
1937
|
+
onDisconnect: (listener) => this.wire.onDisconnect(listener),
|
|
1937
1938
|
});
|
|
1938
1939
|
// Every construct channel this user may read, before the rail subscribes:
|
|
1939
1940
|
// a held channel starts at its own Inbox cursor, so start is the only
|
|
@@ -2071,7 +2072,19 @@ export class UserGroundHost {
|
|
|
2071
2072
|
enterRoot: (rootUUID, through) => this.enterReferencedRoot(rootUUID, through),
|
|
2072
2073
|
// Apply resumes from a download in its own dispatcher turn, and stops
|
|
2073
2074
|
// waiting for one when shutdown ends Apply.
|
|
2074
|
-
readContent: resumeInTurn((wants, onBytes, lane, staged) => untilAborted(this.applyWaits.signal, () =>
|
|
2075
|
+
readContent: resumeInTurn((wants, onBytes, lane, staged) => untilAborted(this.applyWaits.signal, async () => {
|
|
2076
|
+
const download = (resource, set) => this.downloadContentSet(resource, this.cacheDir(), set, DOWNLOAD_CONTENT_RETRY_ATTEMPTS, { journey: "apply" }, staged, onBytes, lane ? this.laneBytes : undefined);
|
|
2077
|
+
// A construct's cargo lives under its own UUID, never the home's.
|
|
2078
|
+
const owned = wants.filter(want => want.artifact.kind === "construct");
|
|
2079
|
+
if (owned.length === 0)
|
|
2080
|
+
return download(this.cloudState.resourceId, wants);
|
|
2081
|
+
const home = wants.filter(want => want.artifact.kind !== "construct");
|
|
2082
|
+
const sets = await Promise.all([
|
|
2083
|
+
...(home.length > 0 ? [download(this.cloudState.resourceId, home)] : []),
|
|
2084
|
+
...owned.map(want => download(want.artifact.entityId, [want])),
|
|
2085
|
+
]);
|
|
2086
|
+
return new Map(sets.flatMap(set => [...set]));
|
|
2087
|
+
})),
|
|
2075
2088
|
progressed: (unit, bytes) => this.applyRail?.progressed(unit, bytes),
|
|
2076
2089
|
graphs,
|
|
2077
2090
|
captureLocal: async (intent, plan, _position, compared) => {
|