@weibaohui/dsh-git-server 0.1.4 → 0.2.1

package/server/dist/gitx/git.js

@@ -273,7 +273,9 @@ export async function lsTree(repoDir, treeRev, treePath) {
     return { entries: entries.entries, sha: rev };
 }
 async function lsTreeOnce(repoDir, rev, subPath) {
-    const args = ['ls-tree', '-z', '--end-of-options', safeRev(rev)];
+    // -l: blob sizes come inline ("<mode> <type> <sha> <size>\t<name>"), saving a
+    // cat-file subprocess per file at every call site
+    const args = ['ls-tree', '-l', '-z', '--end-of-options', safeRev(rev)];
     if (subPath)
         args.push('--', subPath);
     const out = await gitOK(repoDir, ...args);
@@ -282,7 +284,6 @@ async function lsTreeOnce(repoDir, rev, subPath) {
     const entries = [];
     const records = out.toString('utf8').split('\0').filter(Boolean);
     for (const rec of records) {
-        // "<mode> <type> <sha>\t<name>"
         const tab = rec.indexOf('\t');
         if (tab < 0)
             continue;
@@ -293,7 +294,7 @@ async function lsTreeOnce(repoDir, rev, subPath) {
             type: meta[1],
             sha: meta[2],
             name,
-            size: 0,
+            size: meta[3] && meta[3] !== '-' ? Number(meta[3]) || 0 : 0,
         });
     }
     return { entries, sha: rev };
@@ -302,6 +303,41 @@ export async function entrySize(repoDir, sha) {
     const out = await gitOK(repoDir, 'cat-file', '-s', sha);
     return out ? Number(out.toString().trim()) : 0;
 }
+/** Last commit touching each path, in ONE `git log` walk (first hit per path
+ * wins; -m --first-parent linearizes merges so a merge commit counts as the
+ * last change). Paths not resolved within the walk are simply absent — callers
+ * may fall back to a per-path `git log -1` for those (rare). */
+export async function lastCommitsForPaths(repoDir, rev, paths, maxCount = 4000) {
+    const result = new Map();
+    if (paths.length === 0)
+        return result;
+    const out = await gitOK(repoDir, '-c', 'core.quotePath=false', 'log', '--first-parent', '-m', `--max-count=${maxCount}`, '--pretty=tformat:%x01%h%x1f%s%x1f%ct%x1f%an', '--name-only', '--no-renames', '--end-of-options', safeRev(rev), '--', ...paths);
+    if (!out)
+        return result;
+    let cur = null;
+    const pending = new Set(paths);
+    for (const line of out.toString('utf8').split('\n')) {
+        if (line.startsWith('\x01')) {
+            const [sha, msg, ct, author] = line.slice(1).split('\x1f');
+            cur = { sha: sha || '', msg: (msg || '').slice(0, 90), date: Number(ct) * 1000 || 0, author: author || '' };
+            continue;
+        }
+        const name = line.trim();
+        if (!name || !cur)
+            continue;
+        // a name-only record may be the path itself or (for dir pathspecs) a file under it
+        for (const p of pending) {
+            if (name === p || name.startsWith(p + '/')) {
+                if (!result.has(p))
+                    result.set(p, cur);
+                pending.delete(p);
+            }
+        }
+        if (pending.size === 0)
+            break;
+    }
+    return result;
+}
 export async function blobBytes(repoDir, sha, maxBytes = 0) {
     if (maxBytes > 0) {
         // read at most maxBytes by streaming through cat-file with size check

package/server/dist/gitx/service.js

@@ -106,10 +106,11 @@ function renderReadmeTemplate(name, repo) {
     const tpl = readVendorTemplate('readme', name);
     if (!tpl)
         return `# ${repo.name}\n\n${repo.description ?? ''}\n`;
+    // vendored 模板用单花括号（{Name}），上游 gogs 用双花括号（{{Name}}）——两种都替换
     return tpl
-        .replace(/\{\{Filename\}\}/g, 'README.md')
-        .replace(/\{\{Description\}\}/g, repo.description ?? '')
-        .replace(/\{\{Name\}\}/g, repo.name);
+        .replace(/\{\{?\s*Filename\s*\}?\}/g, 'README.md')
+        .replace(/\{\{?\s*Description\s*\}?\}/g, repo.description ?? '')
+        .replace(/\{\{?\s*Name\s*\}?\}/g, repo.name);
 }
 export function readVendorTemplate(kind, name) {
     const file = path.join(conf.workDir, 'vendored-conf', kind, name);

package/server/dist/hook.js

@@ -2,8 +2,37 @@
 // Environment carries the auth/repo context (ComposeHookEnvs).
 import * as db from './db/db.js';
 export async function runHook(name) {
-    if (name === 'pre-receive' || name === 'update') {
-        // branch protection enforcement goes here; accept by default
+    if (name === 'update') {
+        // 分支保护：受保护分支拒绝删除与强推（非快进）。merge/网页编辑都是快进，不受影响。
+        const [ref, oldSha, newSha] = process.argv.slice(4);
+        if (ref?.startsWith('refs/heads/') && newSha) {
+            const branch = ref.slice('refs/heads/'.length);
+            const ownerName = process.env.GOGS_REPO_OWNER_NAME ?? '';
+            const repoName = process.env.GOGS_REPO_NAME ?? '';
+            const owner = db.getUserByUsername(ownerName);
+            const repo = owner ? db.getRepoByOwnerAndName(owner, repoName) : null;
+            if (repo) {
+                const prot = db.db().prepare('SELECT 1 FROM protect_branch WHERE repo_id = ? AND name = ? AND protected = 1').get(repo.id, branch);
+                if (prot) {
+                    const EMPTY = '0000000000000000000000000000000000000000';
+                    if (newSha === EMPTY) {
+                        console.error(`[hook] rejected: branch ${branch} is protected (deletion)`);
+                        process.exit(1);
+                    }
+                    if (oldSha && oldSha !== EMPTY && /^[0-9a-f]{40}$/.test(oldSha) && /^[0-9a-f]{40}$/.test(newSha)) {
+                        const { gitOK } = await import('./gitx/git.js');
+                        const ok = await gitOK(repo.RepoPath(), 'merge-base', '--is-ancestor', oldSha, newSha);
+                        if (ok === null) {
+                            console.error(`[hook] rejected: branch ${branch} is protected (non-fast-forward)`);
+                            process.exit(1);
+                        }
+                    }
+                }
+            }
+        }
+        process.exit(0);
+    }
+    if (name === 'pre-receive') {
         process.exit(0);
     }
     if (name !== 'post-receive') {

package/server/dist/notify.js

@@ -0,0 +1,55 @@
+// 站内通知：基于 issue_user 表（is_read/is_assigned/is_mentioned/is_poster）的
+// 轻量实现——评论/指派/提及/状态变更时把相关人的行标记为未读，面板轮询未读数。
+import * as db from './db/db.js';
+function ensureRow(uid, issue) {
+    const row = db.db().prepare('SELECT 1 FROM issue_user WHERE uid = ? AND issue_id = ?').get(uid, issue.id);
+    if (row)
+        return;
+    db.db()
+        .prepare('INSERT INTO issue_user (uid, issue_id, repo_id, is_read, is_assigned, is_mentioned, is_poster, is_closed) VALUES (?,?,?,1,0,0,0,?)')
+        .run(uid, issue.id, issue.repo_id, issue.is_closed ?? 0);
+}
+/** 文本里 @到的已存在用户。 */
+export function mentionedUserIDs(content) {
+    const out = new Set();
+    for (const m of content.matchAll(/@([a-zA-Z0-9_.-]+)/g)) {
+        const u = db.getUserByUsername(m[1]);
+        if (u)
+            out.add(u.id);
+    }
+    return [...out];
+}
+/** 把工单相关人（作者/负责人/既往评论者/@提及）标记为未读；actor 本人除外。 */
+export function markIssueUnread(issue, actorID, opts = {}) {
+    const uids = new Set();
+    if (issue.poster_id)
+        uids.add(issue.poster_id);
+    if (issue.assignee_id)
+        uids.add(issue.assignee_id);
+    const commenters = db.db().prepare('SELECT DISTINCT poster_id FROM comment WHERE issue_id = ? AND type = 0').all(issue.id);
+    for (const cm of commenters)
+        if (cm.poster_id)
+            uids.add(cm.poster_id);
+    const mentioned = new Set(opts.mentionContent ? mentionedUserIDs(opts.mentionContent) : []);
+    for (const uid of mentioned)
+        uids.add(uid);
+    for (const uid of uids) {
+        if (!uid || uid === actorID)
+            continue;
+        ensureRow(uid, issue);
+        db.db()
+            .prepare(`UPDATE issue_user SET is_read = 0, is_closed = ?,
+           is_mentioned = MAX(COALESCE(is_mentioned, 0), ?), is_assigned = MAX(COALESCE(is_assigned, 0), ?),
+           milestone_id = COALESCE(?, milestone_id)
+         WHERE uid = ? AND issue_id = ?`)
+            .run(issue.is_closed ?? 0, mentioned.has(uid) ? 1 : 0, opts.assigned && issue.assignee_id === uid ? 1 : 0, issue.milestone_id ?? null, uid, issue.id);
+    }
+}
+/** 查看工单详情后标记已读。 */
+export function markIssueRead(uid, issueID) {
+    db.db().prepare('UPDATE issue_user SET is_read = 1 WHERE uid = ? AND issue_id = ?').run(uid, issueID);
+}
+export function unreadCount(uid) {
+    return db.db().prepare('SELECT COUNT(*) AS c FROM issue_user WHERE uid = ? AND is_read = 0').get(uid).c;
+}
+//# sourceMappingURL=notify.js.map

package/src/index.js

@@ -577,6 +577,7 @@ module.exports = {
                     const r = await kernelApi(cfg, actor, 'GET', `/repos/${owner}/${repo}/issues/${idx}/comments`)
                     sendJson(res, r.status, { ok: Array.isArray(r.json), comments: (Array.isArray(r.json) ? r.json : []).map((c) => ({
                       id: c.id, body: c.body, user: c.user && c.user.login, created: c.created_at,
+                      type: c.type || 0, commit_sha: c.commit_sha || '',
                     })) })
                     return
                   }
@@ -603,13 +604,23 @@ module.exports = {
                 sendJson(res, r.status === 201 ? 200 : r.status, r.status === 201 ? { ok: true } : { ok: false, error: errText(r) })
                 return
               }
+              // PATCH/DELETE /repos/:o/:r/issues/comments/:id — 评论编辑/删除
+              if ((req.method === 'PATCH' || req.method === 'DELETE') && parts[0] === 'repos' && parts[3] === 'issues' && parts[4] === 'comments' && parts[5]) {
+                const [, owner, repo, , , cid] = parts
+                const body = req.method === 'PATCH' ? JSON.parse((await readBody(req)) || '{}') : undefined
+                const r = await kernelApi(cfg, actor, req.method, `/repos/${owner}/${repo}/issues/comments/${cid}`, body)
+                sendJson(res, [200, 201, 204].includes(r.status) ? 200 : r.status,
+                  [200, 201, 204].includes(r.status) ? { ok: true } : { ok: false, error: errText(r) })
+                return
+              }
               // /dsh/*：宿主进程内直接执行内核 dshapi（省铸令牌+HTTP 跳转）。
               // 异常/未匹配路由回退到原来的 HTTP 转发，保证任何内核端点仍可到达。
               if (parts && parts[0] === 'dsh') {
                 try {
                   const token = await kernelTokenFor(cfg, actor)
                   const { dispatch } = require('./dsh-host')
-                  const handled = await dispatch(cfg, actor, req.method, rest, req, res, token)
+                  // rest 只是路径部分；进程内 dispatch 需要连同 query 一起（blame/tree 等带参端点）
+                  const handled = await dispatch(cfg, actor, req.method, rest + (url.search || ''), req, res, token)
                   if (handled) return
                 } catch (e) {
                   sendJson(res, 502, { ok: false, error: 'in-process dispatch failed: ' + String((e && e.message) || e) })