From 68da2029f4678c0ff0f929f20ca29810846ff951 Mon Sep 17 00:00:00 2001
From: dev-warrior777 <>
Date: Tue, 24 Dec 2024 01:25:54 +0800
Subject: [PATCH 1/3] client/webserver: download log files from UI button.
---
client/webserver/api.go | 4 ++++
client/webserver/webserver.go | 1 +
2 files changed, 5 insertions(+)
diff --git a/client/webserver/api.go b/client/webserver/api.go
index 9dde92640e..e898ffc1a5 100644
--- a/client/webserver/api.go
+++ b/client/webserver/api.go
@@ -2042,6 +2042,10 @@ func (s *WebServer) apiTakeAction(w http.ResponseWriter, r *http.Request) {
writeJSON(w, simpleAck())
}
+func (s *WebServer) apiExportAppLogs(w http.ResponseWriter, r *http.Request) {
+ fmt.Printf("apiExportAppLogs")
+}
+
func (s *WebServer) redeemGameCode(w http.ResponseWriter, r *http.Request) {
var form struct {
Code dex.Bytes `json:"code"`
diff --git a/client/webserver/webserver.go b/client/webserver/webserver.go
index 5ea7ba9e93..70af0509ed 100644
--- a/client/webserver/webserver.go
+++ b/client/webserver/webserver.go
@@ -574,6 +574,7 @@ func New(cfg *Config) (*WebServer, error) {
apiAuth.Post("/txhistory", s.apiTxHistory)
apiAuth.Post("/takeaction", s.apiTakeAction)
apiAuth.Post("/redeemgamecode", s.redeemGameCode)
+ apiAuth.Post("/exportapplogs", s.apiExportAppLogs)
apiAuth.Post("/stakestatus", s.apiStakeStatus)
apiAuth.Post("/setvsp", s.apiSetVSP)
From d0a697730af8cabb5a9955eb183942f064cb343f Mon Sep 17 00:00:00 2001
From: dev-warrior777 <>
Date: Thu, 26 Dec 2024 00:53:25 +0800
Subject: [PATCH 2/3] client,webserver: basic pattern done #2
---
client/app/config.go | 1 +
client/webserver/api.go | 11 ++++++++++-
client/webserver/locales/en-us.go | 1 +
client/webserver/site/src/html/settings.tmpl | 3 +++
client/webserver/site/src/js/settings.ts | 12 ++++++++++++
client/webserver/webserver.go | 7 +++++--
6 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/client/app/config.go b/client/app/config.go
index 240e457e54..40eaf8a956 100644
--- a/client/app/config.go
+++ b/client/app/config.go
@@ -197,6 +197,7 @@ func (cfg *Config) Web(c *core.Core, mm *mm.MarketMaker, log dex.Logger, utc boo
KeyFile: keyFile,
Language: cfg.Language,
Tor: cfg.Tor,
+ MainLogFilePath: cfg.LogPath,
}
}
diff --git a/client/webserver/api.go b/client/webserver/api.go
index e898ffc1a5..89d7679032 100644
--- a/client/webserver/api.go
+++ b/client/webserver/api.go
@@ -2043,7 +2043,16 @@ func (s *WebServer) apiTakeAction(w http.ResponseWriter, r *http.Request) {
}
func (s *WebServer) apiExportAppLogs(w http.ResponseWriter, r *http.Request) {
- fmt.Printf("apiExportAppLogs")
+ fmt.Printf("=== apiExportAppLogs->\n")
+ w.Header().Set("Content-Disposition", "attachment; filename=bwlogs.zip")
+ w.Header().Set("Content-Type", "text/plain")
+ w.WriteHeader(http.StatusOK)
+
+ fmt.Printf("=== %s\n", s.mainLogFilePath)
+
+ // TODO(warrior) .. get the file ;-)
+
+ fmt.Printf("=== <-apiExportAppLogs\n")
}
func (s *WebServer) redeemGameCode(w http.ResponseWriter, r *http.Request) {
diff --git a/client/webserver/locales/en-us.go b/client/webserver/locales/en-us.go
index 34f57ee888..6c08ff62b4 100644
--- a/client/webserver/locales/en-us.go
+++ b/client/webserver/locales/en-us.go
@@ -684,4 +684,5 @@ var EnUS = map[string]*intl.Translation{
"Wallet Balances": {T: "Wallet Balances"},
"Placements": {T: "Placements"},
"delete_bot": {T: "Delete Bot"},
+ "export_logs": {T: "Export Logs"},
}
diff --git a/client/webserver/site/src/html/settings.tmpl b/client/webserver/site/src/html/settings.tmpl
index f9a1056d6b..21377506b1 100644
--- a/client/webserver/site/src/html/settings.tmpl
+++ b/client/webserver/site/src/html/settings.tmpl
@@ -76,6 +76,9 @@
[[[seed_implore_msg]]]
[[[View Application Seed]]]
+
+
diff --git a/client/webserver/site/src/js/settings.ts b/client/webserver/site/src/js/settings.ts
index 59e6758446..4e05265fff 100644
--- a/client/webserver/site/src/js/settings.ts
+++ b/client/webserver/site/src/js/settings.ts
@@ -173,6 +173,8 @@ export default class SettingsPage extends BasePage {
})
forms.bind(page.exportSeedAuth, page.exportSeedSubmit, () => this.submitExportSeedReq())
+ Doc.bind(page.exportLogs, 'click', () => this.exportLogs())
+
Doc.bind(page.gameCodeLink, 'click', () => this.showForm(page.gameCodeForm))
Doc.bind(page.gameCodeSubmit, 'click', () => this.submitGameCode())
@@ -473,6 +475,16 @@ export default class SettingsPage extends BasePage {
Doc.show(form)
}
+ async exportLogs () {
+ console.log('exportLogs->')
+
+ const url = new URL(window.location.href)
+ url.pathname = '/api/exportapplog'
+ window.open(url.toString())
+
+ console.log('exportLogs<-')
+ }
+
async submitGameCode () {
const page = this.page
Doc.hide(page.gameCodeErr)
diff --git a/client/webserver/webserver.go b/client/webserver/webserver.go
index 70af0509ed..3ada9b21d7 100644
--- a/client/webserver/webserver.go
+++ b/client/webserver/webserver.go
@@ -243,6 +243,7 @@ type Config struct {
NoEmbed bool
HttpProf bool
Tor bool
+ MainLogFilePath string
}
type valStamp struct {
@@ -276,7 +277,8 @@ type WebServer struct {
bondBufMtx sync.Mutex
bondBuf map[uint32]valStamp
- useDEXBranding bool
+ useDEXBranding bool
+ mainLogFilePath string
}
// New is the constructor for a new WebServer. CustomSiteDir in the Config can
@@ -403,6 +405,7 @@ func New(cfg *Config) (*WebServer, error) {
tor: cfg.Tor,
bondBuf: map[uint32]valStamp{},
useDEXBranding: useDEXBranding,
+ mainLogFilePath: cfg.MainLogFilePath,
}
s.lang.Store(lang)
@@ -574,7 +577,7 @@ func New(cfg *Config) (*WebServer, error) {
apiAuth.Post("/txhistory", s.apiTxHistory)
apiAuth.Post("/takeaction", s.apiTakeAction)
apiAuth.Post("/redeemgamecode", s.redeemGameCode)
- apiAuth.Post("/exportapplogs", s.apiExportAppLogs)
+ apiAuth.Get("/exportapplog", s.apiExportAppLogs)
apiAuth.Post("/stakestatus", s.apiStakeStatus)
apiAuth.Post("/setvsp", s.apiSetVSP)
From 1396cd68f12c1084ddd01c84390dfa3a2d8213bf Mon Sep 17 00:00:00 2001
From: dev-warrior777 <>
Date: Sun, 2 Feb 2025 19:12:02 +0800
Subject: [PATCH 3/3] multi: Squash commits.
---
client/app/config.go | 22 ++++++------
client/webserver/api.go | 35 ++++++++++++++++----
client/webserver/site/src/css/icons.scss | 6 ++++
client/webserver/site/src/html/settings.tmpl | 2 +-
client/webserver/site/src/js/settings.ts | 12 ++++---
client/webserver/webserver.go | 6 ++--
6 files changed, 57 insertions(+), 26 deletions(-)
diff --git a/client/app/config.go b/client/app/config.go
index 40eaf8a956..d0d6e2a55f 100644
--- a/client/app/config.go
+++ b/client/app/config.go
@@ -186,17 +186,17 @@ func (cfg *Config) Web(c *core.Core, mm *mm.MarketMaker, log dex.Logger, utc boo
}
return &webserver.Config{
- DataDir: filepath.Join(cfg.AppData, "srv"),
- Core: c,
- MarketMaker: mmCore,
- Addr: cfg.WebAddr,
- CustomSiteDir: cfg.SiteDir,
- Logger: log,
- UTC: utc,
- CertFile: certFile,
- KeyFile: keyFile,
- Language: cfg.Language,
- Tor: cfg.Tor,
+ DataDir: filepath.Join(cfg.AppData, "srv"),
+ Core: c,
+ MarketMaker: mmCore,
+ Addr: cfg.WebAddr,
+ CustomSiteDir: cfg.SiteDir,
+ Logger: log,
+ UTC: utc,
+ CertFile: certFile,
+ KeyFile: keyFile,
+ Language: cfg.Language,
+ Tor: cfg.Tor,
MainLogFilePath: cfg.LogPath,
}
}
diff --git a/client/webserver/api.go b/client/webserver/api.go
index 89d7679032..adf216687f 100644
--- a/client/webserver/api.go
+++ b/client/webserver/api.go
@@ -4,11 +4,14 @@
package webserver
import (
+ "archive/zip"
"encoding/hex"
"encoding/json"
"errors"
"fmt"
+ "io"
"net/http"
+ "os"
"time"
"decred.org/dcrdex/client/asset"
@@ -2042,17 +2045,37 @@ func (s *WebServer) apiTakeAction(w http.ResponseWriter, r *http.Request) {
writeJSON(w, simpleAck())
}
+// apiExportAppLogs time stamps the application log, zips it and sends it back to
+// the browser or webview as an attachment. Logfile names need to be distinct as
+// webview will not overwite an existing file.
func (s *WebServer) apiExportAppLogs(w http.ResponseWriter, r *http.Request) {
- fmt.Printf("=== apiExportAppLogs->\n")
- w.Header().Set("Content-Disposition", "attachment; filename=bwlogs.zip")
- w.Header().Set("Content-Type", "text/plain")
+ timeString := time.Now().Format("2006-01-02T15_04_05")
+ zipAttachment := fmt.Sprintf("attachment; filename=bwlog_%s.zip", timeString)
+
+ w.Header().Set("Content-Disposition", zipAttachment)
+ w.Header().Set("Content-Type", "application/octet-stream; type=zip")
w.WriteHeader(http.StatusOK)
- fmt.Printf("=== %s\n", s.mainLogFilePath)
+ zipWriter := zip.NewWriter(w)
+ defer zipWriter.Close()
+
+ lf, err := os.Open(s.mainLogFilePath)
+ if err != nil {
+ log.Errorf("error opening bisonw log file: %v", err)
+ return
+ }
+ defer lf.Close()
- // TODO(warrior) .. get the file ;-)
+ iow, err := zipWriter.Create("bwlog.txt") // only 1 file in zip header
+ if err != nil {
+ log.Errorf("error creating an io.Writer: %v", err)
+ return
+ }
- fmt.Printf("=== <-apiExportAppLogs\n")
+ if _, err := io.Copy(iow, lf); err != nil {
+ log.Errorf("error copying bisonw log to zip writer: %v", err)
+ return
+ }
}
func (s *WebServer) redeemGameCode(w http.ResponseWriter, r *http.Request) {
diff --git a/client/webserver/site/src/css/icons.scss b/client/webserver/site/src/css/icons.scss
index 098e4a42e6..d25d7b963c 100644
--- a/client/webserver/site/src/css/icons.scss
+++ b/client/webserver/site/src/css/icons.scss
@@ -155,6 +155,12 @@
display: inline-block;
}
+.ico-wide-headed-down-arrow::before {
+ content: "\e919";
+ display: inline-block;
+ transform: rotate(270deg);
+}
+
.ico-arrowup::before {
content: "\e90c";
display: inline-block;
diff --git a/client/webserver/site/src/html/settings.tmpl b/client/webserver/site/src/html/settings.tmpl
index 21377506b1..eeaccf3471 100644
--- a/client/webserver/site/src/html/settings.tmpl
+++ b/client/webserver/site/src/html/settings.tmpl
@@ -77,7 +77,7 @@
[[[View Application Seed]]]
-