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

.gitignore

@@ -33,6 +33,7 @@ dex/testing/loadbot/loadbot
 bin/
 bin-v*/
 client/webserver/site/template-builder/template-builder
+client/webserver/site/webpack-build-id.txt
 dex/testing/btc/harnesschain.tar.gz
 client/asset/btc/electrum/example/server/server
 client/asset/btc/electrum/example/wallet/wallet

client/app/config.go

@@ -162,7 +162,7 @@ type Config struct {
 // Web creates a configuration for the webserver. This is a Config method
 // instead of a WebConfig method because Language is an app-level setting used
 // by both core and rpcserver.
-func (cfg *Config) Web(c *core.Core, mm *mm.MarketMaker, log dex.Logger, utc bool) *webserver.Config {
+func (cfg *Config) Web(c *core.Core, mm *mm.MarketMaker, log dex.Logger, utc bool, appVersion string) *webserver.Config {
 	addr := cfg.WebAddr
 	host, _, err := net.SplitHostPort(addr)
 	if err == nil && host != "" {
@@ -196,6 +196,7 @@ func (cfg *Config) Web(c *core.Core, mm *mm.MarketMaker, log dex.Logger, utc boo
 		NoEmbed:       cfg.NoEmbedSite,
 		HttpProf:      cfg.HTTPProfile,
 		Language:      cfg.Language,
+		AppVersion:    appVersion,
 	}
 }
 
@@ -348,6 +349,7 @@ func ResolveConfig(appData string, cfg *Config) error {
 	if cfg.MMConfig.EventLogDBPath == "" {
 		cfg.MMConfig.EventLogDBPath = defaultMMEventLogDBPath
 	}
+
 	return nil
 }
 

client/cmd/bisonw-desktop/app.go

@@ -222,7 +222,7 @@ func mainCore() error {
 		}()
 	}
 
-	webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc))
+	webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc, app.Version))
 	if err != nil {
 		return fmt.Errorf("failed creating web server: %w", err)
 	}

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, app.Version))
 		if err != nil {
 			return fmt.Errorf("failed creating web server: %w", err)
 		}

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)
 }

client/webserver/locales/ar.go

@@ -137,7 +137,7 @@ var Ar = map[string]*intl.Translation{
 	"Export Account":            {T: "تصدير الحساب"},
 	"simultaneous_servers_msg":  {T: "يدعم عميل منصة المبادلات اللامركزية لديكريد الاستخدام المتزامن لأي عدد من خوادم منصة المبادلات اللامركزية DEX."},
 	"Change App Password":       {T: "تغيير كلمة مرور التطبيق"},
-	"Build ID":                  {T: "معرف البنية"},
+	"Version":                   {T: "معرف البنية"},
 	"Connect":                   {T: "اتصل"},
 	"Send":                      {T: "ارسال"},
 	"Deposit":                   {T: "إيداع"},

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"},
+	"Version":                   {T: "Version"},
 	"Connect":                   {T: "Verbinden"},
 	"Send":                      {T: "Senden"},
 	"Deposit":                   {T: "Einzahlen"},

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"},
+	"Version":                   {T: "Version"},
 	"Connect":                   {T: "Connect"},
 	"Send":                      {T: "Send"},
 	"Deposit":                   {T: "Deposit"}, // unused

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"},
+	"Version":                       {T: "Wersja"},
 	"Connect":                       {T: "Połącz"},
 	"Withdraw":                      {T: "Wypłać"},
 	"Deposit":                       {T: "Zdeponuj"},

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"},
+	"Version":                    {T: "Versão"},
 	"Connect":                    {T: "Conectar"},
 	"Withdraw":                   {T: "Retirar"},
 	"Deposit":                    {T: "Depositar"},

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"},
+	"Version":                   {T: "版本"},
 	"Connect":                   {T: "连接"},
 	"Send":                      {T: "发送"},
 	"Deposit":                   {T: "存款"},

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{{webpackBuildIdQuery}}" rel="stylesheet">
 </head>
 <body {{if .UseDEXBranding}}class="dex-branding"{{end}}>
   <div class="popup-notes d-hide" id="popupNotes">
@@ -97,7 +97,7 @@
       <span class="ico-barchart fs16 me-2"></span>
       [[[Market Making]]]
     </a>
-    <a href="/settings" class="demi hoverbright plainlink d-flex align-items-center py-1">
+    <a href="/settings" class="demi hoverbright plainlink d-flex align-items-center py-1 authed-only">
       <span class="ico-settings fs16 me-2"></span>
       [[[Settings]]]
     </a>
@@ -257,7 +257,7 @@
   </div>
 </div>
 
-<script src="/js/entry.js?v={{commitHash}}"></script>
+<script src="/js/entry.js{{webpackBuildIdQuery}}"></script>
 </body>
 </html>
 {{end}}

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">[[[Version]]]: <span id="version" class="mono">{{$version}}</span></p>
     </div>
   </section>
 

client/webserver/site/src/js/app.ts

@@ -161,7 +161,7 @@ export default class Application {
   authed: boolean
   user: User
   seedGenTime: number
-  commitHash: string
+  webpackBuildID: string
   showPopups: boolean
   loggers: Record<string, boolean>
   recorders: Record<string, LogMessage[]>
@@ -185,14 +185,14 @@ export default class Application {
     this.notes = []
     this.pokes = []
     this.seedGenTime = 0
-    this.commitHash = process.env.COMMITHASH || ''
+    this.webpackBuildID = process.env.WEBPACK_BUILD_ID || ''
     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', 'Webpack Build Id:', this.webpackBuildID)
 
     // Set Bootstrap dark theme attribute if dark mode is enabled.
     if (State.isDark()) {
@@ -261,7 +261,7 @@ 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, this.webpackBuildID, ignoreCachedLocale)
     // 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.

client/webserver/site/src/js/locales.ts

@@ -222,16 +222,16 @@ 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, buildID: string, skipCache: boolean) {
   if (!skipCache) {
     const specs = State.fetchLocal(State.localeSpecsKey)
-    if (specs && specs.lang === lang && specs.commitHash === commitHash) {
+    if (specs && specs.lang === lang && specs.webpackBuildID === buildID) { // not stale
       locale = State.fetchLocal(State.localeKey)
       return
     }
   }
   locale = await postJSON('/api/locale', lang)
-  State.storeLocal(State.localeSpecsKey, { lang, commitHash })
+  State.storeLocal(State.localeSpecsKey, { lang, buildID })
   State.storeLocal(State.localeKey, locale)
 }
 

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
+  webpackBuildID: string
   authed: boolean
   start (): Promise<void>
   reconnected (): void

client/webserver/site/src/js/settings.ts

@@ -61,7 +61,6 @@ 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)

client/webserver/site/webpack/analyze.js

@@ -8,7 +8,7 @@ module.exports = merge(common, {
     rules: [{
       test: /\.ts$/,
       use: 'ts-loader',
-      exclude: /node_modules/,
+      exclude: /node_modules/
     }]
   },
   optimization: {

client/webserver/site/webpack/common.js

@@ -5,13 +5,24 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 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();
+const fs = require('node:fs')
+const buildIdFilename = 'webpack-build-id.txt'
+
+function randBuildId () {
+  const buildID = JSON.stringify(Math.floor(Math.random() * 1000000000)).trim()
+  console.log('WEBPACK_BUILD_ID:', buildID)
+  fs.writeFile(buildIdFilename, buildID, err => {
+    if (err) {
+      console.error(err)
+    } else {
+      console.log(' ', buildID, ' written to ', buildIdFilename)
+    }
+  })
+  return buildID
 }
 
 module.exports = {
-  target: "web",
+  target: 'web',
   module: {
     rules: [
       {
@@ -29,7 +40,7 @@ module.exports = {
           {
             loader: 'sass-loader',
             options: {
-              implementation: require("sass"), // dart-sass
+              implementation: require('sass'), // dart-sass
               sourceMap: true
             }
           }
@@ -38,15 +49,15 @@ module.exports = {
     ]
   },
   plugins: [
-    new webpack.EnvironmentPlugin({
-      COMMITHASH: git('rev-parse HEAD'),
+    new webpack.DefinePlugin({
+      'process.env.WEBPACK_BUILD_ID': randBuildId()
     }),
     new CleanWebpackPlugin(),
     new MiniCssExtractPlugin({
       filename: '../dist/style.css'
     }),
     new StyleLintPlugin({
-      threads: true,
+      threads: true
     }),
     new ESLintPlugin({
       extensions: ['ts'],
@@ -59,7 +70,7 @@ module.exports = {
     publicPath: '/dist/'
   },
   resolve: {
-    extensions: ['.ts', ".js"],
+    extensions: ['.ts', '.js']
   },
   // Fixes weird issue with watch script. See
   // https://github.com/webpack/webpack/issues/2297#issuecomment-289291324

client/webserver/site/webpack/dev.js

@@ -7,7 +7,7 @@ module.exports = merge(common, {
     rules: [{
       test: /\.ts$/,
       use: 'ts-loader',
-      exclude: /node_modules/,
+      exclude: /node_modules/
     }]
   },
   devtool: 'inline-source-map'

client/webserver/site/webpack/prod.js

@@ -9,7 +9,7 @@ module.exports = merge(common, {
     usedExports: true,
     minimize: true,
     minimizer: [
-      `...`, // extend webpack 5's TerserPlugin
+      '...', // extend webpack 5's TerserPlugin
       new CssMinimizerPlugin({})
     ]
   },