From 7b9fca8d0061cf5e5af08cba98e9d5b6dbbed8ec Mon Sep 17 00:00:00 2001 From: HampusM Date: Wed, 21 Jul 2021 22:00:04 +0200 Subject: Began with better backend error handling & cleaned up the backend --- packages/server/src/git/repository.ts | 54 ++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 14 deletions(-) (limited to 'packages/server/src/git/repository.ts') diff --git a/packages/server/src/git/repository.ts b/packages/server/src/git/repository.ts index ff23761..c95edaa 100644 --- a/packages/server/src/git/repository.ts +++ b/packages/server/src/git/repository.ts @@ -7,6 +7,8 @@ import { Commit } from "./commit"; import { FastifyReply } from "fastify"; import { Tag } from "./tag"; import { Tree } from "./tree"; +import { BranchError, createError, RepositoryError } from "./error"; +import { isNodeGitReferenceBranch, isNodeGitReferenceTag, Reference } from "./reference"; function getFullRepositoryName(repo_name: string) { return repo_name.endsWith(".git") ? repo_name : `${repo_name}.git`; @@ -19,12 +21,21 @@ type RepositoryName = { type RepositoryConstructorData = { description: string | null, - owner: string | null + owner: string | null, + branch: string +} + +// This fucking shit isn't in the Nodegit documentation. +interface WeirdNodeGitError extends Error { + errno: number; + errorFunction: string; } export class Repository { private _ng_repository: NodeGitRepository; + private _branch: string; + public name: RepositoryName; public base_dir: string; public description: string | null; @@ -39,6 +50,12 @@ export class Repository { this.base_dir = dirname(repository.path()); this.description = data.description; this.owner = data.owner; + + this._branch = data.branch; + } + + public branch(): Promise { + return Branch.lookup(this, this._branch); } public async commits(): Promise { @@ -49,9 +66,7 @@ export class Repository { } public async tree(): Promise { - const master_commit = await this._ng_repository.getMasterCommit(); - const tree = await master_commit.getTree(); - return new Tree(this, tree); + return Tree.ofRepository(this); } public lookupExists(id: string): Promise { @@ -60,18 +75,16 @@ export class Repository { .catch(() => false); } - public async branches(): Promise { - const references = await this._ng_repository.getReferences(); - return references.filter(ref => ref.isBranch()).map(branch => new Branch(this, branch)); + public branches(): Promise { + return Reference.all(this, Branch, isNodeGitReferenceBranch); } public async tags(): Promise { - const references = await this._ng_repository.getReferences(); - return references.filter(ref => ref.isTag()).map(tag => new Tag(this, tag)); + return Reference.all(this, Tag, isNodeGitReferenceTag); } - public async latestCommit(): Promise { - return new Commit(this, await this._ng_repository.getMasterCommit()); + public async masterCommit(): Promise { + return Commit.masterCommit(this); } public HTTPconnect(req: Request, reply: FastifyReply): void { @@ -82,12 +95,25 @@ export class Repository { return this._ng_repository; } - public static async open(base_dir: string, repository: string): Promise { - const ng_repository = await NodeGitRepository.openBare(`${base_dir}/${getFullRepositoryName(repository)}`); + public static async open(base_dir: string, repository: string, branch?: string): Promise { + let ng_repository = await NodeGitRepository.openBare(`${base_dir}/${getFullRepositoryName(repository)}`).catch((err: WeirdNodeGitError) => { + if(err.errno === -3) { + throw(createError(RepositoryError, 404, "Repository not found")); + } + + throw(createError(RepositoryError, 500, "Unknown error")); + }); + + if(branch) { + if(!await Branch.lookupExists(ng_repository, branch)) { + throw(createError(BranchError, 404, "Branch not found!")); + } + } return new Repository(ng_repository, { description: await getFile(base_dir, getFullRepositoryName(repository), "description"), - owner: await getFile(base_dir, getFullRepositoryName(repository), "owner") + owner: await getFile(base_dir, getFullRepositoryName(repository), "owner"), + branch: branch || "master" }); } -- cgit v1.2.3-18-g5258