parsing from file fixes + pretty printing.

This commit is contained in:
fiatjaf
2023-09-24 22:05:54 -03:00
parent 619f2cb453
commit 3c38206ce3
3 changed files with 180 additions and 29 deletions

View File

@@ -3,17 +3,16 @@ package opentimestamps
import (
"bytes"
"context"
"encoding/hex"
"fmt"
"io"
"net/http"
)
func Stamp(ctx context.Context, calendarUrl string, digest [32]byte) error {
func Stamp(ctx context.Context, calendarUrl string, digest [32]byte) (*Timestamp, error) {
body := bytes.NewBuffer(digest[:])
req, err := http.NewRequestWithContext(ctx, "POST", normalizeUrl(calendarUrl)+"/digest", body)
if err != nil {
return err
return nil, err
}
req.Header.Add("User-Agent", "github.com/fiatjaf/opentimestamps")
@@ -21,19 +20,42 @@ func Stamp(ctx context.Context, calendarUrl string, digest [32]byte) error {
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
resp, err := http.DefaultClient.Do(req)
if err != nil {
return fmt.Errorf("'%s' request failed: %w", calendarUrl, err)
return nil, fmt.Errorf("'%s' request failed: %w", calendarUrl, err)
}
full, err := io.ReadAll(resp.Body)
if err != nil {
return fmt.Errorf("failed to read response from '%s': %w", calendarUrl, err)
return nil, fmt.Errorf("failed to read response from '%s': %w", calendarUrl, err)
}
resp.Body.Close()
fmt.Println("full", hex.EncodeToString(full))
v, err := parseCalendarServerResponse(NewBuffer(full), digest[:])
fmt.Println(err)
fmt.Println(v)
return nil
return parseCalendarServerResponse(NewBuffer(full), digest[:])
}
func ReadFromFile(data []byte) (*Timestamp, error) {
return parseOTSFile(NewBuffer(data))
}
// func Upgrade(ctx context.Context, calendarUrl string) (*Timestamp, error) {
// body := bytes.NewBuffer(digest[:])
// req, err := http.NewRequestWithContext(ctx, "POST", normalizeUrl(calendarUrl)+"/timestamp/" +, nil)
// if err != nil {
// return nil, err
// }
//
// req.Header.Add("User-Agent", "github.com/fiatjaf/opentimestamps")
// req.Header.Add("Accept", "application/vnd.opentimestamps.v1")
// req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
// resp, err := http.DefaultClient.Do(req)
// if err != nil {
// return nil, fmt.Errorf("'%s' request failed: %w", calendarUrl, err)
// }
//
// full, err := io.ReadAll(resp.Body)
// if err != nil {
// return nil, fmt.Errorf("failed to read response from '%s': %w", calendarUrl, err)
// }
// resp.Body.Close()
//
// return parseCalendarServerResponse(NewBuffer(full), digest[:])
// }