@paradigma-inc/flywheel 0.2.9 → 0.2.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -0
- package/bin/flywheel.js +11 -2
- package/package.json +1 -1
- package/src/public-command-metadata.mjs +16 -1
- package/src/runtime/delegate.mjs +13 -0
- package/src/runtime/node-version-preflight.mjs +37 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/repository.js +2 -2
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/repository.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/repository-operation.js +7 -4
- package/src/runtime/vendor/flywheel-cli-dist/commands/repository-operation.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/repository-output.js +9 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/repository-output.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/adapter.js +4 -2
- package/src/runtime/vendor/flywheel-cli-dist/local/adapter.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/pull.js +5 -4
- package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/pull.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/dispatch.js +48 -18
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/dispatch.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/operations/core.js +8 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/operations/core.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/remote/pull.js +11 -0
- 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 +15 -4
- package/src/runtime/vendor/flywheel-cli-dist/local/runtime/remote/push.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/backup/archive.js +2 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/backup/archive.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/backup/backup.js +2 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/backup/backup.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/contract.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/migration/steps.js +5 -2
- package/src/runtime/vendor/flywheel-cli-dist/local/store/migration/steps.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/migration/versions.js +2 -2
- package/src/runtime/vendor/flywheel-cli-dist/local/store/migration/versions.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/migrations/001_initial.sql +14 -2
- package/src/runtime/vendor/flywheel-cli-dist/local/store/migrations/006_sync_journal.sql +12 -0
- package/src/runtime/vendor/flywheel-cli-dist/local/store/migrations.js +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/local/store/migrations.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/connection.js +10 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/connection.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/errors.js +37 -0
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/errors.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/store.js +51 -5
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/store.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sync-journal.js +64 -0
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sync-journal.js.map +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sync.js +46 -10
- package/src/runtime/vendor/flywheel-cli-dist/local/store/sync.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/main.js +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/main.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/prebuilds/darwin-arm64/node.napi.node +0 -0
- package/src/runtime/vendor/flywheel-cli-dist/prebuilds/darwin-x64/node.napi.node +0 -0
- package/src/runtime/vendor/manifest.json +4 -1
- package/src/setup-auth.mjs +34 -14
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { join } from "node:path";
|
|
2
|
+
import { setTimeout as delay } from "node:timers/promises";
|
|
2
3
|
import { isDigest, isUuid } from "../domain/models/constants.js";
|
|
3
4
|
import { RetainedRepositoryState } from "../fs/state.js";
|
|
4
5
|
import { RepositoryWriteGateBusyError, withRepositoryWriter } from "../fs/writer-lock.js";
|
|
@@ -7,6 +8,7 @@ import { migrateLocalRepository } from "../store/migrate.js";
|
|
|
7
8
|
import { readRepositoryIdentity } from "../store/migration/steps.js";
|
|
8
9
|
import { CURRENT_REPOSITORY_USER_VERSION } from "../store/migration/versions.js";
|
|
9
10
|
import { RepositoryObjectStorage } from "../store/objects.js";
|
|
11
|
+
import { RepositoryBusyError } from "../store/sqlite/errors.js";
|
|
10
12
|
import { SQLiteRepositoryStore } from "../store/sqlite/store.js";
|
|
11
13
|
import { localRuntimeIdentity } from "./identity.js";
|
|
12
14
|
import { dispatchLocalOperation } from "./operations/index.js";
|
|
@@ -19,12 +21,34 @@ const MUTATIONS = {
|
|
|
19
21
|
"staging:discard": true,
|
|
20
22
|
pull: true, push: true, purge: true, revert: true, backup: true, restore: true, commit: true, object_install: true,
|
|
21
23
|
};
|
|
24
|
+
/** Backoff between read-path retries once a `repository_busy` timeout is observed; one entry per retry. */
|
|
25
|
+
const READ_BUSY_RETRY_DELAYS_MS = [250, 1000];
|
|
26
|
+
/** Distinguishes "the repository needs migration" from a real (possibly empty-shaped) read result. */
|
|
27
|
+
const MIGRATION_REQUIRED = Symbol("repository_migration_required");
|
|
22
28
|
/** One command retains one state handle; nested helpers never reacquire its writer locks. */
|
|
23
29
|
export async function dispatchRepositoryCommand(rootPath, operation, args, options = {}) {
|
|
24
30
|
const runtimeIdentity = await localRuntimeIdentity();
|
|
25
31
|
const mutates = Object.hasOwn(MUTATIONS, operation) || operation === "gc" && args.dry_run === false;
|
|
26
32
|
if (mutates)
|
|
27
33
|
return executeWriter(rootPath, operation, args, options, runtimeIdentity);
|
|
34
|
+
for (let attempt = 0;; attempt++) {
|
|
35
|
+
try {
|
|
36
|
+
const result = await executeReader(rootPath, operation, args, options, runtimeIdentity);
|
|
37
|
+
if (result === MIGRATION_REQUIRED)
|
|
38
|
+
break;
|
|
39
|
+
return result;
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
if (!(error instanceof RepositoryBusyError) || attempt >= READ_BUSY_RETRY_DELAYS_MS.length)
|
|
43
|
+
throw error;
|
|
44
|
+
await delay(READ_BUSY_RETRY_DELAYS_MS[attempt]);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
// Migration itself is a mutation even when the requested command only reads.
|
|
48
|
+
return executeWriter(rootPath, operation, args, options, runtimeIdentity);
|
|
49
|
+
}
|
|
50
|
+
/** Runs one non-mutating read attempt; a `RepositoryBusyError` here is the caller's retry signal. */
|
|
51
|
+
async function executeReader(rootPath, operation, args, options, runtimeIdentity) {
|
|
28
52
|
const state = RetainedRepositoryState.open(rootPath);
|
|
29
53
|
let success = false;
|
|
30
54
|
try {
|
|
@@ -36,6 +60,7 @@ export async function dispatchRepositoryCommand(rootPath, operation, args, optio
|
|
|
36
60
|
return result;
|
|
37
61
|
}
|
|
38
62
|
state.assertValid();
|
|
63
|
+
return MIGRATION_REQUIRED;
|
|
39
64
|
}
|
|
40
65
|
finally {
|
|
41
66
|
try {
|
|
@@ -45,33 +70,38 @@ export async function dispatchRepositoryCommand(rootPath, operation, args, optio
|
|
|
45
70
|
state.close();
|
|
46
71
|
}
|
|
47
72
|
}
|
|
48
|
-
// Migration itself is a mutation even when the requested command only reads.
|
|
49
|
-
return executeWriter(rootPath, operation, args, options, runtimeIdentity);
|
|
50
73
|
}
|
|
51
74
|
async function executeWriter(rootPath, operation, args, options, runtimeIdentity) {
|
|
52
75
|
try {
|
|
53
76
|
return await withRepositoryWriter(rootPath, state => execute(state, operation, args, options, true, runtimeIdentity));
|
|
54
77
|
}
|
|
55
78
|
catch (error) {
|
|
56
|
-
if (error instanceof RepositoryWriteGateBusyError)
|
|
57
|
-
|
|
58
|
-
try {
|
|
59
|
-
const identity = readRepositoryIdentity(join(state.statePath, "db.sqlite"));
|
|
60
|
-
const diagnostics = new LocalDiagnosticWriter(options.diagnosticsPath ?? diagnosticsPath());
|
|
61
|
-
diagnostics.record({
|
|
62
|
-
repositoryId: identity.repositoryId, clientId: identity.clientId,
|
|
63
|
-
event: "repository_lock_contention", requestId: options.requestId,
|
|
64
|
-
fields: { operation, outcome: "failure", failure_kind: "repository_locked" },
|
|
65
|
-
});
|
|
66
|
-
await diagnostics.close();
|
|
67
|
-
}
|
|
68
|
-
finally {
|
|
69
|
-
state.close();
|
|
70
|
-
}
|
|
71
|
-
}
|
|
79
|
+
if (error instanceof RepositoryWriteGateBusyError)
|
|
80
|
+
await recordWriterLockContention(rootPath, operation, options);
|
|
72
81
|
throw error;
|
|
73
82
|
}
|
|
74
83
|
}
|
|
84
|
+
/** Best-effort diagnostic for writer-lock contention; a failure here must never replace the caller's `repository_locked` error. */
|
|
85
|
+
async function recordWriterLockContention(rootPath, operation, options) {
|
|
86
|
+
let state;
|
|
87
|
+
try {
|
|
88
|
+
state = RetainedRepositoryState.open(rootPath);
|
|
89
|
+
const identity = readRepositoryIdentity(join(state.statePath, "db.sqlite"));
|
|
90
|
+
const diagnostics = new LocalDiagnosticWriter(options.diagnosticsPath ?? diagnosticsPath());
|
|
91
|
+
diagnostics.record({
|
|
92
|
+
repositoryId: identity.repositoryId, clientId: identity.clientId,
|
|
93
|
+
event: "repository_lock_contention", requestId: options.requestId,
|
|
94
|
+
fields: { operation, outcome: "failure", failure_kind: "repository_locked" },
|
|
95
|
+
});
|
|
96
|
+
await diagnostics.close();
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
// Diagnostic recording is best-effort; swallow so the original repository_locked error is authoritative.
|
|
100
|
+
}
|
|
101
|
+
finally {
|
|
102
|
+
state?.close();
|
|
103
|
+
}
|
|
104
|
+
}
|
|
75
105
|
async function execute(state, operation, args, options, writerHeld, runtimeIdentity) {
|
|
76
106
|
const identity = writerHeld ? await migrateLocalRepository(state) : readRepositoryIdentity(join(state.statePath, "db.sqlite"));
|
|
77
107
|
const diagnostics = new LocalDiagnosticWriter(options.diagnosticsPath ?? diagnosticsPath());
|
|
@@ -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,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,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,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,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;
|
|
1
|
+
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../../src/local/runtime/dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,9 +94,10 @@ export async function status(context, arguments_, runtimeIdentity) {
|
|
|
94
94
|
requireExactArguments(arguments_, []);
|
|
95
95
|
context.state.assertValid();
|
|
96
96
|
validateRepositoryIdentity(join(context.state.statePath, "db.sqlite"), context.repositoryId);
|
|
97
|
-
const [repository, head, workspace, objectMode, association] = await Promise.all([
|
|
97
|
+
const [repository, head, workspace, objectMode, association, interruptedSync] = await Promise.all([
|
|
98
98
|
context.store.loadRepository(context.repositoryId), context.store.loadHead(context.repositoryId), context.store.loadWorkspace(context.repositoryId),
|
|
99
99
|
context.store.loadObjectMode(context.repositoryId), context.store.loadHostedAssociation(context.repositoryId),
|
|
100
|
+
context.store.loadInterruptedSyncEntries(context.repositoryId),
|
|
100
101
|
]);
|
|
101
102
|
const reachable = await context.store.loadReachableObjectDigests(context.repositoryId, head.commitId);
|
|
102
103
|
let unpublishedCount;
|
|
@@ -141,6 +142,12 @@ export async function status(context, arguments_, runtimeIdentity) {
|
|
|
141
142
|
conflicts: { open: openConflicts, total: workspace.conflicts.length },
|
|
142
143
|
staging: { operation_count: workspace.staging.operations.length, digest: workspace.staging.digest },
|
|
143
144
|
sync: { rebase: workspace.rebase?.state ?? null, object_mode: objectMode, remote_tracking_head: workspace.remoteTrackingHeadCommitId },
|
|
145
|
+
interrupted_sync: {
|
|
146
|
+
entries: interruptedSync.map(entry => ({ operation: entry.operation, logical_id: entry.logicalId, phase: entry.phase })),
|
|
147
|
+
guidance: interruptedSync.length > 0
|
|
148
|
+
? "Rerun the interrupted repo:push or repo:pull with the same --idempotency-key; the server replays the recorded outcome for that key."
|
|
149
|
+
: null,
|
|
150
|
+
},
|
|
144
151
|
reclaimable_bytes: objectBytes.reclaimable,
|
|
145
152
|
last_backup: null,
|
|
146
153
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../src/local/runtime/operations/core.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../src/local/runtime/operations/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { RepositoryServiceError } from "../../domain/errors.js";
|
|
2
|
+
import { isUuid } from "../../domain/models/constants.js";
|
|
1
3
|
import { applyRemotePull } from "../../domain/sync/local-pull.js";
|
|
2
4
|
import { fetchTransfer, publishedCursor, publishedSequence, requireMatchingAssociation, requestObject } from "./transport.js";
|
|
3
5
|
function pullArguments(args) {
|
|
@@ -9,6 +11,8 @@ function pullArguments(args) {
|
|
|
9
11
|
}
|
|
10
12
|
export async function pullIntoStore(context, args, connection, requiredCommitId = null) {
|
|
11
13
|
const { pullId, objectMode } = pullArguments(args);
|
|
14
|
+
if (!isUuid(pullId))
|
|
15
|
+
throw new RepositoryServiceError("pull_id must be UUIDv4");
|
|
12
16
|
const associationExists = requireMatchingAssociation(await context.store.loadHostedAssociation(context.repositoryId), connection);
|
|
13
17
|
const workspace = await context.store.loadWorkspace(context.repositoryId);
|
|
14
18
|
const afterCursor = workspace.remoteTrackingHeadCommitId === null
|
|
@@ -23,6 +27,7 @@ export async function pullIntoStore(context, args, connection, requiredCommitId
|
|
|
23
27
|
localHead: workspace.remoteTrackingHeadCommitId,
|
|
24
28
|
objectMode,
|
|
25
29
|
});
|
|
30
|
+
await context.store.recordSyncPhase(context.repositoryId, "pull", pullId, "session");
|
|
26
31
|
if (!associationExists) {
|
|
27
32
|
await context.store.attachHostedAssociation(context.repositoryId, connection.baseUrl, connection.profile);
|
|
28
33
|
}
|
|
@@ -30,8 +35,14 @@ export async function pullIntoStore(context, args, connection, requiredCommitId
|
|
|
30
35
|
for (const objectDigest of transfer.objectDigests) {
|
|
31
36
|
await context.store.installObject(context.repositoryId, objectDigest, await requestObject(connection, context.repositoryId, objectDigest));
|
|
32
37
|
}
|
|
38
|
+
await context.store.recordSyncPhase(context.repositoryId, "pull", pullId, "objects");
|
|
33
39
|
}
|
|
34
40
|
const result = await applyRemotePull(context, pullId, objectMode, transfer, publishedSequence(context.repositoryId, transfer.targetCursor), requiredCommitId);
|
|
41
|
+
// A pull with nothing new since the last sync never reaches `applySyncAtomic`, so its
|
|
42
|
+
// coupled journal completion never runs; complete the entry directly for that case only.
|
|
43
|
+
if (transfer.targetHead === workspace.remoteTrackingHeadCommitId) {
|
|
44
|
+
await context.store.completeSyncPhase(context.repositoryId, "pull", pullId, "apply");
|
|
45
|
+
}
|
|
35
46
|
await context.store.setObjectMode(context.repositoryId, objectMode);
|
|
36
47
|
return {
|
|
37
48
|
repository_id: context.repositoryId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/local/runtime/remote/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAO9H,SAAS,aAAa,CAAC,IAAuC;IAC5D,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ;QACpE,CAAC,IAAI,CAAC,WAAW,KAAK,MAAM,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;AAChE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAuB,EACvB,IAAuC,EACvC,UAAsC,EACtC,mBAAkC,IAAI;IAEtC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,iBAAiB,GAAG,0BAA0B,CAClD,MAAM,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,YAAY,CAAC,EAC/D,UAAU,CACX,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,SAAS,CAAC,0BAA0B,KAAK,IAAI;QAC/D,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,qBAAqB,CAAC,CAAC;IAC3E,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC;QACnC,UAAU;QACV,IAAI,EAAE,MAAM;QACZ,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW;QACX,SAAS,EAAE,SAAS,CAAC,0BAA0B;QAC/C,UAAU;KACX,CAAC,CAAC;IACH,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,OAAO,CAAC,YAAY,EAAE,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC5G,CAAC;IACD,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;QACzB,KAAK,MAAM,YAAY,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YAClD,MAAM,OAAO,CAAC,KAAK,CAAC,aAAa,CAC/B,OAAO,CAAC,YAAY,EACpB,YAAY,EACZ,MAAM,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CACpE,CAAC;QACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/local/runtime/remote/pull.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ export async function pushFromStore(context, args, connection) {
|
|
|
17
17
|
const workspace = await context.store.loadWorkspace(context.repositoryId);
|
|
18
18
|
if (workspace.staging.operations.length > 0)
|
|
19
19
|
throw new Error("repository workspace is not pushable");
|
|
20
|
+
let lastRecordedPhase = null;
|
|
20
21
|
if (createRemote) {
|
|
21
22
|
await connection.client.requestRepositoryJson("POST", "/repositories", {
|
|
22
23
|
...repositoryOptions({
|
|
@@ -33,8 +34,12 @@ export async function pushFromStore(context, args, connection) {
|
|
|
33
34
|
return undefined;
|
|
34
35
|
},
|
|
35
36
|
});
|
|
36
|
-
|
|
37
|
-
|
|
37
|
+
await context.store.recordSyncPhase(context.repositoryId, "push", pushId, "create_remote");
|
|
38
|
+
lastRecordedPhase = "create_remote";
|
|
39
|
+
if (!associationExists) {
|
|
40
|
+
await context.store.attachHostedAssociation(context.repositoryId, connection.baseUrl, connection.profile, { operation: "push", logicalId: pushId, phase: "attach" });
|
|
41
|
+
lastRecordedPhase = "attach";
|
|
42
|
+
}
|
|
38
43
|
}
|
|
39
44
|
else if (!associationExists) {
|
|
40
45
|
const remoteHead = responseRecord(await connection.client.requestRepositoryJson("GET", `/repositories/${encodeURIComponent(context.repositoryId)}/head`), "repository hosted reattachment verification failed");
|
|
@@ -42,11 +47,14 @@ export async function pushFromStore(context, args, connection) {
|
|
|
42
47
|
(remoteHead.head !== null && !isDigest(remoteHead.head)) || remoteHead.head !== workspace.remoteTrackingHeadCommitId) {
|
|
43
48
|
throw new Error("repository hosted reattachment verification failed");
|
|
44
49
|
}
|
|
45
|
-
await context.store.attachHostedAssociation(context.repositoryId, connection.baseUrl, connection.profile);
|
|
50
|
+
await context.store.attachHostedAssociation(context.repositoryId, connection.baseUrl, connection.profile, { operation: "push", logicalId: pushId, phase: "attach" });
|
|
51
|
+
lastRecordedPhase = "attach";
|
|
46
52
|
}
|
|
47
53
|
const localHead = workspace.localHeadCommitId;
|
|
48
54
|
const remoteHead = workspace.remoteTrackingHeadCommitId;
|
|
49
55
|
if (localHead === remoteHead) {
|
|
56
|
+
if (lastRecordedPhase !== null)
|
|
57
|
+
await context.store.completeSyncPhase(context.repositoryId, "push", pushId, lastRecordedPhase);
|
|
50
58
|
return {
|
|
51
59
|
repository_id: context.repositoryId,
|
|
52
60
|
local_head: localHead,
|
|
@@ -67,8 +75,10 @@ export async function pushFromStore(context, args, connection) {
|
|
|
67
75
|
negotiation.missing_uploads.some((objectDigest) => !references.includes(objectDigest))) {
|
|
68
76
|
throw new Error("repository object negotiation is invalid");
|
|
69
77
|
}
|
|
78
|
+
await context.store.recordSyncPhase(context.repositoryId, "push", pushId, "object_prepare");
|
|
70
79
|
for (const objectDigest of negotiation.missing_uploads) {
|
|
71
80
|
await uploadObject(connection, context.repositoryId, randomUUID(), objectDigest, await context.store.loadObjectBytes(context.repositoryId, objectDigest));
|
|
81
|
+
await context.store.recordSyncPhase(context.repositoryId, "push", pushId, `object_upload:${objectDigest}`, objectDigest);
|
|
72
82
|
}
|
|
73
83
|
}
|
|
74
84
|
const response = await connection.client.requestRepositoryJson("POST", `/repositories/${encodeURIComponent(context.repositoryId)}/pushes`, {
|
|
@@ -99,8 +109,9 @@ export async function pushFromStore(context, args, connection) {
|
|
|
99
109
|
return undefined;
|
|
100
110
|
},
|
|
101
111
|
});
|
|
112
|
+
await context.store.recordSyncPhase(context.repositoryId, "push", pushId, "push_submit");
|
|
102
113
|
const sequence = BigInt(response.receipt_sequence);
|
|
103
|
-
await context.store.recordPushResult(context.repositoryId, remoteHead, response.head, sequence);
|
|
114
|
+
await context.store.recordPushResult(context.repositoryId, remoteHead, response.head, sequence, { logicalId: pushId, phase: "head_update" });
|
|
104
115
|
return {
|
|
105
116
|
repository_id: context.repositoryId,
|
|
106
117
|
local_head: localHead,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../src/local/runtime/remote/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtH,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAOtD,SAAS,aAAa,CAAC,IAAuC;IAC5D,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QAClH,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC;AACpE,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAuB,EACvB,IAAuC,EACvC,UAAsC;IAEtC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACtE,MAAM,iBAAiB,GAAG,0BAA0B,CAClD,MAAM,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,YAAY,CAAC,EAC/D,UAAU,CACX,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1E,IAAI,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACrG,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,UAAU,CAAC,MAAM,CAAC,qBAAqB,CAC3C,MAAM,EACN,eAAe,EACf;YACE,GAAG,iBAAiB,CAAC;gBACnB,YAAY,EAAE,CAAC;gBACf,aAAa,EAAE,OAAO,CAAC,YAAY;gBACnC,SAAS,EAAE,OAAO,CAAC,QAAQ;gBAC3B,WAAW,EAAE,MAAM;aACpB,EAAE,MAAM,CAAC;YACV,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;gBACtB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,aAAa,KAAK,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI;oBACnH,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,WAAW,KAAK,MAAM,EAAE,CAAC;oBACxD,OAAO,yCAAyC,CAAC;gBACnD,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;SACF,CACF,CAAC;QACF,IAAI,CAAC,iBAAiB;
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../src/local/runtime/remote/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtH,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAOtD,SAAS,aAAa,CAAC,IAAuC;IAC5D,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QAClH,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC;AACpE,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAuB,EACvB,IAAuC,EACvC,UAAsC;IAEtC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACtE,MAAM,iBAAiB,GAAG,0BAA0B,CAClD,MAAM,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,YAAY,CAAC,EAC/D,UAAU,CACX,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1E,IAAI,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACrG,IAAI,iBAAiB,GAAkB,IAAI,CAAC;IAC5C,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,UAAU,CAAC,MAAM,CAAC,qBAAqB,CAC3C,MAAM,EACN,eAAe,EACf;YACE,GAAG,iBAAiB,CAAC;gBACnB,YAAY,EAAE,CAAC;gBACf,aAAa,EAAE,OAAO,CAAC,YAAY;gBACnC,SAAS,EAAE,OAAO,CAAC,QAAQ;gBAC3B,WAAW,EAAE,MAAM;aACpB,EAAE,MAAM,CAAC;YACV,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;gBACtB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,aAAa,KAAK,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI;oBACnH,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,WAAW,KAAK,MAAM,EAAE,CAAC;oBACxD,OAAO,yCAAyC,CAAC;gBACnD,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;SACF,CACF,CAAC;QACF,MAAM,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;QAC3F,iBAAiB,GAAG,eAAe,CAAC;QACpC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,OAAO,CAAC,KAAK,CAAC,uBAAuB,CACzC,OAAO,CAAC,YAAY,EAAE,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,EAC5D,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAC1D,CAAC;YACF,iBAAiB,GAAG,QAAQ,CAAC;QAC/B,CAAC;IACH,CAAC;SAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,UAAU,CAAC,MAAM,CAAC,qBAAqB,CAC7E,KAAK,EACL,iBAAiB,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CACjE,EAAE,oDAAoD,CAAC,CAAC;QACzD,IAAI,UAAU,CAAC,aAAa,KAAK,OAAO,CAAC,YAAY;YACnD,CAAC,UAAU,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,CAAC,0BAA0B,EAAE,CAAC;YACvH,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,OAAO,CAAC,KAAK,CAAC,uBAAuB,CACzC,OAAO,CAAC,YAAY,EAAE,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,EAC5D,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAC1D,CAAC;QACF,iBAAiB,GAAG,QAAQ,CAAC;IAC/B,CAAC;IACD,MAAM,SAAS,GAAG,SAAS,CAAC,iBAAiB,CAAC;IAC9C,MAAM,UAAU,GAAG,SAAS,CAAC,0BAA0B,CAAC;IACxD,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;QAC7B,IAAI,iBAAiB,KAAK,IAAI;YAAE,MAAM,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;QAC/H,OAAO;YACL,aAAa,EAAE,OAAO,CAAC,YAAY;YACnC,UAAU,EAAE,SAAS;YACrB,oBAAoB,EAAE,UAAU;YAChC,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,MAAM;SACnB,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACzE,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAClJ,MAAM,YAAY,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACtI,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5F,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,aAAa,GAAG,UAAU,EAAE,CAAC;QACnC,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,UAAU,CAAC,MAAM,CAAC,qBAAqB,CAC9E,MAAM,EACN,iBAAiB,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,kBAAkB,EAC3E,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,aAAa,CAAC,CAC1G,EAAE,0CAA0C,CAAC,CAAC;QAC/C,IAAI,WAAW,CAAC,cAAc,KAAK,aAAa,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC;YAC7F,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;YACtJ,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;YACzF,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;QAC5F,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,eAAe,EAAE,CAAC;YACvD,MAAM,YAAY,CAChB,UAAU,EACV,OAAO,CAAC,YAAY,EACpB,UAAU,EAAE,EACZ,YAAY,EACZ,MAAM,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CACxE,CAAC;YACF,MAAM,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,YAAY,EAAE,EAAE,YAAY,CAAC,CAAC;QAC3H,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,qBAAqB,CAI5D,MAAM,EACN,iBAAiB,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,EAClE;QACE,GAAG,iBAAiB,CAAC;YACnB,YAAY,EAAE,CAAC;YACf,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,OAAO,CAAC,QAAQ;YAC3B,aAAa,EAAE,UAAU;YACzB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBACvC,SAAS,EAAE,MAAM,CAAC,QAAQ;gBAC1B,aAAa,EAAE,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACvD,kBAAkB,EAAE,iBAAiB,CAAC,KAAK,CAAE,CAAC,MAAM;aACrD,CAAC,CAAC;YACH,aAAa,EAAE,YAAY;YAC3B,iBAAiB,EAAE,UAAU;SAC9B,EAAE,MAAM,CAAC;QACV,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;YACtB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,KAAK,MAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,UAAU,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;gBAC3G,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC5D,OAAO,qCAAqC,CAAC;YAC/C,CAAC;YACD,IAAI,CAAC;gBACH,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,qCAAqC,CAAC,CAAC;YACzE,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,qCAAqC,CAAC;YAC/C,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KACF,CACF,CAAC;IACF,MAAM,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IACzF,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IACnD,MAAM,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,YAAY,EAAE,UAAU,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;IAC7I,OAAO;QACL,aAAa,EAAE,OAAO,CAAC,YAAY;QACnC,UAAU,EAAE,SAAS;QACrB,oBAAoB,EAAE,QAAQ,CAAC,IAAI;QACnC,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,MAAM;KACnB,CAAC;AACJ,CAAC"}
|
|
@@ -7,6 +7,7 @@ import yauzl from "yauzl";
|
|
|
7
7
|
import yazl from "yazl";
|
|
8
8
|
import { close, createFileExclusiveAt, fchmod, fstat, fsync, mkdirAt, openDirectory, openDirectoryAt, statAt, } from "../../fs/native.js";
|
|
9
9
|
import { isRecord } from "../../domain/models/constants.js";
|
|
10
|
+
import { CURRENT_REPOSITORY_USER_VERSION, isPredecessorRepositoryUserVersion, } from "../migration/versions.js";
|
|
10
11
|
const DATABASE_MEMBER = "db.sqlite";
|
|
11
12
|
const MANIFEST_MEMBER = "manifest.json";
|
|
12
13
|
const OBJECT_PREFIX = "objects/sha256/";
|
|
@@ -99,7 +100,7 @@ function parseManifest(raw) {
|
|
|
99
100
|
|| parsed.version !== 1
|
|
100
101
|
|| !isUuid4(parsed.repository_id)
|
|
101
102
|
|| parsed.repository_format !== "flywheel.repository.v1"
|
|
102
|
-
||
|
|
103
|
+
|| (parsed.repository_user_version !== CURRENT_REPOSITORY_USER_VERSION && !isPredecessorRepositoryUserVersion(parsed.repository_user_version))
|
|
103
104
|
|| typeof parsed.runtime_python_version !== "string"
|
|
104
105
|
|| typeof parsed.sqlite_version !== "string"
|
|
105
106
|
|| !isEntry(parsed.database)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../../../src/local/store/backup/archive.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../../../src/local/store/backup/archive.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { fsync, linkAt, renameReplaceAt, statAt, unlinkAt } from "../../fs/nativ
|
|
|
6
6
|
import { validateCanonicalHistoryIn } from "../history-validation.js";
|
|
7
7
|
import { openReadDatabase, withWriteConnectionAsync } from "../sqlite/connection.js";
|
|
8
8
|
import { loadRepositoryUserVersion } from "../sqlite/verify.js";
|
|
9
|
+
import { CURRENT_REPOSITORY_USER_VERSION, isPredecessorRepositoryUserVersion } from "../migration/versions.js";
|
|
9
10
|
import { RepositoryBackupError, verifyArchive, writeArchive } from "./archive.js";
|
|
10
11
|
import { destinationName, RetainedPrivateDirectory } from "./retained-directory.js";
|
|
11
12
|
const FILE_TYPE_MASK = 0o170000;
|
|
@@ -79,7 +80,7 @@ async function manifestFor(repositoryId, snapshotPath, objects, snapshotValidato
|
|
|
79
80
|
throw backupError("repository_backup_size_limit");
|
|
80
81
|
}
|
|
81
82
|
const userVersion = loadRepositoryUserVersion(snapshotPath);
|
|
82
|
-
if (userVersion !==
|
|
83
|
+
if (userVersion !== CURRENT_REPOSITORY_USER_VERSION && !isPredecessorRepositoryUserVersion(userVersion)) {
|
|
83
84
|
throw backupError("repository_backup_database_invalid");
|
|
84
85
|
}
|
|
85
86
|
let databaseConnection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../../../src/local/store/backup/backup.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../../../src/local/store/backup/backup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../src/local/store/contract.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,0BAA0B,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACpH,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../src/local/store/contract.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { canonicalBytes, parseRepositoryJson, valueDigest } from "../../domain/m
|
|
|
8
8
|
import { validateCanonicalHistoryIn } from "../history-validation.js";
|
|
9
9
|
import { loadMigration } from "../migrations.js";
|
|
10
10
|
import { stagingState, workspaceStateIn } from "../workspace-state.js";
|
|
11
|
-
import { RepositoryStoreError } from "../sqlite/errors.js";
|
|
11
|
+
import { RepositoryStoreError, throwIfBusy } from "../sqlite/errors.js";
|
|
12
12
|
import { allRows, runSql } from "../sqlite/rows.js";
|
|
13
13
|
import { APPLICATION_ID, validateRepositoryDatabase, validateRepositoryIdentity, } from "../sqlite/verify.js";
|
|
14
14
|
import { CURRENT_REPOSITORY_USER_VERSION, isPredecessorRepositoryUserVersion, migrationNameForVersion, } from "./versions.js";
|
|
@@ -365,6 +365,7 @@ export function readRepositoryIdentity(databasePath) {
|
|
|
365
365
|
catch (error) {
|
|
366
366
|
if (error instanceof RepositoryStoreError)
|
|
367
367
|
throw error;
|
|
368
|
+
throwIfBusy(error);
|
|
368
369
|
throw identityInvalid(error);
|
|
369
370
|
}
|
|
370
371
|
finally {
|
|
@@ -414,7 +415,9 @@ export function applyForwardMigrations(databasePath, fromVersion) {
|
|
|
414
415
|
applySqlMigration(databasePath, 2, 6);
|
|
415
416
|
if (fromVersion <= 3)
|
|
416
417
|
applySqlMigration(databasePath, 3, 2);
|
|
417
|
-
|
|
418
|
+
if (fromVersion <= 4)
|
|
419
|
+
applyV5(databasePath);
|
|
420
|
+
applySqlMigration(databasePath, 5, 3);
|
|
418
421
|
validateRepositoryIdentity(databasePath, identity.repositoryId);
|
|
419
422
|
validateMigratedStaging(databasePath, identity.repositoryId);
|
|
420
423
|
if (readRepositoryIdentity(databasePath).userVersion !== CURRENT_REPOSITORY_USER_VERSION) {
|