mirror of
https://github.com/fiatjaf/nak.git
synced 2025-12-08 16:48:51 +00:00
"nak git" command with "init", "announce" and "push".
This commit is contained in:
737
git.go
Normal file
737
git.go
Normal file
@@ -0,0 +1,737 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path/filepath"
|
||||||
|
"slices"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"fiatjaf.com/nostr"
|
||||||
|
"fiatjaf.com/nostr/nip19"
|
||||||
|
"fiatjaf.com/nostr/nip34"
|
||||||
|
"github.com/chzyer/readline"
|
||||||
|
"github.com/fatih/color"
|
||||||
|
"github.com/urfave/cli/v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Nip34Config struct {
|
||||||
|
Identifier string `json:"identifier"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Description string `json:"description"`
|
||||||
|
Web []string `json:"web"`
|
||||||
|
Owner string `json:"owner"`
|
||||||
|
GraspServers []string `json:"grasp-servers"`
|
||||||
|
EarliestUniqueCommit string `json:"earliest-unique-commit"`
|
||||||
|
Maintainers []string `json:"maintainers"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var git = &cli.Command{
|
||||||
|
Name: "git",
|
||||||
|
Usage: "git-related operations",
|
||||||
|
Commands: []*cli.Command{
|
||||||
|
gitInit,
|
||||||
|
gitPush,
|
||||||
|
gitPull,
|
||||||
|
gitFetch,
|
||||||
|
gitAnnounce,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var gitInit = &cli.Command{
|
||||||
|
Name: "init",
|
||||||
|
Usage: "initialize a NIP-34 repository configuration",
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
&cli.BoolFlag{
|
||||||
|
Name: "interactive",
|
||||||
|
Aliases: []string{"i"},
|
||||||
|
Usage: "prompt for repository details interactively",
|
||||||
|
},
|
||||||
|
&cli.BoolFlag{
|
||||||
|
Name: "force",
|
||||||
|
Aliases: []string{"f"},
|
||||||
|
Usage: "overwrite existing nip34.json file",
|
||||||
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "identifier",
|
||||||
|
Usage: "unique identifier for the repository",
|
||||||
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "name",
|
||||||
|
Usage: "repository name",
|
||||||
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "description",
|
||||||
|
Usage: "repository description",
|
||||||
|
},
|
||||||
|
&cli.StringSliceFlag{
|
||||||
|
Name: "web",
|
||||||
|
Usage: "web URLs for the repository (can be used multiple times)",
|
||||||
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "owner",
|
||||||
|
Usage: "owner public key",
|
||||||
|
},
|
||||||
|
&cli.StringSliceFlag{
|
||||||
|
Name: "grasp-servers",
|
||||||
|
Usage: "grasp servers (can be used multiple times)",
|
||||||
|
},
|
||||||
|
&cli.StringSliceFlag{
|
||||||
|
Name: "relays",
|
||||||
|
Usage: "relay URLs to publish to (can be used multiple times)",
|
||||||
|
},
|
||||||
|
&cli.StringSliceFlag{
|
||||||
|
Name: "maintainers",
|
||||||
|
Usage: "maintainer public keys as npub or hex (can be used multiple times)",
|
||||||
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "earliest-unique-commit",
|
||||||
|
Usage: "earliest unique commit of the repository",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Action: func(ctx context.Context, c *cli.Command) error {
|
||||||
|
// check if current directory is a git repository
|
||||||
|
cmd := exec.Command("git", "rev-parse", "--git-dir")
|
||||||
|
if err := cmd.Run(); err != nil {
|
||||||
|
return fmt.Errorf("current directory is not a git repository")
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if nip34.json already exists
|
||||||
|
configPath := "nip34.json"
|
||||||
|
var existingConfig Nip34Config
|
||||||
|
if data, err := os.ReadFile(configPath); err == nil {
|
||||||
|
// file exists, read it
|
||||||
|
if !c.Bool("force") && !c.Bool("interactive") {
|
||||||
|
return fmt.Errorf("nip34.json already exists, use --force to overwrite or --interactive to update")
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(data, &existingConfig); err != nil {
|
||||||
|
log("Warning: could not parse existing nip34.json: %v\n", err)
|
||||||
|
existingConfig = Nip34Config{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// get repository base directory name for defaults
|
||||||
|
cwd, err := os.Getwd()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get current directory: %w", err)
|
||||||
|
}
|
||||||
|
baseName := filepath.Base(cwd)
|
||||||
|
|
||||||
|
// get earliest unique commit
|
||||||
|
var earliestCommit string
|
||||||
|
if output, err := exec.Command("git", "rev-list", "--max-parents=0", "HEAD").Output(); err == nil {
|
||||||
|
earliest := strings.Split(strings.TrimSpace(string(output)), "\n")
|
||||||
|
if len(earliest) > 0 {
|
||||||
|
earliestCommit = earliest[0]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// extract clone URLs from nostr:// git remotes
|
||||||
|
var defaultCloneURLs []string
|
||||||
|
if output, err := exec.Command("git", "remote", "-v").Output(); err == nil {
|
||||||
|
remotes := strings.Split(strings.TrimSpace(string(output)), "\n")
|
||||||
|
for _, remote := range remotes {
|
||||||
|
if strings.Contains(remote, "nostr://") {
|
||||||
|
parts := strings.Fields(remote)
|
||||||
|
if len(parts) >= 2 {
|
||||||
|
nostrURL := parts[1]
|
||||||
|
// parse nostr://npub.../relay_hostname/identifier
|
||||||
|
if strings.HasPrefix(nostrURL, "nostr://") {
|
||||||
|
urlParts := strings.TrimPrefix(nostrURL, "nostr://")
|
||||||
|
components := strings.Split(urlParts, "/")
|
||||||
|
if len(components) == 3 {
|
||||||
|
npub := components[0]
|
||||||
|
relayHostname := components[1]
|
||||||
|
identifier := components[2]
|
||||||
|
// convert to https://relay_hostname/npub.../identifier.git
|
||||||
|
cloneURL := fmt.Sprintf("http%s/%s/%s.git", nostr.NormalizeURL(relayHostname)[2:], npub, identifier)
|
||||||
|
defaultCloneURLs = appendUnique(defaultCloneURLs, cloneURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// helper to get value from flags, existing config, or default
|
||||||
|
getValue := func(existingVal, flagVal, defaultVal string) string {
|
||||||
|
if flagVal != "" {
|
||||||
|
return flagVal
|
||||||
|
}
|
||||||
|
if existingVal != "" {
|
||||||
|
return existingVal
|
||||||
|
}
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
|
||||||
|
getSliceValue := func(existingVals, flagVals, defaultVals []string) []string {
|
||||||
|
if len(flagVals) > 0 {
|
||||||
|
return flagVals
|
||||||
|
}
|
||||||
|
if len(existingVals) > 0 {
|
||||||
|
return existingVals
|
||||||
|
}
|
||||||
|
return defaultVals
|
||||||
|
}
|
||||||
|
|
||||||
|
config := Nip34Config{
|
||||||
|
Identifier: getValue(existingConfig.Identifier, c.String("identifier"), baseName),
|
||||||
|
Name: getValue(existingConfig.Name, c.String("name"), baseName),
|
||||||
|
Description: getValue(existingConfig.Description, c.String("description"), ""),
|
||||||
|
Web: getSliceValue(existingConfig.Web, c.StringSlice("web"), []string{}),
|
||||||
|
Owner: getValue(existingConfig.Owner, c.String("owner"), ""),
|
||||||
|
GraspServers: getSliceValue(existingConfig.GraspServers, c.StringSlice("grasp-servers"), []string{"gitnostr.com", "relay.ngit.dev"}),
|
||||||
|
EarliestUniqueCommit: getValue(existingConfig.EarliestUniqueCommit, c.String("earliest-unique-commit"), earliestCommit),
|
||||||
|
Maintainers: getSliceValue(existingConfig.Maintainers, c.StringSlice("maintainers"), []string{}),
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.Bool("interactive") {
|
||||||
|
if err := promptForConfig(&config); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// write config file
|
||||||
|
data, err := json.MarshalIndent(config, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to marshal config: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := os.WriteFile(configPath, data, 0644); err != nil {
|
||||||
|
return fmt.Errorf("failed to write nip34.json: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log("Created %s\n", color.GreenString(configPath))
|
||||||
|
|
||||||
|
// parse owner to npub
|
||||||
|
pk, err := parsePubKey(config.Owner)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("invalid owner public key: %w", err)
|
||||||
|
}
|
||||||
|
ownerNpub := nip19.EncodeNpub(pk)
|
||||||
|
|
||||||
|
// check existing git remotes
|
||||||
|
cmd = exec.Command("git", "remote", "-v")
|
||||||
|
output, err := cmd.Output()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get git remotes: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
remotes := strings.Split(strings.TrimSpace(string(output)), "\n")
|
||||||
|
var nostrRemote string
|
||||||
|
for _, remote := range remotes {
|
||||||
|
if strings.Contains(remote, "nostr://") {
|
||||||
|
parts := strings.Fields(remote)
|
||||||
|
if len(parts) >= 2 {
|
||||||
|
nostrRemote = parts[1]
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if nostrRemote == "" {
|
||||||
|
// set the remote
|
||||||
|
remoteURL := fmt.Sprintf("nostr://%s/%s/%s", ownerNpub, config.GraspServers[0], config.Identifier)
|
||||||
|
cmd = exec.Command("git", "remote", "add", "origin", remoteURL)
|
||||||
|
if err := cmd.Run(); err != nil {
|
||||||
|
return fmt.Errorf("failed to add git remote: %w", err)
|
||||||
|
}
|
||||||
|
log("Added git remote: %s\n", remoteURL)
|
||||||
|
} else {
|
||||||
|
// validate existing remote
|
||||||
|
if !strings.HasPrefix(nostrRemote, "nostr://") {
|
||||||
|
return fmt.Errorf("invalid nostr remote URL: %s", nostrRemote)
|
||||||
|
}
|
||||||
|
urlParts := strings.TrimPrefix(nostrRemote, "nostr://")
|
||||||
|
parts := strings.Split(urlParts, "/")
|
||||||
|
if len(parts) != 3 {
|
||||||
|
return fmt.Errorf("invalid nostr URL format, expected nostr://<npub>/<relay_hostname>/<identifier>, got: %s", nostrRemote)
|
||||||
|
}
|
||||||
|
repoNpub := parts[0]
|
||||||
|
relayHostname := parts[1]
|
||||||
|
identifier := parts[2]
|
||||||
|
if repoNpub != ownerNpub {
|
||||||
|
return fmt.Errorf("git remote npub '%s' does not match owner '%s'", repoNpub, ownerNpub)
|
||||||
|
}
|
||||||
|
if !slices.Contains(config.GraspServers, relayHostname) {
|
||||||
|
return fmt.Errorf("git remote relay '%s' not in grasp servers %v", relayHostname, config.GraspServers)
|
||||||
|
}
|
||||||
|
if identifier != config.Identifier {
|
||||||
|
return fmt.Errorf("git remote identifier '%s' does not match config '%s'", identifier, config.Identifier)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// gitignore it
|
||||||
|
excludePath := ".git/info/exclude"
|
||||||
|
excludeContent, err := os.ReadFile(excludePath)
|
||||||
|
if err != nil {
|
||||||
|
// file doesn't exist, create it
|
||||||
|
excludeContent = []byte("")
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if nip34.json is already in exclude
|
||||||
|
if !strings.Contains(string(excludeContent), "nip34.json") {
|
||||||
|
newContent := string(excludeContent)
|
||||||
|
if len(newContent) > 0 && !strings.HasSuffix(newContent, "\n") {
|
||||||
|
newContent += "\n"
|
||||||
|
}
|
||||||
|
newContent += "nip34.json\n"
|
||||||
|
if err := os.WriteFile(excludePath, []byte(newContent), 0644); err != nil {
|
||||||
|
log(color.YellowString("failed to add nip34.json to .git/info/exclude: %v\n", err))
|
||||||
|
} else {
|
||||||
|
log("added nip34.json to %s\n", color.GreenString(".git/info/exclude"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
log("edit %s if needed, then run %s to publish.\n",
|
||||||
|
color.CyanString("nip34.json"),
|
||||||
|
color.CyanString("nak git announce"))
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func repositoriesEqual(a, b nip34.Repository) bool {
|
||||||
|
if a.ID != b.ID || a.Name != b.Name || a.Description != b.Description {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if a.EarliestUniqueCommitID != b.EarliestUniqueCommitID {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(a.Web) != len(b.Web) || len(a.Clone) != len(b.Clone) ||
|
||||||
|
len(a.Relays) != len(b.Relays) || len(a.Maintainers) != len(b.Maintainers) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for i := range a.Web {
|
||||||
|
if a.Web[i] != b.Web[i] {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for i := range a.Clone {
|
||||||
|
if a.Clone[i] != b.Clone[i] {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for i := range a.Relays {
|
||||||
|
if a.Relays[i] != b.Relays[i] {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for i := range a.Maintainers {
|
||||||
|
if a.Maintainers[i] != b.Maintainers[i] {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func promptForConfig(config *Nip34Config) error {
|
||||||
|
rlConfig := &readline.Config{
|
||||||
|
Stdout: os.Stderr,
|
||||||
|
InterruptPrompt: "^C",
|
||||||
|
DisableAutoSaveHistory: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
rl, err := readline.NewEx(rlConfig)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer rl.Close()
|
||||||
|
|
||||||
|
promptString := func(currentVal *string, prompt string) error {
|
||||||
|
rl.SetPrompt(color.YellowString("%s [%s]: ", prompt, *currentVal))
|
||||||
|
answer, err := rl.Readline()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
answer = strings.TrimSpace(answer)
|
||||||
|
if answer != "" {
|
||||||
|
*currentVal = answer
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
promptSlice := func(currentVal *[]string, prompt string) error {
|
||||||
|
defaultStr := strings.Join(*currentVal, ", ")
|
||||||
|
rl.SetPrompt(color.YellowString("%s (comma-separated) [%s]: ", prompt, defaultStr))
|
||||||
|
answer, err := rl.Readline()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
answer = strings.TrimSpace(answer)
|
||||||
|
if answer != "" {
|
||||||
|
parts := strings.Split(answer, ",")
|
||||||
|
result := make([]string, 0, len(parts))
|
||||||
|
for _, p := range parts {
|
||||||
|
if trimmed := strings.TrimSpace(p); trimmed != "" {
|
||||||
|
result = append(result, trimmed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*currentVal = result
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
log("\nenter repository details (press Enter to keep default):\n\n")
|
||||||
|
|
||||||
|
if err := promptString(&config.Identifier, "identifier"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := promptString(&config.Name, "name"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := promptString(&config.Description, "description"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := promptString(&config.Owner, "owner (npub or hex)"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := promptSlice(&config.GraspServers, "grasp servers"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := promptSlice(&config.Web, "web URLs"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := promptSlice(&config.Maintainers, "other maintainers"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
log("\n")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func gitSanityCheck(localConfig Nip34Config, nostrRemote string) (nostr.PubKey, error) {
|
||||||
|
urlParts := strings.TrimPrefix(nostrRemote, "nostr://")
|
||||||
|
parts := strings.Split(urlParts, "/")
|
||||||
|
if len(parts) != 3 {
|
||||||
|
return nostr.ZeroPK, fmt.Errorf("invalid nostr URL format, expected nostr://<npub>/<relay_hostname>/<identifier>, got: %s", nostrRemote)
|
||||||
|
}
|
||||||
|
|
||||||
|
remoteNpub := parts[0]
|
||||||
|
remoteHostname := parts[1]
|
||||||
|
remoteIdentifier := parts[2]
|
||||||
|
|
||||||
|
ownerPk, err := parsePubKey(localConfig.Owner)
|
||||||
|
if err != nil {
|
||||||
|
return nostr.ZeroPK, fmt.Errorf("invalid owner public key: %w", err)
|
||||||
|
}
|
||||||
|
if nip19.EncodeNpub(ownerPk) != remoteNpub {
|
||||||
|
return nostr.ZeroPK, fmt.Errorf("owner in nip34.json does not match git remote npub")
|
||||||
|
}
|
||||||
|
if remoteIdentifier != localConfig.Identifier {
|
||||||
|
return nostr.ZeroPK, fmt.Errorf("git remote identifier '%s' differs from nip34.json identifier '%s'", remoteIdentifier, localConfig.Identifier)
|
||||||
|
}
|
||||||
|
if !slices.Contains(localConfig.GraspServers, remoteHostname) {
|
||||||
|
return nostr.ZeroPK, fmt.Errorf("git remote relay '%s' not in grasp servers %v", remoteHostname, localConfig.GraspServers)
|
||||||
|
}
|
||||||
|
return ownerPk, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var gitPush = &cli.Command{
|
||||||
|
Name: "push",
|
||||||
|
Usage: "push git changes",
|
||||||
|
Flags: defaultKeyFlags,
|
||||||
|
Action: func(ctx context.Context, c *cli.Command) error {
|
||||||
|
// setup signer
|
||||||
|
kr, _, err := gatherKeyerFromArguments(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to gather keyer: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// log publishing as npub
|
||||||
|
currentPk, _ := kr.GetPublicKey(ctx)
|
||||||
|
currentNpub := nip19.EncodeNpub(currentPk)
|
||||||
|
log("publishing as %s\n", color.CyanString(currentNpub))
|
||||||
|
|
||||||
|
// read nip34.json configuration
|
||||||
|
configPath := "nip34.json"
|
||||||
|
var localConfig Nip34Config
|
||||||
|
data, err := os.ReadFile(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to read nip34.json: %w (run 'nak git init' first)", err)
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(data, &localConfig); err != nil {
|
||||||
|
return fmt.Errorf("failed to parse nip34.json: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// get git remotes
|
||||||
|
cmd := exec.Command("git", "remote", "-v")
|
||||||
|
output, err := cmd.Output()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get git remotes: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
remotes := strings.Split(strings.TrimSpace(string(output)), "\n")
|
||||||
|
var nostrRemote string
|
||||||
|
for _, remote := range remotes {
|
||||||
|
if strings.Contains(remote, "nostr://") {
|
||||||
|
parts := strings.Fields(remote)
|
||||||
|
if len(parts) >= 2 {
|
||||||
|
nostrRemote = parts[1]
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if nostrRemote == "" {
|
||||||
|
return fmt.Errorf("no nostr:// remote found")
|
||||||
|
}
|
||||||
|
|
||||||
|
// parse the URL: nostr://<npub>/<relay_hostname>/<identifier>
|
||||||
|
if !strings.HasPrefix(nostrRemote, "nostr://") {
|
||||||
|
return fmt.Errorf("invalid nostr remote URL: %s", nostrRemote)
|
||||||
|
}
|
||||||
|
|
||||||
|
ownerPk, err := gitSanityCheck(localConfig, nostrRemote)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// fetch repository announcement (30617) and state (30618) events
|
||||||
|
var repo nip34.Repository
|
||||||
|
var state nip34.RepositoryState
|
||||||
|
relays := append(sys.FetchOutboxRelays(ctx, ownerPk, 3), localConfig.GraspServers...)
|
||||||
|
results := sys.Pool.FetchMany(ctx, relays, nostr.Filter{
|
||||||
|
Kinds: []nostr.Kind{30617, 30618},
|
||||||
|
Tags: nostr.TagMap{
|
||||||
|
"d": []string{localConfig.Identifier},
|
||||||
|
},
|
||||||
|
Limit: 2,
|
||||||
|
}, nostr.SubscriptionOptions{
|
||||||
|
Label: "nak-git-push",
|
||||||
|
})
|
||||||
|
for ie := range results {
|
||||||
|
if ie.Event.Kind == 30617 {
|
||||||
|
repo = nip34.ParseRepository(ie.Event)
|
||||||
|
} else if ie.Event.Kind == 30618 {
|
||||||
|
state = nip34.ParseRepositoryState(ie.Event)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if repo.Event.ID == nostr.ZeroID {
|
||||||
|
return fmt.Errorf("no existing repository announcement found")
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if signer matches owner or is in maintainers
|
||||||
|
if currentPk != ownerPk && !slices.Contains(repo.Maintainers, currentPk) {
|
||||||
|
return fmt.Errorf("current user is not allowed to push")
|
||||||
|
}
|
||||||
|
|
||||||
|
if state.Event.ID != nostr.ZeroID {
|
||||||
|
log("found state event: %s\n", state.Event.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// get current branch and commit
|
||||||
|
res, err := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD").Output()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get current branch: %w", err)
|
||||||
|
}
|
||||||
|
currentBranch := strings.TrimSpace(string(res))
|
||||||
|
|
||||||
|
res, err = exec.Command("git", "rev-parse", "HEAD").Output()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get current commit: %w", err)
|
||||||
|
}
|
||||||
|
currentCommit := strings.TrimSpace(string(res))
|
||||||
|
|
||||||
|
log("Current branch: %s, commit: %s\n", currentBranch, currentCommit)
|
||||||
|
|
||||||
|
// create a new state if we didn't find any
|
||||||
|
if state.Event.ID == nostr.ZeroID {
|
||||||
|
state = nip34.RepositoryState{
|
||||||
|
ID: repo.ID,
|
||||||
|
Branches: make(map[string]string),
|
||||||
|
Tags: make(map[string]string),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// update the branch
|
||||||
|
state.Branches[currentBranch] = currentCommit
|
||||||
|
log("> setting branch %s to commit %s\n", currentBranch, currentCommit)
|
||||||
|
|
||||||
|
// set the HEAD to the current branch if none is set
|
||||||
|
if state.HEAD == "" {
|
||||||
|
state.HEAD = currentBranch
|
||||||
|
log("> setting HEAD to branch %s\n", currentBranch)
|
||||||
|
}
|
||||||
|
|
||||||
|
// create and sign the new state event
|
||||||
|
newStateEvent := state.ToEvent()
|
||||||
|
err = kr.SignEvent(ctx, &newStateEvent)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("error signing state event: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log("> publishing updated repository state %s\n", newStateEvent.ID)
|
||||||
|
for res := range sys.Pool.PublishMany(ctx, relays, newStateEvent) {
|
||||||
|
if res.Error != nil {
|
||||||
|
log("(!) error publishing event to relay %s: %v\n", res.RelayURL, res.Error)
|
||||||
|
} else {
|
||||||
|
log("> published to relay %s\n", res.RelayURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// push to git clone URLs
|
||||||
|
for _, cloneURL := range repo.Clone {
|
||||||
|
log("> pushing to: %s\n", cloneURL)
|
||||||
|
cmd := exec.Command("git", "push", cloneURL, fmt.Sprintf("refs/heads/%s:refs/heads/%s", currentBranch, currentBranch))
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
log("(!) failed to push to %s: %v\n%s\n", cloneURL, err, string(output))
|
||||||
|
} else {
|
||||||
|
log("> successfully pushed to %s\n", cloneURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var gitPull = &cli.Command{
|
||||||
|
Name: "pull",
|
||||||
|
Usage: "pull git changes",
|
||||||
|
Action: func(ctx context.Context, c *cli.Command) error {
|
||||||
|
return fmt.Errorf("git pull not implemented yet")
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var gitFetch = &cli.Command{
|
||||||
|
Name: "fetch",
|
||||||
|
Usage: "fetch git data",
|
||||||
|
Action: func(ctx context.Context, c *cli.Command) error {
|
||||||
|
return fmt.Errorf("git fetch not implemented yet")
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var gitAnnounce = &cli.Command{
|
||||||
|
Name: "announce",
|
||||||
|
Usage: "announce repository to Nostr",
|
||||||
|
Flags: defaultKeyFlags,
|
||||||
|
Action: func(ctx context.Context, c *cli.Command) error {
|
||||||
|
// check if current directory is a git repository
|
||||||
|
cmd := exec.Command("git", "rev-parse", "--git-dir")
|
||||||
|
if err := cmd.Run(); err != nil {
|
||||||
|
return fmt.Errorf("current directory is not a git repository")
|
||||||
|
}
|
||||||
|
|
||||||
|
// read nip34.json configuration
|
||||||
|
configPath := "nip34.json"
|
||||||
|
var localConfig Nip34Config
|
||||||
|
data, err := os.ReadFile(configPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to read nip34.json: %w (run 'nak git init' first)", err)
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(data, &localConfig); err != nil {
|
||||||
|
return fmt.Errorf("failed to parse nip34.json: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// get git remotes
|
||||||
|
cmd = exec.Command("git", "remote", "-v")
|
||||||
|
output, err := cmd.Output()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get git remotes: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
remotes := strings.Split(strings.TrimSpace(string(output)), "\n")
|
||||||
|
var nostrRemote string
|
||||||
|
for _, remote := range remotes {
|
||||||
|
if strings.Contains(remote, "nostr://") {
|
||||||
|
parts := strings.Fields(remote)
|
||||||
|
if len(parts) >= 2 {
|
||||||
|
nostrRemote = parts[1]
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if nostrRemote == "" {
|
||||||
|
return fmt.Errorf("no nostr:// remote found")
|
||||||
|
}
|
||||||
|
|
||||||
|
ownerPk, err := gitSanityCheck(localConfig, nostrRemote)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// setup signer
|
||||||
|
kr, _, err := gatherKeyerFromArguments(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to gather keyer: %w", err)
|
||||||
|
}
|
||||||
|
currentPk, _ := kr.GetPublicKey(ctx)
|
||||||
|
|
||||||
|
// current signer must match owner otherwise we can't announce
|
||||||
|
if currentPk != ownerPk {
|
||||||
|
return fmt.Errorf("current user is not the owner of this repository, can't announce")
|
||||||
|
}
|
||||||
|
|
||||||
|
// convert local config to nip34.Repository
|
||||||
|
localRepo := nip34.Repository{
|
||||||
|
ID: localConfig.Identifier,
|
||||||
|
Name: localConfig.Name,
|
||||||
|
Description: localConfig.Description,
|
||||||
|
Web: localConfig.Web,
|
||||||
|
Relays: localConfig.GraspServers,
|
||||||
|
EarliestUniqueCommitID: localConfig.EarliestUniqueCommit,
|
||||||
|
Maintainers: []nostr.PubKey{},
|
||||||
|
}
|
||||||
|
for _, server := range localConfig.GraspServers {
|
||||||
|
url := fmt.Sprintf("http%s/%s/%s.git", nostr.NormalizeURL(server)[2:], nip19.EncodeNpub(ownerPk), localConfig.Identifier)
|
||||||
|
localRepo.Clone = append(localRepo.Clone, url)
|
||||||
|
}
|
||||||
|
for _, maintainer := range localConfig.Maintainers {
|
||||||
|
if pk, err := parsePubKey(maintainer); err == nil {
|
||||||
|
localRepo.Maintainers = append(localRepo.Maintainers, pk)
|
||||||
|
} else {
|
||||||
|
log(color.YellowString("invalid maintainer pubkey '%s': %v\n", maintainer, err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// fetch repository announcement (30617) events
|
||||||
|
var repo nip34.Repository
|
||||||
|
relays := append(sys.FetchOutboxRelays(ctx, ownerPk, 3), localConfig.GraspServers...)
|
||||||
|
results := sys.Pool.FetchMany(ctx, relays, nostr.Filter{
|
||||||
|
Kinds: []nostr.Kind{30617},
|
||||||
|
Tags: nostr.TagMap{
|
||||||
|
"d": []string{localConfig.Identifier},
|
||||||
|
},
|
||||||
|
Limit: 1,
|
||||||
|
}, nostr.SubscriptionOptions{
|
||||||
|
Label: "nak-git-announce",
|
||||||
|
})
|
||||||
|
for ie := range results {
|
||||||
|
repo = nip34.ParseRepository(ie.Event)
|
||||||
|
}
|
||||||
|
|
||||||
|
// publish repository announcement if needed
|
||||||
|
var needsAnnouncement bool
|
||||||
|
if repo.Event.ID == nostr.ZeroID {
|
||||||
|
log("no existing repository announcement found, will create one\n")
|
||||||
|
needsAnnouncement = true
|
||||||
|
} else if !repositoriesEqual(repo, localRepo) {
|
||||||
|
log("Local repository config differs from published announcement, will update\n")
|
||||||
|
needsAnnouncement = true
|
||||||
|
}
|
||||||
|
if needsAnnouncement {
|
||||||
|
announcementEvent := localRepo.ToEvent()
|
||||||
|
if err := kr.SignEvent(ctx, &announcementEvent); err != nil {
|
||||||
|
return fmt.Errorf("failed to sign announcement event: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log("> publishing repository announcement %s\n", announcementEvent.ID)
|
||||||
|
for res := range sys.Pool.PublishMany(ctx, relays, announcementEvent) {
|
||||||
|
if res.Error != nil {
|
||||||
|
log("(!) error publishing announcement to relay %s: %v\n", res.RelayURL, res.Error)
|
||||||
|
} else {
|
||||||
|
log("> published announcement to relay %s\n", res.RelayURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log("Repository announcement is up to date\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user