client,webserver: Use the app build version as Version in UI.

dev-warrior777 · dev-warrior777 · commit c298ca2bb06f · 2024-11-24T18:44:22.000+08:00
- Use the value from client/app/version.go
	- Place at the foot of Settings dialog
	- Re-purpose 'BUILD ID' as "Version for
	  translations and find relevant translations
diff --git a/client/app/config.go b/client/app/config.go
@@ -143,6 +143,7 @@ type Config struct {
 	WebConfig
 	LogConfig
 	MMConfig
+	AppVersion string
 	// AppData and ConfigPath should be parsed from the command-line,
 	// as it makes no sense to set these in the config file itself. If no values
 	// are assigned, defaults will be used.
@@ -348,6 +349,7 @@ func ResolveConfig(appData string, cfg *Config) error {
 	if cfg.MMConfig.EventLogDBPath == "" {
 		cfg.MMConfig.EventLogDBPath = defaultMMEventLogDBPath
 	}
+
 	return nil
 }
 
diff --git a/client/cmd/bisonw/config.go b/client/cmd/bisonw/config.go
@@ -13,6 +13,7 @@ func configure() (*app.Config, error) {
 	// or the version flag was specified. Override any environment variables
 	// with parsed command line flags.
 	iniCfg := app.DefaultConfig
+	iniCfg.AppVersion = app.Version
 	preCfg := iniCfg
 	if err := app.ParseCLIConfig(&preCfg); err != nil {
 		return nil, err
diff --git a/client/cmd/bisonw/main.go b/client/cmd/bisonw/main.go
@@ -154,7 +154,7 @@ func runCore(cfg *app.Config) error {
 	}
 
 	if !cfg.NoWeb {
-		webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc))
+		webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc), cfg.AppVersion)
 		if err != nil {
 			return fmt.Errorf("failed creating web server: %w", err)
 		}
diff --git a/client/webserver/http.go b/client/webserver/http.go
@@ -260,13 +260,15 @@ func (s *WebServer) handleSettings(w http.ResponseWriter, r *http.Request) {
 		FiatCurrency    string
 		Exchanges       map[string]*core.Exchange
 		IsInitialized   bool
+		AppVersion      string
 	}{
 		CommonArguments: *common,
 		KnownExchanges:  s.knownUnregisteredExchanges(xcs),
 		FiatCurrency:    core.DefaultFiatCurrency,
 		FiatRateSources: s.core.FiatRateSources(),
 		Exchanges:       xcs,
 		IsInitialized:   s.core.IsInitialized(),
+		AppVersion:      s.appVersion,
 	}
 	s.sendTemplate(w, "settings", data)
 }
diff --git a/client/webserver/locales/de-de.go b/client/webserver/locales/de-de.go
@@ -135,7 +135,7 @@ var DeDE = map[string]*intl.Translation{
 	"Export Account":            {T: "Account exportieren"},
 	"simultaneous_servers_msg":  {T: "Der <span class=brand></span> unterstützt die gleichzeitige Nutzung einer beliebigen Anzahl von DEX-Servern."},
 	"Change App Password":       {T: "App-Passwort ändern"},
-	"Build ID":                  {T: "Build ID"},
+	"Build ID":                  {T: "Version"},
 	"Connect":                   {T: "Verbinden"},
 	"Send":                      {T: "Senden"},
 	"Deposit":                   {T: "Einzahlen"},
diff --git a/client/webserver/locales/en-us.go b/client/webserver/locales/en-us.go
@@ -167,7 +167,7 @@ var EnUS = map[string]*intl.Translation{
 	"browser_ntfn_blocked":      {T: "Browser notifications are currently blocked.  Please unblock this site in your browser to receive notifications."},
 	"enable_browser_ntfn_info":  {T: "Desktop notifications appear even when this window is not active.  When you have other applications open this can be helpful as you will be notified on DCRDEX events.  Customize below the types of notifications you would like to receive."},
 	"Save Notifications":        {T: "Save Notifications"},
-	"Build ID":                  {T: "Build ID"},
+	"Build ID":                  {T: "Version"},
 	"Connect":                   {T: "Connect"},
 	"Send":                      {T: "Send"},
 	"Deposit":                   {T: "Deposit"}, // unused
diff --git a/client/webserver/locales/pl-pl.go b/client/webserver/locales/pl-pl.go
@@ -133,7 +133,7 @@ var PlPL = map[string]*intl.Translation{
 	"Export Account":                {T: "Eksportuj konto"},
 	"simultaneous_servers_msg":      {T: "Klient Decred DEX wspiera jednoczesne korzystanie z wielu serwerów DEX."},
 	"Change App Password":           {T: "Zmień hasło aplikacji"},
-	"Build ID":                      {T: "ID builda"},
+	"Build ID":                      {T: "Wersja"},
 	"Connect":                       {T: "Połącz"},
 	"Withdraw":                      {T: "Wypłać"},
 	"Deposit":                       {T: "Zdeponuj"},
diff --git a/client/webserver/locales/pt-br.go b/client/webserver/locales/pt-br.go
@@ -133,7 +133,7 @@ var PtBr = map[string]*intl.Translation{
 	"Export Account":             {T: "Exportar Conta"},
 	"simultaneous_servers_msg":   {T: "O cliente da DEX suporta simultâneos números de servidores DEX."},
 	"Change App Password":        {T: "Trocar Senha do aplicativo"},
-	"Build ID":                   {T: "ID da Build"},
+	"Build ID":                   {T: "Versão"},
 	"Connect":                    {T: "Conectar"},
 	"Withdraw":                   {T: "Retirar"},
 	"Deposit":                    {T: "Depositar"},
diff --git a/client/webserver/locales/zh-cn.go b/client/webserver/locales/zh-cn.go
@@ -135,7 +135,7 @@ var ZhCN = map[string]*intl.Translation{
 	"Export Account":            {T: "退出账户"},
 	"simultaneous_servers_msg":  {T: "Decred DEX 客户端支持同时使用任意数量的 DEX 服务器。"},
 	"Change App Password":       {T: "更改应用程序密码"},
-	"Build ID":                  {T: "构建 ID"},
+	"Build ID":                  {T: "版本"},
 	"Connect":                   {T: "连接"},
 	"Send":                      {T: "发送"},
 	"Deposit":                   {T: "存款"},
diff --git a/client/webserver/site/src/html/bodybuilder.tmpl b/client/webserver/site/src/html/bodybuilder.tmpl
@@ -9,7 +9,7 @@
   <link rel="icon" href="/img/favicon.png?v=AZ4AZX">
   <meta name="description" content="Bison Wallet">
   <title>{{.Title}}</title>
-  <link href="/css/style.css?v={{commitHash}}" rel="stylesheet">
+  <link href="/css/style.css" rel="stylesheet">
 </head>
 <body {{if .UseDEXBranding}}class="dex-branding"{{end}}>
   <div class="popup-notes d-hide" id="popupNotes">
@@ -257,7 +257,7 @@
   </div>
 </div>
 
-<script src="/js/entry.js?v={{commitHash}}"></script>
+<script src="/js/entry.js"></script>
 </body>
 </html>
 {{end}}
diff --git a/client/webserver/site/src/html/settings.tmpl b/client/webserver/site/src/html/settings.tmpl
@@ -79,7 +79,8 @@
       <div id="gameCodeLink" class="py-3 mb-3 border-bottom pointer hoverbg">
         <span class="ico-ticket"></span> [[[Redeem game code]]]
       </div>
-      <p class="grey">[[[Build ID]]]: <span id="commitHash" class="mono"></span></p>
+      {{$version := .AppVersion}}
+      <p class="grey">[[[Build ID]]]: <span id="version" class="mono">{{$version}}</span></p>
     </div>
   </section>
 
diff --git a/client/webserver/site/src/js/app.ts b/client/webserver/site/src/js/app.ts
@@ -161,7 +161,7 @@ export default class Application {
   authed: boolean
   user: User
   seedGenTime: number
-  commitHash: string
+  // commitHash: string // TODO: Remove
   showPopups: boolean
   loggers: Record<string, boolean>
   recorders: Record<string, LogMessage[]>
@@ -185,14 +185,15 @@ export default class Application {
     this.notes = []
     this.pokes = []
     this.seedGenTime = 0
-    this.commitHash = process.env.COMMITHASH || ''
+    // this.commitHash = process.env.COMMITHASH || '' // TODO: Remove
     this.noteReceivers = []
     this.fiatRatesMap = {}
     this.showPopups = State.fetchLocal(State.popupsLK) === '1'
     this.txHistoryMap = {}
     this.requiredActions = {}
 
-    console.log('Bison Wallet, Build', this.commitHash.substring(0, 7))
+    console.log('Bison Wallet')
+    // console.log('Bison Wallet, Build', this.commitHash.substring(0, 7)) // TODO: Remove
 
     // Set Bootstrap dark theme attribute if dark mode is enabled.
     if (State.isDark()) {
@@ -261,7 +262,8 @@ export default class Application {
     // Don't fetch the user until we know what page we're on.
     await this.fetchUser()
     const ignoreCachedLocale = process.env.NODE_ENV === 'development'
-    await intl.loadLocale(this.lang, this.commitHash, ignoreCachedLocale)
+    await intl.loadLocale(this.lang, ignoreCachedLocale)
+    // await intl.loadLocale(this.lang, this.commitHash, ignoreCachedLocale) // TODO: Remove
     // The application is free to respond with a page that differs from the
     // one requested in the omnibox, e.g. routing though a login page. Set the
     // current URL state based on the actual page.
diff --git a/client/webserver/site/src/js/locales.ts b/client/webserver/site/src/js/locales.ts
@@ -222,16 +222,19 @@ export const ID_DELETE_BOT = 'DELETE_BOT'
 
 let locale: Locale
 
-export async function loadLocale (lang: string, commitHash: string, skipCache: boolean) {
+export async function loadLocale (lang: string, /* commitHash: string, TODO: Remove */ skipCache: boolean) {
   if (!skipCache) {
     const specs = State.fetchLocal(State.localeSpecsKey)
-    if (specs && specs.lang === lang && specs.commitHash === commitHash) {
+    if (specs && specs.lang === lang) {
+      // if (specs && specs.lang === lang && specs.commitHash === commitHash) { // TODO: Remove
       locale = State.fetchLocal(State.localeKey)
       return
     }
   }
   locale = await postJSON('/api/locale', lang)
-  State.storeLocal(State.localeSpecsKey, { lang, commitHash })
+  // TODO: Remove + Change
+  State.storeLocal(State.localeSpecsKey, { lang })
+  // State.storeLocal(State.localeSpecsKey, { lang, commitHash })
   State.storeLocal(State.localeKey, locale)
 }
 
diff --git a/client/webserver/site/src/js/registry.ts b/client/webserver/site/src/js/registry.ts
@@ -1275,7 +1275,7 @@ export interface Application {
   exchanges: Record<string, Exchange>
   fiatRatesMap: Record<number, number>
   showPopups: boolean
-  commitHash: string
+  // commitHash: string // TODO: Remove
   authed: boolean
   start (): Promise<void>
   reconnected (): void
diff --git a/client/webserver/site/src/js/settings.ts b/client/webserver/site/src/js/settings.ts
@@ -61,11 +61,12 @@ export default class SettingsPage extends BasePage {
       app().showPopups = show
     })
 
-    page.commitHash.textContent = app().commitHash.substring(0, 7)
-    Doc.bind(page.addADex, 'click', () => {
-      this.dexAddrForm.refresh()
-      this.showForm(page.dexAddrForm)
-    })
+    // TODO: Remove
+    // page.commitHash.textContent = app().commitHash.substring(0, 7)
+    // Doc.bind(page.addADex, 'click', () => {
+    //   this.dexAddrForm.refresh()
+    //   this.showForm(page.dexAddrForm)
+    // })
 
     this.fiatRateSources.forEach(src => {
       Doc.bind(src, 'change', async () => {
diff --git a/client/webserver/site/webpack/common.js b/client/webserver/site/webpack/common.js
@@ -6,9 +6,10 @@ const StyleLintPlugin = require('stylelint-webpack-plugin')
 const ESLintPlugin = require('eslint-webpack-plugin')
 
 const child_process = require('child_process')
-function git(command) {
-  return child_process.execSync(`git ${command}`, { encoding: 'utf8' }).trim();
-}
+// TODO: Remove
+// function git(command) {
+//   return child_process.execSync(`git ${command}`, { encoding: 'utf8' }).trim();
+// }
 
 module.exports = {
   target: "web",
@@ -38,9 +39,10 @@ module.exports = {
     ]
   },
   plugins: [
-    new webpack.EnvironmentPlugin({
-      COMMITHASH: git('rev-parse HEAD'),
-    }),
+    // TODO: Remove
+    // new webpack.EnvironmentPlugin({
+    //   COMMITHASH: git('rev-parse HEAD'),
+    // }),
     new CleanWebpackPlugin(),
     new MiniCssExtractPlugin({
       filename: '../dist/style.css'
diff --git a/client/webserver/template.go b/client/webserver/template.go
@@ -5,18 +5,14 @@ package webserver
 
 import (
 	"bytes"
-	"encoding/hex"
 	"fmt"
 	"html/template"
 	"io/fs"
 	"os"
 	"strings"
 
-	"runtime/debug"
-
 	"decred.org/dcrdex/client/intl"
 	"decred.org/dcrdex/client/webserver/locales"
-	"decred.org/dcrdex/dex/encode"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 )
@@ -188,17 +184,18 @@ func (t *templates) exec(name string, data any) (string, error) {
 	return page.String(), err
 }
 
-var commit = func() string {
-	if info, ok := debug.ReadBuildInfo(); ok {
-		for _, setting := range info.Settings {
-			if setting.Key == "vcs.revision" && len(setting.Value) >= 8 {
-				return setting.Value
-			}
-		}
-	}
+// TODO: Remove
+// var commit = func() string {
+// 	if info, ok := debug.ReadBuildInfo(); ok {
+// 		for _, setting := range info.Settings {
+// 			if setting.Key == "vcs.revision" && len(setting.Value) >= 8 {
+// 				return setting.Value
+// 			}
+// 		}
+// 	}
 
-	return hex.EncodeToString(encode.RandomBytes(4))
-}()
+// 	return hex.EncodeToString(encode.RandomBytes(4))
+// }()
 
 // templateFuncs are able to be called during template execution.
 var templateFuncs = template.FuncMap{
@@ -228,7 +225,8 @@ var templateFuncs = template.FuncMap{
 		}
 		return parts[0]
 	},
-	"commitHash": func() string {
-		return commit[:8]
-	},
+	// TODO: Remove
+	// "commitHash": func() string {
+	// 	return commit[:8]
+	// },
 }
diff --git a/client/webserver/webserver.go b/client/webserver/webserver.go
@@ -271,12 +271,13 @@ type WebServer struct {
 	bondBuf    map[uint32]valStamp
 
 	useDEXBranding bool
+	appVersion     string
 }
 
 // New is the constructor for a new WebServer. CustomSiteDir in the Config can
 // be left blank, in which case a handful of default locations will be checked.
 // This will work in most cases.
-func New(cfg *Config) (*WebServer, error) {
+func New(cfg *Config, appVersion string) (*WebServer, error) {
 	log = cfg.Logger
 
 	// Only look for files on disk if NoEmbed is set. This is necessary since
@@ -392,6 +393,7 @@ func New(cfg *Config) (*WebServer, error) {
 		cachedPasswords: make(map[string]*cachedPassword),
 		bondBuf:         map[uint32]valStamp{},
 		useDEXBranding:  useDEXBranding,
+		appVersion:      appVersion,
 	}
 	s.lang.Store(lang)
 

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ type Config struct {`
`143`	`143`	`WebConfig`
`144`	`144`	`LogConfig`
`145`	`145`	`MMConfig`
	`146`	`+ AppVersion string`
`146`	`147`	`// AppData and ConfigPath should be parsed from the command-line,`
`147`	`148`	`// as it makes no sense to set these in the config file itself. If no values`
`148`	`149`	`// are assigned, defaults will be used.`
`@@ -348,6 +349,7 @@ func ResolveConfig(appData string, cfg *Config) error {`
`348`	`349`	`if cfg.MMConfig.EventLogDBPath == "" {`
`349`	`350`	`cfg.MMConfig.EventLogDBPath = defaultMMEventLogDBPath`
`350`	`351`	`}`
	`352`	`+`
`351`	`353`	`return nil`
`352`	`354`	`}`
`353`	`355`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func runCore(cfg *app.Config) error {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`if !cfg.NoWeb {`
`157`		`- webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc))`
	`157`	`+ webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc), cfg.AppVersion)`
`158`	`158`	`if err != nil {`
`159`	`159`	`return fmt.Errorf("failed creating web server: %w", err)`
`160`	`160`	`}`