Multi instance

CHANGELOG.md

@@ -2,13 +2,20 @@
 
 ## 64.0.0-SNAPSHOT - unreleased
 
+### 🎁 New Features
+* Provides admin support for Cluster-aware version of Hoist.
+
+### 💥 Breaking Changes
+* Requires update to `hoist-core >= 20.0.0`.
+
 ## 63.0.1 - 2024-04-05
 
 ### 🐞 Bug Fixes
 
 * New filterable fields exposed in the Admin Console for `ActivityTracking` and `ClientErrors` modules.
     * `url`, `appEnvironment`, `appVersion` in `ActivityTracking`
     * `impersonating` in `ClientErrors`
+    * 
 
 ## 63.0.0 - 2024-04-04
 

admin/AppModel.ts

@@ -12,7 +12,7 @@ import {Route} from 'router5';
 import {activityTab} from './tabs/activity/ActivityTab';
 import {generalTab} from './tabs/general/GeneralTab';
 import {monitorTab} from './tabs/monitor/MonitorTab';
-import {serverTab} from './tabs/server/ServerTab';
+import {clusterTab} from '@xh/hoist/admin/tabs/cluster/ClusterTab';
 import {userDataTab} from './tabs/userData/UserDataTab';
 
 export class AppModel extends HoistAppModel {
@@ -63,11 +63,26 @@ export class AppModel extends HoistAppModel {
                 children: [
                     {name: 'about', path: '/about'},
                     {name: 'config', path: '/config'},
+                    {name: 'logLevels', path: '/logLevels'},
                     {name: 'users', path: '/users'},
                     {name: 'roles', path: '/roles'},
                     {name: 'alertBanner', path: '/alertBanner'}
                 ]
             },
+            {
+                name: 'cluster',
+                path: '/cluster',
+                children: [
+                    {name: 'logs', path: '/logs'},
+                    {name: 'memory', path: '/memory'},
+                    {name: 'jdbcPool', path: '/jdbcPool'},
+                    {name: 'environment', path: '/environment'},
+                    {name: 'services', path: '/services'},
+                    {name: 'objects', path: '/objects'},
+                    {name: 'hibernate', path: '/hibernate'},
+                    {name: 'webSockets', path: '/webSockets'}
+                ]
+            },
             {
                 name: 'activity',
                 path: '/activity',
@@ -77,20 +92,6 @@ export class AppModel extends HoistAppModel {
                     {name: 'feedback', path: '/feedback'}
                 ]
             },
-            {
-                name: 'server',
-                path: '/server',
-                children: [
-                    {name: 'logViewer', path: '/logViewer'},
-                    {name: 'logLevels', path: '/logLevels'},
-                    {name: 'memory', path: '/memory'},
-                    {name: 'connectionPool', path: '/connectionPool'},
-                    {name: 'environment', path: '/environment'},
-                    {name: 'services', path: '/services'},
-                    {name: 'ehCache', path: '/ehCache'},
-                    {name: 'webSockets', path: '/webSockets'}
-                ]
-            },
             {
                 name: 'monitor',
                 path: '/monitor',
@@ -118,16 +119,16 @@ export class AppModel extends HoistAppModel {
                 icon: Icon.info(),
                 content: generalTab
             },
+            {
+                id: 'cluster',
+                icon: Icon.server(),
+                content: clusterTab
+            },
             {
                 id: 'activity',
                 icon: Icon.analytics(),
                 content: activityTab
             },
-            {
-                id: 'server',
-                icon: Icon.server(),
-                content: serverTab
-            },
             {
                 id: 'monitor',
                 icon: Icon.shieldCheck(),

admin/columns/Core.ts

@@ -4,7 +4,8 @@
  *
  * Copyright © 2024 Extremely Heavy Industries Inc.
  */
-import {ColumnSpec} from '@xh/hoist/cmp/grid';
+import {ColumnSpec, dateTimeSec} from '@xh/hoist/cmp/grid';
+import {dateTimeRenderer} from '@xh/hoist/format';
 
 export const name: ColumnSpec = {
     field: {name: 'name', type: 'string'},
@@ -39,3 +40,9 @@ export const note: ColumnSpec = {
     flex: true,
     tooltip: true
 };
+
+export const timestampNoYear: ColumnSpec = {
+    field: {name: 'timestamp', type: 'date'},
+    ...dateTimeSec,
+    renderer: dateTimeRenderer({fmt: 'MMM DD HH:mm:ss'})
+};

admin/tabs/cluster/BaseInstanceModel.ts

@@ -0,0 +1,56 @@
+/*
+ * This file belongs to Hoist, an application development toolkit
+ * developed by Extremely Heavy Industries (www.xh.io | [email protected])
+ *
+ * Copyright © 2024 Extremely Heavy Industries Inc.
+ */
+import {ClusterTabModel} from '@xh/hoist/admin/tabs/cluster/ClusterTabModel';
+import {HoistModel, LoadSpec, lookup, PlainObject, XH} from '@xh/hoist/core';
+import {fmtDateTimeSec, fmtJson} from '@xh/hoist/format';
+import {DAYS} from '@xh/hoist/utils/datetime';
+import {cloneDeep, forOwn, isArray, isNumber, isPlainObject} from 'lodash';
+
+export class BaseInstanceModel extends HoistModel {
+    @lookup(() => ClusterTabModel) parent: ClusterTabModel;
+
+    get instanceName(): string {
+        return this.parent.instanceName;
+    }
+
+    fmtStats(stats: PlainObject): string {
+        stats = cloneDeep(stats);
+        this.processTimestamps(stats);
+        return fmtJson(JSON.stringify(stats));
+    }
+
+    handleLoadException(e: unknown, loadSpec: LoadSpec) {
+        const instanceNotFound = this.isInstanceNotFound(e);
+        XH.handleException(e, {
+            showAlert: !loadSpec.isAutoRefresh && !instanceNotFound,
+            logOnServer: !instanceNotFound
+        });
+    }
+
+    isInstanceNotFound(e: unknown): boolean {
+        return e['name'] == 'InstanceNotFoundException';
+    }
+
+    //-------------------
+    // Implementation
+    //-------------------
+    private processTimestamps(stats: PlainObject) {
+        forOwn(stats, (v, k) => {
+            // Convert numbers that look like recent timestamps to date values.
+            if (
+                (k.endsWith('Time') || k.endsWith('Date') || k == 'timestamp') &&
+                isNumber(v) &&
+                v > Date.now() - 365 * DAYS
+            ) {
+                stats[k] = v ? fmtDateTimeSec(v, {fmt: 'MMM DD HH:mm:ss'}) : null;
+            }
+            if (isPlainObject(v) || isArray(v)) {
+                this.processTimestamps(v);
+            }
+        });
+    }
+}

admin/tabs/cluster/ClusterTab.ts

@@ -0,0 +1,47 @@
+/*
+ * This file belongs to Hoist, an application development toolkit
+ * developed by Extremely Heavy Industries (www.xh.io | [email protected])
+ *
+ * Copyright © 2024 Extremely Heavy Industries Inc.
+ */
+import {grid} from '@xh/hoist/cmp/grid';
+import {tabContainer} from '@xh/hoist/cmp/tab';
+import {creates, hoistCmp} from '@xh/hoist/core';
+import {mask} from '@xh/hoist/desktop/cmp/mask';
+import {panel} from '@xh/hoist/desktop/cmp/panel';
+import {tabSwitcher} from '@xh/hoist/desktop/cmp/tab';
+import {box, hspacer, placeholder, vframe} from '@xh/hoist/cmp/layout';
+import {ClusterTabModel} from './ClusterTabModel';
+import {Icon} from '@xh/hoist/icon';
+
+export const clusterTab = hoistCmp.factory({
+    model: creates(ClusterTabModel),
+    render({model}) {
+        const {instance} = model;
+        return vframe(
+            panel({
+                modelConfig: {
+                    side: 'top',
+                    defaultSize: 105,
+                    minSize: 75,
+                    collapsible: false,
+                    persistWith: model.persistWith
+                },
+                item: grid()
+            }),
+            instance?.isReady
+                ? panel({
+                      compactHeader: true,
+                      tbar: [
+                          box({width: 150, item: model.formatInstance(instance)}),
+                          hspacer(25),
+                          tabSwitcher()
+                      ],
+                      flex: 1,
+                      item: tabContainer()
+                  })
+                : placeholder(Icon.server(), 'Select a running instance above.'),
+            mask({bind: model.loadModel})
+        );
+    }
+});