@amalgm/shell 0.1.164-main.42033196669 → 0.1.164-main.42054328268

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.
@@ -14,6 +14,9 @@
14
14
  * listing places each (`linkAt`) and makes it beside the placeholders, never
15
15
  * a placeholder itself (asks.ts). One link that cannot be placed now keeps
16
16
  * no other name from showing, and is made after the listing (reconcile.ts).
17
+ * A reference into a root this person holds stands on the shelf as a link,
18
+ * but the drive shows that root inline where it stands: it is a folder, as
19
+ * every computer's look says, never a link to place.
17
20
  */
18
21
  import { type Stats } from "node:fs";
19
22
  import type { Drive } from "@amalgm/live/drive";
@@ -14,6 +14,9 @@
14
14
  * listing places each (`linkAt`) and makes it beside the placeholders, never
15
15
  * a placeholder itself (asks.ts). One link that cannot be placed now keeps
16
16
  * no other name from showing, and is made after the listing (reconcile.ts).
17
+ * A reference into a root this person holds stands on the shelf as a link,
18
+ * but the drive shows that root inline where it stands: it is a folder, as
19
+ * every computer's look says, never a link to place.
17
20
  */
18
21
  import { lstatSync, statSync } from "node:fs";
19
22
  import { addressOf, errno } from "../operations.js";
@@ -57,8 +60,13 @@ export async function contents(serving, at, mounted) {
57
60
  continue;
58
61
  throw error;
59
62
  }
60
- if (stats.isSymbolicLink())
61
- links.push(name);
63
+ if (stats.isSymbolicLink()) {
64
+ const into = await entered(serving, at, name, listed.root, mounted);
65
+ if (into === null)
66
+ links.push(name);
67
+ else
68
+ items.push(into);
69
+ }
62
70
  else if (stats.isDirectory())
63
71
  items.push(folder(name, stats.mtimeMs, stats.birthtimeMs));
64
72
  else if (stats.isFile())
@@ -94,6 +102,27 @@ export const placed = (name, stats) => ({
94
102
  const folder = (name, mtimeMs, birthtimeMs = mtimeMs) => ({
95
103
  name, directory: true, size: 0, mtimeMs, birthtimeMs, identity: identityText({ v: null, s: null }),
96
104
  });
105
+ /** The folder a shelf link in a folder at a drive path stands for when the
106
+ * drive leads through it into a root other than `root`, the folder's own:
107
+ * the root it enters, at its shelf's times, or the mount's while nothing
108
+ * stands there. Null for a link the drive shows as itself. */
109
+ async function entered(serving, at, name, root, mounted) {
110
+ const where = await serving.drive.where(addressOf(childOf(at, name)));
111
+ if (where.kind === "listed")
112
+ return where.root !== root && where.entry.kind === "directory" ? folder(name, mounted.getTime()) : null;
113
+ if (where.kind !== "shelf" || where.root === root)
114
+ return null;
115
+ let stats;
116
+ try {
117
+ stats = statSync(serving.shelf(where.root).path(where.address));
118
+ }
119
+ catch (error) {
120
+ if (missing(error))
121
+ return null;
122
+ throw error;
123
+ }
124
+ return stats.isDirectory() ? folder(name, stats.mtimeMs, stats.birthtimeMs) : null;
125
+ }
97
126
  /** The link a folder at a drive path shows by name, placed, as the sync root
98
127
  * makes it: its own target text, and the kind of what that target is on the
99
128
  * shelf, a file when nothing stands there. Rejects as its placement does. */
@@ -1 +1 @@
1
- {"version":3,"file":"contents.js","sourceRoot":"","sources":["../../../src/drive/cloud-files/contents.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"contents.js","sourceRoot":"","sources":["../../../src/drive/cloud-files/contents.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,9 @@
1
1
  /**
2
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 when
4
- * the computer starts and after every drop, until it answers, and what the
5
- * gap hid (at start, everything) is read again by saying "gap" only after the
6
- * new watch stands, so no signal falls between. Starting asks it in the
7
- * background: a computer with no network starts, and joins when one returns.
3
+ * holds a watch per socket, so a dropped wire ends it. The watch is asked on
4
+ * every join of the wire (wire-join.ts), and what the gap hid (at start,
5
+ * everything) is read again by saying "gap" only after the new watch stands,
6
+ * so no signal falls between.
8
7
  */
9
8
  import type { EntityAccessWirePort, GrantSignal } from "./entity-access-wire.js";
10
9
  export declare function watchGrantSignals(wire: EntityAccessWirePort, listener: (signal: GrantSignal) => void): () => void;
@@ -1,15 +1,13 @@
1
1
  /**
2
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 when
4
- * the computer starts and after every drop, until it answers, and what the
5
- * gap hid (at start, everything) is read again by saying "gap" only after the
6
- * new watch stands, so no signal falls between. Starting asks it in the
7
- * background: a computer with no network starts, and joins when one returns.
3
+ * holds a watch per socket, so a dropped wire ends it. The watch is asked on
4
+ * every join of the wire (wire-join.ts), and what the gap hid (at start,
5
+ * everything) is read again by saying "gap" only after the new watch stands,
6
+ * so no signal falls between.
8
7
  */
9
- import { ENTITY_RECORD_RETRY_BASE_MS, ENTITY_RECORD_RETRY_MAX_MS } from "@amalgm/live/records";
8
+ import { askOnEveryJoin } from "./wire-join.js";
10
9
  const isGrantFrame = (frame) => typeof frame === "object" && frame !== null && frame.type === "entity.grant.changed";
11
10
  export function watchGrantSignals(wire, listener) {
12
- const ask = () => wire.request({ type: "entity.access.watch" }, ["entity.access.watching"]);
13
11
  const stopFrames = wire.onFrame((frame) => {
14
12
  if (!isGrantFrame(frame))
15
13
  return;
@@ -18,42 +16,14 @@ export function watchGrantSignals(wire, listener) {
18
16
  revoked: frame.revoked === true,
19
17
  });
20
18
  });
21
- let stopped = false;
22
- let retry = null;
23
- let joining = false;
24
- let droppedAgain = false;
25
- const join = async () => {
26
- if (joining) {
27
- droppedAgain = true;
28
- return;
29
- }
30
- joining = true;
31
- let delay = ENTITY_RECORD_RETRY_BASE_MS;
32
- while (!stopped) {
33
- droppedAgain = false;
34
- const answered = await ask().then(() => true, () => false);
35
- if (answered && !droppedAgain)
36
- break;
37
- if (answered)
38
- continue;
39
- await new Promise((resolve) => {
40
- retry = setTimeout(resolve, delay);
41
- retry.unref();
42
- });
43
- delay = Math.min(delay * 2, ENTITY_RECORD_RETRY_MAX_MS);
44
- }
45
- joining = false;
46
- if (!stopped)
47
- listener({ entityId: null, revoked: false });
48
- };
49
- const stopDrops = wire.onDisconnect(() => void join());
50
- void join();
19
+ const stopJoins = askOnEveryJoin({
20
+ onDisconnect: (heard) => wire.onDisconnect(heard),
21
+ ask: () => wire.request({ type: "entity.access.watch" }, ["entity.access.watching"]),
22
+ answered: () => listener({ entityId: null, revoked: false }),
23
+ });
51
24
  return () => {
52
- stopped = true;
53
- if (retry)
54
- clearTimeout(retry);
25
+ stopJoins();
55
26
  stopFrames();
56
- stopDrops();
57
27
  };
58
28
  }
59
29
  //# sourceMappingURL=entity-grant-watch.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"entity-grant-watch.js","sourceRoot":"","sources":["../src/entity-grant-watch.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;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,UAAU,iBAAiB,CAC/B,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,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,KAAK,GAA0B,IAAI,CAAC;IACxC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,KAAK,IAAmB,EAAE;QACrC,IAAI,OAAO,EAAE,CAAC;YACZ,YAAY,GAAG,IAAI,CAAC;YACpB,OAAO;QACT,CAAC;QACD,OAAO,GAAG,IAAI,CAAC;QACf,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,OAAO,GAAG,KAAK,CAAC;QAChB,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,IAAI,EAAE,CAAC,CAAC;IACvD,KAAK,IAAI,EAAE,CAAC;IACZ,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"}
1
+ {"version":3,"file":"entity-grant-watch.js","sourceRoot":"","sources":["../src/entity-grant-watch.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,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,UAAU,iBAAiB,CAC/B,IAA0B,EAC1B,QAAuC;IAEvC,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,MAAM,SAAS,GAAG,cAAc,CAAC;QAC/B,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;QACjD,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,EAAE,CAAC,wBAAwB,CAAC,CAAC;QACpF,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;KAC7D,CAAC,CAAC;IACH,OAAO,GAAG,EAAE;QACV,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
Binary file
Binary file
@@ -303,6 +303,7 @@ export declare class UserGroundHost {
303
303
  private constructLedger;
304
304
  private constructDoor;
305
305
  private releaseGrantWatch;
306
+ private releaseHeadWatch;
306
307
  private applyRail;
307
308
  private applyHost;
308
309
  /** The last placement of accepted declarations (reference-placement.ts);
@@ -434,6 +435,9 @@ export declare class UserGroundHost {
434
435
  /** Records arrived, or these entities' O rows changed: every map reads
435
436
  * the received prefix again and takes each entity where it stands now. */
436
437
  private wakeDriveMaps;
438
+ /** What every map lists may have changed at no new position: each loads
439
+ * again. */
440
+ private reloadDriveMaps;
437
441
  private closeDriveMaps;
438
442
  private wakeObservedApply;
439
443
  /** A Detect dependency is a request, never a hope. It is made in the same
@@ -885,6 +889,12 @@ export declare class UserGroundHost {
885
889
  * rows standing now: a later one is its Register's, which submits and
886
890
  * places it itself. */
887
891
  private resolveLeftDeclarations;
892
+ /** A Register on another computer publishes only the graph head, which no
893
+ * delivery announces, and placed ground reads no head to start. So the
894
+ * head is read in the background once ready and on every join of the wire
895
+ * (wire-join.ts), and a newer one reloads the drive (keepGraphHead). A
896
+ * computer that stays connected hears the next one at its next join. */
897
+ private watchGraphHead;
888
898
  /** AV: the authority's current head H plus every accepted result Receive
889
899
  * has delivered after its watermark M. The head is read fresh, because a
890
900
  * graph-head commit is never an entity delivery. `beyond` is a delivery a
@@ -79,6 +79,7 @@ import { beginGroundWait, GroundCoordinator, GroundEffectCrossedError, GroundFoo
79
79
  import { physicalPath } from "./sync-address.js";
80
80
  import { readAcceptedTail } from "./accepted-tail.js";
81
81
  import { readDeliveryReceipt, readGraphBasis, readNewestGraphHead } from "./graph-heads.js";
82
+ import { askOnEveryJoin } from "./wire-join.js";
82
83
  import { AcceptedFold } from "./accepted-fold.js";
83
84
  import { journaledDeclaration, readDeclarationJournal } from "./declaration-journal.js";
84
85
  import { acceptedView, derivePublication } from "./graph-publication.js";
@@ -258,6 +259,7 @@ export class UserGroundHost {
258
259
  constructLedger = null;
259
260
  constructDoor = null;
260
261
  releaseGrantWatch = null;
262
+ releaseHeadWatch = null;
261
263
  applyRail = null;
262
264
  applyHost = null;
263
265
  /** The last placement of accepted declarations (reference-placement.ts);
@@ -485,6 +487,7 @@ export class UserGroundHost {
485
487
  // before the stop still owes its way in core, which it holds W until
486
488
  // placed.
487
489
  this.resolveLeftDeclarations(this.activeIdentity, this.authorityId);
490
+ this.watchGraphHead(this.activeIdentity, this.authorityId);
488
491
  // Native rings collected while convergence was establishing Watch
489
492
  // coverage are ordinary evidence, not a startup exception. They get
490
493
  // one Detect generation now that Apply recovery is authoritative.
@@ -708,6 +711,13 @@ export class UserGroundHost {
708
711
  void map.refresh(uuids).catch((error) => this.options.onBackgroundError?.(error));
709
712
  }
710
713
  }
714
+ /** What every map lists may have changed at no new position: each loads
715
+ * again. */
716
+ reloadDriveMaps() {
717
+ for (const map of this.driveMaps.values())
718
+ map.drop();
719
+ this.wakeDriveMaps();
720
+ }
711
721
  closeDriveMaps() {
712
722
  for (const map of this.driveMaps.values())
713
723
  map.drop();
@@ -1989,9 +1999,7 @@ export class UserGroundHost {
1989
1999
  this.applyRail?.capabilityChanged();
1990
2000
  this.applyRail?.localStateChanged();
1991
2001
  // An Add admits a whole root's rows at once: every map loads again.
1992
- for (const map of this.driveMaps.values())
1993
- map.drop();
1994
- this.wakeDriveMaps();
2002
+ this.reloadDriveMaps();
1995
2003
  }
1996
2004
  async startRecordRail(identity) {
1997
2005
  if (!this.authorityId)
@@ -2425,6 +2433,8 @@ export class UserGroundHost {
2425
2433
  await attempt(() => this.ownedWire?.dispose());
2426
2434
  this.releaseGrantWatch?.();
2427
2435
  this.releaseGrantWatch = null;
2436
+ this.releaseHeadWatch?.();
2437
+ this.releaseHeadWatch = null;
2428
2438
  this.entityAccess = null;
2429
2439
  this.constructLedger = null;
2430
2440
  this.constructDoor = null;
@@ -2870,6 +2880,8 @@ export class UserGroundHost {
2870
2880
  async keepGraphHead(frame, head) {
2871
2881
  if (head.graph.checksum() !== head.checksum)
2872
2882
  throw new Error("cloud registry head does not match its checksum");
2883
+ const database = groundDatabase(this.databasePath());
2884
+ const newest = readNewestGraphHead(database, head.resourceId)?.checksum;
2873
2885
  await save(this.databasePath(), "record.keepGraphHead", {
2874
2886
  authorityId: head.resourceId,
2875
2887
  deliveryWatermark: head.deliveryWatermark,
@@ -2877,6 +2889,10 @@ export class UserGroundHost {
2877
2889
  snapshot: Buffer.from(String(frame.snapshot_b64 || ""), "base64"),
2878
2890
  checksum: head.checksum,
2879
2891
  });
2892
+ // A head the drive reads moved with no delivery (a Register sends none),
2893
+ // so no position wakes the maps.
2894
+ if (readNewestGraphHead(database, head.resourceId)?.checksum !== newest)
2895
+ this.reloadDriveMaps();
2880
2896
  }
2881
2897
  /** The authority's stored snapshot as this machine's graph. A head is held
2882
2898
  * lazily — no page is read until an operation asks for a root — and every
@@ -5135,6 +5151,22 @@ export class UserGroundHost {
5135
5151
  };
5136
5152
  attempt();
5137
5153
  }
5154
+ /** A Register on another computer publishes only the graph head, which no
5155
+ * delivery announces, and placed ground reads no head to start. So the
5156
+ * head is read in the background once ready and on every join of the wire
5157
+ * (wire-join.ts), and a newer one reloads the drive (keepGraphHead). A
5158
+ * computer that stays connected hears the next one at its next join. */
5159
+ watchGraphHead(identity, resourceId) {
5160
+ this.releaseHeadWatch = askOnEveryJoin({
5161
+ onDisconnect: (heard) => this.wire.onDisconnect(heard),
5162
+ ask: () => this.operation(() => this.readHead(identity, resourceId, { kind: "none" })),
5163
+ failed: (error) => {
5164
+ if (this.closing || this.wire.signal.aborted)
5165
+ return;
5166
+ this.options.onBackgroundError?.(error instanceof Error ? error : new Error(String(error)));
5167
+ },
5168
+ });
5169
+ }
5138
5170
  /** AV: the authority's current head H plus every accepted result Receive
5139
5171
  * has delivered after its watermark M. The head is read fresh, because a
5140
5172
  * graph-head commit is never an entity delivery. `beyond` is a delivery a