diff --git a/package.json b/package.json index 252d71f..c5c8af8 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "type": "module", "description": "Nostr-based git server with NIP-34 repo announcements", "scripts": { - "dev": "vite dev", + "dev": "GIT_REPO_ROOT=./repos vite dev", "build": "tsc && vite build", "preview": "vite preview", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/HEAD b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/config b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/config new file mode 100644 index 0000000..dc433bd --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/config @@ -0,0 +1,6 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true +[remote "origin"] + url = https://git.imwald.eu/silberengel/aitherboard.git diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/description b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/applypatch-msg.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/commit-msg.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/fsmonitor-watchman.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..23e856f --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/post-update.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-applypatch.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-commit.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-commit.sample new file mode 100755 index 0000000..e144712 --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-merge-commit.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..399eab1 --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-push.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-push.sample new file mode 100755 index 0000000..4ce688d --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-rebase.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-receive.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/prepare-commit-msg.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/push-to-checkout.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/push-to-checkout.sample new file mode 100755 index 0000000..af5a0c0 --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/update.sample b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/update.sample new file mode 100755 index 0000000..c4d426b --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/info/exclude b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/objects/pack/pack-c7c33f30769d9ba1ce88b50f7b5c2e45ff731231.idx b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/objects/pack/pack-c7c33f30769d9ba1ce88b50f7b5c2e45ff731231.idx new file mode 100644 index 0000000..3ebab1a Binary files /dev/null and b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/objects/pack/pack-c7c33f30769d9ba1ce88b50f7b5c2e45ff731231.idx differ diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/objects/pack/pack-c7c33f30769d9ba1ce88b50f7b5c2e45ff731231.pack b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/objects/pack/pack-c7c33f30769d9ba1ce88b50f7b5c2e45ff731231.pack new file mode 100644 index 0000000..329ad46 Binary files /dev/null and b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/objects/pack/pack-c7c33f30769d9ba1ce88b50f7b5c2e45ff731231.pack differ diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/objects/pack/pack-c7c33f30769d9ba1ce88b50f7b5c2e45ff731231.rev b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/objects/pack/pack-c7c33f30769d9ba1ce88b50f7b5c2e45ff731231.rev new file mode 100644 index 0000000..285cec7 Binary files /dev/null and b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/objects/pack/pack-c7c33f30769d9ba1ce88b50f7b5c2e45ff731231.rev differ diff --git a/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/packed-refs b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/packed-refs new file mode 100644 index 0000000..c3ec2b7 --- /dev/null +++ b/repos/npub1l5sga6xg72phsz5422ykujprejwud075ggrr3z2hwyrfgr7eylqstegx9z/aitherboard.git/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +432ca405d33a6389b1d12529e6e0e76b523b39f8 refs/heads/master diff --git a/src/lib/services/git/file-manager.ts b/src/lib/services/git/file-manager.ts index 9ddd86b..a4cc38d 100644 --- a/src/lib/services/git/file-manager.ts +++ b/src/lib/services/git/file-manager.ts @@ -663,6 +663,64 @@ export class FileManager { /** * Get list of branches (with caching) */ + /** + * Get the default branch name for a repository + * Tries to detect the actual default branch (master, main, etc.) + */ + async getDefaultBranch(npub: string, repoName: string): Promise { + const repoPath = this.getRepoPath(npub, repoName); + + if (!this.repoExists(npub, repoName)) { + throw new Error('Repository not found'); + } + + const git: SimpleGit = simpleGit(repoPath); + + try { + // Try to get the default branch from symbolic-ref + // For bare repos, this points to the default branch + const defaultRef = await git.raw(['symbolic-ref', 'HEAD']); + if (defaultRef) { + const match = defaultRef.trim().match(/^refs\/heads\/(.+)$/); + if (match) { + return match[1]; + } + } + } catch { + // If symbolic-ref fails, try to get from remote HEAD + try { + const remoteHead = await git.raw(['symbolic-ref', 'refs/remotes/origin/HEAD']); + if (remoteHead) { + const match = remoteHead.trim().match(/^refs\/remotes\/origin\/(.+)$/); + if (match) { + return match[1]; + } + } + } catch { + // Fall through to branch detection + } + } + + // Fallback: get branches and prefer 'main', then 'master', then first branch + try { + const branches = await git.branch(['-r']); + const branchList = branches.all + .map(b => b.replace(/^origin\//, '')) + .filter(b => !b.includes('HEAD')); + + if (branchList.length === 0) { + return 'main'; // Ultimate fallback + } + + // Prefer 'main', then 'master', then first branch + if (branchList.includes('main')) return 'main'; + if (branchList.includes('master')) return 'master'; + return branchList[0]; + } catch { + return 'main'; // Ultimate fallback + } + } + async getBranches(npub: string, repoName: string): Promise { const repoPath = this.getRepoPath(npub, repoName); diff --git a/src/lib/services/git/repo-manager.ts b/src/lib/services/git/repo-manager.ts index db82d12..3c0a459 100644 --- a/src/lib/services/git/repo-manager.ts +++ b/src/lib/services/git/repo-manager.ts @@ -373,6 +373,34 @@ export class RepoManager { }); } + /** + * Normalize a clone URL to ensure it's in the correct format for git clone + * Handles Gitea URLs that might be missing .git extension + */ + private normalizeCloneUrl(url: string): string { + // Remove trailing slash + url = url.trim().replace(/\/$/, ''); + + // For HTTPS/HTTP URLs that don't end in .git, check if they're Gitea/GitHub/GitLab style + // Pattern: https://domain.com/owner/repo (without .git) + if ((url.startsWith('https://') || url.startsWith('http://')) && !url.endsWith('.git')) { + // Check if it looks like a git hosting service URL (has at least 2 path segments) + const urlObj = new URL(url); + const pathParts = urlObj.pathname.split('/').filter(p => p); + + // If it has 2+ path segments (e.g., /owner/repo), add .git + if (pathParts.length >= 2) { + // Check if it's not already a file or has an extension + const lastPart = pathParts[pathParts.length - 1]; + if (!lastPart.includes('.')) { + return `${url}.git`; + } + } + } + + return url; + } + /** * Extract clone URLs from a NIP-34 repo announcement */ @@ -384,7 +412,8 @@ export class RepoManager { for (let i = 1; i < tag.length; i++) { const url = tag[i]; if (url && typeof url === 'string') { - urls.push(url); + // Normalize the URL to ensure it's cloneable + urls.push(this.normalizeCloneUrl(url)); } } } @@ -442,6 +471,13 @@ export class RepoManager { const remoteUrls = externalUrls.length > 0 ? externalUrls : cloneUrls.filter(url => !url.includes(this.domain)); + // If still no remote URLs, but there are *any* clone URLs, try the first one + // This handles cases where the only clone URL is our own domain, but the repo doesn't exist locally yet + if (remoteUrls.length === 0 && cloneUrls.length > 0) { + logger.info({ npub, repoName, cloneUrls }, 'No external remote clone URLs found, attempting to clone from first available clone URL (may be local domain).'); + remoteUrls.push(cloneUrls[0]); + } + if (remoteUrls.length === 0) { logger.warn({ npub, repoName }, 'No remote clone URLs found for on-demand fetch'); return false; diff --git a/src/routes/api/repos/[npub]/[repo]/branches/+server.ts b/src/routes/api/repos/[npub]/[repo]/branches/+server.ts index da71739..ee5e67e 100644 --- a/src/routes/api/repos/[npub]/[repo]/branches/+server.ts +++ b/src/routes/api/repos/[npub]/[repo]/branches/+server.ts @@ -8,10 +8,11 @@ import type { RequestHandler } from './$types'; import { fileManager, repoManager, nostrClient } from '$lib/services/service-registry.js'; import { createRepoGetHandler, createRepoPostHandler } from '$lib/utils/api-handlers.js'; import type { RepoRequestContext, RequestEvent } from '$lib/utils/api-context.js'; -import { handleValidationError, handleApiError } from '$lib/utils/error-handler.js'; +import { handleValidationError, handleApiError, handleNotFoundError } from '$lib/utils/error-handler.js'; import { KIND } from '$lib/types/nostr.js'; import { join } from 'path'; import { existsSync } from 'fs'; +import { repoCache, RepoCache } from '$lib/services/git/repo-cache.js'; const repoRoot = typeof process !== 'undefined' && process.env?.GIT_REPO_ROOT ? process.env.GIT_REPO_ROOT @@ -42,42 +43,78 @@ export const GET: RequestHandler = createRepoGetHandler( events[0] ); - if (!fetched) { - // Check if repo exists now (might have been created by another request) - if (existsSync(repoPath)) { - // Repo was created, continue - } else { - throw handleApiError( - new Error('Repository not found and could not be fetched from remote. The repository may not have any accessible clone URLs.'), - { operation: 'getBranches', npub: context.npub, repo: context.repo }, - 'Repository not found and could not be fetched from remote' + // Always check if repo exists after fetch attempt (might have been created) + // Also clear cache to ensure fileManager sees it + if (existsSync(repoPath)) { + repoCache.delete(RepoCache.repoExistsKey(context.npub, context.repo)); + // Repo exists, continue with normal flow + } else if (!fetched) { + // Fetch failed and repo doesn't exist + throw handleNotFoundError( + 'Repository not found and could not be fetched from remote. The repository may not have any accessible clone URLs.', + { operation: 'getBranches', npub: context.npub, repo: context.repo } + ); + } else { + // Fetch returned true but repo doesn't exist - this shouldn't happen, but clear cache anyway + repoCache.delete(RepoCache.repoExistsKey(context.npub, context.repo)); + // Wait a moment for filesystem to sync, then check again + await new Promise(resolve => setTimeout(resolve, 100)); + if (!existsSync(repoPath)) { + throw handleNotFoundError( + 'Repository fetch completed but repository is not accessible', + { operation: 'getBranches', npub: context.npub, repo: context.repo } ); } } } else { - throw handleApiError( - new Error('Repository announcement not found in Nostr'), - { operation: 'getBranches', npub: context.npub, repo: context.repo }, - 'Repository announcement not found' + throw handleNotFoundError( + 'Repository announcement not found in Nostr', + { operation: 'getBranches', npub: context.npub, repo: context.repo } ); } } catch (err) { // Check if repo was created by another concurrent request if (existsSync(repoPath)) { - // Repo exists now, continue with normal flow + // Repo exists now, clear cache and continue with normal flow + repoCache.delete(RepoCache.repoExistsKey(context.npub, context.repo)); } else { // If fetching fails, return 404 - throw handleApiError( - err instanceof Error ? err : new Error('Failed to fetch repository'), - { operation: 'getBranches', npub: context.npub, repo: context.repo }, - 'Repository not found' + throw handleNotFoundError( + 'Repository not found', + { operation: 'getBranches', npub: context.npub, repo: context.repo } ); } } } - const branches = await fileManager.getBranches(context.npub, context.repo); - return json(branches); + // Double-check repo exists after on-demand fetch + if (!existsSync(repoPath)) { + throw handleNotFoundError( + 'Repository not found', + { operation: 'getBranches', npub: context.npub, repo: context.repo } + ); + } + + try { + const branches = await fileManager.getBranches(context.npub, context.repo); + return json(branches); + } catch (err) { + // Log the actual error for debugging + console.error('[Branches] Error getting branches:', err); + // Check if it's a "not found" error + if (err instanceof Error && err.message.includes('not found')) { + throw handleNotFoundError( + err.message, + { operation: 'getBranches', npub: context.npub, repo: context.repo } + ); + } + // Otherwise, it's a server error + throw handleApiError( + err, + { operation: 'getBranches', npub: context.npub, repo: context.repo }, + 'Failed to get branches' + ); + } }, { operation: 'getBranches', requireRepoExists: false, requireRepoAccess: false } // Branches are public info, handle on-demand fetching ); diff --git a/src/routes/api/repos/[npub]/[repo]/commits/+server.ts b/src/routes/api/repos/[npub]/[repo]/commits/+server.ts index a43cd2a..f7a244c 100644 --- a/src/routes/api/repos/[npub]/[repo]/commits/+server.ts +++ b/src/routes/api/repos/[npub]/[repo]/commits/+server.ts @@ -4,18 +4,128 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; -import { fileManager } from '$lib/services/service-registry.js'; +import { fileManager, repoManager, nostrClient } from '$lib/services/service-registry.js'; import { createRepoGetHandler } from '$lib/utils/api-handlers.js'; import type { RepoRequestContext } from '$lib/utils/api-context.js'; +import { handleApiError, handleNotFoundError } from '$lib/utils/error-handler.js'; +import { KIND } from '$lib/types/nostr.js'; +import { join } from 'path'; +import { existsSync } from 'fs'; +import { repoCache, RepoCache } from '$lib/services/git/repo-cache.js'; + +const repoRoot = typeof process !== 'undefined' && process.env?.GIT_REPO_ROOT + ? process.env.GIT_REPO_ROOT + : '/repos'; export const GET: RequestHandler = createRepoGetHandler( async (context: RepoRequestContext) => { - const branch = context.branch || 'main'; + const repoPath = join(repoRoot, context.npub, `${context.repo}.git`); + + // If repo doesn't exist, try to fetch it on-demand + if (!existsSync(repoPath)) { + try { + // Fetch repository announcement from Nostr + const events = await nostrClient.fetchEvents([ + { + kinds: [KIND.REPO_ANNOUNCEMENT], + authors: [context.repoOwnerPubkey], + '#d': [context.repo], + limit: 1 + } + ]); + + if (events.length > 0) { + // Try to fetch the repository from remote clone URLs + const fetched = await repoManager.fetchRepoOnDemand( + context.npub, + context.repo, + events[0] + ); + + // Always check if repo exists after fetch attempt (might have been created) + // Also clear cache to ensure fileManager sees it + if (existsSync(repoPath)) { + repoCache.delete(RepoCache.repoExistsKey(context.npub, context.repo)); + // Repo exists, continue with normal flow + } else if (!fetched) { + // Fetch failed and repo doesn't exist + throw handleNotFoundError( + 'Repository not found and could not be fetched from remote. The repository may not have any accessible clone URLs.', + { operation: 'getCommits', npub: context.npub, repo: context.repo } + ); + } else { + // Fetch returned true but repo doesn't exist - this shouldn't happen, but clear cache anyway + repoCache.delete(RepoCache.repoExistsKey(context.npub, context.repo)); + // Wait a moment for filesystem to sync, then check again + await new Promise(resolve => setTimeout(resolve, 100)); + if (!existsSync(repoPath)) { + throw handleNotFoundError( + 'Repository fetch completed but repository is not accessible', + { operation: 'getCommits', npub: context.npub, repo: context.repo } + ); + } + } + } else { + throw handleNotFoundError( + 'Repository announcement not found in Nostr', + { operation: 'getCommits', npub: context.npub, repo: context.repo } + ); + } + } catch (err) { + // Check if repo was created by another concurrent request + if (existsSync(repoPath)) { + // Repo exists now, clear cache and continue with normal flow + repoCache.delete(RepoCache.repoExistsKey(context.npub, context.repo)); + } else { + // If fetching fails, return 404 + throw handleNotFoundError( + 'Repository not found', + { operation: 'getCommits', npub: context.npub, repo: context.repo } + ); + } + } + } + + // Double-check repo exists after on-demand fetch + if (!existsSync(repoPath)) { + throw handleNotFoundError( + 'Repository not found', + { operation: 'getCommits', npub: context.npub, repo: context.repo } + ); + } + + // Get default branch if not specified + let branch = context.branch; + if (!branch) { + try { + branch = await fileManager.getDefaultBranch(context.npub, context.repo); + } catch { + branch = 'main'; // Fallback + } + } const limit = context.limit || 50; const path = context.path; - const commits = await fileManager.getCommitHistory(context.npub, context.repo, branch, limit, path); - return json(commits); + try { + const commits = await fileManager.getCommitHistory(context.npub, context.repo, branch, limit, path); + return json(commits); + } catch (err) { + // Log the actual error for debugging + console.error('[Commits] Error getting commit history:', err); + // Check if it's a "not found" error + if (err instanceof Error && err.message.includes('not found')) { + throw handleNotFoundError( + err.message, + { operation: 'getCommits', npub: context.npub, repo: context.repo } + ); + } + // Otherwise, it's a server error + throw handleApiError( + err, + { operation: 'getCommits', npub: context.npub, repo: context.repo }, + 'Failed to get commit history' + ); + } }, - { operation: 'getCommits' } + { operation: 'getCommits', requireRepoExists: false, requireRepoAccess: false } // Commits are public, handle on-demand fetching ); diff --git a/src/routes/api/repos/[npub]/[repo]/issues/+server.ts b/src/routes/api/repos/[npub]/[repo]/issues/+server.ts index b34c360..cb6f32b 100644 --- a/src/routes/api/repos/[npub]/[repo]/issues/+server.ts +++ b/src/routes/api/repos/[npub]/[repo]/issues/+server.ts @@ -15,7 +15,7 @@ export const GET: RequestHandler = createRepoGetHandler( const issues = await issuesService.getIssues(context.repoOwnerPubkey, context.repo); return json(issues); }, - { operation: 'getIssues' } + { operation: 'getIssues', requireRepoExists: false, requireRepoAccess: false } // Issues are stored in Nostr, don't require local repo ); export const POST: RequestHandler = withRepoValidation( diff --git a/src/routes/api/repos/[npub]/[repo]/maintainers/+server.ts b/src/routes/api/repos/[npub]/[repo]/maintainers/+server.ts index defcaa4..65cf254 100644 --- a/src/routes/api/repos/[npub]/[repo]/maintainers/+server.ts +++ b/src/routes/api/repos/[npub]/[repo]/maintainers/+server.ts @@ -26,5 +26,5 @@ export const GET: RequestHandler = createRepoGetHandler( return json({ maintainers, owner }); }, - { operation: 'getMaintainers', requireRepoAccess: false } // Maintainer list is public info + { operation: 'getMaintainers', requireRepoExists: false, requireRepoAccess: false } // Maintainer list is public info, doesn't need repo to exist ); diff --git a/src/routes/api/repos/[npub]/[repo]/prs/+server.ts b/src/routes/api/repos/[npub]/[repo]/prs/+server.ts index 417a26e..510e4b8 100644 --- a/src/routes/api/repos/[npub]/[repo]/prs/+server.ts +++ b/src/routes/api/repos/[npub]/[repo]/prs/+server.ts @@ -16,7 +16,7 @@ export const GET: RequestHandler = createRepoGetHandler( const prs = await prsService.getPullRequests(context.repoOwnerPubkey, context.repo); return json(prs); }, - { operation: 'getPRs' } + { operation: 'getPRs', requireRepoExists: false, requireRepoAccess: false } // PRs are stored in Nostr, don't require local repo ); export const POST: RequestHandler = withRepoValidation( diff --git a/src/routes/api/repos/[npub]/[repo]/readme/+server.ts b/src/routes/api/repos/[npub]/[repo]/readme/+server.ts index cef9713..9dc23dd 100644 --- a/src/routes/api/repos/[npub]/[repo]/readme/+server.ts +++ b/src/routes/api/repos/[npub]/[repo]/readme/+server.ts @@ -66,7 +66,22 @@ export const GET: RequestHandler = createRepoGetHandler( } } - const ref = context.ref || 'HEAD'; + // Use HEAD if no ref specified (HEAD points to default branch) + // If a specific branch is requested, validate it exists or use default branch + let ref = context.ref || 'HEAD'; + if (ref !== 'HEAD' && !ref.startsWith('refs/')) { + // It's a branch name, validate it exists + try { + const branches = await fileManager.getBranches(context.npub, context.repo); + if (!branches.includes(ref)) { + // Branch doesn't exist, use default branch + ref = await fileManager.getDefaultBranch(context.npub, context.repo); + } + } catch { + // If we can't get branches, fall back to HEAD + ref = 'HEAD'; + } + } // Try to find README file let readmeContent: string | null = null; diff --git a/src/routes/api/repos/[npub]/[repo]/tags/+server.ts b/src/routes/api/repos/[npub]/[repo]/tags/+server.ts index 40900d3..e865add 100644 --- a/src/routes/api/repos/[npub]/[repo]/tags/+server.ts +++ b/src/routes/api/repos/[npub]/[repo]/tags/+server.ts @@ -15,7 +15,7 @@ export const GET: RequestHandler = createRepoGetHandler( const tags = await fileManager.getTags(context.npub, context.repo); return json(tags); }, - { operation: 'getTags' } + { operation: 'getTags', requireRepoExists: false, requireRepoAccess: false } // Tags are public, handle on-demand fetching ); export const POST: RequestHandler = createRepoPostHandler( diff --git a/src/routes/api/repos/[npub]/[repo]/tree/+server.ts b/src/routes/api/repos/[npub]/[repo]/tree/+server.ts index 2596037..02ecdee 100644 --- a/src/routes/api/repos/[npub]/[repo]/tree/+server.ts +++ b/src/routes/api/repos/[npub]/[repo]/tree/+server.ts @@ -7,10 +7,11 @@ import type { RequestHandler } from './$types'; import { fileManager, repoManager, nostrClient } from '$lib/services/service-registry.js'; import { createRepoGetHandler } from '$lib/utils/api-handlers.js'; import type { RepoRequestContext, RequestEvent } from '$lib/utils/api-context.js'; -import { handleApiError } from '$lib/utils/error-handler.js'; +import { handleApiError, handleNotFoundError } from '$lib/utils/error-handler.js'; import { KIND } from '$lib/types/nostr.js'; import { join } from 'path'; import { existsSync } from 'fs'; +import { repoCache, RepoCache } from '$lib/services/git/repo-cache.js'; const repoRoot = typeof process !== 'undefined' && process.env?.GIT_REPO_ROOT ? process.env.GIT_REPO_ROOT @@ -41,45 +42,95 @@ export const GET: RequestHandler = createRepoGetHandler( events[0] ); - if (!fetched) { - // Check if repo exists now (might have been created by another request) - if (existsSync(repoPath)) { - // Repo was created, continue - } else { - throw handleApiError( - new Error('Repository not found and could not be fetched from remote. The repository may not have any accessible clone URLs.'), - { operation: 'listFiles', npub: context.npub, repo: context.repo }, - 'Repository not found and could not be fetched from remote' + // Always check if repo exists after fetch attempt (might have been created) + // Also clear cache to ensure fileManager sees it + if (existsSync(repoPath)) { + repoCache.delete(RepoCache.repoExistsKey(context.npub, context.repo)); + // Repo exists, continue with normal flow + } else if (!fetched) { + // Fetch failed and repo doesn't exist + throw handleNotFoundError( + 'Repository not found and could not be fetched from remote. The repository may not have any accessible clone URLs.', + { operation: 'listFiles', npub: context.npub, repo: context.repo } + ); + } else { + // Fetch returned true but repo doesn't exist - this shouldn't happen, but clear cache anyway + repoCache.delete(RepoCache.repoExistsKey(context.npub, context.repo)); + // Wait a moment for filesystem to sync, then check again + await new Promise(resolve => setTimeout(resolve, 100)); + if (!existsSync(repoPath)) { + throw handleNotFoundError( + 'Repository fetch completed but repository is not accessible', + { operation: 'listFiles', npub: context.npub, repo: context.repo } ); } } } else { - throw handleApiError( - new Error('Repository announcement not found in Nostr'), - { operation: 'listFiles', npub: context.npub, repo: context.repo }, - 'Repository announcement not found' + throw handleNotFoundError( + 'Repository announcement not found in Nostr', + { operation: 'listFiles', npub: context.npub, repo: context.repo } ); } } catch (err) { // Check if repo was created by another concurrent request if (existsSync(repoPath)) { - // Repo exists now, continue with normal flow + // Repo exists now, clear cache and continue with normal flow + repoCache.delete(RepoCache.repoExistsKey(context.npub, context.repo)); } else { // If fetching fails, return 404 - throw handleApiError( - err instanceof Error ? err : new Error('Failed to fetch repository'), - { operation: 'listFiles', npub: context.npub, repo: context.repo }, - 'Repository not found' + throw handleNotFoundError( + 'Repository not found', + { operation: 'listFiles', npub: context.npub, repo: context.repo } ); } } } - const ref = context.ref || 'HEAD'; + // Double-check repo exists after on-demand fetch + if (!existsSync(repoPath)) { + throw handleNotFoundError( + 'Repository not found', + { operation: 'listFiles', npub: context.npub, repo: context.repo } + ); + } + + // Get default branch if no ref specified + let ref = context.ref || 'HEAD'; + // If ref is a branch name, validate it exists or use default branch + if (ref !== 'HEAD' && !ref.startsWith('refs/')) { + try { + const branches = await fileManager.getBranches(context.npub, context.repo); + if (!branches.includes(ref)) { + // Branch doesn't exist, use default branch + ref = await fileManager.getDefaultBranch(context.npub, context.repo); + } + } catch { + // If we can't get branches, fall back to HEAD + ref = 'HEAD'; + } + } const path = context.path || ''; - const files = await fileManager.listFiles(context.npub, context.repo, ref, path); - return json(files); + try { + const files = await fileManager.listFiles(context.npub, context.repo, ref, path); + return json(files); + } catch (err) { + // Log the actual error for debugging + console.error('[Tree] Error listing files:', err); + // Check if it's a "not found" error + if (err instanceof Error && err.message.includes('not found')) { + throw handleNotFoundError( + err.message, + { operation: 'listFiles', npub: context.npub, repo: context.repo } + ); + } + // Otherwise, it's a server error + throw handleApiError( + err, + { operation: 'listFiles', npub: context.npub, repo: context.repo }, + 'Failed to list files' + ); + } }, { operation: 'listFiles', requireRepoExists: false, requireRepoAccess: false } // Handle on-demand fetching, tree is public ); diff --git a/src/routes/api/repos/[npub]/[repo]/verify/+server.ts b/src/routes/api/repos/[npub]/[repo]/verify/+server.ts index 93ca26f..1aa12ad 100644 --- a/src/routes/api/repos/[npub]/[repo]/verify/+server.ts +++ b/src/routes/api/repos/[npub]/[repo]/verify/+server.ts @@ -22,11 +22,8 @@ const repoRoot = typeof process !== 'undefined' && process.env?.GIT_REPO_ROOT export const GET: RequestHandler = createRepoGetHandler( async (context: RepoRequestContext) => { - // Check if repository exists - const repoPath = join(repoRoot, context.npub, `${context.repo}.git`); - if (!existsSync(repoPath)) { - throw handleApiError(new Error('Repository not found'), { operation: 'verifyRepo', npub: context.npub, repo: context.repo }, 'Repository not found'); - } + // Check if repository exists - verification doesn't require the repo to be cloned locally + // We can verify ownership from Nostr events alone // Fetch the repository announcement const events = await nostrClient.fetchEvents([ @@ -127,5 +124,5 @@ export const GET: RequestHandler = createRepoGetHandler( }); } }, - { operation: 'verifyRepo', requireRepoAccess: false } // Verification is public + { operation: 'verifyRepo', requireRepoExists: false, requireRepoAccess: false } // Verification is public, doesn't need repo to exist ); diff --git a/src/routes/repos/[npub]/[repo]/+page.svelte b/src/routes/repos/[npub]/[repo]/+page.svelte index 01485b8..c3e9113 100644 --- a/src/routes/repos/[npub]/[repo]/+page.svelte +++ b/src/routes/repos/[npub]/[repo]/+page.svelte @@ -431,12 +431,14 @@ async function loadRepoImages() { try { // Get images from page data (loaded from announcement) - if (pageData.image) { - repoImage = pageData.image; + // Use $page.data directly to ensure we get the latest data + const data = $page.data as typeof pageData; + if (data.image) { + repoImage = data.image; console.log('[Repo Images] Loaded image from pageData:', repoImage); } - if (pageData.banner) { - repoBanner = pageData.banner; + if (data.banner) { + repoBanner = data.banner; console.log('[Repo Images] Loaded banner from pageData:', repoBanner); } @@ -482,6 +484,20 @@ } } + // Reactively update images when pageData changes (only once, when data becomes available) + $effect(() => { + const data = $page.data as typeof pageData; + // Only update if we have new data and don't already have the images set + if (data.image && data.image !== repoImage) { + repoImage = data.image; + console.log('[Repo Images] Updated image from pageData (reactive):', repoImage); + } + if (data.banner && data.banner !== repoBanner) { + repoBanner = data.banner; + console.log('[Repo Images] Updated banner from pageData (reactive):', repoBanner); + } + }); + onMount(async () => { await loadBranches(); // Skip other API calls if repository doesn't exist @@ -489,6 +505,10 @@ loading = false; return; } + // Update currentBranch to first available branch if 'main' doesn't exist + if (branches.length > 0 && !branches.includes(currentBranch)) { + currentBranch = branches[0]; + } await loadFiles(); await checkAuth(); await loadTags(); @@ -1126,22 +1146,30 @@ } } + // Only load tab content when tab actually changes, not on every render + let lastTab = $state(null); $effect(() => { - if (activeTab === 'history') { - loadCommitHistory(); - } else if (activeTab === 'tags') { - loadTags(); - } else if (activeTab === 'issues') { - loadIssues(); - } else if (activeTab === 'prs') { - loadPRs(); - } else if (activeTab === 'docs') { - loadDocumentation(); + if (activeTab !== lastTab) { + lastTab = activeTab; + if (activeTab === 'history') { + loadCommitHistory(); + } else if (activeTab === 'tags') { + loadTags(); + } else if (activeTab === 'issues') { + loadIssues(); + } else if (activeTab === 'prs') { + loadPRs(); + } else if (activeTab === 'docs') { + loadDocumentation(); + } } }); + // Only load readme when branch changes, not on every render + let lastBranch = $state(null); $effect(() => { - if (currentBranch) { + if (currentBranch && currentBranch !== lastBranch) { + lastBranch = currentBranch; loadReadme(); } }); @@ -2401,6 +2429,8 @@ display: flex; flex-direction: column; overflow: hidden; + height: 100%; /* Ensure full height */ + max-height: calc(100vh - 200px); /* Constrain to viewport with some margin */ } .file-tree-header { @@ -2434,10 +2464,13 @@ .file-list { list-style: none; - padding: 0; + padding: 0.5rem 0; margin: 0; overflow-y: auto; + overflow-x: hidden; flex: 1; + min-height: 0; /* Allows flex child to shrink below content size */ + max-height: 100%; /* Constrains height for scrolling */ } .file-item { @@ -2457,6 +2490,7 @@ font-size: 0.875rem; color: var(--text-primary); transition: background 0.2s ease; + box-sizing: border-box; } .file-button:hover { @@ -2937,6 +2971,84 @@ line-height: 1.5; } + .readme-section { + display: flex; + flex-direction: column; + height: 100%; + overflow: hidden; + } + + .readme-header { + padding: 1rem; + border-bottom: 1px solid var(--border-color); + display: flex; + justify-content: space-between; + align-items: center; + flex-shrink: 0; + } + + .readme-header h3 { + margin: 0; + font-size: 1.25rem; + color: var(--text-primary); + } + + .readme-actions { + display: flex; + gap: 1rem; + align-items: center; + } + + .readme-content { + flex: 1; + overflow-y: auto; + overflow-x: hidden; + padding: 1.5rem; + min-height: 0; /* Allows flex child to shrink below content size */ + } + + .readme-content.markdown { + padding: 1.5rem; + } + + .readme-content.markdown :global(h1), + .readme-content.markdown :global(h2), + .readme-content.markdown :global(h3), + .readme-content.markdown :global(h4), + .readme-content.markdown :global(h5), + .readme-content.markdown :global(h6) { + margin-top: 1.5rem; + margin-bottom: 0.75rem; + color: var(--text-primary); + } + + .readme-content.markdown :global(p) { + margin-bottom: 1rem; + line-height: 1.6; + } + + .readme-content.markdown :global(code) { + background: var(--bg-secondary); + padding: 0.2rem 0.4rem; + border-radius: 3px; + font-family: 'IBM Plex Mono', monospace; + font-size: 0.9em; + } + + .readme-content.markdown :global(pre) { + background: var(--bg-secondary); + padding: 1rem; + border-radius: 4px; + overflow-x: auto; + border: 1px solid var(--border-light); + margin: 1rem 0; + } + + .readme-content.markdown :global(pre code) { + background: none; + padding: 0; + } + .readme-content :global(.hljs) { background: var(--bg-secondary); padding: 1rem;