@indigoai-us/hq-cloud 6.18.108 → 6.18.110
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/bin/area-ledger-migration.d.ts.map +1 -1
- package/dist/bin/area-ledger-migration.js +5 -3
- package/dist/bin/area-ledger-migration.js.map +1 -1
- package/dist/bin/backup-prune-runner.js +2 -2
- package/dist/bin/backup-prune-runner.js.map +1 -1
- package/dist/bin/runner-output-guard.d.ts +39 -0
- package/dist/bin/runner-output-guard.d.ts.map +1 -0
- package/dist/bin/runner-output-guard.js +104 -0
- package/dist/bin/runner-output-guard.js.map +1 -0
- package/dist/bin/sync-runner-company.d.ts +9 -0
- package/dist/bin/sync-runner-company.d.ts.map +1 -1
- package/dist/bin/sync-runner-company.js +76 -6
- package/dist/bin/sync-runner-company.js.map +1 -1
- package/dist/bin/sync-runner.d.ts +37 -1
- package/dist/bin/sync-runner.d.ts.map +1 -1
- package/dist/bin/sync-runner.js +37 -3
- package/dist/bin/sync-runner.js.map +1 -1
- package/dist/cli/conflict.d.ts +30 -1
- package/dist/cli/conflict.d.ts.map +1 -1
- package/dist/cli/conflict.js +69 -3
- package/dist/cli/conflict.js.map +1 -1
- package/dist/cli/reconcile-skip-reason.d.ts +1 -1
- package/dist/cli/reconcile-skip-reason.d.ts.map +1 -1
- package/dist/cli/reconcile-skip-reason.js +2 -0
- package/dist/cli/reconcile-skip-reason.js.map +1 -1
- package/dist/cli/reindex.d.ts.map +1 -1
- package/dist/cli/reindex.js +228 -43
- package/dist/cli/reindex.js.map +1 -1
- package/dist/cli/rescue-core.d.ts +160 -1
- package/dist/cli/rescue-core.d.ts.map +1 -1
- package/dist/cli/rescue-core.js +681 -162
- package/dist/cli/rescue-core.js.map +1 -1
- package/dist/cli/rescue-native-copy.d.ts +88 -0
- package/dist/cli/rescue-native-copy.d.ts.map +1 -0
- package/dist/cli/rescue-native-copy.js +823 -0
- package/dist/cli/rescue-native-copy.js.map +1 -0
- package/dist/cli/rescue.d.ts.map +1 -1
- package/dist/cli/rescue.js +37 -9
- package/dist/cli/rescue.js.map +1 -1
- package/dist/cli/share.d.ts +35 -8
- package/dist/cli/share.d.ts.map +1 -1
- package/dist/cli/share.js +437 -32
- package/dist/cli/share.js.map +1 -1
- package/dist/cli/sync.d.ts +70 -5
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +439 -77
- package/dist/cli/sync.js.map +1 -1
- package/dist/cognito-auth.d.ts +10 -0
- package/dist/cognito-auth.d.ts.map +1 -1
- package/dist/cognito-auth.js +162 -1
- package/dist/cognito-auth.js.map +1 -1
- package/dist/ignore.d.ts +5 -1
- package/dist/ignore.d.ts.map +1 -1
- package/dist/ignore.js +75 -23
- package/dist/ignore.js.map +1 -1
- package/dist/index.d.ts +4 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -2
- package/dist/index.js.map +1 -1
- package/dist/journal-row-store.d.ts +3 -0
- package/dist/journal-row-store.d.ts.map +1 -1
- package/dist/journal-row-store.js +21 -0
- package/dist/journal-row-store.js.map +1 -1
- package/dist/journal-snapshot-decoder.js +2 -0
- package/dist/journal-snapshot-decoder.js.map +1 -1
- package/dist/journal-snapshot-v4.d.ts.map +1 -1
- package/dist/journal-snapshot-v4.js +6 -1
- package/dist/journal-snapshot-v4.js.map +1 -1
- package/dist/journal.d.ts +1 -1
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +20 -20
- package/dist/journal.js.map +1 -1
- package/dist/lib/append-log-merge.d.ts +43 -0
- package/dist/lib/append-log-merge.d.ts.map +1 -0
- package/dist/lib/append-log-merge.js +424 -0
- package/dist/lib/append-log-merge.js.map +1 -0
- package/dist/lib/same-path-upload-lock.d.ts +27 -1
- package/dist/lib/same-path-upload-lock.d.ts.map +1 -1
- package/dist/lib/same-path-upload-lock.js +32 -1
- package/dist/lib/same-path-upload-lock.js.map +1 -1
- package/dist/object-io.d.ts +36 -1
- package/dist/object-io.d.ts.map +1 -1
- package/dist/object-io.js +93 -12
- package/dist/object-io.js.map +1 -1
- package/dist/operation-lock.d.ts +27 -1
- package/dist/operation-lock.d.ts.map +1 -1
- package/dist/operation-lock.js +94 -8
- package/dist/operation-lock.js.map +1 -1
- package/dist/outposts/client.d.ts +19 -6
- package/dist/outposts/client.d.ts.map +1 -1
- package/dist/outposts/client.js +16 -5
- package/dist/outposts/client.js.map +1 -1
- package/dist/outposts/command.d.ts +2 -1
- package/dist/outposts/command.d.ts.map +1 -1
- package/dist/outposts/command.js +81 -13
- package/dist/outposts/command.js.map +1 -1
- package/dist/outposts/self-deploy.d.ts.map +1 -1
- package/dist/outposts/self-deploy.js +3 -0
- package/dist/outposts/self-deploy.js.map +1 -1
- package/dist/private-folder-transport.d.ts +0 -2
- package/dist/private-folder-transport.d.ts.map +1 -1
- package/dist/private-folder-transport.js +17 -16
- package/dist/private-folder-transport.js.map +1 -1
- package/dist/push-identity-fence.d.ts +116 -3
- package/dist/push-identity-fence.d.ts.map +1 -1
- package/dist/push-identity-fence.js +625 -62
- package/dist/push-identity-fence.js.map +1 -1
- package/dist/qmd-reindex.d.ts.map +1 -1
- package/dist/qmd-reindex.js +3 -2
- package/dist/qmd-reindex.js.map +1 -1
- package/dist/s3.d.ts +30 -9
- package/dist/s3.d.ts.map +1 -1
- package/dist/s3.js +110 -82
- package/dist/s3.js.map +1 -1
- package/dist/sync/area-ledger-migration.d.ts +17 -0
- package/dist/sync/area-ledger-migration.d.ts.map +1 -1
- package/dist/sync/area-ledger-migration.js +37 -3
- package/dist/sync/area-ledger-migration.js.map +1 -1
- package/dist/sync/scattered-delete-burst.d.ts +61 -0
- package/dist/sync/scattered-delete-burst.d.ts.map +1 -0
- package/dist/sync/scattered-delete-burst.js +111 -0
- package/dist/sync/scattered-delete-burst.js.map +1 -0
- package/dist/sync/unattended-delete-hold.d.ts +102 -0
- package/dist/sync/unattended-delete-hold.d.ts.map +1 -0
- package/dist/sync/unattended-delete-hold.js +164 -0
- package/dist/sync/unattended-delete-hold.js.map +1 -0
- package/dist/sync-core.d.ts +5 -6
- package/dist/sync-core.d.ts.map +1 -1
- package/dist/sync-core.js +5 -6
- package/dist/sync-core.js.map +1 -1
- package/dist/types.d.ts +13 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/vault-client.d.ts +6 -0
- package/dist/vault-client.d.ts.map +1 -1
- package/dist/vault-client.js +53 -8
- package/dist/vault-client.js.map +1 -1
- package/dist/vault-key-grammar.d.ts +44 -0
- package/dist/vault-key-grammar.d.ts.map +1 -0
- package/dist/vault-key-grammar.js +158 -0
- package/dist/vault-key-grammar.js.map +1 -0
- package/dist/watcher.d.ts.map +1 -1
- package/dist/watcher.js +4 -1
- package/dist/watcher.js.map +1 -1
- package/dist/windows-extended-path.d.ts +22 -0
- package/dist/windows-extended-path.d.ts.map +1 -0
- package/dist/windows-extended-path.js +55 -0
- package/dist/windows-extended-path.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,424 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Entry merge for append-only text logs (`PLANNING.md` and similar).
|
|
3
|
+
*
|
|
4
|
+
* Several machines append entries to the same markdown change log. When two of
|
|
5
|
+
* them append between syncs, both bodies changed since the journal and sync
|
|
6
|
+
* used to keep one whole file and park the other under `.hq/conflict-backups/`,
|
|
7
|
+
* so the entries that only existed in the parked copy dropped out of the live
|
|
8
|
+
* log (feedback_5f5f3ee1).
|
|
9
|
+
*
|
|
10
|
+
* A conflict on such a file is merged when, and only when, the merge provably
|
|
11
|
+
* loses nothing and changes nothing either side wrote:
|
|
12
|
+
*
|
|
13
|
+
* - The file is markdown or plain text ({@link isAppendLogPath}), both bodies
|
|
14
|
+
* are UTF-8 text, and each is under {@link APPEND_LOG_MERGE_MAX_BYTES}.
|
|
15
|
+
* - The last synced body (the journal's sha256 `hash`) must be a prefix of
|
|
16
|
+
* BOTH bodies, ending at a line boundary: each machine only appended to the
|
|
17
|
+
* version it last synced. The merge is that common start, then the blocks
|
|
18
|
+
* each side appended. A side that edited or deleted anything in the synced
|
|
19
|
+
* body fails this check, and the ordinary conflict rule (keep one, park
|
|
20
|
+
* the other) runs. When one side already holds every block the other
|
|
21
|
+
* added, that side is returned as it is.
|
|
22
|
+
* - One exception needs no prefix: the local body IS the journalled body
|
|
23
|
+
* (this machine's own earlier merge, held for the push leg) and it holds
|
|
24
|
+
* every cloud block. It is returned as it is so the push publishes it.
|
|
25
|
+
* - A block is a markdown heading (`#` to `######`) and the lines under it.
|
|
26
|
+
* Text appended before the first new heading continues the last synced
|
|
27
|
+
* entry and stays directly after it. A block both sides added identically
|
|
28
|
+
* is kept once. The same heading with a different body on the two sides
|
|
29
|
+
* is a real edit conflict and is never merged.
|
|
30
|
+
* - A `.log` file is only ever extended in place: a program may hold it
|
|
31
|
+
* open for appending, and replacing the file would send its later writes
|
|
32
|
+
* to an unlinked inode. When the merge is not "local body + extra bytes"
|
|
33
|
+
* the merge is refused and the ordinary conflict rule applies. Other
|
|
34
|
+
* files (`.md`, `.markdown`, `.txt`) may be replaced; see
|
|
35
|
+
* {@link writeAppendLogMerge} for the guard and its remaining window.
|
|
36
|
+
* - New heading blocks keep the cloud's order first, then local-only blocks.
|
|
37
|
+
* Timestamps never insert entries into the previous cloud writer's base.
|
|
38
|
+
*/
|
|
39
|
+
import { createHash } from "node:crypto";
|
|
40
|
+
import * as fs from "node:fs";
|
|
41
|
+
import * as path from "node:path";
|
|
42
|
+
import { appendIfUnchanged } from "./append-only-merge.js";
|
|
43
|
+
/** Bodies above this size keep the ordinary conflict rule. */
|
|
44
|
+
export const APPEND_LOG_MERGE_MAX_BYTES = 8 * 1024 * 1024;
|
|
45
|
+
const APPEND_LOG_EXTENSIONS = [".md", ".markdown", ".txt", ".log"];
|
|
46
|
+
/** True for a markdown or plain-text path (any depth), the files merged by entry. */
|
|
47
|
+
export function isAppendLogPath(relativePath) {
|
|
48
|
+
const base = (relativePath.split(/[\\/]/).pop() ?? "").toLowerCase();
|
|
49
|
+
return APPEND_LOG_EXTENSIONS.some((ext) => base.length > ext.length && base.endsWith(ext));
|
|
50
|
+
}
|
|
51
|
+
function decodeText(body) {
|
|
52
|
+
if (body.length > APPEND_LOG_MERGE_MAX_BYTES || body.includes(0))
|
|
53
|
+
return null;
|
|
54
|
+
try {
|
|
55
|
+
return new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(body);
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
const LF = 0x0a;
|
|
62
|
+
const CR = 0x0d;
|
|
63
|
+
function commonPrefixLength(a, b) {
|
|
64
|
+
const max = Math.min(a.length, b.length);
|
|
65
|
+
let i = 0;
|
|
66
|
+
while (i < max && a[i] === b[i])
|
|
67
|
+
i++;
|
|
68
|
+
return i;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* True when a prefix of `length` bytes ends at a line boundary of `body`:
|
|
72
|
+
* right after a line end (after the LF of a CRLF), or right before one (a
|
|
73
|
+
* synced body whose last line had no newline yet).
|
|
74
|
+
*/
|
|
75
|
+
function endsAtLineBoundary(body, length) {
|
|
76
|
+
if (length === 0)
|
|
77
|
+
return true;
|
|
78
|
+
const before = body[length - 1];
|
|
79
|
+
const after = body[length];
|
|
80
|
+
if (before === LF || (before === CR && after !== LF))
|
|
81
|
+
return true;
|
|
82
|
+
return before !== CR && (after === LF || after === CR);
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Byte length of the prefix of `body` (at most `limit` bytes) whose sha256 is
|
|
86
|
+
* `baseHash`, or null. Only line boundaries and `limit` itself are tried; the
|
|
87
|
+
* hash is fed once and copied at each candidate.
|
|
88
|
+
*/
|
|
89
|
+
function findVerifiedBaseLength(body, limit, baseHash) {
|
|
90
|
+
const target = baseHash.toLowerCase();
|
|
91
|
+
const hash = createHash("sha256");
|
|
92
|
+
let fed = 0;
|
|
93
|
+
for (let length = 0; length <= limit; length++) {
|
|
94
|
+
if (length !== limit && !endsAtLineBoundary(body, length))
|
|
95
|
+
continue;
|
|
96
|
+
hash.update(body.subarray(fed, length));
|
|
97
|
+
fed = length;
|
|
98
|
+
if (hash.copy().digest("hex") === target)
|
|
99
|
+
return length;
|
|
100
|
+
}
|
|
101
|
+
return null;
|
|
102
|
+
}
|
|
103
|
+
/** Length of the longest prefix of `body` within `limit` that ends at a line start. */
|
|
104
|
+
function lineAlignedLength(body, limit) {
|
|
105
|
+
for (let i = limit; i > 0; i--) {
|
|
106
|
+
if (body[i - 1] === LF || (body[i - 1] === CR && body[i] !== LF))
|
|
107
|
+
return i;
|
|
108
|
+
}
|
|
109
|
+
return 0;
|
|
110
|
+
}
|
|
111
|
+
const HEADING = /^(#{1,6})[ \t]/;
|
|
112
|
+
const FENCE = /^[ \t]{0,3}(```|~~~)/;
|
|
113
|
+
function normalize(text) {
|
|
114
|
+
return text
|
|
115
|
+
.replace(/\r\n?/g, "\n")
|
|
116
|
+
.split("\n")
|
|
117
|
+
.map((line) => line.trimEnd())
|
|
118
|
+
.join("\n")
|
|
119
|
+
.trimEnd();
|
|
120
|
+
}
|
|
121
|
+
function splitLines(text) {
|
|
122
|
+
return text.match(/[^\r\n]*(?:\r\n|\n|\r)|[^\r\n]+$/g) ?? [];
|
|
123
|
+
}
|
|
124
|
+
/** Each line of `text` with its heading level (outside code fences), or 0. */
|
|
125
|
+
function headingLevels(text) {
|
|
126
|
+
let inFence = false;
|
|
127
|
+
return splitLines(text).map((line) => {
|
|
128
|
+
const bare = line.replace(/[\r\n]+$/, "");
|
|
129
|
+
if (FENCE.test(bare)) {
|
|
130
|
+
inFence = !inFence;
|
|
131
|
+
return { line, level: 0 };
|
|
132
|
+
}
|
|
133
|
+
const m = inFence ? null : HEADING.exec(bare);
|
|
134
|
+
return { line, level: m ? m[1].length : 0 };
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
/** The shallowest heading level in `text`, or null when it has no heading. */
|
|
138
|
+
function entryLevel(text) {
|
|
139
|
+
let level = null;
|
|
140
|
+
for (const line of headingLevels(text)) {
|
|
141
|
+
if (line.level > 0 && (level === null || line.level < level))
|
|
142
|
+
level = line.level;
|
|
143
|
+
}
|
|
144
|
+
return level;
|
|
145
|
+
}
|
|
146
|
+
/**
|
|
147
|
+
* Split appended text into the lead (text before the first entry heading) and
|
|
148
|
+
* one block per heading at `level`. Deeper headings stay inside their entry.
|
|
149
|
+
*/
|
|
150
|
+
function splitBlocks(text, level) {
|
|
151
|
+
let lead = "";
|
|
152
|
+
const blocks = [];
|
|
153
|
+
let current = null;
|
|
154
|
+
for (const { line, level: lineLevel } of headingLevels(text)) {
|
|
155
|
+
if (level !== null && lineLevel === level) {
|
|
156
|
+
if (current)
|
|
157
|
+
blocks.push({ ...current, key: normalize(current.text) });
|
|
158
|
+
current = { heading: normalize(line), text: line };
|
|
159
|
+
}
|
|
160
|
+
else if (current) {
|
|
161
|
+
current.text += line;
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
lead += line;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
if (current)
|
|
168
|
+
blocks.push({ ...current, key: normalize(current.text) });
|
|
169
|
+
return { lead, blocks };
|
|
170
|
+
}
|
|
171
|
+
/**
|
|
172
|
+
* Epoch milliseconds of the first ISO-style date/time in a heading, or null.
|
|
173
|
+
* A date without a time is midnight; a time without a zone is read as UTC.
|
|
174
|
+
*/
|
|
175
|
+
export function parseHeadingTimestamp(heading) {
|
|
176
|
+
const m = /(\d{4}-\d{2}-\d{2})(?:[T ](\d{2}):(\d{2})(?::(\d{2})(\.\d+)?)?[ \t]*(Z|UTC|[+-]\d{2}:?\d{2})?)?/i.exec(heading);
|
|
177
|
+
if (!m)
|
|
178
|
+
return null;
|
|
179
|
+
let zone = (m[6] ?? "Z").toUpperCase();
|
|
180
|
+
if (zone === "UTC")
|
|
181
|
+
zone = "Z";
|
|
182
|
+
if (zone !== "Z" && !zone.includes(":"))
|
|
183
|
+
zone = `${zone.slice(0, 3)}:${zone.slice(3)}`;
|
|
184
|
+
const fraction = m[5] ? m[5].slice(0, 4) : "";
|
|
185
|
+
const iso = `${m[1]}T${m[2] ?? "00"}:${m[3] ?? "00"}:${m[4] ?? "00"}${fraction}${zone}`;
|
|
186
|
+
const ms = Date.parse(iso);
|
|
187
|
+
return Number.isFinite(ms) ? ms : null;
|
|
188
|
+
}
|
|
189
|
+
/** True when every key in `added` is matched (as a multiset) by a key in `held`. */
|
|
190
|
+
function holdsAll(held, added) {
|
|
191
|
+
const remaining = new Map();
|
|
192
|
+
for (const block of held)
|
|
193
|
+
remaining.set(block.key, (remaining.get(block.key) ?? 0) + 1);
|
|
194
|
+
for (const block of added) {
|
|
195
|
+
const count = remaining.get(block.key) ?? 0;
|
|
196
|
+
if (count === 0)
|
|
197
|
+
return false;
|
|
198
|
+
remaining.set(block.key, count - 1);
|
|
199
|
+
}
|
|
200
|
+
return true;
|
|
201
|
+
}
|
|
202
|
+
function eolOf(text) {
|
|
203
|
+
const m = /\r\n|\n|\r/.exec(text);
|
|
204
|
+
return m ? m[0] : "\n";
|
|
205
|
+
}
|
|
206
|
+
function terminated(text, eol) {
|
|
207
|
+
return text === "" || /[\r\n]$/.test(text) ? text : text + eol;
|
|
208
|
+
}
|
|
209
|
+
/**
|
|
210
|
+
* Merge two bodies of an append-only text log against the last synced body
|
|
211
|
+
* (`baseHash`, the journal's sha256 hex; null when there is none).
|
|
212
|
+
*
|
|
213
|
+
* Returns the local buffer itself when it already holds everything the cloud
|
|
214
|
+
* added, the remote buffer itself when the cloud holds everything this machine
|
|
215
|
+
* added (or the merge equals it), a new buffer with the merged log, or null
|
|
216
|
+
* when the bodies cannot be merged without risk; the caller then applies the
|
|
217
|
+
* ordinary conflict rule, which parks the losing body.
|
|
218
|
+
*/
|
|
219
|
+
export function mergeAppendLog(localBody, remoteBody, baseHash, relativePath) {
|
|
220
|
+
const merged = mergeAppendLogBodies(localBody, remoteBody, baseHash);
|
|
221
|
+
if (merged && relativePath !== undefined && isInPlaceOnlyPath(relativePath) && !extendsBody(localBody, merged)) {
|
|
222
|
+
return null;
|
|
223
|
+
}
|
|
224
|
+
return merged;
|
|
225
|
+
}
|
|
226
|
+
function extendsBody(expected, merged) {
|
|
227
|
+
return merged.length >= expected.length && merged.subarray(0, expected.length).equals(expected);
|
|
228
|
+
}
|
|
229
|
+
/** `.log` files are written by running programs; they are never replaced. */
|
|
230
|
+
function isInPlaceOnlyPath(relativePath) {
|
|
231
|
+
return relativePath.toLowerCase().endsWith(".log");
|
|
232
|
+
}
|
|
233
|
+
function mergeAppendLogBodies(localBody, remoteBody, baseHash) {
|
|
234
|
+
if (localBody.equals(remoteBody))
|
|
235
|
+
return localBody;
|
|
236
|
+
const localText = decodeText(localBody);
|
|
237
|
+
const remoteText = decodeText(remoteBody);
|
|
238
|
+
if (localText === null || remoteText === null)
|
|
239
|
+
return null;
|
|
240
|
+
const common = commonPrefixLength(localBody, remoteBody);
|
|
241
|
+
const verified = typeof baseHash === "string" && /^[0-9a-f]{64}$/i.test(baseHash)
|
|
242
|
+
? findVerifiedBaseLength(localBody, common, baseHash)
|
|
243
|
+
: null;
|
|
244
|
+
const baseLength = verified ?? lineAlignedLength(localBody, common);
|
|
245
|
+
// A cut inside a multi-byte character leaves tails that are not UTF-8.
|
|
246
|
+
const base = decodeText(localBody.subarray(0, baseLength));
|
|
247
|
+
let localTail = decodeText(localBody.subarray(baseLength));
|
|
248
|
+
let remoteTail = decodeText(remoteBody.subarray(baseLength));
|
|
249
|
+
if (base === null || localTail === null || remoteTail === null)
|
|
250
|
+
return null;
|
|
251
|
+
let mergedBase = base;
|
|
252
|
+
if (base !== "" && !/[\r\n]$/.test(base)) {
|
|
253
|
+
// The synced body ended mid-line. Both sides must have ended that line
|
|
254
|
+
// with the same newline before appending; anything else is a line edit.
|
|
255
|
+
const localEol = /^(\r\n|\n|\r)/.exec(localTail)?.[1];
|
|
256
|
+
const remoteEol = /^(\r\n|\n|\r)/.exec(remoteTail)?.[1];
|
|
257
|
+
if (localTail === "" || remoteTail === "") {
|
|
258
|
+
// One side kept the synced body unchanged; the other is a pure append.
|
|
259
|
+
}
|
|
260
|
+
else if (!localEol || localEol !== remoteEol) {
|
|
261
|
+
return null;
|
|
262
|
+
}
|
|
263
|
+
else {
|
|
264
|
+
mergedBase = base + localEol;
|
|
265
|
+
localTail = localTail.slice(localEol.length);
|
|
266
|
+
remoteTail = remoteTail.slice(localEol.length);
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
const localLevel = entryLevel(localTail);
|
|
270
|
+
const remoteLevel = entryLevel(remoteTail);
|
|
271
|
+
const level = localLevel === null ? remoteLevel : remoteLevel === null ? localLevel : Math.min(localLevel, remoteLevel);
|
|
272
|
+
const local = splitBlocks(localTail, level);
|
|
273
|
+
const remote = splitBlocks(remoteTail, level);
|
|
274
|
+
const localLeadKey = normalize(local.lead);
|
|
275
|
+
const remoteLeadKey = normalize(remote.lead);
|
|
276
|
+
// A heading both sides added with different bodies is an edit conflict.
|
|
277
|
+
const remoteByHeading = new Map();
|
|
278
|
+
for (const block of remote.blocks) {
|
|
279
|
+
const keys = remoteByHeading.get(block.heading) ?? new Set();
|
|
280
|
+
keys.add(block.key);
|
|
281
|
+
remoteByHeading.set(block.heading, keys);
|
|
282
|
+
}
|
|
283
|
+
for (const block of local.blocks) {
|
|
284
|
+
const keys = remoteByHeading.get(block.heading);
|
|
285
|
+
if (keys && !keys.has(block.key))
|
|
286
|
+
return null;
|
|
287
|
+
}
|
|
288
|
+
// Lines appended under the last synced entry (the lead). Two machines may
|
|
289
|
+
// append the same line independently (`- ok`), and those must both be kept
|
|
290
|
+
// on the first merge. A merge writes the cloud lead first and the local lead
|
|
291
|
+
// after it, so this machine's own earlier merge (the journal stays on the
|
|
292
|
+
// base, see sync.ts) has a lead that is the cloud lead plus a continuation at
|
|
293
|
+
// a line boundary. Only that shape, local = remote lead + more lines, counts
|
|
294
|
+
// as "local already holds the cloud lead"; without it every repeat merge
|
|
295
|
+
// would prepend the cloud lead again. The mirror shape (cloud lead = local
|
|
296
|
+
// lead + more lines) is how two independent appends look, so there a lead is
|
|
297
|
+
// held only when both are equal. A recorded earlier merge with no verified
|
|
298
|
+
// base may match by line prefix in either direction.
|
|
299
|
+
const leadEquals = (held, added) => added === "" || held === added;
|
|
300
|
+
const leadExtends = (held, added) => held.startsWith(`${added}\n`);
|
|
301
|
+
const strictLead = verified !== null;
|
|
302
|
+
const localLeadHoldsRemote = () => leadEquals(localLeadKey, remoteLeadKey) || leadExtends(localLeadKey, remoteLeadKey);
|
|
303
|
+
const remoteLeadHoldsLocal = () => leadEquals(remoteLeadKey, localLeadKey) || (!strictLead && leadExtends(remoteLeadKey, localLeadKey));
|
|
304
|
+
const localHoldsRemote = localLeadHoldsRemote() && holdsAll(local.blocks, remote.blocks);
|
|
305
|
+
const remoteHoldsLocal = remoteLeadHoldsLocal() && holdsAll(remote.blocks, local.blocks);
|
|
306
|
+
// Without a verified base, the only safe outcome is keeping a local body
|
|
307
|
+
// this machine already recorded as synced (its own earlier merge, held for
|
|
308
|
+
// the push leg) that holds every cloud entry. Anything else could hide an
|
|
309
|
+
// edit or a deletion on one side.
|
|
310
|
+
if (verified === null) {
|
|
311
|
+
const localIsJournalled = typeof baseHash === "string" &&
|
|
312
|
+
createHash("sha256").update(localBody).digest("hex") === baseHash.toLowerCase();
|
|
313
|
+
// A cloud body that is a strict prefix of local is not "held": someone
|
|
314
|
+
// deleted the tail entries in the cloud, and keeping local would push them
|
|
315
|
+
// back. Leave that to the ordinary keep-newer/park rule.
|
|
316
|
+
const cloudCutTail = remoteBody.length < localBody.length && localBody.subarray(0, remoteBody.length).equals(remoteBody);
|
|
317
|
+
return localIsJournalled && localHoldsRemote && !cloudCutTail ? localBody : null;
|
|
318
|
+
}
|
|
319
|
+
// A superset in a different order is not an extension of the cloud
|
|
320
|
+
// writer's base. Rebuild it cloud-first rather than publishing that order.
|
|
321
|
+
if (localHoldsRemote && extendsBody(remoteBody, localBody))
|
|
322
|
+
return localBody;
|
|
323
|
+
if (remoteHoldsLocal)
|
|
324
|
+
return remoteBody;
|
|
325
|
+
const eol = eolOf(base || remoteTail || localTail);
|
|
326
|
+
let lead;
|
|
327
|
+
if (remoteLeadHoldsLocal())
|
|
328
|
+
lead = remote.lead;
|
|
329
|
+
else if (localLeadHoldsRemote())
|
|
330
|
+
lead = local.lead;
|
|
331
|
+
else
|
|
332
|
+
lead = terminated(remote.lead, eol) + local.lead;
|
|
333
|
+
// Drop the local blocks the cloud added identically (each cloud block
|
|
334
|
+
// absorbs at most one local copy).
|
|
335
|
+
const remaining = new Map();
|
|
336
|
+
for (const block of remote.blocks)
|
|
337
|
+
remaining.set(block.key, (remaining.get(block.key) ?? 0) + 1);
|
|
338
|
+
const localOnly = local.blocks.filter((block) => {
|
|
339
|
+
const count = remaining.get(block.key) ?? 0;
|
|
340
|
+
if (count === 0)
|
|
341
|
+
return true;
|
|
342
|
+
remaining.set(block.key, count - 1);
|
|
343
|
+
return false;
|
|
344
|
+
});
|
|
345
|
+
// Preserve the previous cloud writer's journal base for its next append.
|
|
346
|
+
// Timestamp interleaving inserts bytes into that base and invalidates it.
|
|
347
|
+
const ordered = [...remote.blocks, ...localOnly];
|
|
348
|
+
let out = mergedBase + lead;
|
|
349
|
+
for (const block of ordered)
|
|
350
|
+
out = terminated(out, eol) + block.text;
|
|
351
|
+
const merged = Buffer.from(out, "utf8");
|
|
352
|
+
if (merged.equals(remoteBody))
|
|
353
|
+
return remoteBody;
|
|
354
|
+
if (merged.equals(localBody))
|
|
355
|
+
return localBody;
|
|
356
|
+
return merged;
|
|
357
|
+
}
|
|
358
|
+
/**
|
|
359
|
+
* Write a merged log over `file`, but only while it still holds `expected`, the
|
|
360
|
+
* body the merge read. A merge that only adds bytes after the local body is
|
|
361
|
+
* appended in place (the file is never replaced, so a program holding it open
|
|
362
|
+
* keeps writing to it). Any other merge replaces the file, and only for
|
|
363
|
+
* `.md`, `.markdown` and `.txt`: a `.log` that would need replacing returns
|
|
364
|
+
* "changed" and is left alone.
|
|
365
|
+
*
|
|
366
|
+
* The replace keeps the file's permission bits. It records the file's size,
|
|
367
|
+
* mtime and inode when the body is read, writes a sibling temp file, and
|
|
368
|
+
* immediately before the rename checks again that the size, mtime, inode and
|
|
369
|
+
* the bytes (a full compare) are unchanged; on any difference the temp file is
|
|
370
|
+
* removed and "changed" is returned, so the next pass merges from the new body.
|
|
371
|
+
* A rename cannot be made conditional on the target, so a write landing
|
|
372
|
+
* between that last check and the rename (microseconds) still goes to the
|
|
373
|
+
* replaced inode. That window is accepted for files that are edited, not
|
|
374
|
+
* streamed, and is why `.log` is never replaced.
|
|
375
|
+
*
|
|
376
|
+
* Returns "changed" when another writer changed the file first. Filesystem
|
|
377
|
+
* failures are thrown.
|
|
378
|
+
*/
|
|
379
|
+
export function writeAppendLogMerge(file, expected, merged) {
|
|
380
|
+
if (extendsBody(expected, merged))
|
|
381
|
+
return appendIfUnchanged(file, expected, merged);
|
|
382
|
+
if (isInPlaceOnlyPath(file))
|
|
383
|
+
return "changed";
|
|
384
|
+
return replaceKeepingMode(file, expected, merged);
|
|
385
|
+
}
|
|
386
|
+
function replaceKeepingMode(file, expected, merged) {
|
|
387
|
+
const before = fs.lstatSync(file);
|
|
388
|
+
if (!before.isFile())
|
|
389
|
+
return "changed";
|
|
390
|
+
const unchanged = () => {
|
|
391
|
+
const now = fs.lstatSync(file);
|
|
392
|
+
return (now.isFile() &&
|
|
393
|
+
now.ino === before.ino &&
|
|
394
|
+
now.size === before.size &&
|
|
395
|
+
now.mtimeMs === before.mtimeMs &&
|
|
396
|
+
fs.readFileSync(file).equals(expected));
|
|
397
|
+
};
|
|
398
|
+
if (!unchanged())
|
|
399
|
+
return "changed";
|
|
400
|
+
// `.__hqpo` is a sync-ignored machine-local suffix, so the temp is never pushed.
|
|
401
|
+
const tmp = path.join(path.dirname(file), `${path.basename(file)}.merge-${process.pid}.__hqpo`);
|
|
402
|
+
try {
|
|
403
|
+
const fd = fs.openSync(tmp, "w", before.mode & 0o7777);
|
|
404
|
+
try {
|
|
405
|
+
fs.writeFileSync(fd, merged);
|
|
406
|
+
fs.fsyncSync(fd);
|
|
407
|
+
}
|
|
408
|
+
finally {
|
|
409
|
+
fs.closeSync(fd);
|
|
410
|
+
}
|
|
411
|
+
fs.chmodSync(tmp, before.mode & 0o7777);
|
|
412
|
+
if (!unchanged()) {
|
|
413
|
+
fs.rmSync(tmp, { force: true });
|
|
414
|
+
return "changed";
|
|
415
|
+
}
|
|
416
|
+
fs.renameSync(tmp, file);
|
|
417
|
+
}
|
|
418
|
+
catch (error) {
|
|
419
|
+
fs.rmSync(tmp, { force: true });
|
|
420
|
+
throw error;
|
|
421
|
+
}
|
|
422
|
+
return "appended";
|
|
423
|
+
}
|
|
424
|
+
//# sourceMappingURL=append-log-merge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"append-log-merge.js","sourceRoot":"","sources":["../../src/lib/append-log-merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -106,6 +106,25 @@ export declare class SamePathUploadSupersededError extends Error {
|
|
|
106
106
|
}
|
|
107
107
|
/** Intents older than this are ignored and their files removed. */
|
|
108
108
|
export declare const UPLOAD_INTENT_MAX_AGE_MS: number;
|
|
109
|
+
/**
|
|
110
|
+
* How close the remote object's LastModified must be to an intent's recorded
|
|
111
|
+
* time for the object to count as that upload. The intent is written before the
|
|
112
|
+
* PUT, and S3 stamps the object when the PUT is received, so LastModified
|
|
113
|
+
* normally trails the intent by seconds (longer for a large body on a slow
|
|
114
|
+
* link). A small negative allowance covers clock skew between this machine and
|
|
115
|
+
* S3. A byte-identical object outside this window is a peer's write, not ours.
|
|
116
|
+
*
|
|
117
|
+
* Why +10 min / -2 min: the intent is written before the PUT starts. S3 stamps
|
|
118
|
+
* a single PUT when the request arrives, so LastModified trails the intent by
|
|
119
|
+
* the time to connect. A multipart upload is stamped at initiation, before any
|
|
120
|
+
* part is sent, so it is also close to the intent however long the parts take.
|
|
121
|
+
* +10 min leaves room for a slow start or retry before the stamp; -2 min
|
|
122
|
+
* covers clock skew. Missing the window is safe: the pull or push falls
|
|
123
|
+
* through to the normal path, which parks a conflict copy and raises a notice
|
|
124
|
+
* instead of adopting the object.
|
|
125
|
+
*/
|
|
126
|
+
export declare const UPLOAD_INTENT_MATCH_AFTER_MS: number;
|
|
127
|
+
export declare const UPLOAD_INTENT_MATCH_BEFORE_MS: number;
|
|
109
128
|
export interface UploadIntentToken {
|
|
110
129
|
file: string;
|
|
111
130
|
id: number;
|
|
@@ -132,8 +151,15 @@ export declare function settleUploadIntent(token: UploadIntentToken | undefined)
|
|
|
132
151
|
* this machine recorded for `scope`, if one exists. `notBeforeMs` is the time
|
|
133
152
|
* the caller's journal row was written: an intent older than that row has
|
|
134
153
|
* already been accounted for and is ignored.
|
|
154
|
+
*
|
|
155
|
+
* `remoteLastModifiedMs` is the LastModified of the remote object being
|
|
156
|
+
* explained. Only an intent recorded close to it (see UPLOAD_INTENT_MATCH_*)
|
|
157
|
+
* matches: within the 7-day window a peer can re-upload byte-identical
|
|
158
|
+
* content, and adopting that as our own write would let a local edit replace
|
|
159
|
+
* it without a conflict. `null` (LastModified unknown) never matches, so the
|
|
160
|
+
* caller falls through to the normal conflict path.
|
|
135
161
|
*/
|
|
136
|
-
export declare function findUploadIntent(scope: string, relativePath: string, hash: string, notBeforeMs
|
|
162
|
+
export declare function findUploadIntent(scope: string, relativePath: string, hash: string, notBeforeMs: number | undefined, remoteLastModifiedMs: number | null): UploadIntent | undefined;
|
|
137
163
|
export declare const _testing: {
|
|
138
164
|
/** Drop every in-memory record, as if the process died. Files stay. */
|
|
139
165
|
reset(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"same-path-upload-lock.d.ts","sourceRoot":"","sources":["../../src/lib/same-path-upload-lock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAOH,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAC/C,gFAAgF;AAChF,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,gDAAgD;AAChD,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAI9C,wBAAgB,iCAAiC,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAE9E;AAKD;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,eAAe,GAAE,OAAmC,GACnD,MAAM,CAIR;AAED,wDAAwD;AACxD,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB,2EAA2E;IAC3E,SAAS,EAAE,aAAa,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AA0BD,mFAAmF;AACnF,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GACX,YAAY,GAAG,SAAS,CAW1B;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,GACtB,YAAY,GAAG,SAAS,CA2B1B;AAED;;;GAGG;AACH,qBAAa,kBAAkB;IAS3B,QAAQ,CAAC,GAAG,EAAE,MAAM;IACpB,QAAQ,CAAC,YAAY,EAAE,MAAM;IAT/B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,gBAAgB,CAAS;IACjC,2EAA2E;IAC3E,OAAO,CAAC,QAAQ,CAAS;IACzB,gEAAgE;IAChE,OAAO,CAAC,OAAO,CAAK;gBAGT,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM;IAG/B,oDAAoD;IACpD,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,IAAI,IAAI,IAAI,OAAO,CAElB;IAED;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAmD9B,oDAAoD;IACpD,OAAO,IAAI,IAAI;IAef,2DAA2D;IAC3D,UAAU,IAAI,OAAO;IAMrB,oEAAoE;IACpE,QAAQ,IAAI,MAAM;IAIlB,sEAAsE;IACtE,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIjC,gDAAgD;IAChD,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;CAmBzC;AAED,0EAA0E;AAC1E,qBAAa,6BAA8B,SAAQ,KAAK;IAC1C,QAAQ,CAAC,YAAY,EAAE,MAAM;gBAApB,YAAY,EAAE,MAAM;CAI1C;AAeD,mEAAmE;AACnE,eAAO,MAAM,wBAAwB,QAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"same-path-upload-lock.d.ts","sourceRoot":"","sources":["../../src/lib/same-path-upload-lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -268,6 +268,25 @@ export class SamePathUploadSupersededError extends Error {
|
|
|
268
268
|
// survives a killed process.
|
|
269
269
|
/** Intents older than this are ignored and their files removed. */
|
|
270
270
|
export const UPLOAD_INTENT_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
|
|
271
|
+
/**
|
|
272
|
+
* How close the remote object's LastModified must be to an intent's recorded
|
|
273
|
+
* time for the object to count as that upload. The intent is written before the
|
|
274
|
+
* PUT, and S3 stamps the object when the PUT is received, so LastModified
|
|
275
|
+
* normally trails the intent by seconds (longer for a large body on a slow
|
|
276
|
+
* link). A small negative allowance covers clock skew between this machine and
|
|
277
|
+
* S3. A byte-identical object outside this window is a peer's write, not ours.
|
|
278
|
+
*
|
|
279
|
+
* Why +10 min / -2 min: the intent is written before the PUT starts. S3 stamps
|
|
280
|
+
* a single PUT when the request arrives, so LastModified trails the intent by
|
|
281
|
+
* the time to connect. A multipart upload is stamped at initiation, before any
|
|
282
|
+
* part is sent, so it is also close to the intent however long the parts take.
|
|
283
|
+
* +10 min leaves room for a slow start or retry before the stamp; -2 min
|
|
284
|
+
* covers clock skew. Missing the window is safe: the pull or push falls
|
|
285
|
+
* through to the normal path, which parks a conflict copy and raises a notice
|
|
286
|
+
* instead of adopting the object.
|
|
287
|
+
*/
|
|
288
|
+
export const UPLOAD_INTENT_MATCH_AFTER_MS = 10 * 60 * 1000;
|
|
289
|
+
export const UPLOAD_INTENT_MATCH_BEFORE_MS = 2 * 60 * 1000;
|
|
271
290
|
/** Compact a live intent file once it holds this many settled lines. */
|
|
272
291
|
const UPLOAD_INTENT_COMPACT_LINES = 64;
|
|
273
292
|
const SHA256_HEX_RE = /^[a-f0-9]{64}$/;
|
|
@@ -355,8 +374,17 @@ export function settleUploadIntent(token) {
|
|
|
355
374
|
* this machine recorded for `scope`, if one exists. `notBeforeMs` is the time
|
|
356
375
|
* the caller's journal row was written: an intent older than that row has
|
|
357
376
|
* already been accounted for and is ignored.
|
|
377
|
+
*
|
|
378
|
+
* `remoteLastModifiedMs` is the LastModified of the remote object being
|
|
379
|
+
* explained. Only an intent recorded close to it (see UPLOAD_INTENT_MATCH_*)
|
|
380
|
+
* matches: within the 7-day window a peer can re-upload byte-identical
|
|
381
|
+
* content, and adopting that as our own write would let a local edit replace
|
|
382
|
+
* it without a conflict. `null` (LastModified unknown) never matches, so the
|
|
383
|
+
* caller falls through to the normal conflict path.
|
|
358
384
|
*/
|
|
359
|
-
export function findUploadIntent(scope, relativePath, hash, notBeforeMs) {
|
|
385
|
+
export function findUploadIntent(scope, relativePath, hash, notBeforeMs, remoteLastModifiedMs) {
|
|
386
|
+
if (remoteLastModifiedMs === null || !Number.isFinite(remoteLastModifiedMs))
|
|
387
|
+
return undefined;
|
|
360
388
|
if (!SHA256_HEX_RE.test(hash))
|
|
361
389
|
return undefined;
|
|
362
390
|
const dir = uploadIntentDir();
|
|
@@ -408,6 +436,9 @@ export function findUploadIntent(scope, relativePath, hash, notBeforeMs) {
|
|
|
408
436
|
continue;
|
|
409
437
|
if (notBeforeMs !== undefined && parsed.t <= notBeforeMs)
|
|
410
438
|
continue;
|
|
439
|
+
const lag = remoteLastModifiedMs - parsed.t;
|
|
440
|
+
if (lag < -UPLOAD_INTENT_MATCH_BEFORE_MS || lag > UPLOAD_INTENT_MATCH_AFTER_MS)
|
|
441
|
+
continue;
|
|
411
442
|
if (!best || parsed.t > best.recordedAtMs) {
|
|
412
443
|
best = { relativePath, hash, recordedAtMs: parsed.t };
|
|
413
444
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"same-path-upload-lock.js","sourceRoot":"","sources":["../../src/lib/same-path-upload-lock.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"same-path-upload-lock.js","sourceRoot":"","sources":["../../src/lib/same-path-upload-lock.ts"],"names":[],"mappings":"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"}
|