collabmd 0.1.44 → 0.1.45

package/src/server/infrastructure/git/history-service.js

@@ -1,4 +1,4 @@
-import { createGitRequestError } from './errors.js';
+import { createRequestError as createGitRequestError } from '../http/http-errors.js';
 import { getVaultFileKind, isImageAttachmentFilePath } from '../../../domain/file-kind.js';
 import { normalizeRelativeGitPath } from './path-utils.js';
 import {
@@ -9,11 +9,7 @@ import {
   parseUnifiedDiff,
 } from './parsers.js';
 import {
-  createCommitDiffResponse,
   createEmptyStats,
-  createFileHistoryResponse,
-  createFileSnapshotResponse,
-  createHistoryResponse,
 } from './responses.js';
 
 const EMPTY_TREE_HASH = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
@@ -127,13 +123,13 @@ export class GitHistoryService {
     const normalizedOffset = normalizeHistoryOffset(offset);
 
     if (!isGitRepo) {
-      return createHistoryResponse({
+      return {
         commits: [],
         hasMore: false,
         isGitRepo: false,
         limit: normalizedLimit,
         offset: normalizedOffset,
-      });
+      };
     }
 
     const cacheKey = JSON.stringify({
@@ -149,12 +145,13 @@ export class GitHistoryService {
     return this.runRequest(cacheKey, async () => {
       const hasHeadCommit = await this.hasHeadCommit();
       if (!hasHeadCommit) {
-        return setCachedValue(this.historyCache, cacheKey, createHistoryResponse({
+        return setCachedValue(this.historyCache, cacheKey, {
           commits: [],
           hasMore: false,
+          isGitRepo: true,
           limit: normalizedLimit,
           offset: normalizedOffset,
-        }), this.responseCacheTtlMs);
+        }, this.responseCacheTtlMs);
       }
 
       const output = await this.commandRunner.execGit([
@@ -175,12 +172,13 @@ export class GitHistoryService {
         .map((chunk) => this.parseHistoryChunk(chunk));
 
       const hasMore = commits.length > normalizedLimit;
-      const response = createHistoryResponse({
+      const response = {
         commits: commits.slice(0, normalizedLimit),
         hasMore,
+        isGitRepo: true,
         limit: normalizedLimit,
         offset: normalizedOffset,
-      });
+      };
 
       return setCachedValue(this.historyCache, cacheKey, response, this.responseCacheTtlMs);
     });
@@ -193,14 +191,14 @@ export class GitHistoryService {
     const normalizedPath = normalizeRelativeGitPath(path);
 
     if (!isGitRepo) {
-      return createFileHistoryResponse({
+      return {
         commits: [],
         hasMore: false,
         isGitRepo: false,
         limit: normalizedLimit,
         offset: normalizedOffset,
         path: normalizedPath,
-      });
+      };
     }
 
     const cacheKey = JSON.stringify({
@@ -217,13 +215,14 @@ export class GitHistoryService {
     return this.runRequest(cacheKey, async () => {
       const hasHeadCommit = await this.hasHeadCommit();
       if (!hasHeadCommit) {
-        return setCachedValue(this.historyCache, cacheKey, createFileHistoryResponse({
+        return setCachedValue(this.historyCache, cacheKey, {
           commits: [],
           hasMore: false,
+          isGitRepo: true,
           limit: normalizedLimit,
           offset: normalizedOffset,
           path: normalizedPath,
-        }), this.responseCacheTtlMs);
+        }, this.responseCacheTtlMs);
       }
 
       const logArgs = [
@@ -254,13 +253,14 @@ export class GitHistoryService {
 
       const commits = this.mergeFileHistoryChunks(nameStatusOutput, numstatOutput);
       const hasMore = commits.length > normalizedLimit;
-      const response = createFileHistoryResponse({
+      const response = {
         commits: commits.slice(0, normalizedLimit),
         hasMore,
+        isGitRepo: true,
         limit: normalizedLimit,
         offset: normalizedOffset,
         path: normalizedPath,
-      });
+      };
 
       return setCachedValue(this.historyCache, cacheKey, response, this.responseCacheTtlMs);
     });
@@ -269,13 +269,19 @@ export class GitHistoryService {
   async getCommit({ allowLargePatch = false, hash, metaOnly = false, path = null } = {}) {
     const isGitRepo = await this.commandRunner.isGitRepo();
     if (!isGitRepo) {
-      return createCommitDiffResponse({
+      return {
         commit: null,
         files: [],
         isGitRepo: false,
         metaOnly,
         path: null,
-      });
+        source: 'commit',
+        summary: {
+          additions: 0,
+          deletions: 0,
+          filesChanged: 0,
+        },
+      };
     }
 
     const normalizedHash = this.normalizeCommitHash(hash);
@@ -301,13 +307,15 @@ export class GitHistoryService {
       const summary = createSummaryFromFiles(meta.files);
 
       if (metaOnly) {
-        const metaResponse = createCommitDiffResponse({
+        const metaResponse = {
           commit: meta.commit,
           files: meta.files,
+          isGitRepo: true,
           metaOnly: true,
           path: normalizedPath,
+          source: 'commit',
           summary,
-        });
+        };
         return setCachedValue(this.commitCache, cacheKey, metaResponse, this.responseCacheTtlMs);
       }
 
@@ -326,7 +334,7 @@ export class GitHistoryService {
         !allowLargePatch
         && (fileSummary.additions + fileSummary.deletions) > this.maxInitialPatchLines
       ) {
-        const guardedResponse = createCommitDiffResponse({
+        const guardedResponse = {
           commit: meta.commit,
           files: [{
             ...baseFile,
@@ -335,10 +343,12 @@ export class GitHistoryService {
             patchLineCount: fileSummary.additions + fileSummary.deletions,
             tooLarge: true,
           }],
+          isGitRepo: true,
           metaOnly: false,
           path: normalizedPath,
+          source: 'commit',
           summary,
-        });
+        };
         return setCachedValue(this.commitCache, cacheKey, guardedResponse, this.responseCacheTtlMs);
       }
 
@@ -385,13 +395,15 @@ export class GitHistoryService {
           tooLarge: false,
         };
 
-      const response = createCommitDiffResponse({
+      const response = {
         commit: meta.commit,
         files: [detailedFile],
+        isGitRepo: true,
         metaOnly: false,
         path: normalizedPath,
+        source: 'commit',
         summary,
-      });
+      };
       return setCachedValue(this.commitCache, cacheKey, response, this.responseCacheTtlMs);
     });
   }
@@ -402,13 +414,13 @@ export class GitHistoryService {
     const normalizedPath = normalizeRelativeGitPath(path);
 
     if (!isGitRepo) {
-      return createFileSnapshotResponse({
+      return {
         content: '',
         fileKind: getVaultFileKind(normalizedPath),
         hash: normalizedHash,
         isGitRepo: false,
         path: normalizedPath,
-      });
+      };
     }
 
     if (isImageAttachmentFilePath(normalizedPath)) {
@@ -438,12 +450,13 @@ export class GitHistoryService {
         throw createGitRequestError(404, 'Commit file not found');
       }
 
-      return setCachedValue(this.commitCache, cacheKey, createFileSnapshotResponse({
+      return setCachedValue(this.commitCache, cacheKey, {
         content,
         fileKind,
         hash: normalizedHash,
+        isGitRepo: true,
         path: normalizedPath,
-      }), this.responseCacheTtlMs);
+      }, this.responseCacheTtlMs);
     });
   }
 

package/src/server/infrastructure/git/path-utils.js

@@ -1,4 +1,4 @@
-import { createGitRequestError } from './errors.js';
+import { createRequestError as createGitRequestError } from '../http/http-errors.js';
 
 export function decodeQuotedPath(pathValue) {
   const rawValue = String(pathValue ?? '').trim();

package/src/server/infrastructure/git/responses.js

@@ -54,98 +54,3 @@ export function createEmptyStatusResponse() {
     summary: createEmptySummary(),
   };
 }
-
-export function createDiffResponse({
-  files = [],
-  isGitRepo = true,
-  metaOnly = false,
-  path = null,
-  scope = 'working-tree',
-  summary = {
-    additions: 0,
-    deletions: 0,
-    filesChanged: 0,
-  },
-} = {}) {
-  return {
-    files,
-    isGitRepo,
-    metaOnly,
-    path,
-    scope,
-    summary,
-  };
-}
-
-export function createHistoryResponse({
-  commits = [],
-  hasMore = false,
-  isGitRepo = true,
-  limit = 30,
-  offset = 0,
-} = {}) {
-  return {
-    commits,
-    hasMore,
-    isGitRepo,
-    limit,
-    offset,
-  };
-}
-
-export function createFileHistoryResponse({
-  commits = [],
-  hasMore = false,
-  isGitRepo = true,
-  limit = 30,
-  offset = 0,
-  path = null,
-} = {}) {
-  return {
-    commits,
-    hasMore,
-    isGitRepo,
-    limit,
-    offset,
-    path,
-  };
-}
-
-export function createCommitDiffResponse({
-  commit = null,
-  files = [],
-  isGitRepo = true,
-  metaOnly = false,
-  path = null,
-  summary = {
-    additions: 0,
-    deletions: 0,
-    filesChanged: 0,
-  },
-} = {}) {
-  return {
-    commit,
-    files,
-    isGitRepo,
-    metaOnly,
-    path,
-    source: 'commit',
-    summary,
-  };
-}
-
-export function createFileSnapshotResponse({
-  content = '',
-  fileKind = null,
-  hash = null,
-  isGitRepo = true,
-  path = null,
-} = {}) {
-  return {
-    content,
-    fileKind,
-    hash,
-    isGitRepo,
-    path,
-  };
-}

package/src/server/infrastructure/github/github-app-client.js

@@ -1,16 +1,11 @@
 import { createSign } from 'node:crypto';
 
+import { createRequestError } from '../http/http-errors.js';
+
 function base64UrlJson(value) {
   return Buffer.from(JSON.stringify(value)).toString('base64url');
 }
 
-function createRequestError(statusCode, message, code) {
-  const error = new Error(message);
-  error.statusCode = statusCode;
-  error.code = code;
-  return error;
-}
-
 function normalizeBaseUrl(value) {
   return String(value ?? 'https://api.github.com').trim().replace(/\/+$/u, '') || 'https://api.github.com';
 }
@@ -80,7 +75,9 @@ export class GitHubAppClient {
 
   createAppJwt() {
     if (!this.isConfigured()) {
-      throw createRequestError(503, 'GitHub App setup is not configured.', 'HOSTED_GITHUB_APP_NOT_CONFIGURED');
+      throw createRequestError(503, 'GitHub App setup is not configured.', {
+        code: 'HOSTED_GITHUB_APP_NOT_CONFIGURED',
+      });
     }
 
     return createGitHubAppJwt({
@@ -91,7 +88,9 @@ export class GitHubAppClient {
 
   createInstallationSetupUrl({ state } = {}) {
     if (!this.appSlug) {
-      throw createRequestError(503, 'GitHub App slug is not configured.', 'HOSTED_GITHUB_APP_NOT_CONFIGURED');
+      throw createRequestError(503, 'GitHub App slug is not configured.', {
+        code: 'HOSTED_GITHUB_APP_NOT_CONFIGURED',
+      });
     }
 
     const setupUrl = new URL(`/apps/${encodeURIComponent(this.appSlug)}/installations/new`, this.htmlBaseUrl);
@@ -131,7 +130,7 @@ export class GitHubAppClient {
       throw createRequestError(
         response.status,
         payload?.message || 'GitHub API request failed.',
-        'HOSTED_GITHUB_API_FAILED',
+        { code: 'HOSTED_GITHUB_API_FAILED' },
       );
     }
 
@@ -141,7 +140,9 @@ export class GitHubAppClient {
   async createInstallationAccessToken(installationId, { appJwt = null } = {}) {
     const normalizedInstallationId = String(installationId ?? '').trim();
     if (!normalizedInstallationId) {
-      throw createRequestError(400, 'GitHub installation id is required.', 'HOSTED_GITHUB_INSTALLATION_REQUIRED');
+      throw createRequestError(400, 'GitHub installation id is required.', {
+        code: 'HOSTED_GITHUB_INSTALLATION_REQUIRED',
+      });
     }
 
     const payload = await this.request(`/app/installations/${encodeURIComponent(normalizedInstallationId)}/access_tokens`, {
@@ -150,7 +151,9 @@ export class GitHubAppClient {
     });
     const token = String(payload?.token ?? '').trim();
     if (!token) {
-      throw createRequestError(502, 'GitHub did not return an installation access token.', 'HOSTED_GITHUB_TOKEN_MISSING');
+      throw createRequestError(502, 'GitHub did not return an installation access token.', {
+        code: 'HOSTED_GITHUB_TOKEN_MISSING',
+      });
     }
     return token;
   }
@@ -158,7 +161,9 @@ export class GitHubAppClient {
   async getInstallation(installationId, { appJwt = null } = {}) {
     const normalizedInstallationId = String(installationId ?? '').trim();
     if (!normalizedInstallationId) {
-      throw createRequestError(400, 'GitHub installation id is required.', 'HOSTED_GITHUB_INSTALLATION_REQUIRED');
+      throw createRequestError(400, 'GitHub installation id is required.', {
+        code: 'HOSTED_GITHUB_INSTALLATION_REQUIRED',
+      });
     }
 
     return this.request(`/app/installations/${encodeURIComponent(normalizedInstallationId)}`, {
@@ -176,7 +181,9 @@ export class GitHubAppClient {
   async resolveVaultSourceFromInstallation(installationId) {
     const normalizedInstallationId = String(installationId ?? '').trim();
     if (!normalizedInstallationId) {
-      throw createRequestError(400, 'GitHub installation id is required.', 'HOSTED_GITHUB_INSTALLATION_REQUIRED');
+      throw createRequestError(400, 'GitHub installation id is required.', {
+        code: 'HOSTED_GITHUB_INSTALLATION_REQUIRED',
+      });
     }
 
     const appJwt = this.createAppJwt();
@@ -189,7 +196,7 @@ export class GitHubAppClient {
       throw createRequestError(
         409,
         'GitHub App installation must grant access to exactly one selected repository.',
-        'HOSTED_GITHUB_REPOSITORY_SELECTION_REQUIRED',
+        { code: 'HOSTED_GITHUB_REPOSITORY_SELECTION_REQUIRED' },
       );
     }
 

package/src/server/infrastructure/http/create-request-handler.js

@@ -2,7 +2,6 @@ import { createAuthApiHandler } from './create-auth-api-handler.js';
 import { createGitApiCommandHandler } from './create-git-api-command-handler.js';
 import { createGitApiQueryHandler } from './create-git-api-query-handler.js';
 import { createHostedApiHandler } from './create-hosted-api-handler.js';
-import { createEsmProxyHandler } from './create-esm-proxy-handler.js';
 import { createPlantUmlApiHandler } from './create-plantuml-api-handler.js';
 import { createStaticHandler } from './create-static-handler.js';
 import { createVaultApiCommandHandler } from './create-vault-api-command-handler.js';
@@ -45,7 +44,7 @@ export function createRequestHandler(
   vaultFileStore,
   backlinkIndex,
   baseQueryService = null,
-  docxExporter = null,
+  renderDocx = null,
   roomRegistry = null,
   plantUmlRenderer = null,
   gitService = null,
@@ -56,7 +55,6 @@ export function createRequestHandler(
   hostedWorkspaceService = null,
   githubSetupFlow = null,
 ) {
-  const handleEsmProxy = createEsmProxyHandler();
   const handleStaticRequest = createStaticHandler(config, authService, searchService);
   const handleAuthApi = createAuthApiHandler({ authService });
   const handleHostedApi = createHostedApiHandler({
@@ -80,7 +78,7 @@ export function createRequestHandler(
   });
   const handleVaultApiCommand = createVaultApiCommandHandler({
     backlinkIndex,
-    docxExporter,
+    renderDocx,
     roomRegistry,
     vaultFileStore,
     workspaceMutationCoordinator,
@@ -195,10 +193,6 @@ export function createRequestHandler(
       return;
     }
 
-    if (await handleEsmProxy(req, res, requestUrl)) {
-      return;
-    }
-
     if (requestUrl.pathname.startsWith('/api/')) {
       const authorization = authService.authorizeApiRequest(req);
       if (!authorization.ok) {

package/src/server/infrastructure/http/create-vault-api-command-handler.js

@@ -40,7 +40,7 @@ function getDirectoryDeleteStatusCode(message = '') {
   return String(message).includes('Directory is not empty') ? 409 : 400;
 }
 
-async function handleExportDocx({ docxExporter }, req, res) {
+async function handleExportDocx({ renderDocx }, req, res) {
   try {
     const body = await parseJsonBody(req, DOCX_EXPORT_REQUEST_LIMIT_BYTES);
     if (!body?.filePath || typeof body?.html !== 'string') {
@@ -48,12 +48,12 @@ async function handleExportDocx({ docxExporter }, req, res) {
       return true;
     }
 
-    if (!docxExporter?.render) {
+    if (typeof renderDocx !== 'function') {
       jsonResponse(req, res, 503, { error: 'DOCX export is unavailable' });
       return true;
     }
 
-    const docxBuffer = await docxExporter.render({
+    const docxBuffer = await renderDocx({
       html: body.html,
       title: body.title || '',
     });
@@ -289,11 +289,11 @@ const ROUTE_TABLE = [
 ];
 
 export function createVaultApiCommandHandler({
-  docxExporter = null,
+  renderDocx = null,
   vaultFileStore,
   workspaceMutationCoordinator = null,
 }) {
-  const context = { docxExporter, vaultFileStore, workspaceMutationCoordinator };
+  const context = { renderDocx, vaultFileStore, workspaceMutationCoordinator };
 
   return async function handleVaultApiCommand(req, res, requestUrl) {
     for (const route of ROUTE_TABLE) {

package/src/server/infrastructure/http/http-errors.js

@@ -1,6 +1,12 @@
-export function createRequestError(statusCode, message) {
+export function createRequestError(statusCode, message, { code = null, requestCode = null } = {}) {
   const error = new Error(message);
   error.statusCode = statusCode;
+  if (code) {
+    error.code = code;
+  }
+  if (requestCode) {
+    error.requestCode = requestCode;
+  }
   return error;
 }