Add version to login and nav, handle database outages gracefully, and align…

Add version to login and nav, handle database outages gracefully, and align emiMobile client startup/error handling with webCharms

emiMobileServer/Source/Api.Database.pas

@@ -211,11 +211,13 @@ type
     procedure UniAlerter1Event(Sender: TDAAlerter; const EventName,
       Message: string);
   private
+
     { Private declarations }
   public
     CADUpdate: Boolean;
     function HandleUniqueFilenames(const category: string): string;
     function BadgeCounts(const BaseQuery: TUniQuery): Integer;
+    function EnsureConnected: Boolean;
   end;
 
 var
@@ -240,7 +242,18 @@ begin
   ucENTCAD.Password := IniEntries.DatabasePassword;
   ucENTCAD.LoginPrompt := False;
 
+  EnsureConnected;
+end;
+
+
+function TApiDatabaseModule.EnsureConnected: Boolean;
+begin
+  Result := False;
+
+  try
     if not ucENTCAD.Connected then
+    begin
+      Logger.Log(2, 'Connecting to PostgreSQL API database...');
       ucENTCAD.Connect;
 
       ucENTCAD.ExecSQL('set search_path to lems, avl, entcad, public');
@@ -249,6 +262,15 @@ begin
       Logger.Log(1, 'Starting PostgreSQL disupdate listener');
       UniAlerter1.Start;
       Logger.Log(1, 'PostgreSQL disupdate listener started');
+
+      CADUpdate := True;
+    end;
+
+    Result := True;
+  except
+    on E: Exception do
+      Logger.Log(1, 'PostgreSQL API database unavailable: ' + E.Message);
+  end;
 end;
 
 procedure TApiDatabaseModule.uqComplaintListCalcFields(DataSet: TDataSet);

emiMobileServer/Source/Api.ServiceImpl.pas

@@ -14,9 +14,11 @@ type
   strict private
   ApiDB: TApiDatabaseModule;
   private
-    procedure AfterConstruction; override;
-    procedure BeforeDestruction; override;
+
+
   public
+    constructor Create;
+    destructor Destroy; override;
     function GetBadgeCounts: TJSONObject;
     function GetComplaintList: TJSONObject;
     function GetUnitList: TJSONObject;
@@ -37,21 +39,35 @@ implementation
 uses
   uLibrary;
 
-procedure TApiService.AfterConstruction;
+
+constructor TApiService.Create;
 begin
-  inherited;
+  Logger.Log(3, 'TApiService.Create');
+  inherited Create;
+
   ApiDB := TApiDatabaseModule.Create(nil);
+
+  if not ApiDB.ucENTCAD.Connected then
+  begin
+    Logger.Log(1, 'Unable to connect to API database');
+    raise EXDataHttpException.Create(
+      500,
+      'Unable to connect to the database. Please contact EM Systems support.'
+    );
+  end;
+
   Logger.Log(3, 'ApiDatabaseModule created');
 end;
 
-procedure TApiService.BeforeDestruction;
+destructor TApiService.Destroy;
 begin
   ApiDB.Free;
-  inherited;
   Logger.Log(3, 'ApiDatabaseModule destroyed');
+  inherited Destroy;
 end;
 
 
+
 function TApiService.GetBadgeCounts: TJSONObject;
 begin
   Logger.Log(3, '---TApiService.GetBadgeCounts initiated');

emiMobileServer/Source/Auth.Database.pas

@@ -55,10 +55,7 @@ begin
       ucLemsOCSO.Connect;
   except
     on E: Exception do
-    begin
       Logger.Log(2, Format('Failed to connect to auth database: %s', [E.Message]));
-      raise;
-    end;
   end;
 end;
 

emiMobileServer/Source/Auth.ServiceImpl.pas

@@ -21,12 +21,13 @@ type
     userBadge: string;
     userId: string;
     userPersonnelId: string;
-    procedure AfterConstruction; override;
-    procedure BeforeDestruction; override;
+
     function VerifyVersion(ClientVersion: string): TJSONObject;
     function CheckUser(const User, Password, Agency: string): Integer;
     function Decrypt(inStr, keyStr: AnsiString): AnsiString;
   public
+    constructor Create;
+    destructor Destroy; override;
     function Login(const User, Password, Agency: string): string;
     function GetAgencieslist(): TAgenciesList;
     function GetAgencyConfiglist: TAgencyConfigList;
@@ -46,20 +47,31 @@ uses
 
 { TAuthService }
 
-procedure TAuthService.AfterConstruction;
+
+constructor TAuthService.Create;
 begin
-  inherited;
+  Logger.Log(3, 'TAuthService.Create');
+  inherited Create;
+
   authDB := TAuthDatabase.Create(nil);
+
+  if not authDB.ucLemsOCSO.Connected then
+  begin
+    Logger.Log(1, 'Unable to connect to auth database');
+    raise EXDataHttpException.Create(500, 'Unable to connect to the database. Please contact EM Systems support.');
+  end;
+
   Logger.Log(3, 'AuthDatabase created');
 end;
 
-procedure TAuthService.BeforeDestruction;
+destructor TAuthService.Destroy;
 begin
   authDB.Free;
-  inherited;
   Logger.Log(3, 'AuthDatabase destroyed');
+  inherited Destroy;
 end;
 
+
 function TAuthService.GetAgenciesList: TAgenciesList;
 var
   agency: TAgencyItem;

emiMobileServer/Source/Main.dfm

@@ -2,7 +2,7 @@ object FMain: TFMain
   Left = 0
   Top = 0
   Caption = 'emiMobileServer'
-  ClientHeight = 615
+  ClientHeight = 773
   ClientWidth = 778
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
@@ -13,28 +13,30 @@ object FMain: TFMain
   OnClose = FormClose
   DesignSize = (
     778
-    615)
+    773)
   TextHeight = 13
   object pgcMain: TPageControl
     Left = 0
     Top = 40
     Width = 778
-    Height = 575
-    ActivePage = tabConnectedClients
+    Height = 733
+    ActivePage = tabServerLog
     Align = alBottom
     Anchors = [akLeft, akTop, akRight, akBottom]
     TabOrder = 3
+    ExplicitHeight = 575
     object tabServerLog: TTabSheet
       Caption = 'Server Log'
       object memoInfo: TMemo
         Left = 0
         Top = 0
         Width = 770
-        Height = 547
+        Height = 705
         Align = alClient
         ScrollBars = ssVertical
         TabOrder = 0
         WordWrap = False
+        ExplicitHeight = 547
       end
     end
     object tabConnectedClients: TTabSheet
@@ -44,7 +46,7 @@ object FMain: TFMain
         Left = 0
         Top = 0
         Width = 770
-        Height = 487
+        Height = 645
         Align = alClient
         DataSource = dsConnectedClients
         Options = [dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgTabs, dgRowSelect, dgConfirmDelete, dgCancelOnExit, dgTitleClick, dgTitleHotTrack]
@@ -75,13 +77,14 @@ object FMain: TFMain
       end
       object pnlConnectedClientsActions: TPanel
         Left = 0
-        Top = 487
+        Top = 645
         Width = 770
         Height = 60
         Align = alBottom
         Caption = 'pnlConnectedClientsActions'
         ShowCaption = False
         TabOrder = 1
+        ExplicitTop = 487
         object btnDisconnectClient: TButton
           Left = 5
           Top = 18

emiMobileServer/Source/Ws.DataModel.pas

@@ -71,6 +71,9 @@ end;
 
 procedure TWsDataModel.TimerFire(Sender: TObject);
 begin
+  if not FDb.ucENTCAD.Connected then
+    Exit;
+
   if not FDb.CADUpdate then
     Exit;
 
@@ -80,12 +83,13 @@ end;
 
 procedure TWsDataModel.BroadcastAll;
 begin
-  Logger.Log(3, 'WsDataModel: broadcasting all');
+  Logger.Log(3, 'WsDataModel: BroadcastAll initiated');
   try FBroadcast(BuildBadgeCountsJson);   except on E: Exception do Logger.Log(2, 'WsDataModel BADGE_COUNTS error: ' + E.Message); end;
   try FBroadcast(BuildUnitMapJson);       except on E: Exception do Logger.Log(2, 'WsDataModel UNIT_MAP error: '       + E.Message); end;
   try FBroadcast(BuildComplaintMapJson);  except on E: Exception do Logger.Log(2, 'WsDataModel COMPLAINT_MAP error: '  + E.Message); end;
   try FBroadcast(BuildUnitListJson);      except on E: Exception do Logger.Log(2, 'WsDataModel UNIT_LIST error: '      + E.Message); end;
   try FBroadcast(BuildComplaintListJson); except on E: Exception do Logger.Log(2, 'WsDataModel COMPLAINT_LIST error: ' + E.Message); end;
+  Logger.Log(3, 'WsDataModel: BroadcastAll end');
 end;
 
 function TWsDataModel.BuildBadgeCountsJson: string;

emiMobileServer/bin/emiMobileServer.ini

 [Settings]
-LogFileNum=110
-webClientVersion=9.4.0
+LogFileNum=144
+webClientVersion=0.9.4.1
 
 [Database]
-Server=192.168.91.136
+--Server=192.168.91.136
+Server=192.168.102.10
 --Server=192.168.56.129
---Port=5432
+Port=5432
 --Port=5433
 Database=lems_wcso
 Username=postgres
-Password=postgreSQL
---Password=emsys01
+--Password=postgreSQL
+Password=emsys01
 --Postgre!SQL

emiMobileServer/bin/emiMobileServer.json

 {
-  "url": "http://localhost:2001/emsys/emiMobile/",
+  "url": "http://localhost:2009/emiMobile/",
   "jwtTokenSecret": "super_secret0123super_secret4567",
   "adminPassword": "whatisthisusedfor?",
   "webAppFolder": "static",

emiMobileServer/emiMobileServer.dproj

@@ -108,8 +108,9 @@
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
         <VerInfo_Release>4</VerInfo_Release>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=0.9.4.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.2.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=0.9.4.1;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.2.0;Comments=</VerInfo_Keys>
         <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <VerInfo_Build>1</VerInfo_Build>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>

webEMIMobile/App.Types.pas

@@ -11,7 +11,6 @@ type
   TSuccessProc = reference to procedure;
   TLogoutProc = reference to procedure(AMessage: string = '');
   TUnauthorizedAccessProc = reference to procedure(AMessage: string);
-  TVersionCheckCallback = reference to procedure(Success: Boolean; ErrorMessage: string);
 
   TListProc = reference to procedure;
   TSelectProc = reference to procedure(AParam: string);

webEMIMobile/ConnectionModule.pas

@@ -4,7 +4,7 @@ interface
 
 uses
   System.SysUtils, System.Classes, WEBLib.Modules, XData.Web.Connection,
-  App.Types, App.Config, XData.Web.Client;
+  XData.Web.Client, App.Types, App.Config;
 
 type
   TDMConnection = class(TWebDataModule)
@@ -18,12 +18,12 @@ type
   private
     FUnauthorizedAccessProc: TUnauthorizedAccessProc;
     FWsUrl: string;
+    procedure VerifyVersion(SuccessProc: TSuccessProc);
   public
     property WsUrl: string read FWsUrl;
     const clientVersion = '0.9.4.1';
     procedure InitApp(SuccessProc: TSuccessProc;
       UnauthorizedAccessProc: TUnauthorizedAccessProc);
-    procedure SetClientConfig(Callback: TVersionCheckCallback);
   end;
 
 var
@@ -57,7 +57,8 @@ procedure TDMConnection.ApiConnectionResponse(
   Args: TXDataWebConnectionResponse);
 begin
   if Args.Response.StatusCode = 401 then
-    FUnauthorizedAccessProc(Format('%d: %s',[Args.Response.StatusCode, Args.Response.ContentAsText]));
+    FUnauthorizedAccessProc(Format('%d: %s',
+      [Args.Response.StatusCode, Args.Response.ContentAsText]));
 end;
 
 procedure TDMConnection.AuthConnectionError(Error: TXDataWebConnectionError);
@@ -79,7 +80,14 @@ procedure TDMConnection.InitApp(SuccessProc: TSuccessProc;
     if Config.WsUrl <> '' then
       FWsUrl := Config.WsUrl;
 
-    AuthConnection.Open(SuccessProc);
+    console.log('InitApp: opening AuthConnection');
+
+    AuthConnection.Open(
+      procedure
+      begin
+        console.log('InitApp: AuthConnection opened');
+        VerifyVersion(SuccessProc);
+      end);
   end;
 
 begin
@@ -87,9 +95,9 @@ begin
   LoadConfig(@ConfigLoaded);
 end;
 
-procedure TDMConnection.SetClientConfig(Callback: TVersionCheckCallback);
-
+procedure TDMConnection.VerifyVersion(SuccessProc: TSuccessProc);
 begin
+  console.log('VerifyVersion: calling server');
   XDataWebClient1.Connection := AuthConnection;
 
   XDataWebClient1.RawInvoke('IAuthService.VerifyVersion', [clientVersion],
@@ -98,17 +106,23 @@ begin
       jsonResult: TJSObject;
       error: string;
     begin
+      console.log('VerifyVersion: response received');
       jsonResult := TJSObject(Response.Result);
 
-      if jsonResult.HasOwnProperty('error') then
+      if Assigned(jsonResult) and jsonResult.HasOwnProperty('error') then
         error := string(jsonResult['error'])
       else
         error := '';
 
       if error <> '' then
-        Callback(False, error)
+        TFViewErrorPage.Display(error)
       else
-        Callback(True, '');
+        SuccessProc;
+    end,
+    procedure(Error: TXDataClientError)
+    begin
+      console.log('VerifyVersion ERROR: ' + Error.ErrorMessage);
+      TFViewErrorPage.Display('Unable to connect to the database.');
     end);
 end;
 

webEMIMobile/View.ErrorPage.html

 <div class="container">
-    <br />
+  <div class="row justify-content-center mt-5">
+    <div class="col-12 col-sm-10 col-md-8 col-lg-6">
+      <div class="card shadow-sm border-danger">
 
-    <div class="panel panel-red">
-        <div id="view.errorpage.title" class="panel-heading">
-            Error Page
+        <div id="view.errorpage.title"
+             class="card-header bg-danger text-white fw-semibold">
+          Error
         </div>
 
-        <div id="view.errorpage.message" class="panel-body">
+        <div class="card-body">
+          <div id="view.errorpage.message"
+               class="text-danger">
             Message
           </div>
+        </div>
+
+        <div class="card-footer bg-light text-end">
+          <a href="."
+             class="btn btn-outline-danger btn-sm">
+            Reload web application
+          </a>
+        </div>
 
-        <div class="panel-footer">
-            <a href=".">Reload web application</a>
+      </div>
     </div>
   </div>
 </div>

webEMIMobile/View.Login.html

@@ -52,8 +52,9 @@
             Login
           </button>
         </div>
-        <div class="card-footer text-muted small">
-          Please use your lems username &amp; password to login.
+        <div class="card-footer text-muted small d-flex justify-content-between">
+          <span>Please use your lems username &amp; password to login.</span>
+          <span id="view.login.version" class="opacity-75"></span>
         </div>
       </div>
     </div>

webEMIMobile/View.Login.pas

@@ -4,7 +4,7 @@ interface
 
 uses
   System.SysUtils, System.Classes, WEBLib.Graphics, WEBLib.Controls, WEBLib.Forms, WEBLib.Dialogs,
-  Vcl.Controls, Vcl.StdCtrls, WEBLib.StdCtrls, WEBLib.JSON,
+  Vcl.Controls, Vcl.StdCtrls, WEBLib.StdCtrls, WEBLib.JSON, Web,
   JS, XData.Web.Connection, WEBLib.ExtCtrls,
   App.Types, ConnectionModule, XData.Web.Client;
 
@@ -65,8 +65,12 @@ end;
 
 
 procedure TFViewLogin.WebFormCreate(Sender: TObject);
+var
+  el: TJSElement;
 begin
-//  lblAppTitle.Caption := 'EM Systems - webCharms App ver 0.9.2.22';
+  el := Document.getElementById('view.login.version');
+  if Assigned(el) then
+    TJSHtmlElement(el).innerText := 'v' + TDMConnection.clientVersion;
   GetAgencyConfigList();
   if FMessage <> '' then
     ShowNotification(FMessage)

webEMIMobile/View.Main.html

@@ -15,6 +15,7 @@
 
         <div class="d-flex align-items-center gap-2 ms-auto">
           <span id="view.main.lblconnection" class="navbar-text text-light small"></span>
+          <span id="view.main.version" class="navbar-text text-light small opacity-75"></span>
           <button id="btn_logout" type="button" class="btn btn-outline-light btn-sm">Logout</button>
         </div>
     </div>

webEMIMobile/View.Main.pas

@@ -121,9 +121,15 @@ const
 procedure TFViewMain.WebFormCreate(Sender: TObject);
 var
   userName: string;
+  el: TJSElement;
 begin
   userName := JS.toString(AuthService.TokenPayload.Properties['user_name']);
   lblUsername.Caption := ' ' + userName.ToLower + ' ';
+
+  el := Document.getElementById('view.main.version');
+  if Assigned(el) then
+    TJSHtmlElement(el).innerText := 'v' + TDMConnection.clientVersion;
+
   FChildForm := nil;
   FDetailsForm := nil;
   FArchiveForm := nil;