disco: FileSecretStore -> SecretFile

Author: rkonfj

cmd/pgcli/vpn/vpn.go

@@ -358,7 +358,7 @@ func (v *P2PVPN) loginIfNecessary(ctx context.Context) (disco.SecretStore, error
 		v.Config.SecretFile = filepath.Join(currentUser.HomeDir, ".peerguard_network_secret.json")
 	}
 
-	store := p2p.FileSecretStore(v.Config.SecretFile)
+	store := &disco.SecretFile{FilePath: v.Config.SecretFile}
 	newFileStore := func() (disco.SecretStore, error) {
 		joined, err := v.requestNetworkSecret(ctx)
 		if err != nil {

disco/server.go

@@ -59,25 +59,25 @@ func (s *NetworkSecret) UpdateNetworkSecret(secret NetworkSecret) error {
 	return nil
 }
 
-type FileSecretStore struct {
-	StoreFilePath string
+type SecretFile struct {
+	FilePath string
 }
 
-func (s *FileSecretStore) NetworkSecret() (NetworkSecret, error) {
-	f, err := os.Open(s.StoreFilePath)
+func (s *SecretFile) NetworkSecret() (NetworkSecret, error) {
+	f, err := os.Open(s.FilePath)
 	if err != nil {
-		return NetworkSecret{}, fmt.Errorf("file secret store(%s) open failed: %s", s.StoreFilePath, err)
+		return NetworkSecret{}, fmt.Errorf("file secret store(%s) open failed: %s", s.FilePath, err)
 	}
 	defer f.Close()
 	var secret NetworkSecret
 	if err = json.NewDecoder(f).Decode(&secret); err != nil {
-		return secret, fmt.Errorf("file secret store(%s) decode failed: %w", s.StoreFilePath, err)
+		return secret, fmt.Errorf("file secret store(%s) decode failed: %w", s.FilePath, err)
 	}
 	return secret, nil
 }
 
-func (s *FileSecretStore) UpdateNetworkSecret(secret NetworkSecret) error {
-	f, err := os.Create(s.StoreFilePath)
+func (s *SecretFile) UpdateNetworkSecret(secret NetworkSecret) error {
+	f, err := os.Create(s.FilePath)
 	if err != nil {
 		return fmt.Errorf("update network secret failed: %w", err)
 	}

p2p/README.md

@@ -5,23 +5,17 @@
 ### Peer1 (act as echo server)
 
 ```go
-serverURL := "wss://synf.in/pg"
+serverURL := "wss://openpg.in/pg"
 
-intent, err := network.JoinOIDC(oidc.ProviderGoogle, peermapURL)
-if err != nil {
-    panic(err)
-}
-fmt.Println(intent.AuthURL()) // https://synf.in/oidc/google?state=5G68CtYnMRMdrtrRF
-networkSecret, err := intent.Wait(context.TODO())
-if err != nil {
-    panic(err)
-}
+intent := langs.Must(network.JoinOIDC(oidc.ProviderGoogle, peermapURL))
+fmt.Println(intent.AuthURL()) // https://openpg.in/oidc/google?state=5G68CtYnMRMdrtrRF
+networkSecret := langs.Must(intent.Wait(context.TODO()))
 
 // peerID is a unique string (less than 256bytes)
-packetConn, err := p2p.ListenPacket(disco.NewServer(serverURL, networkSecret), p2p.ListenPeerID("uniqueString"))
-if err != nil {
-    panic(err)
-}
+packetConn := langs.Must(p2p.ListenPacket(
+    disco.NewServer(serverURL, networkSecret),
+    p2p.ListenPeerID("uniqueString"),
+))
 
 // unreliability echo server
 buf := make([]byte, 1024)
@@ -31,10 +25,7 @@ for {
         panic(err)
     }
     fmt.Println("Echo packet to", peerID, string(buf[:n]))
-    _, err = packetConn.WriteTo(peerID, buf[:n])
-    if err != nil {
-        panic(err)
-    }
+    langs.Must(packetConn.WriteTo(peerID, buf[:n]))
 }
 ```
 
@@ -43,18 +34,11 @@ for {
 ```go
 ...
 
-packetConn, err := p2p.ListenPacket(disco.NewServer(serverURL, networkSecret))
-if err != nil {
-    panic(err)
-}
-
+packetConn := langs.Must(p2p.ListenPacket(disco.NewServer(serverURL, networkSecret)))
 defer packetConn.Close()
 
 // "uniqueString" is above echo server's address
-_, err := packetConn.WriteTo(peer.ID("uniqueString"), []byte("hello"))
-if err != nil {
-    panic(err)
-}
+langs.Must(packetConn.WriteTo(peer.ID("uniqueString"), []byte("hello")))
 
 packetConn.SetReadDeadline(time.Now().Add(time.Second))
 

p2p/config.go

@@ -112,10 +112,6 @@ func ListenPeerLeave(onPeerLeave OnPeerLeave) Option {
 	}
 }
 
-func FileSecretStore(storeFilePath string) disco.SecretStore {
-	return &disco.FileSecretStore{StoreFilePath: storeFilePath}
-}
-
 func PeerSilenceMode() Option {
 	return func(cfg *Config) error {
 		if cfg.Metadata == nil {