laantungir/nak
1
0
Fork 0
mirror of https://github.com/fiatjaf/nak.git synced 2025-12-08 16:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

git: nip34.json into repository object helpers.

Browse Source
This commit is contained in:
fiatjaf
2025-11-23 21:32:33 -03:00
parent ddc009a391
commit 26fc7c338a
2 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
git.go
View File

@@ -29,11 +29,55 @@ type Nip34Config struct {
Maintainers []string `json:"maintainers"`
}
type nostrRemote struct {
formatted string
owner nostr.PubKey
identifier string
relayHost string
func (localConfig Nip34Config) Validate() error {
_, err := parsePubKey(localConfig.Owner)
if err != nil {
return fmt.Errorf("owner pubkey '%s' is not valid: %w", localConfig.Owner, err)
}
for _, maintainer := range localConfig.Maintainers {
_, err := parsePubKey(maintainer)
if err != nil {
return fmt.Errorf("maintainer pubkey '%s' is not valid: %w", maintainer, err)
}
}
return nil
}
func (localConfig Nip34Config) ToRepository() nip34.Repository {
owner, err := parsePubKey(localConfig.Owner)
if err != nil {
panic(err)
}
localRepo := nip34.Repository{
ID: localConfig.Identifier,
Name: localConfig.Name,
Description: localConfig.Description,
Web: localConfig.Web,
EarliestUniqueCommitID: localConfig.EarliestUniqueCommit,
Maintainers: []nostr.PubKey{},
Event: nostr.Event{
PubKey: owner,
},
}
for _, server := range localConfig.GraspServers {
graspServerURL := nostr.NormalizeURL(server)
url := fmt.Sprintf("http%s/%s/%s.git",
graspServerURL[2:], nip19.EncodeNpub(localRepo.PubKey), localConfig.Identifier)
localRepo.Clone = append(localRepo.Clone, url)
localRepo.Relays = append(localRepo.Relays, graspServerURL)
}
for _, maintainer := range localConfig.Maintainers {
pk, err := parsePubKey(maintainer)
if err != nil {
panic(err)
}
localRepo.Maintainers = append(localRepo.Maintainers, pk)
}
return localRepo
}
var git = &cli.Command{
@@ -206,6 +250,10 @@ var gitInit = &cli.Command{
}
}
if err := config.Validate(); err != nil {
return fmt.Errorf("invalid config: %w", err)
}
// write config file
if err := writeNip34ConfigFile("", config); err != nil {
return err
@@ -213,34 +261,8 @@ var gitInit = &cli.Command{
log("created %s\n", color.GreenString("nip34.json"))
// parse owner to npub
owner, err := parsePubKey(config.Owner)
if err != nil {
return fmt.Errorf("invalid owner public key: %w", err)
}
// convert local config to nip34.Repository for setting up remotes
localRepo := nip34.Repository{
ID: config.Identifier,
Name: config.Name,
Description: config.Description,
Web: config.Web,
EarliestUniqueCommitID: config.EarliestUniqueCommit,
Maintainers: []nostr.PubKey{},
Event: nostr.Event{PubKey: owner},
}
for _, server := range config.GraspServers {
graspRelayURL := nostr.NormalizeURL(server)
localRepo.Relays = append(localRepo.Relays, graspRelayURL)
}
for _, maintainer := range config.Maintainers {
if pk, err := parsePubKey(maintainer); err == nil {
localRepo.Maintainers = append(localRepo.Maintainers, pk)
}
}
// setup git remotes
gitSetupRemotes(ctx, "", localRepo)
gitSetupRemotes(ctx, "", config.ToRepository())
// gitignore it
excludeNip34ConfigFile("")
@@ -399,6 +421,10 @@ var gitClone = &cli.Command{
localConfig.Maintainers = append(localConfig.Maintainers, nip19.EncodeNpub(m))
}
if err := localConfig.Validate(); err != nil {
return fmt.Errorf("invalid config: %w", err)
}
// write nip34.json
if err := writeNip34ConfigFile(targetDir, localConfig); err != nil {
return err
@@ -781,48 +807,14 @@ func syncRepository(ctx context.Context, signer nostr.Signer) (nip34.Repository,
if err != nil {
logverbose("failed to fetch repository metadata: %v\n", err)
// create a local repository object from config
repo = nip34.Repository{
ID: localConfig.Identifier,
Name: localConfig.Name,
Description: localConfig.Description,
Web: localConfig.Web,
EarliestUniqueCommitID: localConfig.EarliestUniqueCommit,
Event: nostr.Event{PubKey: owner},
Maintainers: []nostr.PubKey{},
}
for _, server := range localConfig.GraspServers {
graspRelayURL := nostr.NormalizeURL(server)
repo.Relays = append(repo.Relays, graspRelayURL)
}
for _, maintainer := range localConfig.Maintainers {
if pk, err := parsePubKey(maintainer); err == nil {
repo.Maintainers = append(repo.Maintainers, pk)
}
}
repo = localConfig.ToRepository()
} else {
// check if local config differs from remote announcement
// construct local repo from config for comparison
localRepo := nip34.Repository{
ID: localConfig.Identifier,
Name: localConfig.Name,
Description: localConfig.Description,
Web: localConfig.Web,
EarliestUniqueCommitID: localConfig.EarliestUniqueCommit,
Maintainers: []nostr.PubKey{},
Event: nostr.Event{PubKey: owner},
}
for _, server := range localConfig.GraspServers {
graspRelayURL := nostr.NormalizeURL(server)
localRepo.Relays = append(localRepo.Relays, graspRelayURL)
}
for _, maintainer := range localConfig.Maintainers {
if pk, err := parsePubKey(maintainer); err == nil {
localRepo.Maintainers = append(localRepo.Maintainers, pk)
}
}
localRepo := localConfig.ToRepository()
if !repo.Equals(localRepo) {
// check if we need to update local config or publish new announcement
if !repo.Equals(localRepo) {
// check modification times
configPath := filepath.Join(findGitRoot(""), "nip34.json")
if fi, err := os.Stat(configPath); err == nil {
@@ -832,7 +824,7 @@ func syncRepository(ctx context.Context, signer nostr.Signer) (nip34.Repository,
if configModTime.After(announcementTime) {
// local config is newer, publish new announcement if signer is available
if signer != nil {
log("local configuration is newer, publishing updated announcement...\n")
log("local configuration is newer, publishing updated repository announcement...\n")
// prepare clone URLs
for _, server := range localConfig.GraspServers {
graspRelayURL := nostr.NormalizeURL(server)
@@ -861,7 +853,7 @@ func syncRepository(ctx context.Context, signer nostr.Signer) (nip34.Repository,
}
} else {
// remote is newer, update local config
log("remote announcement is newer, updating local configuration...\n")
log("remote announcement is newer than local, updating local configuration...\n")
localConfig.Name = repo.Name
localConfig.Description = repo.Description
localConfig.Web = repo.Web
@@ -944,14 +936,18 @@ func gitSetupRemotes(ctx context.Context, dir string, repo nip34.Repository) {
// construct the git URL
gitURL := fmt.Sprintf("http%s/%s/%s.git",
relayURL[2:], nip19.EncodeNpub(repo.Event.PubKey), repo.ID)
relayURL[2:], nip19.EncodeNpub(repo.PubKey), repo.ID)
addCmd := exec.Command("git", "remote", "add", remoteName, gitURL)
if dir != "" {
addCmd.Dir = dir
}
if err := addCmd.Run(); err != nil {
logverbose("failed to add remote %s: %v\n", remoteName, err)
if out, err := addCmd.Output(); err != nil {
var stderr string
if exiterr, ok := err.(*exec.ExitError); ok {
stderr = string(exiterr.Stderr)
}
logverbose("failed to add remote %s: %s %s\n", remoteName, stderr, string(out))
}
}
}
@@ -1129,6 +1125,10 @@ func readNip34ConfigFile(baseDir string) (Nip34Config, error) {
localConfig.GraspServers[i] = nostr.NormalizeURL(localConfig.GraspServers[i])
}
if err := localConfig.Validate(); err != nil {
return localConfig, fmt.Errorf("nip34.json is invalid: %w", err)
}
return localConfig, nil
}

2
helpers_key.go
View File

@@ -77,7 +77,7 @@ func gatherSecretKeyOrBunkerFromArguments(ctx context.Context, c *cli.Command) (
clientKey = nostr.Generate()
}
logverbose("[nip46]: connecting to %s with client key %s", bunkerURL, clientKey.Hex())
logverbose("[nip46]: connecting to %s with client key %s\n", bunkerURL, clientKey.Hex())
bunker, err := nip46.ConnectBunker(ctx, clientKey, bunkerURL, nil, func(s string) {
log(color.CyanString("[nip46]: open the following URL: %s"), s)