@paradigma-inc/flywheel 0.2.19 → 0.2.20
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/package.json +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/fs/writer-lock.js +20 -9
- package/src/runtime/vendor/flywheel-cli-dist/local/fs/writer-lock.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/bootstrap.js +163 -85
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/bootstrap.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/dispatch.js +103 -6
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/dispatch.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/remote/clone.js +14 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/remote/clone.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/remote/pull.js +53 -18
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/remote/pull.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/remote/push.js +44 -15
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/remote/push.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/objects.js +29 -0
- package/src/runtime/vendor/flywheel-cli-dist/local/store/objects.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/prepared-objects.js +46 -0
- package/src/runtime/vendor/flywheel-cli-dist/local/store/prepared-objects.js.map +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/store.js +58 -7
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/store.js.map +1 -1
- package/src/runtime/vendor/manifest.json +3 -1
package/package.json
CHANGED
|
@@ -89,9 +89,8 @@ function acquireLock(fd) {
|
|
|
89
89
|
throw error;
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
|
-
/**
|
|
93
|
-
export async function
|
|
94
|
-
const state = RetainedRepositoryState.open(rootPath);
|
|
92
|
+
/** Acquires the run/writer-file locks on an already-open state for one mutation and completes it before releasing, leaving open/close to the caller. */
|
|
93
|
+
export async function withWriterLock(state, callback) {
|
|
95
94
|
let stateLocked = false;
|
|
96
95
|
let runFd = -1;
|
|
97
96
|
let writerFd = -1;
|
|
@@ -170,18 +169,30 @@ export async function withRepositoryWriter(rootPath, callback) {
|
|
|
170
169
|
captureCleanupError(error);
|
|
171
170
|
}
|
|
172
171
|
}
|
|
173
|
-
try {
|
|
174
|
-
state.close();
|
|
175
|
-
}
|
|
176
|
-
catch (error) {
|
|
177
|
-
captureCleanupError(error);
|
|
178
|
-
}
|
|
179
172
|
if (operationFailed)
|
|
180
173
|
throw operationError;
|
|
181
174
|
if (cleanupFailed)
|
|
182
175
|
throw cleanupError;
|
|
183
176
|
return result;
|
|
184
177
|
}
|
|
178
|
+
/** Opens, locks, and closes one repository state for exactly one mutation. */
|
|
179
|
+
export async function withRepositoryWriter(rootPath, callback) {
|
|
180
|
+
const state = RetainedRepositoryState.open(rootPath);
|
|
181
|
+
let result;
|
|
182
|
+
try {
|
|
183
|
+
result = await withWriterLock(state, callback);
|
|
184
|
+
}
|
|
185
|
+
catch (error) {
|
|
186
|
+
// Swallow a close failure here: the operation's own error is more informative.
|
|
187
|
+
try {
|
|
188
|
+
state.close();
|
|
189
|
+
}
|
|
190
|
+
catch { /* ignored */ }
|
|
191
|
+
throw error;
|
|
192
|
+
}
|
|
193
|
+
state.close();
|
|
194
|
+
return result;
|
|
195
|
+
}
|
|
185
196
|
/** Holds the persistent sidecar writer lock used before a repository state directory exists. */
|
|
186
197
|
export async function withBootstrapWriter(rootPath, callback) {
|
|
187
198
|
const requestedRoot = resolve(rootPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writer-lock.js","sourceRoot":"","sources":["../../../src/local/fs/writer-lock.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"writer-lock.js","sourceRoot":"","sources":["../../../src/local/fs/writer-lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ import { migrateLocalRepository } from "../store/migrate.js";
|
|
|
12
12
|
import { RepositoryObjectStorage } from "../store/objects.js";
|
|
13
13
|
import { SQLiteRepositoryStore } from "../store/sqlite/store.js";
|
|
14
14
|
import { isUuid } from "../domain/models/constants.js";
|
|
15
|
-
import {
|
|
15
|
+
import { applyPreparedClone, prepareClone } from "./remote/clone.js";
|
|
16
16
|
import { localRuntimeIdentity } from "./identity.js";
|
|
17
17
|
function hasCode(error, code) {
|
|
18
18
|
return typeof error === "object" && error !== null && "code" in error && error.code === code;
|
|
@@ -33,108 +33,187 @@ export async function bootstrapRepository(operation, args, connection) {
|
|
|
33
33
|
const requestedTarget = args.directory;
|
|
34
34
|
mkdirSync(dirname(requestedTarget), { recursive: true, mode: 0o700 });
|
|
35
35
|
const target = requestedTarget;
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
if (!clone)
|
|
37
|
+
return withBootstrapWriter(target, () => installBootstrap(target, args));
|
|
38
|
+
return cloneBootstrap(target, args, connection);
|
|
39
|
+
}
|
|
40
|
+
function bootstrapLockDescriptor(target) {
|
|
41
|
+
const lockRoot = join(realpathSync(dirname(target)), basename(target));
|
|
42
|
+
return { path: join(dirname(lockRoot), ".flywheel-runtime-locks", `${createHash("sha256").update(lockRoot).digest("hex")}.lock`), retained: true };
|
|
43
|
+
}
|
|
44
|
+
/** Initializes a fresh (or adopted) local repository; fully local, so the whole flow stays under the bootstrap lock. */
|
|
45
|
+
async function installBootstrap(target, args) {
|
|
46
|
+
const bootstrapLock = bootstrapLockDescriptor(target);
|
|
47
|
+
const staging = RetainedPrivateDirectory.create(dirname(target), ".flywheel-bootstrap-");
|
|
48
|
+
let targetFd = -1;
|
|
49
|
+
try {
|
|
41
50
|
try {
|
|
51
|
+
const entry = statAt(staging.parentFd, basename(target));
|
|
52
|
+
if ((entry.mode & 0o170000) !== 0o040000)
|
|
53
|
+
throw new Error("repository_target_not_empty");
|
|
54
|
+
targetFd = openDirectoryAt(staging.parentFd, basename(target));
|
|
55
|
+
const opened = fstat(targetFd);
|
|
56
|
+
if (entry.dev !== opened.dev || entry.ino !== opened.ino)
|
|
57
|
+
throw new Error("repository_target_not_empty");
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
if (!hasCode(error, "ENOENT"))
|
|
61
|
+
throw error;
|
|
62
|
+
}
|
|
63
|
+
if (targetFd >= 0) {
|
|
64
|
+
let initialized = false;
|
|
42
65
|
try {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
throw new Error("repository_target_not_empty");
|
|
46
|
-
targetFd = openDirectoryAt(staging.parentFd, basename(target));
|
|
47
|
-
const opened = fstat(targetFd);
|
|
48
|
-
if (entry.dev !== opened.dev || entry.ino !== opened.ino)
|
|
49
|
-
throw new Error("repository_target_not_empty");
|
|
50
|
-
if (clone && listDirectory(targetFd).length !== 0)
|
|
51
|
-
throw new Error("repository_target_not_empty");
|
|
66
|
+
statAt(targetFd, ".flywheel");
|
|
67
|
+
initialized = true;
|
|
52
68
|
}
|
|
53
69
|
catch (error) {
|
|
54
70
|
if (!hasCode(error, "ENOENT"))
|
|
55
71
|
throw error;
|
|
56
72
|
}
|
|
57
|
-
if (
|
|
58
|
-
|
|
73
|
+
if (initialized) {
|
|
74
|
+
if (args.adopt !== true)
|
|
75
|
+
throw new Error("repository_already_initialized");
|
|
59
76
|
try {
|
|
60
|
-
|
|
61
|
-
|
|
77
|
+
const identity = await withRepositoryWriter(target, state => migrateLocalRepository(state));
|
|
78
|
+
return { path: target, repository_id: identity.repositoryId, client_id: identity.clientId, adopted: true, bootstrap_lock: bootstrapLock };
|
|
62
79
|
}
|
|
63
80
|
catch (error) {
|
|
64
|
-
|
|
65
|
-
throw error;
|
|
66
|
-
}
|
|
67
|
-
if (initialized) {
|
|
68
|
-
if (args.adopt !== true)
|
|
69
|
-
throw new Error("repository_already_initialized");
|
|
70
|
-
try {
|
|
71
|
-
const identity = await withRepositoryWriter(target, state => migrateLocalRepository(state));
|
|
72
|
-
return { path: target, repository_id: identity.repositoryId, client_id: identity.clientId, adopted: true, bootstrap_lock: bootstrapLock };
|
|
73
|
-
}
|
|
74
|
-
catch (error) {
|
|
75
|
-
throw new Error("repository_adoption_invalid", { cause: error });
|
|
76
|
-
}
|
|
81
|
+
throw new Error("repository_adoption_invalid", { cause: error });
|
|
77
82
|
}
|
|
78
83
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
84
|
+
}
|
|
85
|
+
mkdirAt(staging.fd, ".flywheel", 0o700);
|
|
86
|
+
const state = RetainedRepositoryState.open(staging.path);
|
|
87
|
+
const repositoryId = randomUUID();
|
|
88
|
+
const clientId = randomUUID();
|
|
89
|
+
try {
|
|
90
|
+
const objects = new RepositoryObjectStorage(state);
|
|
91
|
+
const store = new SQLiteRepositoryStore(state, objects);
|
|
92
|
+
store.initialize(repositoryId, clientId);
|
|
93
|
+
state.assertValid();
|
|
94
|
+
fsync(state.stateFd);
|
|
95
|
+
}
|
|
96
|
+
finally {
|
|
97
|
+
state.close();
|
|
98
|
+
}
|
|
99
|
+
staging.assertCurrent("repository_bootstrap_target_replaced");
|
|
100
|
+
installStaging(staging, targetFd, target, false);
|
|
101
|
+
return { path: target, repository_id: repositoryId, client_id: clientId, bootstrap_lock: bootstrapLock };
|
|
102
|
+
}
|
|
103
|
+
finally {
|
|
104
|
+
try {
|
|
105
|
+
if (targetFd >= 0)
|
|
106
|
+
close(targetFd);
|
|
107
|
+
}
|
|
108
|
+
finally {
|
|
109
|
+
staging.finish();
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Clones a fresh repository. The network fetch and the resulting local snapshot are built inside
|
|
115
|
+
* a private staging directory before the bootstrap lock is ever acquired, matching the same
|
|
116
|
+
* private-directory safety the reads already have. The lock then wraps only the final atomic
|
|
117
|
+
* install: re-verifying the target is still available and renaming staging into place.
|
|
118
|
+
*/
|
|
119
|
+
async function cloneBootstrap(target, args, connection) {
|
|
120
|
+
const bootstrapLock = bootstrapLockDescriptor(target);
|
|
121
|
+
const staging = RetainedPrivateDirectory.create(dirname(target), ".flywheel-bootstrap-");
|
|
122
|
+
let targetFd = -1;
|
|
123
|
+
try {
|
|
124
|
+
try {
|
|
125
|
+
const entry = statAt(staging.parentFd, basename(target));
|
|
126
|
+
if ((entry.mode & 0o170000) !== 0o040000)
|
|
127
|
+
throw new Error("repository_target_not_empty");
|
|
128
|
+
targetFd = openDirectoryAt(staging.parentFd, basename(target));
|
|
129
|
+
const opened = fstat(targetFd);
|
|
130
|
+
if (entry.dev !== opened.dev || entry.ino !== opened.ino)
|
|
131
|
+
throw new Error("repository_target_not_empty");
|
|
132
|
+
if (listDirectory(targetFd).length !== 0)
|
|
133
|
+
throw new Error("repository_target_not_empty");
|
|
134
|
+
}
|
|
135
|
+
catch (error) {
|
|
136
|
+
if (!hasCode(error, "ENOENT"))
|
|
137
|
+
throw error;
|
|
138
|
+
}
|
|
139
|
+
if (targetFd >= 0) {
|
|
140
|
+
let initialized = false;
|
|
97
141
|
try {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
const installed = statAt(staging.parentFd, basename(target));
|
|
101
|
-
const original = fstat(staging.fd);
|
|
102
|
-
if (installed.dev !== original.dev || installed.ino !== original.ino)
|
|
103
|
-
throw new Error("repository_bootstrap_target_replaced");
|
|
104
|
-
staging.transfer();
|
|
105
|
-
}
|
|
106
|
-
else {
|
|
107
|
-
const named = statAt(staging.parentFd, basename(target));
|
|
108
|
-
const retained = fstat(targetFd);
|
|
109
|
-
if (named.dev !== retained.dev || named.ino !== retained.ino)
|
|
110
|
-
throw new Error("repository_bootstrap_target_replaced");
|
|
111
|
-
if (clone && listDirectory(targetFd).length !== 0)
|
|
112
|
-
throw new Error("repository_target_not_empty");
|
|
113
|
-
renameNoReplaceAt(staging.fd, ".flywheel", targetFd, ".flywheel");
|
|
114
|
-
fsync(targetFd);
|
|
115
|
-
}
|
|
142
|
+
statAt(targetFd, ".flywheel");
|
|
143
|
+
initialized = true;
|
|
116
144
|
}
|
|
117
145
|
catch (error) {
|
|
118
|
-
if (hasCode(error, "
|
|
119
|
-
throw
|
|
120
|
-
if (hasCode(error, "ENOSYS") || hasCode(error, "EINVAL"))
|
|
121
|
-
throw new Error("repository_bootstrap_target_install_unsupported", { cause: error });
|
|
122
|
-
throw error;
|
|
146
|
+
if (!hasCode(error, "ENOENT"))
|
|
147
|
+
throw error;
|
|
123
148
|
}
|
|
124
|
-
|
|
125
|
-
|
|
149
|
+
if (initialized)
|
|
150
|
+
throw new Error("repository_already_initialized");
|
|
151
|
+
}
|
|
152
|
+
mkdirAt(staging.fd, ".flywheel", 0o700);
|
|
153
|
+
const state = RetainedRepositoryState.open(staging.path);
|
|
154
|
+
const repositoryId = args.repository_id;
|
|
155
|
+
const clientId = randomUUID();
|
|
156
|
+
let cloneResult;
|
|
157
|
+
try {
|
|
158
|
+
const objects = new RepositoryObjectStorage(state);
|
|
159
|
+
const store = new SQLiteRepositoryStore(state, objects);
|
|
160
|
+
store.initialize(repositoryId, clientId);
|
|
161
|
+
const context = { state, objects, store, repositoryId, clientId };
|
|
162
|
+
const prepared = await prepareClone(context, { object_mode: args.object_mode }, connection);
|
|
163
|
+
cloneResult = await applyPreparedClone(context, prepared, connection);
|
|
164
|
+
state.assertValid();
|
|
165
|
+
fsync(state.stateFd);
|
|
166
|
+
}
|
|
167
|
+
finally {
|
|
168
|
+
state.close();
|
|
169
|
+
}
|
|
170
|
+
staging.assertCurrent("repository_bootstrap_target_replaced");
|
|
171
|
+
return await withBootstrapWriter(target, async () => {
|
|
172
|
+
installStaging(staging, targetFd, target, true);
|
|
126
173
|
return { path: target, repository_id: repositoryId, client_id: clientId, ...cloneResult, bootstrap_lock: bootstrapLock };
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
finally {
|
|
177
|
+
try {
|
|
178
|
+
if (targetFd >= 0)
|
|
179
|
+
close(targetFd);
|
|
127
180
|
}
|
|
128
181
|
finally {
|
|
129
|
-
|
|
130
|
-
if (targetFd >= 0)
|
|
131
|
-
close(targetFd);
|
|
132
|
-
}
|
|
133
|
-
finally {
|
|
134
|
-
staging.finish();
|
|
135
|
-
}
|
|
182
|
+
staging.finish();
|
|
136
183
|
}
|
|
137
|
-
}
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
/** Renames a fully-built staging directory into its final target; re-verifies target identity right before the write. */
|
|
187
|
+
function installStaging(staging, targetFd, target, enforceEmpty) {
|
|
188
|
+
try {
|
|
189
|
+
if (targetFd < 0) {
|
|
190
|
+
renameNoReplaceAt(staging.parentFd, staging.name, staging.parentFd, basename(target));
|
|
191
|
+
const installed = statAt(staging.parentFd, basename(target));
|
|
192
|
+
const original = fstat(staging.fd);
|
|
193
|
+
if (installed.dev !== original.dev || installed.ino !== original.ino)
|
|
194
|
+
throw new Error("repository_bootstrap_target_replaced");
|
|
195
|
+
staging.transfer();
|
|
196
|
+
}
|
|
197
|
+
else {
|
|
198
|
+
const named = statAt(staging.parentFd, basename(target));
|
|
199
|
+
const retained = fstat(targetFd);
|
|
200
|
+
if (named.dev !== retained.dev || named.ino !== retained.ino)
|
|
201
|
+
throw new Error("repository_bootstrap_target_replaced");
|
|
202
|
+
if (enforceEmpty && listDirectory(targetFd).length !== 0)
|
|
203
|
+
throw new Error("repository_target_not_empty");
|
|
204
|
+
renameNoReplaceAt(staging.fd, ".flywheel", targetFd, ".flywheel");
|
|
205
|
+
fsync(targetFd);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
catch (error) {
|
|
209
|
+
if (hasCode(error, "EEXIST") || hasCode(error, "ENOTEMPTY"))
|
|
210
|
+
throw new Error("repository_target_not_empty", { cause: error });
|
|
211
|
+
if (hasCode(error, "ENOSYS") || hasCode(error, "EINVAL"))
|
|
212
|
+
throw new Error("repository_bootstrap_target_install_unsupported", { cause: error });
|
|
213
|
+
throw error;
|
|
214
|
+
}
|
|
215
|
+
fsync(staging.parentFd);
|
|
216
|
+
staging.assertParentCurrent("repository_bootstrap_target_replaced");
|
|
138
217
|
}
|
|
139
218
|
async function restoreBootstrap(args) {
|
|
140
219
|
if (Object.keys(args).length !== 2 ||
|
|
@@ -169,10 +248,9 @@ async function restoreBootstrap(args) {
|
|
|
169
248
|
try {
|
|
170
249
|
const identity = readRepositoryIdentity(join(state.statePath, "db.sqlite"));
|
|
171
250
|
const head = withReadConnection(state, database => database.prepare("SELECT workspace_head_commit_id FROM repository_heads WHERE repository_id = ?").get(identity.repositoryId)?.workspace_head_commit_id);
|
|
172
|
-
const lockRoot = join(realpathSync(dirname(target)), basename(target));
|
|
173
251
|
return {
|
|
174
252
|
path: result.path, repository_id: identity.repositoryId, client_id: identity.clientId, head,
|
|
175
|
-
bootstrap_lock:
|
|
253
|
+
bootstrap_lock: bootstrapLockDescriptor(target),
|
|
176
254
|
};
|
|
177
255
|
}
|
|
178
256
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/local/runtime/bootstrap.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/local/runtime/bootstrap.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { join } from "node:path";
|
|
|
2
2
|
import { setTimeout as delay } from "node:timers/promises";
|
|
3
3
|
import { isDigest, isUuid } from "../domain/models/constants.js";
|
|
4
4
|
import { RetainedRepositoryState } from "../fs/state.js";
|
|
5
|
-
import { RepositoryWriteGateBusyError, withRepositoryWriter } from "../fs/writer-lock.js";
|
|
5
|
+
import { RepositoryWriteGateBusyError, withRepositoryWriter, withWriterLock } from "../fs/writer-lock.js";
|
|
6
6
|
import { diagnosticsPath, LocalDiagnosticWriter } from "../store/diagnostics.js";
|
|
7
7
|
import { migrateLocalRepository } from "../store/migrate.js";
|
|
8
8
|
import { readRepositoryIdentity } from "../store/migration/steps.js";
|
|
@@ -12,8 +12,8 @@ import { RepositoryBusyError } from "../store/sqlite/errors.js";
|
|
|
12
12
|
import { SQLiteRepositoryStore } from "../store/sqlite/store.js";
|
|
13
13
|
import { localRuntimeIdentity } from "./identity.js";
|
|
14
14
|
import { dispatchLocalOperation } from "./operations/index.js";
|
|
15
|
-
import { pullIntoStore } from "./remote/pull.js";
|
|
16
|
-
import { pushFromStore } from "./remote/push.js";
|
|
15
|
+
import { applyPreparedPull, discardPreparedPull, preparePull, pullIntoStore } from "./remote/pull.js";
|
|
16
|
+
import { applyPreparedPush, preparePush, pushFromStore } from "./remote/push.js";
|
|
17
17
|
import { purgeFromStore } from "./remote/purge.js";
|
|
18
18
|
import { randomUUID } from "node:crypto";
|
|
19
19
|
const MUTATIONS = {
|
|
@@ -28,6 +28,9 @@ const MIGRATION_REQUIRED = Symbol("repository_migration_required");
|
|
|
28
28
|
/** One command retains one state handle; nested helpers never reacquire its writer locks. */
|
|
29
29
|
export async function dispatchRepositoryCommand(rootPath, operation, args, options = {}) {
|
|
30
30
|
const runtimeIdentity = await localRuntimeIdentity();
|
|
31
|
+
if (operation === "pull" || operation === "push") {
|
|
32
|
+
return executeRemoteMutation(rootPath, operation, args, options, runtimeIdentity);
|
|
33
|
+
}
|
|
31
34
|
const mutates = Object.hasOwn(MUTATIONS, operation) || operation === "gc" && args.dry_run === false;
|
|
32
35
|
if (mutates)
|
|
33
36
|
return executeWriter(rootPath, operation, args, options, runtimeIdentity);
|
|
@@ -71,6 +74,93 @@ async function executeReader(rootPath, operation, args, options, runtimeIdentity
|
|
|
71
74
|
}
|
|
72
75
|
}
|
|
73
76
|
}
|
|
77
|
+
/**
|
|
78
|
+
* Pull and push fetch and negotiate over the network before ever touching the writer lock, then
|
|
79
|
+
* reacquire it only to apply the already-fetched result. Preconditions are re-validated fresh
|
|
80
|
+
* inside the lock immediately before the write (see preparePull/applyPreparedPull and
|
|
81
|
+
* preparePush/applyPreparedPush), so no check-then-act window opens across the network phase.
|
|
82
|
+
* A repository still mid-migration falls back to the fully-locked legacy path below, since
|
|
83
|
+
* migration itself must happen under the lock and is a rare, one-time cost per repository.
|
|
84
|
+
*/
|
|
85
|
+
async function executeRemoteMutation(rootPath, operation, args, options, runtimeIdentity) {
|
|
86
|
+
if (!options.connection)
|
|
87
|
+
throw new Error("repository credential is unavailable");
|
|
88
|
+
const connection = options.connection;
|
|
89
|
+
const state = RetainedRepositoryState.open(rootPath);
|
|
90
|
+
let success = false;
|
|
91
|
+
try {
|
|
92
|
+
const identity = readRepositoryIdentity(join(state.statePath, "db.sqlite"));
|
|
93
|
+
if (identity.userVersion === CURRENT_REPOSITORY_USER_VERSION) {
|
|
94
|
+
const objects = new RepositoryObjectStorage(state);
|
|
95
|
+
const store = new SQLiteRepositoryStore(state, objects);
|
|
96
|
+
const context = { state, objects, store, repositoryId: identity.repositoryId, clientId: identity.clientId };
|
|
97
|
+
let prepared;
|
|
98
|
+
try {
|
|
99
|
+
prepared = operation === "pull"
|
|
100
|
+
? await preparePull(context, args, connection)
|
|
101
|
+
: await preparePush(context, args, connection);
|
|
102
|
+
}
|
|
103
|
+
catch (error) {
|
|
104
|
+
// execute() only brackets the locked apply phase with "runtime_command" diagnostics; a
|
|
105
|
+
// prepare-phase failure (network error, invalid server response, hosted-association
|
|
106
|
+
// mismatch) never reaches it, so record the same start/failure pair here directly.
|
|
107
|
+
const diagnostics = new LocalDiagnosticWriter(options.diagnosticsPath ?? diagnosticsPath());
|
|
108
|
+
const requestId = isUuid(options.requestId) ? options.requestId : randomUUID();
|
|
109
|
+
const operationId = isUuid(args.operation_id) ? args.operation_id : undefined;
|
|
110
|
+
diagnostics.record({
|
|
111
|
+
repositoryId: identity.repositoryId, clientId: identity.clientId,
|
|
112
|
+
event: "runtime_command", requestId, operationId, fields: { operation },
|
|
113
|
+
});
|
|
114
|
+
diagnostics.record({
|
|
115
|
+
repositoryId: identity.repositoryId, clientId: identity.clientId,
|
|
116
|
+
event: "runtime_command_completed", requestId, operationId,
|
|
117
|
+
fields: { operation, outcome: "failure", failure_kind: "local_runtime_error" },
|
|
118
|
+
});
|
|
119
|
+
await diagnostics.close();
|
|
120
|
+
throw error;
|
|
121
|
+
}
|
|
122
|
+
try {
|
|
123
|
+
state.assertValid();
|
|
124
|
+
let result;
|
|
125
|
+
try {
|
|
126
|
+
result = await withWriterLock(state, lockedState => execute(lockedState, operation, args, options, true, runtimeIdentity, prepared));
|
|
127
|
+
}
|
|
128
|
+
catch (error) {
|
|
129
|
+
if (error instanceof RepositoryWriteGateBusyError) {
|
|
130
|
+
const diagnostics = new LocalDiagnosticWriter(options.diagnosticsPath ?? diagnosticsPath());
|
|
131
|
+
diagnostics.record({
|
|
132
|
+
repositoryId: identity.repositoryId, clientId: identity.clientId,
|
|
133
|
+
event: "repository_lock_contention", requestId: options.requestId,
|
|
134
|
+
fields: { operation, outcome: "failure", failure_kind: "repository_locked" },
|
|
135
|
+
});
|
|
136
|
+
await diagnostics.close();
|
|
137
|
+
}
|
|
138
|
+
throw error;
|
|
139
|
+
}
|
|
140
|
+
success = true;
|
|
141
|
+
return result;
|
|
142
|
+
}
|
|
143
|
+
finally {
|
|
144
|
+
if (operation === "pull") {
|
|
145
|
+
const pull = prepared;
|
|
146
|
+
if (pull.objectStaging !== undefined)
|
|
147
|
+
discardPreparedPull(pull);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
state.assertValid();
|
|
152
|
+
}
|
|
153
|
+
finally {
|
|
154
|
+
try {
|
|
155
|
+
await state.complete(success);
|
|
156
|
+
}
|
|
157
|
+
finally {
|
|
158
|
+
state.close();
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
// Migration itself is a mutation even when the requested command only reads.
|
|
162
|
+
return executeWriter(rootPath, operation, args, options, runtimeIdentity);
|
|
163
|
+
}
|
|
74
164
|
async function executeWriter(rootPath, operation, args, options, runtimeIdentity) {
|
|
75
165
|
try {
|
|
76
166
|
return await withRepositoryWriter(rootPath, state => execute(state, operation, args, options, true, runtimeIdentity));
|
|
@@ -102,7 +192,7 @@ async function recordWriterLockContention(rootPath, operation, options) {
|
|
|
102
192
|
state?.close();
|
|
103
193
|
}
|
|
104
194
|
}
|
|
105
|
-
async function execute(state, operation, args, options, writerHeld, runtimeIdentity) {
|
|
195
|
+
async function execute(state, operation, args, options, writerHeld, runtimeIdentity, prepared) {
|
|
106
196
|
const identity = writerHeld ? await migrateLocalRepository(state) : readRepositoryIdentity(join(state.statePath, "db.sqlite"));
|
|
107
197
|
const diagnostics = new LocalDiagnosticWriter(options.diagnosticsPath ?? diagnosticsPath());
|
|
108
198
|
const requestId = isUuid(options.requestId) ? options.requestId : randomUUID();
|
|
@@ -143,8 +233,15 @@ async function execute(state, operation, args, options, writerHeld, runtimeIdent
|
|
|
143
233
|
else if (operation === "pull" || operation === "push" || operation === "purge") {
|
|
144
234
|
if (!options.connection)
|
|
145
235
|
throw new Error("repository credential is unavailable");
|
|
146
|
-
|
|
147
|
-
|
|
236
|
+
if (prepared !== undefined) {
|
|
237
|
+
result = operation === "pull"
|
|
238
|
+
? await applyPreparedPull(context, prepared, options.connection)
|
|
239
|
+
: await applyPreparedPush(context, prepared, options.connection);
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
const remote = { pull: pullIntoStore, push: pushFromStore, purge: purgeFromStore }[operation];
|
|
243
|
+
result = await remote(context, args, options.connection);
|
|
244
|
+
}
|
|
148
245
|
}
|
|
149
246
|
else {
|
|
150
247
|
result = await dispatchLocalOperation(context, operation, args, runtimeIdentity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../../src/local/runtime/dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,EAAwB,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAWzC,MAAM,SAAS,GAAmC;IAChD,KAAK,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI;IACrF,iBAAiB,EAAE,IAAI;IACvB,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI;CACnH,CAAC;AAEF,2GAA2G;AAC3G,MAAM,yBAAyB,GAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAEjE,sGAAsG;AACtG,MAAM,kBAAkB,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAC;AAEnE,6FAA6F;AAC7F,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,QAAgB,EAChB,SAAiB,EACjB,IAAuC,EACvC,UAA2B,EAAE;IAE7B,MAAM,eAAe,GAAG,MAAM,oBAAoB,EAAE,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC;IACpG,IAAI,OAAO;QAAE,OAAO,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IAEvF,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;YACxF,IAAI,MAAM,KAAK,kBAAkB;gBAAE,MAAM;YACzC,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,CAAC,KAAK,YAAY,mBAAmB,CAAC,IAAI,OAAO,IAAI,yBAAyB,CAAC,MAAM;gBAAE,MAAM,KAAK,CAAC;YACxG,MAAM,KAAK,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IACD,6EAA6E;IAC7E,OAAO,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;AAC5E,CAAC;AAED,qGAAqG;AACrG,KAAK,UAAU,aAAa,CAC1B,QAAgB,EAChB,SAAiB,EACjB,IAAuC,EACvC,OAAwB,EACxB,eAAqC;IAErC,MAAM,KAAK,GAAG,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;QAC5E,IAAI,QAAQ,CAAC,WAAW,KAAK,+BAA+B,EAAE,CAAC;YAC7D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;YACtF,KAAK,CAAC,WAAW,EAAE,CAAC;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,CAAC,WAAW,EAAE,CAAC;QACpB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAAC,CAAC;gBAAS,CAAC;YAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;IACnE,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,QAAgB,EAChB,SAAiB,EACjB,IAAuC,EACvC,OAAwB,EACxB,eAAqC;IAErC,IAAI,CAAC;QACH,OAAO,MAAM,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IACxH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,4BAA4B;YAAE,MAAM,0BAA0B,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAClH,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,mIAAmI;AACnI,KAAK,UAAU,0BAA0B,CAAC,QAAgB,EAAE,SAAiB,EAAE,OAAwB;IACrG,IAAI,KAA0C,CAAC;IAC/C,IAAI,CAAC;QACH,KAAK,GAAG,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;QAC5E,MAAM,WAAW,GAAG,IAAI,qBAAqB,CAAC,OAAO,CAAC,eAAe,IAAI,eAAe,EAAE,CAAC,CAAC;QAC5F,WAAW,CAAC,MAAM,CAAC;YACjB,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAChE,KAAK,EAAE,4BAA4B,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS;YACjE,MAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,EAAE;SAC7E,CAAC,CAAC;QACH,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,yGAAyG;IAC3G,CAAC;YAAS,CAAC;QACT,KAAK,EAAE,KAAK,EAAE,CAAC;IACjB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,OAAO,CACpB,KAA8B,EAC9B,SAAiB,EACjB,IAAuC,EACvC,OAAwB,EACxB,UAAmB,EACnB,eAAqC;IAErC,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IAC/H,MAAM,WAAW,GAAG,IAAI,qBAAqB,CAAC,OAAO,CAAC,eAAe,IAAI,eAAe,EAAE,CAAC,CAAC;IAC5F,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;IAC/E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9E,WAAW,CAAC,MAAM,CAAC;QACjB,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAChE,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE;KACxE,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAgB,EAAiB,EAAE;QACzD,WAAW,CAAC,MAAM,CAAC;YACjB,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAChE,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,WAAW;YAC1D,MAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,OAAO,IAAI,EAAE,YAAY,EAAE,qBAAqB,EAAE,CAAC,EAAE;SAC1H,CAAC,CAAC;QACH,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC,CAAC;IACF,KAAK,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACzF,MAAM,OAAO,GAAG,IAAI,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,OAAO,GAAmB;QAC9B,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QACpG,eAAe,EAAE,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;KAC5G,CAAC;IACF,IAAI,MAA+B,CAAC;IACpC,IAAI,SAAS,KAAK,iBAAiB,EAAE,CAAC;QACpC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC1F,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;IACxE,CAAC;IACD,IAAI,SAAS,KAAK,gBAAgB,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;QAClC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,YAAY,UAAU,CAAC,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC;YAC/K,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrE,MAAM,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACzE,CAAC;SAAM,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QACjF,IAAI,CAAC,OAAO,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACjF,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC;QAC9F,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACnF,CAAC;IACD,KAAK,CAAC,WAAW,EAAE,CAAC;IACpB,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
1
|
+
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../../src/local/runtime/dispatch.ts"],"names":[],"mappings":"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"}
|