dsh-git-push 0.0.0-stage → 2.8.6
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/.auditignore +30 -0
- package/.gitignore +39 -0
- package/LICENSE +21 -0
- package/README.md +1486 -2
- package/cli.mjs +360 -0
- package/cordis.patch.yml +14 -0
- package/lib/ARCHITECTURE.md +34 -0
- package/lib/BUGFIX-NOTES-2026-09-14.md +278 -0
- package/lib/app/apply.js +275 -0
- package/lib/app/audit-api.js +158 -0
- package/lib/app/command-registry.js +266 -0
- package/lib/app/constants.js +16 -0
- package/lib/app/handlers/account.js +166 -0
- package/lib/app/handlers/clone.js +168 -0
- package/lib/app/handlers/http-constants.js +9 -0
- package/lib/app/handlers/identity-rewrite.js +94 -0
- package/lib/app/handlers/meta.js +175 -0
- package/lib/app/handlers/npm.js +169 -0
- package/lib/app/handlers/repo-actions.js +143 -0
- package/lib/app/handlers/repos.js +231 -0
- package/lib/app/handlers/settings.js +62 -0
- package/lib/app/host-doc-checks.js +25 -0
- package/lib/app/http-handlers.js +131 -0
- package/lib/app/index.js +30 -0
- package/lib/app/inject-text.js +192 -0
- package/lib/app/scan-root.js +23 -0
- package/lib/app/schema.js +150 -0
- package/lib/app/settings-bridge.js +167 -0
- package/lib/app/slash-commands.js +395 -0
- package/lib/app/slot-stats.js +35 -0
- package/lib/app/tool-call.js +672 -0
- package/lib/app/tools.js +34 -0
- package/lib/ast/brace.js +105 -0
- package/lib/ast/callgraph.js +135 -0
- package/lib/ast/code-lines.js +114 -0
- package/lib/ast/consts.js +12 -0
- package/lib/ast/control-flow.js +461 -0
- package/lib/ast/credential.js +199 -0
- package/lib/ast/dataflow.js +274 -0
- package/lib/ast/dup-code.js +165 -0
- package/lib/ast/index.js +36 -0
- package/lib/ast/io-risk-const.js +95 -0
- package/lib/ast/io-risk-fn.js +208 -0
- package/lib/ast/io-risk-loop.js +308 -0
- package/lib/ast/io-risk.js +314 -0
- package/lib/ast/lang.js +156 -0
- package/lib/ast/line-count.js +52 -0
- package/lib/ast/magic-number.js +272 -0
- package/lib/ast/naming.js +284 -0
- package/lib/ast/perf.js +472 -0
- package/lib/ast/scope.js +241 -0
- package/lib/ast/shell.js +131 -0
- package/lib/ast/size.js +378 -0
- package/lib/ast/symbol-index.js +399 -0
- package/lib/ast/tokenizer.js +341 -0
- package/lib/audit/analysis-coverage.js +98 -0
- package/lib/audit/audit-file.js +182 -0
- package/lib/audit/checks.js +17 -0
- package/lib/audit/client-entry.js +93 -0
- package/lib/audit/collector.js +477 -0
- package/lib/audit/ext-runner.js +80 -0
- package/lib/audit/file-context.js +138 -0
- package/lib/audit/finding.js +50 -0
- package/lib/audit/gitignore-match.js +113 -0
- package/lib/audit/glob.js +63 -0
- package/lib/audit/history-report.js +100 -0
- package/lib/audit/history.js +126 -0
- package/lib/audit/ignore-blind.js +101 -0
- package/lib/audit/index.js +33 -0
- package/lib/audit/orchestrate.js +476 -0
- package/lib/audit/public.js +24 -0
- package/lib/audit/repo-level.js +30 -0
- package/lib/audit/report-yaml.js +86 -0
- package/lib/audit/slot.js +65 -0
- package/lib/audit-defaults.js +18 -0
- package/lib/audit-rules/audit-rules-comment.yml +247 -0
- package/lib/audit-rules/audit-rules-cpp.yml +22 -0
- package/lib/audit-rules/audit-rules-docs.yml +32 -0
- package/lib/audit-rules/audit-rules-dsh.yml +162 -0
- package/lib/audit-rules/audit-rules-filehealth.yml +42 -0
- package/lib/audit-rules/audit-rules-folder.yml +99 -0
- package/lib/audit-rules/audit-rules-frontend.yml +335 -0
- package/lib/audit-rules/audit-rules-go.yml +22 -0
- package/lib/audit-rules/audit-rules-i18n.yml +45 -0
- package/lib/audit-rules/audit-rules-java.yml +105 -0
- package/lib/audit-rules/audit-rules-nodejs.yml +647 -0
- package/lib/audit-rules/audit-rules-npm.yml +187 -0
- package/lib/audit-rules/audit-rules-paths.yml +92 -0
- package/lib/audit-rules/audit-rules-performance.yml +215 -0
- package/lib/audit-rules/audit-rules-php.yml +22 -0
- package/lib/audit-rules/audit-rules-private.yml +24 -0
- package/lib/audit-rules/audit-rules-python.yml +106 -0
- package/lib/audit-rules/audit-rules-robustness.yml +27 -0
- package/lib/audit-rules/audit-rules-rust.yml +22 -0
- package/lib/audit-rules/audit-rules-structure.yml +159 -0
- package/lib/audit-rules/audit-rules-swift.yml +22 -0
- package/lib/audit-rules/audit-rules-template.yml +108 -0
- package/lib/checks/button-bind.js +276 -0
- package/lib/checks/common.js +170 -0
- package/lib/checks/credential-file.js +43 -0
- package/lib/checks/dataflow.js +40 -0
- package/lib/checks/dispatch.js +112 -0
- package/lib/checks/dup-code.js +69 -0
- package/lib/checks/dup-const.js +232 -0
- package/lib/checks/file-health.js +150 -0
- package/lib/checks/filter.js +137 -0
- package/lib/checks/folder.js +173 -0
- package/lib/checks/hardcoded-path.js +98 -0
- package/lib/checks/index.js +46 -0
- package/lib/checks/io.js +66 -0
- package/lib/checks/magic-number.js +42 -0
- package/lib/checks/npm-json.js +273 -0
- package/lib/checks/private.js +63 -0
- package/lib/checks/regex.js +256 -0
- package/lib/checks/semantic.js +134 -0
- package/lib/checks/structural.js +274 -0
- package/lib/cli/commands-account.mjs +107 -0
- package/lib/cli/commands-audit.mjs +144 -0
- package/lib/cli/commands-doc.mjs +127 -0
- package/lib/cli/commands-vcs.mjs +175 -0
- package/lib/client/index.js +162 -0
- package/lib/client-parts/00-loader.js +33 -0
- package/lib/client-parts/01-const.js +207 -0
- package/lib/client-parts/02-utils.js +62 -0
- package/lib/client-parts/03-icons.js +12 -0
- package/lib/client-parts/10-account.js +83 -0
- package/lib/client-parts/11-browser.js +95 -0
- package/lib/client-parts/20-repo.js +374 -0
- package/lib/client-parts/21-audit.js +301 -0
- package/lib/client-parts/22-settings.js +146 -0
- package/lib/client-parts/23-npm.js +383 -0
- package/lib/client-parts/30-page.js +56 -0
- package/lib/client-parts/40-controller.js +1092 -0
- package/lib/client-parts/41-actions.js +279 -0
- package/lib/client-parts/99-apply.js +72 -0
- package/lib/client.js +3195 -0
- package/lib/commit-push.js +148 -0
- package/lib/context/index.js +363 -0
- package/lib/core/atomic-json.js +98 -0
- package/lib/core/config.js +40 -0
- package/lib/core/credentials.js +274 -0
- package/lib/core/endpoints.js +109 -0
- package/lib/core/exec.js +162 -0
- package/lib/exempt/index.js +292 -0
- package/lib/fs/edit-after-read.js +103 -0
- package/lib/fsx.js +87 -0
- package/lib/git/account-status.js +140 -0
- package/lib/git/account.js +233 -0
- package/lib/git/api.js +136 -0
- package/lib/git/atomic-json.js +6 -0
- package/lib/git/browse.js +38 -0
- package/lib/git/clone-download.js +397 -0
- package/lib/git/clone-history-mode.js +143 -0
- package/lib/git/clone-history.js +175 -0
- package/lib/git/clone-jobs.js +250 -0
- package/lib/git/clone-replay-io.js +172 -0
- package/lib/git/clone-replay.js +275 -0
- package/lib/git/clone.js +445 -0
- package/lib/git/cloud.js +46 -0
- package/lib/git/commit-message.js +141 -0
- package/lib/git/config.js +6 -0
- package/lib/git/cred-env.js +88 -0
- package/lib/git/credentials.js +6 -0
- package/lib/git/endpoints.js +6 -0
- package/lib/git/exec.js +6 -0
- package/lib/git/identity-rewrite.js +297 -0
- package/lib/git/identity.js +150 -0
- package/lib/git/ignore.js +69 -0
- package/lib/git/index.js +41 -0
- package/lib/git/module-splitter.js +47 -0
- package/lib/git/post-push.js +101 -0
- package/lib/git/push-diagnose.js +142 -0
- package/lib/git/push.js +476 -0
- package/lib/git/remote-resolve.js +146 -0
- package/lib/git/remote.js +128 -0
- package/lib/git/repo-index.js +512 -0
- package/lib/git/repos.js +235 -0
- package/lib/git/scan-runner.js +159 -0
- package/lib/git/sensitive.js +134 -0
- package/lib/git/transport.js +430 -0
- package/lib/git/visibility.js +35 -0
- package/lib/git/wrapped-git.js +68 -0
- package/lib/http/index.js +170 -0
- package/lib/index.js +24 -0
- package/lib/link-check/index.js +187 -0
- package/lib/npm/account.js +64 -0
- package/lib/npm/install.js +211 -0
- package/lib/npm/npmrc.js +56 -0
- package/lib/npm/publish.js +171 -0
- package/lib/npm/registry.js +168 -0
- package/lib/plugin/auto-detect.js +92 -0
- package/lib/plugin/auto-push.js +154 -0
- package/lib/plugin/index.js +250 -0
- package/lib/readme-templates/readme.yml +38 -0
- package/lib/rule/compilers/credential.js +62 -0
- package/lib/rule/compilers/dataflow.js +38 -0
- package/lib/rule/compilers/file-health.js +75 -0
- package/lib/rule/compilers/frontend.js +86 -0
- package/lib/rule/compilers/func.js +35 -0
- package/lib/rule/compilers/helpers.js +71 -0
- package/lib/rule/compilers/index.js +29 -0
- package/lib/rule/compilers/link-semantic.js +45 -0
- package/lib/rule/compilers/list-kinds.js +12 -0
- package/lib/rule/compilers/numeric-kinds.js +66 -0
- package/lib/rule/compilers/regex.js +78 -0
- package/lib/rule/compilers/structure.js +80 -0
- package/lib/rule/compilers.js +17 -0
- package/lib/rule/homoglyph.js +45 -0
- package/lib/rule/loader.js +270 -0
- package/lib/rule/registry.js +115 -0
- package/lib/rule/scope.js +67 -0
- package/lib/score/docs-score.js +166 -0
- package/lib/score/index.js +140 -0
- package/lib/self/index.js +196 -0
- package/lib/skip-dirs.js +64 -0
- package/lib/tool-probes.json +50 -0
- package/lib/user-requirements.json +14 -0
- package/lib/vendor/js-yaml/LICENSE +21 -0
- package/lib/vendor/js-yaml/js-yaml.mjs +3073 -0
- package/package.json +95 -4
- package/scripts/__pycache__/module-splitter.cpython-38.pyc +0 -0
- package/scripts/audit-ext/_example-readme-present.mjs +34 -0
- package/scripts/audit-ext/variable-min-length.mjs +102 -0
- package/scripts/audit-runner.mjs +35 -0
- package/scripts/audit-runtime-check.mjs +129 -0
- package/scripts/browser-page-probe.mjs +271 -0
- package/scripts/build-client.mjs +119 -0
- package/scripts/check.mjs +88 -0
- package/scripts/clean-date-comments.py +102 -0
- package/scripts/cpu-sample.mjs +188 -0
- package/scripts/doc-drift.mjs +200 -0
- package/scripts/doc-func.mjs +212 -0
- package/scripts/doc-tree.mjs +456 -0
- package/scripts/doc-version.mjs +220 -0
- package/scripts/frontend-preview-check.mjs +124 -0
- package/scripts/hot-path-probe-cjs.cjs +71 -0
- package/scripts/hot-path-probe-fs-shim.mjs +28 -0
- package/scripts/hot-path-probe-fsp-shim.mjs +31 -0
- package/scripts/hot-path-probe.mjs +153 -0
- package/scripts/module-splitter.py +800 -0
- package/scripts/platform-scan.mjs +168 -0
- package/scripts/preview-gen.mjs +489 -0
- package/scripts/preview-local-runner.mjs +55 -0
- package/scripts/preview-server-direct.mjs +116 -0
- package/scripts/preview-server.mjs +305 -0
- package/scripts/preview-slot-data.mjs +123 -0
- package/scripts/probe-recheck.mjs +47 -0
- package/scripts/readme-gen.mjs +268 -0
- package/scripts/rename-locator.mjs +97 -0
- package/scripts/rule-switch.mjs +97 -0
- package/scripts/rules-solo-audit.mjs +173 -0
- package/scripts/scan-file-io.mjs +713 -0
- package/scripts/scan-hardcoded-paths.mjs +125 -0
- package/scripts/scan-repos.mjs +167 -0
- package/scripts/scan-version.mjs +122 -0
- package/scripts/scrub-user-wording.mjs +420 -0
- package/scripts/symbol-index.mjs +85 -0
- package/scripts/sync-plugin-install.mjs +223 -0
- package/scripts/sync-plugin.mjs +279 -0
- package/scripts/verify-prestep.mjs +100 -0
- package/skills/dev/audit-rule-authoring.md +58 -0
- package/skills/dev/dsh-git-push.md +323 -0
- package/skills/dev/git-push-live-fix.md +45 -0
- package/skills/dsh-repo-index.md +35 -0
- package/skills/guide/guide-audit.md +167 -0
- package/skills/guide/guide-cli-scripts.md +104 -0
- package/skills/guide/guide-clone-repos.md +173 -0
- package/skills/guide/guide-commit-push.md +156 -0
- package/skills/guide/guide-inject-ui.md +166 -0
- package/skills/guide/guide-slash-completion.md +118 -0
- package/skills/workflow/README.md +21 -0
- package/skills/workflow/git-commit-discipline.md +68 -0
- package/skills/workflow/git-project-startup.md +85 -0
- package/skills/workflow/git-rebuild-process.md +57 -0
- package/skills/workflow/github-operations.md +91 -0
- package/skills/workflow/readme-sync-git-md.md +28 -0
- package/skills/workflow/task-completion-report.md +73 -0
- package/skills/workflow/tool-json-add-ask.md +35 -0
- package/skills/workflow/versioning-rule.md +211 -0
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 克隆·真实历史:提交链拉取与「按提交重放」所需的纯逻辑。
|
|
3
|
+
*
|
|
4
|
+
* 【为什么需要本模块】原克隆(clone.js 的 cloneViaApi)走 Git Data API 的 trees+blobs,
|
|
5
|
+
* 把**整树快照**写盘后再 `git init` + 一条合成提交。后果实测:
|
|
6
|
+
* 本地与远端**无共同祖先** ⇒ 推不回(非快进)、`git log` 只有 1 条(读不到演进)、分支/标签全丢。
|
|
7
|
+
* 本模块负责把真实提交链取回来,并给出重放所需的**数据与顺序**;落盘与提交由 clone.js 执行。
|
|
8
|
+
*
|
|
9
|
+
* 【为什么写成纯函数模块(apiGet 注入)】拉链与定序是**可单测的逻辑**——
|
|
10
|
+
* 分页、拓扑序、合并提交、depth 截断——与网络、磁盘无关。
|
|
11
|
+
* 把 apiGet 作为参数注入 ⇒ 单测可完全离线(见 test/test-clone-history.mjs),
|
|
12
|
+
* 这也让本模块能被外部复用(不依赖本插件的网络层)。
|
|
13
|
+
*
|
|
14
|
+
* 【只做三件事】
|
|
15
|
+
* ① fetchCommitChain:按 parents 拉链(逐条 /git/commits/{sha}),并**拓扑排序**(父先于子)
|
|
16
|
+
* ② gitDateOf / authorEnvOf / committerEnvOf:生成 git 提交所需的环境变量与日期格式
|
|
17
|
+
* ③ planReplay:把链整理成「有父先于子」的重放顺序(并标出合并提交的父编号)
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
/** 默认拉链深度:既够读演进,又不至于让大仓打爆 API 配额。 */
|
|
21
|
+
export const DEFAULT_HISTORY_DEPTH = 50;
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* 把 GitHub 返回的 ISO8601 时间转成 git 可接受的原始日期格式。
|
|
25
|
+
*
|
|
26
|
+
* 为什么不能直接塞 ISO:git 认 `@<epoch> <±HHMM>` 或 `<epoch> <±HHMM>`,
|
|
27
|
+
* 不认 `2026-09-13T12:00:00Z`;而**时区偏移必须保留**——
|
|
28
|
+
* commit sha 含作者/提交者的日期字符串,丢掉偏移就再也对不上远端 sha(见 transport.js 的通道说明)。
|
|
29
|
+
*
|
|
30
|
+
* @param {string} iso GitHub API 的 `author.date` / `committer.date`
|
|
31
|
+
* @returns {string} 形如 `1694567890 +0800`;无法解析时回退 `0 +0000`
|
|
32
|
+
*/
|
|
33
|
+
export function gitDateOf(iso) {
|
|
34
|
+
const s = String(iso || '').trim();
|
|
35
|
+
const m = s.match(/^(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2}:\d{2})(?:\.\d+)?(Z|[+-]\d{2}:?\d{2})?$/);
|
|
36
|
+
if (!m) {
|
|
37
|
+
const t = Date.parse(s);
|
|
38
|
+
return Number.isFinite(t) ? `${Math.floor(t / 1000)} +0000` : '0 +0000';
|
|
39
|
+
}
|
|
40
|
+
const [, day, clock, tzRaw] = m;
|
|
41
|
+
const epoch = Math.floor(Date.parse(`${day}T${clock}Z`) / 1000);
|
|
42
|
+
let tz = '+0000';
|
|
43
|
+
if (tzRaw && tzRaw !== 'Z') tz = tzRaw.includes(':') ? tzRaw.replace(':', '') : tzRaw;
|
|
44
|
+
return `${epoch} ${tz}`;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* 生成一次 git 提交所需的环境变量(作者/提交者姓名、邮箱、日期)。
|
|
49
|
+
*
|
|
50
|
+
* 为什么逐字段回填:sha 由「tree + parents + author + committer + message」共同决定,
|
|
51
|
+
* 任一字段不同则 sha 不同 ⇒ 远端祖先关系又会断(这正是 API 推送通道的老问题)。
|
|
52
|
+
*
|
|
53
|
+
* @param {object} c 提交对象(含 author/committer/message)
|
|
54
|
+
* @returns {object} 可直接展开进 runGit 的 env
|
|
55
|
+
*/
|
|
56
|
+
export function commitEnvOf(c) {
|
|
57
|
+
const a = c?.author || {};
|
|
58
|
+
const m = c?.committer || a;
|
|
59
|
+
return {
|
|
60
|
+
GIT_AUTHOR_NAME: String(a.name || 'unknown'),
|
|
61
|
+
GIT_AUTHOR_EMAIL: String(a.email || 'unknown@example.com'),
|
|
62
|
+
GIT_AUTHOR_DATE: gitDateOf(a.date),
|
|
63
|
+
GIT_COMMITTER_NAME: String(m.name || a.name || 'unknown'),
|
|
64
|
+
GIT_COMMITTER_EMAIL: String(m.email || a.email || 'unknown@example.com'),
|
|
65
|
+
GIT_COMMITTER_DATE: gitDateOf(m.date || a.date),
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* 拓扑排序:保证**父提交先于子提交**。
|
|
71
|
+
*
|
|
72
|
+
* 为什么不能只按时间排:GitHub 返回的时间可被改写/时钟漂移,且合并提交的两个父
|
|
73
|
+
* 时间先后不定;一旦子先于父重放,`git commit -p <父>` 会因父对象不存在而失败。
|
|
74
|
+
* 故用「入度=未就绪父数」的 Kahn 排序,与时间无关。
|
|
75
|
+
*
|
|
76
|
+
* @param {Array<object>} commits 提交对象数组(含 sha/parents)
|
|
77
|
+
* @returns {Array<object>} 新数组,父在前;存在环或缺失父时,剩余部分按原顺序追加(不丢数据)
|
|
78
|
+
*/
|
|
79
|
+
export function topoSort(commits) {
|
|
80
|
+
const list = Array.isArray(commits) ? commits.slice() : [];
|
|
81
|
+
const bySha = new Map(list.map((c) => [c.sha, c]));
|
|
82
|
+
const missing = new Set(); // 链外的父(depth 截断处):视为已满足
|
|
83
|
+
const pending = new Map(); // sha → 尚未就绪的父个数
|
|
84
|
+
for (const c of list) {
|
|
85
|
+
const ps = (c.parents || []).filter((p) => bySha.has(p));
|
|
86
|
+
pending.set(c.sha, ps.length);
|
|
87
|
+
for (const p of c.parents || []) if (!bySha.has(p)) missing.add(p);
|
|
88
|
+
}
|
|
89
|
+
const out = [];
|
|
90
|
+
const done = new Set();
|
|
91
|
+
let progressed = true;
|
|
92
|
+
while (progressed) {
|
|
93
|
+
progressed = false;
|
|
94
|
+
for (const c of list) {
|
|
95
|
+
if (done.has(c.sha)) continue;
|
|
96
|
+
if ((pending.get(c.sha) || 0) === 0) {
|
|
97
|
+
done.add(c.sha);
|
|
98
|
+
out.push(c);
|
|
99
|
+
progressed = true;
|
|
100
|
+
for (const other of list) {
|
|
101
|
+
if (done.has(other.sha)) continue;
|
|
102
|
+
if ((other.parents || []).includes(c.sha)) pending.set(other.sha, Math.max(0, (pending.get(other.sha) || 0) - 1));
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
for (const c of list) if (!done.has(c.sha)) out.push(c); // 有环/异常时兜底,绝不丢提交
|
|
108
|
+
return out;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/**
|
|
112
|
+
* 按 parents 拉取提交链(逐条 `/git/commits/{sha}`,与现有 API 层 `{ok,status,json}` 约定一致)。
|
|
113
|
+
*
|
|
114
|
+
* @param {object} o
|
|
115
|
+
* @param {string} o.owner 仓库 owner
|
|
116
|
+
* @param {string} o.repo 仓库名
|
|
117
|
+
* @param {string} o.head 起始提交 sha(分支 HEAD)
|
|
118
|
+
* @param {number} [o.depth] 最多拉多少条(默认 DEFAULT_HISTORY_DEPTH)
|
|
119
|
+
* @param {Function} o.apiGet `(apiPath) => Promise<{ok:boolean,status:number,json:any}>`
|
|
120
|
+
* @returns {Promise<{ok:boolean,commits:Array<object>,truncated:boolean,error?:string}>}
|
|
121
|
+
* commits 已按拓扑序(父先于子)排列
|
|
122
|
+
*/
|
|
123
|
+
export async function fetchCommitChain({ owner, repo, head, depth = DEFAULT_HISTORY_DEPTH, apiGet } = {}) {
|
|
124
|
+
if (typeof apiGet !== 'function') return { ok: false, commits: [], truncated: false, error: '缺少 apiGet 注入' };
|
|
125
|
+
if (!owner || !repo || !head) return { ok: false, commits: [], truncated: false, error: '缺少 owner/repo/head' };
|
|
126
|
+
const max = Math.max(1, Number(depth) || DEFAULT_HISTORY_DEPTH);
|
|
127
|
+
const seen = new Map();
|
|
128
|
+
const queue = [head];
|
|
129
|
+
let truncated = false;
|
|
130
|
+
while (queue.length) {
|
|
131
|
+
if (seen.size >= max) { truncated = true; break; }
|
|
132
|
+
const sha = queue.shift();
|
|
133
|
+
if (seen.has(sha)) continue;
|
|
134
|
+
const r = await apiGet(`/repos/${owner}/${repo}/git/commits/${sha}`);
|
|
135
|
+
// 判定必须按 status:本仓库的 githubFetch 返回 { status, json, text, buffer, rateLimit },
|
|
136
|
+
// **没有 ok 字段** ⇒ 写 !r.ok 会把 HTTP 200 也判成失败(真仓库 e2e 连续暴露三处同一错误)。
|
|
137
|
+
const good = r?.status === 200 || r?.ok === true;
|
|
138
|
+
if (!good || !r.json?.sha) return { ok: false, commits: [], truncated, error: `取提交 ${String(sha).slice(0, 7)} 失败(HTTP ${r?.status ?? '?'})` };
|
|
139
|
+
const c = r.json;
|
|
140
|
+
// parents 的真实形状是**对象数组** [{sha,url,html_url}](Git Data API 如此),不是字符串数组。
|
|
141
|
+
// 故必须在此归一成 sha 字符串:否则 `${p}` 会变成 "[object Object]"(真仓库 e2e 实测 404 暴露),
|
|
142
|
+
// 且下游 topoSort / planReplay 用 sha 做键也会全部失配。
|
|
143
|
+
const parents = (Array.isArray(c.parents) ? c.parents : [])
|
|
144
|
+
.map((p) => (typeof p === 'string' ? p : String(p?.sha || '')))
|
|
145
|
+
.filter(Boolean);
|
|
146
|
+
seen.set(sha, {
|
|
147
|
+
sha: c.sha,
|
|
148
|
+
parents,
|
|
149
|
+
tree: c.tree?.sha || '',
|
|
150
|
+
message: String(c.message || ''),
|
|
151
|
+
author: c.author || {},
|
|
152
|
+
committer: c.committer || {},
|
|
153
|
+
});
|
|
154
|
+
for (const p of parents) if (!seen.has(p)) queue.push(p);
|
|
155
|
+
}
|
|
156
|
+
return { ok: true, commits: topoSort([...seen.values()]), truncated };
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
/**
|
|
160
|
+
* 把(已拓扑排序的)链整理成重放计划:逐条给出「提交 + 父在本地序列中的位置」。
|
|
161
|
+
*
|
|
162
|
+
* 为什么单独一步:重放时要区分「普通提交(1 个父)」与「合并提交(≥2 个父)」,
|
|
163
|
+
* 后者必须显式传多个 `-p`,否则历史线会断(线断了 sha 就不同,祖先关系又裂)。
|
|
164
|
+
*
|
|
165
|
+
* @param {Array<object>} commits 拓扑序提交数组
|
|
166
|
+
* @returns {Array<{commit:object,parentIndexes:number[],isMerge:boolean}>}
|
|
167
|
+
*/
|
|
168
|
+
export function planReplay(commits) {
|
|
169
|
+
const list = Array.isArray(commits) ? commits : [];
|
|
170
|
+
const index = new Map(list.map((c, i) => [c.sha, i]));
|
|
171
|
+
return list.map((c) => {
|
|
172
|
+
const parentIndexes = (c.parents || []).map((p) => index.get(p)).filter((i) => Number.isInteger(i));
|
|
173
|
+
return { commit: c, parentIndexes, isMerge: (c.parents || []).length > 1 };
|
|
174
|
+
});
|
|
175
|
+
}
|
|
@@ -0,0 +1,250 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* clone 任务:预览与进度(内存态)
|
|
3
|
+
*
|
|
4
|
+
* 为什么单独成文件:http-handlers.js 已 600 行(超单文件 400 行上限),不宜再加逻辑;
|
|
5
|
+
* 且预览/进度是「一次 clone 的临时状态」,与请求处理无关,独立后也便于单测。
|
|
6
|
+
*
|
|
7
|
+
* 设计取舍:
|
|
8
|
+
* - 进度是**内存态**:进程重启即丢。符合语义——clone 任务随进程存亡,
|
|
9
|
+
* 留一份持久化的「上次进度」只会误导(重试时已重新开始)。
|
|
10
|
+
* - 单任务模型:本插件一次只跑一个 clone(前端也是串行点击),
|
|
11
|
+
* 多任务会引入任务 id 与并发写同一目录的冲突,收益不抵复杂度。
|
|
12
|
+
* - 进度按**字节**统计而非文件数:大文件占绝对多数耗时,
|
|
13
|
+
* 按文件数会出现「95% 卡住很久」的错觉。
|
|
14
|
+
*
|
|
15
|
+
* 修「报错停止了、其实还在下载」:
|
|
16
|
+
* 原先「单任务模型」只写在注释里,代码并无约束——startCloneJob 直接覆盖 current,
|
|
17
|
+
* 于是第二次 clone 能与第一次并存。实测后果:两次并发写同一 dest,
|
|
18
|
+
* 第二次进清理分支时第一次仍在写 -> rmdir 报 ENOTEMPTY(「创建目录失败」),
|
|
19
|
+
* 而**第一次没人去停**,任务被标记为 done/失败之后 worker 仍继续下载(孤儿协程),
|
|
20
|
+
* .dsh-parts 字节数持续增长、文件句柄不释放。
|
|
21
|
+
* 现补三件事:① 目录级互斥(已有任务在跑则拒绝新请求);② 中止句柄随任务管理;
|
|
22
|
+
* ③ 结构化日志,便于事后定位。
|
|
23
|
+
*/
|
|
24
|
+
|
|
25
|
+
/* ───────── clone 进度常量 ───────── */
|
|
26
|
+
const PROGRESS_PCT_CAP = 99; // 进度百分比上限(避免 100% 与「已完成」混淆)
|
|
27
|
+
const PREVIEW_CACHE_MAX = 20; // 预览缓存条目上限(防内存膨胀)
|
|
28
|
+
|
|
29
|
+
/** 当前 clone 任务(null = 空闲) */
|
|
30
|
+
let current = null;
|
|
31
|
+
|
|
32
|
+
/** 已结束任务的最近结果(供前端在任务结束后仍能取到终态) */
|
|
33
|
+
let lastDone = null;
|
|
34
|
+
|
|
35
|
+
/** 预览缓存:target+maxFileMB → 预览结果(避免每次点 clone 都打一遍 GitHub) */
|
|
36
|
+
const previewCache = new Map();
|
|
37
|
+
const PREVIEW_TTL_MS = 60_000;
|
|
38
|
+
|
|
39
|
+
/** 进行中任务的 dest -> AbortController,用于「中止在跑的下载」 */
|
|
40
|
+
const inflight = new Map();
|
|
41
|
+
|
|
42
|
+
/** clone 日志环形缓冲(最近 N 条,供排查;内存态,随进程存亡) */
|
|
43
|
+
const LOG_MAX = 200;
|
|
44
|
+
const logBuffer = [];
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* 记一条 clone 日志。刻意同时写 stderr:插件在宿主进程内跑,
|
|
48
|
+
* 出问题时用户能直接从实例日志看到,而不必先猜到有这个端点。
|
|
49
|
+
* @param {string} event 事件名(start/refuse/abort/cleanup/...)
|
|
50
|
+
* @param {object} detail 结构化细节
|
|
51
|
+
*/
|
|
52
|
+
export function cloneLog(event, detail = {}) {
|
|
53
|
+
const entry = { at: new Date().toISOString(), event, ...detail };
|
|
54
|
+
logBuffer.push(entry);
|
|
55
|
+
if (logBuffer.length > LOG_MAX) logBuffer.shift();
|
|
56
|
+
try {
|
|
57
|
+
// eslint-disable-next-line no-console
|
|
58
|
+
console.error('[dsh-git-push:clone]', JSON.stringify(entry));
|
|
59
|
+
} catch { /* 日志失败绝不影响主流程 */ }
|
|
60
|
+
return entry;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/** 取最近日志(默认全量,最多 LOG_MAX 条)。 */
|
|
64
|
+
export function cloneLogs(limit = LOG_MAX) {
|
|
65
|
+
return logBuffer.slice(-limit);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* 判断某目录是否已有 clone 在跑。
|
|
70
|
+
* @param {string} dest 目标目录
|
|
71
|
+
* @returns {boolean}
|
|
72
|
+
*/
|
|
73
|
+
export function isCloneInFlight(dest) {
|
|
74
|
+
return inflight.has(String(dest || ''));
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* 开始一个 clone 任务。
|
|
79
|
+
*
|
|
80
|
+
* 原先直接覆盖 current,注释说的「同一时刻只允许一个」并无代码支撑。
|
|
81
|
+
* 现改为**拒绝**而非覆盖:已有任务在跑时返回 { ok:false, reason:'busy' },
|
|
82
|
+
* 由调用方回 409 并如实说明「另一个 clone 正在进行」。
|
|
83
|
+
* @param {{target:string, dest:string, totalFiles:number, totalBytes:number}} meta
|
|
84
|
+
* @returns {{ok:boolean, reason?:string, running?:object, progress?:object}}
|
|
85
|
+
*/
|
|
86
|
+
export function startCloneJob(meta) {
|
|
87
|
+
const dest = String(meta.dest || '');
|
|
88
|
+
const busy = snapshot();
|
|
89
|
+
if (busy) {
|
|
90
|
+
cloneLog('refuse', { target: meta.target, dest, reason: 'another-clone-running', runningDest: busy.dest });
|
|
91
|
+
return { ok: false, reason: 'busy', running: busy };
|
|
92
|
+
}
|
|
93
|
+
const controller = new AbortController();
|
|
94
|
+
inflight.set(dest, controller);
|
|
95
|
+
current = {
|
|
96
|
+
target: meta.target,
|
|
97
|
+
dest: meta.dest,
|
|
98
|
+
totalFiles: meta.totalFiles || 0,
|
|
99
|
+
totalBytes: meta.totalBytes || 0,
|
|
100
|
+
done: 0,
|
|
101
|
+
transferred: 0,
|
|
102
|
+
failed: 0,
|
|
103
|
+
startedAt: Date.now(),
|
|
104
|
+
updatedAt: Date.now(),
|
|
105
|
+
// 进度停滞检测:调用方据此判定「卡死」——比绝对超时合理,
|
|
106
|
+
// 30MB 单文件传输慢但进度在涨,不该被判超时
|
|
107
|
+
lastProgressAt: Date.now(),
|
|
108
|
+
phase: 'downloading',
|
|
109
|
+
};
|
|
110
|
+
cloneLog('start', { target: meta.target, dest, totalFiles: current.totalFiles, totalBytes: current.totalBytes });
|
|
111
|
+
return { ok: true, progress: snapshot() };
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
/**
|
|
115
|
+
* 取当前任务的中止信号(下载器消费它;清理同目录残留前会先 abort)。
|
|
116
|
+
* @returns {AbortSignal|null}
|
|
117
|
+
*/
|
|
118
|
+
export function cloneAbortSignal() {
|
|
119
|
+
if (!current) return null;
|
|
120
|
+
return inflight.get(current.dest)?.signal || null;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/**
|
|
124
|
+
* 中止当前任务的下载。
|
|
125
|
+
*
|
|
126
|
+
* 为什么必须有:清理残留目录(rmSync)与下载 worker 并发时会互相踩——
|
|
127
|
+
* 边删边写导致 rmdir 报 ENOTEMPTY,且 worker 无人取消会变成孤儿继续下载。
|
|
128
|
+
* 故清理前先 abort,让 worker 在下一个检查点退出。
|
|
129
|
+
* @param {string} why 中止原因(写进日志)
|
|
130
|
+
* @returns {boolean} 是否确实中止了一个任务
|
|
131
|
+
*/
|
|
132
|
+
export function abortCloneJob(why = 'unspecified') {
|
|
133
|
+
const dest = current?.dest;
|
|
134
|
+
if (!dest) return false;
|
|
135
|
+
const entry = inflight.get(dest);
|
|
136
|
+
if (!entry) return false;
|
|
137
|
+
cloneLog('abort', { dest, why });
|
|
138
|
+
entry.abort(new Error(`clone aborted: ${why}`));
|
|
139
|
+
inflight.delete(dest);
|
|
140
|
+
return true;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
/**
|
|
144
|
+
* 更新进度(下载器的 onProgress 直接接这里)。
|
|
145
|
+
* @param {{done:number,total:number,transferred:number,totalBytes:number,failed:number}} p
|
|
146
|
+
*/
|
|
147
|
+
export function updateCloneJob(p) {
|
|
148
|
+
if (!current) return;
|
|
149
|
+
const before = current.transferred;
|
|
150
|
+
current.done = p.done ?? current.done;
|
|
151
|
+
current.transferred = p.transferred ?? current.transferred;
|
|
152
|
+
current.failed = p.failed ?? current.failed;
|
|
153
|
+
if (p.total) current.totalFiles = p.total;
|
|
154
|
+
if (p.totalBytes) current.totalBytes = p.totalBytes;
|
|
155
|
+
current.updatedAt = Date.now();
|
|
156
|
+
// 只有真的传了字节才算「有进展」,避免空转重置停滞计时
|
|
157
|
+
if (current.transferred > before) current.lastProgressAt = Date.now();
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
/** 标记任务进入 git init/commit 阶段(此阶段无字节进度,前端文案要跟着变) */
|
|
161
|
+
export function setCloneJobPhase(phase) {
|
|
162
|
+
if (current) { current.phase = phase; current.updatedAt = Date.now(); current.lastProgressAt = Date.now(); }
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
/** 结束任务:记终态,清 current */
|
|
166
|
+
export function finishCloneJob(result) {
|
|
167
|
+
const snap = snapshot();
|
|
168
|
+
lastDone = {
|
|
169
|
+
ok: !!result.ok,
|
|
170
|
+
error: result.error || '',
|
|
171
|
+
...snap,
|
|
172
|
+
finishedAt: Date.now(),
|
|
173
|
+
};
|
|
174
|
+
// inflight 必须随之释放,否则 abort 句柄泄漏、后续同名 dest 会被误判为「仍在跑」
|
|
175
|
+
if (current?.dest) inflight.delete(current.dest);
|
|
176
|
+
current = null;
|
|
177
|
+
cloneLog(result.ok ? 'finish-ok' : 'finish-fail', {
|
|
178
|
+
dest: snap?.dest,
|
|
179
|
+
target: snap?.target,
|
|
180
|
+
done: snap?.done,
|
|
181
|
+
totalFiles: snap?.totalFiles,
|
|
182
|
+
transferred: snap?.transferred,
|
|
183
|
+
failed: snap?.failed,
|
|
184
|
+
elapsedMs: snap ? Date.now() - snap.startedAt : undefined,
|
|
185
|
+
error: result.error || '',
|
|
186
|
+
});
|
|
187
|
+
return lastDone;
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
/**
|
|
191
|
+
* 取当前进度快照(含停滞秒数,供前端判断是否卡死)。
|
|
192
|
+
* @returns {object|null}
|
|
193
|
+
*/
|
|
194
|
+
export function snapshot() {
|
|
195
|
+
if (!current) return null;
|
|
196
|
+
return {
|
|
197
|
+
target: current.target,
|
|
198
|
+
dest: current.dest,
|
|
199
|
+
phase: current.phase,
|
|
200
|
+
done: current.done,
|
|
201
|
+
totalFiles: current.totalFiles,
|
|
202
|
+
transferred: current.transferred,
|
|
203
|
+
totalBytes: current.totalBytes,
|
|
204
|
+
failed: current.failed,
|
|
205
|
+
elapsedMs: Date.now() - current.startedAt,
|
|
206
|
+
stalledMs: Date.now() - current.lastProgressAt,
|
|
207
|
+
// 百分比:按字节;总量未知时退回文件数
|
|
208
|
+
percent: current.totalBytes > 0
|
|
209
|
+
? Math.min(PROGRESS_PCT_CAP, Math.floor((current.transferred / current.totalBytes) * 100))
|
|
210
|
+
: (current.totalFiles > 0 ? Math.min(PROGRESS_PCT_CAP, Math.floor((current.done / current.totalFiles) * 100)) : 0),
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
/**
|
|
215
|
+
* 查询任务状态:进行中返回进度;已结束返回终态;都没有则 idle。
|
|
216
|
+
*/
|
|
217
|
+
export function cloneJobStatus() {
|
|
218
|
+
const cur = snapshot();
|
|
219
|
+
if (cur) return { state: 'running', progress: cur };
|
|
220
|
+
if (lastDone) return { state: 'done', result: lastDone };
|
|
221
|
+
return { state: 'idle' };
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
/** 清除终态(前端取走后调用,避免旧结果被反复读到) */
|
|
225
|
+
export function clearCloneJobResult() {
|
|
226
|
+
lastDone = null;
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
/** 预览缓存读写 */
|
|
230
|
+
export function getPreview(key) {
|
|
231
|
+
const hit = previewCache.get(key);
|
|
232
|
+
if (!hit) return null;
|
|
233
|
+
if (Date.now() - hit.at > PREVIEW_TTL_MS) { previewCache.delete(key); return null; }
|
|
234
|
+
return hit.data;
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
export function setPreview(key, data) {
|
|
238
|
+
previewCache.set(key, { at: Date.now(), data });
|
|
239
|
+
// 简单上限:预览是短命缓存,超过 20 条清最早的一半
|
|
240
|
+
if (previewCache.size > PREVIEW_CACHE_MAX) {
|
|
241
|
+
const keys = [...previewCache.keys()].slice(0, 10);
|
|
242
|
+
for (const k of keys) previewCache.delete(k);
|
|
243
|
+
}
|
|
244
|
+
return data;
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
/** 测试用:重置全部内存态 */
|
|
248
|
+
export function __resetCloneJobs() {
|
|
249
|
+
current = null; lastDone = null; previewCache.clear(); inflight.clear(); logBuffer.length = 0;
|
|
250
|
+
}
|
|
@@ -0,0 +1,172 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 克隆·真实历史:把 replayHistory 的 io 契约接到**真实** git / GitHub API / 下载器上。
|
|
3
|
+
*
|
|
4
|
+
* 【分工】clone-replay.js 负责「算什么」(纯逻辑,已单测);本文件负责「怎么跑」(接线)。
|
|
5
|
+
* 所有外部动作默认走真实实现,但都可用 deps 覆盖 ⇒ 接线层本身也能离线单测。
|
|
6
|
+
*
|
|
7
|
+
* 【真实签名(已逐个核对,非猜测)】
|
|
8
|
+
* · runGit(args, { cwd, timeoutMs, env }) —— lib/git/exec.js:84(支持 env,故 GIT_AUTHOR_* 可传)
|
|
9
|
+
* · githubFetch(path, { token, method, body, timeout, headers }) —— lib/git/api.js:22
|
|
10
|
+
* · downloadBlobs({ blobs, targetDir, owner, repo, branch, token, concurrency, onProgress, signal })
|
|
11
|
+
* → { files, failed, modePreserved } —— lib/git/clone-download.js:217
|
|
12
|
+
*
|
|
13
|
+
* 【两个容易踩的点,已在实现里处理】
|
|
14
|
+
* ① exec.js 的 GIT_GLOBAL_ARGS 已含 `-c core.filemode=false`(仅作用于插件自己的 git 调用);
|
|
15
|
+
* 克隆出来的仓库是**给用户用的**,其 config 里没有这一项 ⇒ 本适配器在 prepare 时显式写一次
|
|
16
|
+
* (不支持 mode 的卷上,避免用户 `git diff` 满屏 mode 变更)。
|
|
17
|
+
* ② `git remote add` 在已有 origin 时会失败 ⇒ prepare 先探测再 add,不改动已有 origin。
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
import { join } from 'node:path';
|
|
21
|
+
import { existsSync, readFileSync, writeFileSync, renameSync, rmSync } from 'node:fs';
|
|
22
|
+
|
|
23
|
+
import { githubFetch } from './api.js';
|
|
24
|
+
import { runGit } from './exec.js';
|
|
25
|
+
import { downloadBlobs } from './clone-download.js';
|
|
26
|
+
import {
|
|
27
|
+
blobEntriesOf, initArgs, setRemoteArgs, configFileModeArgs, addAllArgs, writeTreeArgs,
|
|
28
|
+
commitTreeArgs, updateRefArgs, setUpstreamArgs, localBranchRef, remoteTrackingRef, markerJson,
|
|
29
|
+
} from './clone-replay.js';
|
|
30
|
+
|
|
31
|
+
/** 标记文件名(放在 .git 内,不进工作区、不被 git 跟踪)。 */
|
|
32
|
+
export const REPLAY_MARKER_FILE = 'dsh-clone-history.json';
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* 建一个 replayHistory 可用的 io。
|
|
36
|
+
*
|
|
37
|
+
* @param {object} o
|
|
38
|
+
* @param {string} o.repoPath 目标仓库工作区路径
|
|
39
|
+
* @param {string} o.gitDir 仓库的 .git 目录路径(标记写在这里面)
|
|
40
|
+
* @param {string} o.owner/o.repo/o.branch GitHub 坐标
|
|
41
|
+
* @param {string} [o.token] 私有仓下载所需
|
|
42
|
+
* @param {Function} [o.onProgress] 透传给 downloadBlobs 的进度回调
|
|
43
|
+
* @param {object} [o.signal] 中止信号
|
|
44
|
+
* @param {object} [o.deps] 覆盖真实实现(测试用):{ runGit, githubFetch, downloadBlobs }
|
|
45
|
+
* @returns {object} io:与 replayHistory 约定一致
|
|
46
|
+
*/
|
|
47
|
+
export function createReplayIo({
|
|
48
|
+
repoPath = '', gitDir = '', owner = '', repo = '', branch = '', token = '',
|
|
49
|
+
onProgress = null, signal = null, deps = {},
|
|
50
|
+
} = {}) {
|
|
51
|
+
const git = deps.runGit || runGit;
|
|
52
|
+
const api = deps.githubFetch || githubFetch;
|
|
53
|
+
const download = deps.downloadBlobs || downloadBlobs;
|
|
54
|
+
const markerFile = join(gitDir, REPLAY_MARKER_FILE);
|
|
55
|
+
const gitOpts = { cwd: repoPath };
|
|
56
|
+
|
|
57
|
+
return {
|
|
58
|
+
/** 读续跑标记;不存在/损坏一律回 null(当作从头开始,绝不让坏标记影响重放)。 */
|
|
59
|
+
async readMarker() {
|
|
60
|
+
try {
|
|
61
|
+
if (!existsSync(markerFile)) return null;
|
|
62
|
+
return JSON.parse(readFileSync(markerFile, 'utf8'));
|
|
63
|
+
} catch {
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
},
|
|
67
|
+
|
|
68
|
+
/** 写续跑标记:先写临时文件再 rename(避免半截 JSON 被当成有效标记)。 */
|
|
69
|
+
async writeMarker({ branch: b = '', replayedSha = '' } = {}) {
|
|
70
|
+
try {
|
|
71
|
+
const tmp = `${markerFile}.tmp`;
|
|
72
|
+
writeFileSync(tmp, markerJson({ branch: b, replayedSha }), 'utf8');
|
|
73
|
+
renameSync(tmp, markerFile);
|
|
74
|
+
return { ok: true };
|
|
75
|
+
} catch (e) {
|
|
76
|
+
return { ok: false, error: e?.message || String(e) };
|
|
77
|
+
}
|
|
78
|
+
},
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* 取某提交的树条目:`/git/trees/{sha}?recursive=1` → blobEntriesOf。
|
|
82
|
+
* 树过大被截断时 blobEntriesOf 会返回 ok:false(绝不能当完整树用,否则重放出的 sha 与远端不同)。
|
|
83
|
+
*/
|
|
84
|
+
async fetchTreeEntries(treeSha) {
|
|
85
|
+
const r = await api(`/repos/${owner}/${repo}/git/trees/${treeSha}?recursive=1`, { token });
|
|
86
|
+
// githubFetch 无 ok 字段(返回 {status,json,text,buffer,rateLimit})⇒ 必须按 status 判定,
|
|
87
|
+
// 否则 HTTP 200 也会被当成失败(真仓库 e2e 曾因此一步都跑不动)。
|
|
88
|
+
if (!(r?.status === 200 || r?.ok === true)) return { ok: false, entries: [], error: `取树 HTTP ${r?.status ?? '?'}` };
|
|
89
|
+
const parsed = blobEntriesOf(r.json);
|
|
90
|
+
return { ok: parsed.ok, entries: parsed.entries, error: parsed.error || '' };
|
|
91
|
+
},
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* 落地本轮要下载/更新的文件(复用现有并发下载 + .part 续传 + 体积守卫)。
|
|
95
|
+
*
|
|
96
|
+
* 关键:`ctx.remoteSha` 是**正在重放的远端提交 sha**,把它作为下载 ref 传给 downloadBlobs
|
|
97
|
+
* (GitHub 的 contents/raw 端点接受 commit sha 作为 ref)⇒ 拿到的是该提交的版本。
|
|
98
|
+
* 若退回按分支取(默认 branch),重放会拿到 HEAD 版本:长度校验必然失败,
|
|
99
|
+
* 且中间提交会被写成 HEAD 的样子,sha 保真随之失效。
|
|
100
|
+
*
|
|
101
|
+
* @param {Array<object>} entries 本轮要下载的 blob 条目(含 path/sha/size/mode)
|
|
102
|
+
* @param {{remoteSha?:string}} [ctx] 重放上下文(history 模式必传)
|
|
103
|
+
*/
|
|
104
|
+
async applyDownload(entries, ctx = {}) {
|
|
105
|
+
const ref = String(ctx.remoteSha || branch);
|
|
106
|
+
const r = await download({
|
|
107
|
+
blobs: entries, targetDir: repoPath, owner, repo, branch: ref, token,
|
|
108
|
+
onProgress, signal,
|
|
109
|
+
});
|
|
110
|
+
if (r?.failed?.length) {
|
|
111
|
+
const first = r.failed[0];
|
|
112
|
+
return { ok: false, failed: r.failed, error: `${r.failed.length} 个文件失败(如 ${first.path}: ${first.reason})` };
|
|
113
|
+
}
|
|
114
|
+
return { ok: true, files: r?.files ?? entries.length, modePreserved: r?.modePreserved !== false };
|
|
115
|
+
},
|
|
116
|
+
|
|
117
|
+
/** 删掉本轮从树上消失的路径(目录变文件等情形也由此覆盖)。 */
|
|
118
|
+
async applyRemove(paths = []) {
|
|
119
|
+
const failed = [];
|
|
120
|
+
for (const p of paths) {
|
|
121
|
+
try {
|
|
122
|
+
rmSync(join(repoPath, p), { recursive: true, force: true });
|
|
123
|
+
} catch (e) {
|
|
124
|
+
failed.push({ path: p, reason: e?.message || String(e) });
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
return failed.length ? { ok: false, failed, error: `${failed.length} 个路径删除失败` } : { ok: true };
|
|
128
|
+
},
|
|
129
|
+
|
|
130
|
+
/**
|
|
131
|
+
* 建一条提交:暂存全部变更 → write-tree → commit-tree(多父由 -p 逐个给出)。
|
|
132
|
+
* 为什么不用 `git commit`:commit-tree 原生支持多父,且结果只由 tree+parents+env+message 决定。
|
|
133
|
+
*/
|
|
134
|
+
async commit({ env = {}, message = '', parentShas = [] } = {}) {
|
|
135
|
+
const add = git(addAllArgs(), gitOpts);
|
|
136
|
+
if (!add?.ok) return { ok: false, error: `git add 失败:${add?.stderr || add?.stdout || '未知'}` };
|
|
137
|
+
const wt = git(writeTreeArgs(), gitOpts);
|
|
138
|
+
const tree = String(wt?.stdout || '').trim();
|
|
139
|
+
if (!wt?.ok || !tree) return { ok: false, error: `git write-tree 失败:${wt?.stderr || '无 tree'}` };
|
|
140
|
+
const ct = git(commitTreeArgs({ tree, parents: parentShas, message }), { ...gitOpts, env });
|
|
141
|
+
const sha = String(ct?.stdout || '').trim();
|
|
142
|
+
if (!ct?.ok || !sha) return { ok: false, error: `git commit-tree 失败:${ct?.stderr || '无 sha'}` };
|
|
143
|
+
return { ok: true, sha };
|
|
144
|
+
},
|
|
145
|
+
|
|
146
|
+
/** 重放前准备:init → 显式写 core.fileMode=false → 设 origin(已有 origin 则不覆盖)。 */
|
|
147
|
+
async prepare() {
|
|
148
|
+
const init = git(initArgs(), gitOpts);
|
|
149
|
+
if (!init?.ok) return { ok: false, error: `git init 失败:${init?.stderr || '未知'}` };
|
|
150
|
+
const cfg = git(configFileModeArgs(false), gitOpts);
|
|
151
|
+
const hasOrigin = git(['remote', 'get-url', 'origin'], gitOpts);
|
|
152
|
+
let originSet = true;
|
|
153
|
+
if (!hasOrigin?.ok) {
|
|
154
|
+
const url = `https://github.com/${owner}/${repo}.git`;
|
|
155
|
+
const add = git(setRemoteArgs('origin', url), gitOpts);
|
|
156
|
+
originSet = !!add?.ok;
|
|
157
|
+
}
|
|
158
|
+
return { ok: true, fileModeSet: !!cfg?.ok, originSet };
|
|
159
|
+
},
|
|
160
|
+
|
|
161
|
+
/** 重放收尾:把分支与远端跟踪引用指到重放结果,并设上游(标准 git 命令随即可用)。 */
|
|
162
|
+
async finish({ headSha = '' } = {}) {
|
|
163
|
+
const out = { branchRef: false, remoteRef: false, upstream: false };
|
|
164
|
+
if (!headSha) return { ok: false, ...out, error: '缺少 headSha' };
|
|
165
|
+
out.branchRef = !!git(updateRefArgs(localBranchRef(branch), headSha), gitOpts)?.ok;
|
|
166
|
+
out.remoteRef = !!git(updateRefArgs(remoteTrackingRef('origin', branch), headSha), gitOpts)?.ok;
|
|
167
|
+
out.upstream = !!git(setUpstreamArgs(branch), gitOpts)?.ok;
|
|
168
|
+
const okAll = out.branchRef;
|
|
169
|
+
return { ok: okAll, ...out, error: okAll ? '' : '分支引用更新失败(重放结果未挂到分支上)' };
|
|
170
|
+
},
|
|
171
|
+
};
|
|
172
|
+
}
|