underpost 2.8.872 → 2.8.873

package/src/cli/baremetal.js

@@ -1,3 +1,10 @@
+/**
+ * Baremetal module for managing the generation and deployment of cloud-init configuration files
+ * and associated scripts for baremetal provisioning.
+ * @module src/cli/baremetal.js
+ * @namespace UnderpostBaremetal
+ */
+
 import { getNpmRootPath, getUnderpostRootPath } from '../server/conf.js';
 import { openTerminal, pbcopy, shellExec } from '../server/process.js';
 import dotenv from 'dotenv';
@@ -40,6 +47,7 @@ class UnderpostBaremetal {
      * @param {boolean} [options.nfsUnmount=false] - Flag to unmount the NFS root filesystem.
      * @param {boolean} [options.nfsSh=false] - Flag to chroot into the NFS environment for shell access.
      * @param {string} [options.logs=''] - Specifies which logs to display ('dhcp', 'cloud', 'machine', 'cloud-config').
+     * @memberof UnderpostBaremetal
      * @returns {void}
      */
     async callback(
@@ -576,6 +584,7 @@ menuentry '${menuentryStr}' {
      * @param {object} params.maas - MAAS configuration details.
      * @param {string} params.networkInterfaceName - The name of the network interface.
      * @returns {Promise<void>} A promise that resolves when commissioning is initiated or after a delay.
+     * @memberof UnderpostBaremetal
      */
     async commissionMonitor({ macAddress, nfsHostPath, underpostRoot, hostname, maas, networkInterfaceName }) {
       {
@@ -725,6 +734,7 @@ menuentry '${menuentryStr}' {
      * This is necessary for cross-architecture execution within a chroot environment.
      * @param {object} params - The parameters for the function.
      * @param {string} params.nfsHostPath - The path to the NFS root filesystem on the host.
+     * @memberof UnderpostBaremetal
      * @returns {void}
      */
     mountBinfmtMisc({ nfsHostPath }) {
@@ -747,6 +757,7 @@ menuentry '${menuentryStr}' {
      * @description Deletes all specified machines from MAAS.
      * @param {object} params - The parameters for the function.
      * @param {Array<object>} params.machines - An array of machine objects, each with a `system_id`.
+     * @memberof UnderpostBaremetal
      * @returns {Array<object>} An empty array after machines are removed.
      */
     removeMachines({ machines }) {
@@ -761,6 +772,7 @@ menuentry '${menuentryStr}' {
      * @description Clears all observed discoveries in MAAS and optionally forces a new scan.
      * @param {object} params - The parameters for the function.
      * @param {boolean} params.force - If true, forces a new discovery scan after clearing.
+     * @memberof UnderpostBaremetal
      * @returns {void}
      */
     clearDiscoveries({ force }) {
@@ -776,6 +788,7 @@ menuentry '${menuentryStr}' {
      * This is used to wait for the target machine to report its MAC address.
      * @param {object} params - The parameters for the function.
      * @param {string} params.nfsHostPath - The NFS host path where the MAC file is expected.
+     * @memberof UnderpostBaremetal
      * @returns {Promise<void>} A promise that resolves when the MAC file is found or after a delay.
      */
     async macMonitor({ nfsHostPath }) {
@@ -794,6 +807,7 @@ menuentry '${menuentryStr}' {
      * for cross-architecture execution within a chroot environment.
      * @param {object} params - The parameters for the function.
      * @param {string} params.nfsHostPath - The path to the NFS root filesystem on the host.
+     * @memberof UnderpostBaremetal
      * @param {'arm64'|'amd64'} params.debootstrapArch - The target architecture of the debootstrap environment.
      * @returns {void}
      */
@@ -825,6 +839,7 @@ menuentry '${menuentryStr}' {
      * @param {string} params.nfsHostPath - The path to the NFS root filesystem on the host.
      * @param {'arm64'|'amd64'} params.debootstrapArch - The target architecture of the debootstrap environment.
      * @param {object} params.callbackMetaData - Metadata about the callback, including runner host architecture.
+     * @memberof UnderpostBaremetal
      * @param {string[]} params.steps - An array of shell commands to execute.
      * @returns {void}
      */
@@ -860,6 +875,7 @@ EOF`);
      * This helps in visualizing and debugging the execution flow of provisioning steps.
      * @param {string[]} [steps=[]] - An array of shell commands.
      * @param {boolean} [yaml=true] - If true, formats the output as YAML list items.
+     * @memberof UnderpostBaremetal
      * @returns {string} The formatted string of commands.
      */
     stepsRender(steps = [], yaml = true) {
@@ -892,6 +908,7 @@ EOF`);
      * @param {string} params.workflowId - The identifier for the workflow configuration.
      * @param {boolean} [params.mount] - If true, attempts to mount the NFS paths.
      * @param {boolean} [params.unmount] - If true, attempts to unmount the NFS paths.
+     * @memberof UnderpostBaremetal
      * @returns {{isMounted: boolean}} An object indicating whether any NFS path is currently mounted.
      */
     nfsMountCallback({ hostname, workflowId, mount, unmount }) {
@@ -929,7 +946,8 @@ EOF`);
      * @method getHostArch
      * @description Determines the architecture of the host machine.
      * This is crucial for cross-compilation and selecting the correct QEMU binaries.
-     * @returns {'amd64'|'arm64'} The host architecture.
+     * @memberof UnderpostBaremetal
+     * @returns {{alias: 'amd64'|'arm64', name: 'x86_64'|'aarch64'}} The host architecture.
      * @throws {Error} If the host architecture is unsupported.
      */
     getHostArch() {
@@ -944,12 +962,16 @@ EOF`);
      * @property {object} systemProvisioningFactory
      * @description A factory object containing functions for system provisioning based on OS type.
      * Each OS type (e.g., 'ubuntu') provides methods for base system setup, user creation,
-     * timezone configuration, and keyboard layout settings.
+     * timezone configuration, and keyboard layout settings.     *
+     * @memberof UnderpostBaremetal
+     * @namespace UnderpostBaremetal.systemProvisioningFactory
      */
     systemProvisioningFactory: {
       /**
        * @property {object} ubuntu
        * @description Provisioning steps for Ubuntu-based systems.
+       * @memberof UnderpostBaremetal.systemProvisioningFactory
+       * @namespace UnderpostBaremetal.systemProvisioningFactory.ubuntu
        */
       ubuntu: {
         /**
@@ -959,6 +981,7 @@ EOF`);
          * kernel modules, cloud-init, SSH server, and other core utilities.
          * @param {object} params - The parameters for the function.
          * @param {string} params.kernelLibVersion - The specific kernel library version to install.
+         * @memberof UnderpostBaremetal.systemProvisioningFactory.ubuntu
          * @returns {string[]} An array of shell commands.
          */
         base: ({ kernelLibVersion }) => [
@@ -991,6 +1014,7 @@ SOURCES`,
          * @method user
          * @description Generates shell commands for creating a root user and configuring SSH access.
          * This is a critical security step for initial access to the provisioned system.
+         * @memberof UnderpostBaremetal.systemProvisioningFactory.ubuntu
          * @returns {string[]} An array of shell commands.
          */
         user: () => [
@@ -1014,6 +1038,7 @@ SOURCES`,
          * @param {string} params.timezone - The timezone string (e.g., 'America/New_York').
          * @param {string} params.chronyConfPath - The path to the Chrony configuration file.
          * @param {string} [alias='chrony'] - The alias for the chrony service.
+         * @memberof UnderpostBaremetal.systemProvisioningFactory.ubuntu
          * @returns {string[]} An array of shell commands.
          */
         timezone: ({ timezone, chronyConfPath }, alias = 'chrony') => [
@@ -1081,6 +1106,7 @@ logdir /var/log/chrony
          * @method keyboard
          * @description Generates shell commands for configuring the keyboard layout.
          * This ensures correct input behavior on the provisioned system.
+         * @memberof UnderpostBaremetal.systemProvisioningFactory.ubuntu
          * @returns {string[]} An array of shell commands.
          */
         keyboard: () => [
@@ -1099,6 +1125,7 @@ logdir /var/log/chrony
      * This is crucial for allowing baremetal machines to boot via NFS.
      * @param {object} params - The parameters for the function.
      * @param {string} params.nfsHostPath - The path to be exported by the NFS server.
+     * @memberof UnderpostBaremetal
      * @param {string} [params.subnet='192.168.1.0/24'] - The subnet allowed to access the NFS export.
      * @returns {void}
      */
@@ -1169,6 +1196,7 @@ udp-port = 32766
      * @param {string} params.clientIp - The static IP address for the client device.
      * @param {string} params.subnet - The subnet mask for the client device.
      * @param {string} params.gateway - The gateway IP address for the client device.
+     * @memberof UnderpostBaremetal
      * @returns {string} The generated boot configuration content.
      * @throws {Error} If an invalid workflow ID is provided.
      */
@@ -1229,12 +1257,14 @@ GATEWAY=${gateway}`;
      * @property {object} workflowsConfig
      * @description Configuration for different baremetal provisioning workflows.
      * Each workflow defines specific parameters like system provisioning type,
-     * kernel version, Chrony settings, debootstrap image details, and NFS mounts.
+     * kernel version, Chrony settings, debootstrap image details, and NFS mounts.     *
+     * @memberof UnderpostBaremetal
      */
     workflowsConfig: {
       /**
        * @property {object} rpi4mb
        * @description Configuration for the Raspberry Pi 4 Model B workflow.
+       * @memberof UnderpostBaremetal.workflowsConfig
        */
       rpi4mb: {
         menuentryStr: 'UNDERPOST.NET UEFI/GRUB/MAAS RPi4 commissioning (ARM64)',

package/src/cli/cloud-init.js

@@ -1,3 +1,10 @@
+/**
+ * Cloud-init module for managing the generation and deployment of cloud-init configuration files
+ * and associated scripts for baremetal provisioning.
+ * @module src/cli/cloud-init.js
+ * @namespace UnderpostCloudInit
+ */
+
 import dotenv from 'dotenv';
 import { shellExec } from '../server/process.js';
 import fs from 'fs-extra';
@@ -15,6 +22,7 @@ const logger = loggerFactory(import.meta);
  * and associated scripts for baremetal provisioning. This class provides methods
  * to build various shell scripts and a cloud-init configuration file tailored
  * for MAAS (Metal as a Service) integration.
+ * @memberof UnderpostCloudInit
  */
 class UnderpostCloudInit {
   static API = {
@@ -30,6 +38,7 @@ class UnderpostCloudInit {
      * @param {object} params.callbackMetaData - Metadata about the callback, used for dynamic configuration.
      * @param {boolean} params.dev - Development mode flag.
      * @returns {void}
+     * @memberof UnderpostCloudInit
      */
     buildTools({ workflowId, nfsHostPath, hostname, callbackMetaData, dev }) {
       // Destructure workflow configuration for easier access.
@@ -281,6 +290,7 @@ curl -X POST \\
      * @param {object} [authCredentials={}] - Optional MAAS authentication credentials.
      * @param {string} [path='/etc/cloud/cloud.cfg.d/90_maas.cfg'] - The target path for the cloud-init configuration file.
      * @returns {string} The generated cloud-init configuration content.
+     * @memberof UnderpostCloudInit
      */
     configFactory(
       {
@@ -494,6 +504,7 @@ EOF_MAAS_CFG`;
      * This method parses the output of `maas apikey` to extract the consumer key,
      * consumer secret, token key, and token secret.
      * @returns {object} An object containing the MAAS authentication credentials.
+     * @memberof UnderpostCloudInit
      * @throws {Error} If the MAAS API key format is invalid.
      */
     authCredentialsFactory() {

package/src/cli/deploy.js

@@ -62,7 +62,7 @@ class UnderpostDeploy {
         )
         .join('');
     },
-    deploymentYamlPartsFactory({ deployId, env, suffix, resources, replicas }) {
+    deploymentYamlPartsFactory({ deployId, env, suffix, resources, replicas, image }) {
       return `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -81,7 +81,7 @@ spec:
     spec:
       containers:
         - name: ${deployId}-${env}-${suffix}
-          image: localhost/rockylinux9-underpost:${Underpost.version}
+          image: ${image ?? `localhost/rockylinux9-underpost:${Underpost.version}`}
 #          resources:
 #            requests:
 #              memory: "${resources.requests.memory}"
@@ -118,6 +118,7 @@ spec:
     async buildManifest(deployList, env, options) {
       const resources = UnderpostDeploy.API.resourcesFactory();
       const replicas = options.replicas;
+      const image = options.image;
 
       for (const _deployId of deployList.split(',')) {
         const deployId = _deployId.trim();
@@ -144,6 +145,7 @@ ${UnderpostDeploy.API.deploymentYamlPartsFactory({
   suffix: deploymentVersion,
   resources,
   replicas,
+  image,
 }).replace('{{ports}}', buildKindPorts(fromPort, toPort))}
 `;
         }
@@ -241,6 +243,7 @@ spec:
         expose: false,
         cert: false,
         versions: '',
+        image: '',
         traffic: '',
         replicas: '',
         node: '',

package/src/cli/index.js

@@ -164,6 +164,7 @@ program
     'Builds Kubernetes YAML manifests, including deployments, services, proxies, and secrets.',
   )
   .option('--replicas <replicas>', 'Sets a custom number of replicas for deployments.')
+  .option('--image <image>', 'Sets a custom image for deployments.')
   .option('--versions <deployment-versions>', 'A comma-separated list of custom deployment versions.')
   .option('--traffic <traffic-versions>', 'A comma-separated list of custom deployment traffic weights.')
   .option('--disable-update-deployment', 'Disables updates to deployments.')

package/src/cli/lxd.js

@@ -1,3 +1,9 @@
+/**
+ * LXD module for managing LXD virtual machines and networks.
+ * @module src/cli/lxd.js
+ * @namespace UnderpostLxd
+ */
+
 import { getNpmRootPath } from '../server/conf.js';
 import { getLocalIPv4Address } from '../server/dns.js';
 import { pbcopy, shellExec } from '../server/process.js';
@@ -32,6 +38,7 @@ class UnderpostLxd {
      * @param {string} [options.deleteExpose=''] - Delete exposed ports from a VM (format: 'vmName:port1,port2').
      * @param {string} [options.test=''] - Test health, status and network connectivity for a VM.
      * @param {string} [options.autoExposeK8sPorts=''] - Automatically expose common Kubernetes ports for the VM.
+     * @memberof UnderpostLxd
      */
     async callback(
       options = {

package/src/cli/run.js

@@ -131,6 +131,7 @@ class UnderpostRun {
       actionInitLog();
       const baseCommand = options.dev || true ? 'node bin' : 'underpost';
       shellCd('/home/dd/engine');
+      shellExec(`node bin/build dd-${path.split('engine-')[1]} conf`);
       shellExec(`git reset`);
       shellExec(`${baseCommand} cmt . --empty cd ssh-${path}`);
       shellExec(`${baseCommand} push . underpostnet/engine`);
@@ -149,13 +150,24 @@ class UnderpostRun {
       let [deployId, subConf] = path.split(',');
       shellExec(`npm run dev-api ${deployId} ${subConf}`);
     },
-    'router-sync': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+    sync: (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const env = options.dev ? 'development' : 'production';
       const baseCommand = options.dev || true ? 'node bin' : 'underpost';
-      const defaultPaht = ['dd', 'kind-control-plane'];
-      let [deployId, node] = path ? path.split(',') : defaultPaht;
+      shellExec(`${baseCommand} run clean`);
+      const defaultPaht = ['dd', 1, ``, 'kind-control-plane'];
+      let [deployId, replicas, image, node] = path ? path.split(',') : defaultPaht;
       deployId = deployId ?? defaultPaht[0];
-      node = node ?? defaultPaht[1];
-      shellExec(`${baseCommand} deploy --sync --node ${node} --build-manifest --info-router ${deployId} production`);
+      replicas = replicas ?? defaultPaht[1];
+      image = image ?? defaultPaht[2];
+      node = node ?? defaultPaht[3];
+      shellExec(
+        `${baseCommand} deploy --kubeadm --build-manifest --sync --info-router --replicas ${
+          replicas ?? 1
+        } --node ${node}${image ? ` --image ${image}` : ''} ${deployId} ${env}`,
+      );
+    },
+    'ls-deployments': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      console.table(await UnderpostDeploy.API.get(path, 'deployments'));
     },
     monitor: (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const pid = getTerminalPid();

package/src/cli/ssh.js

@@ -1,23 +1,37 @@
-import { getNpmRootPath } from '../server/conf.js';
+/**
+ * SSH module for managing SSH key generation and connection setup.
+ * @module src/cli/ssh.js
+ * @namespace UnderpostSSH
+ */
+
 import { shellExec } from '../server/process.js';
 
+/**
+ * @class UnderpostSSH
+ * @description Manages SSH key generation and connection setup.
+ * @memberof UnderpostSSH
+ */
 class UnderpostSSH {
   static API = {
     /**
      * @method callback
-     * @param {object} options
-     * @param {boolean} options.generate - Generates new ssh credential and stores it in current private keys file storage.
-     * @description Import and start ssh server and client based on current default deployment ID.
+     * @description Manages SSH key generation and connection setup based on the default deployment ID.
+     * This function will either generate a new SSH key pair or import an existing one,
+     * then initiate the SSH connection process.
+     * @param {object} [options={ generate: false }] - Options for the SSH callback.
+     * @param {boolean} [options.generate=false] - If true, generates a new SSH key pair. Otherwise, it imports the existing one.
+     * @memberof UnderpostSSH
+     * @returns {Promise<void>}
      */
     callback: async (
       options = {
         generate: false,
       },
     ) => {
-      // only import + start
+      // Example usage for importing an existing key:
       // node bin/deploy ssh root@<host> <password> import
 
-      // generate + import + start
+      // Example usage for generating a new key:
       // node bin/deploy ssh root@<host> <password>
 
       shellExec(

package/src/client/components/core/AgGrid.js

@@ -4,6 +4,7 @@
 import { ThemeEvents, darkTheme } from './Css.js';
 import { append, htmls, s } from './VanillaJs.js';
 import { getProxyPath } from './Router.js';
+import './Pagination.js';
 
 const AgGrid = {
   grids: {},
@@ -14,6 +15,9 @@ const AgGrid = {
       // Grid Options: Contains all of the grid configurations
       const gridOptions = {
         // Row Data: The data to be displayed.
+        pagination: false, // Disabled by default, will be handled by the management view
+        // paginationPageSize: 100,
+        // suppressPaginationPanel: true, // We are using our own custom pagination component
         // rowHeight: 60,
         enableCellChangeFlash: true,
         defaultColDef: {
@@ -23,6 +27,12 @@ const AgGrid = {
           filter: true,
           autoHeight: true,
         },
+        rowClassRules: {
+          'row-new-highlight': (params) => {
+            // a temporary flag we can set on new rows to highlight them
+            return params.data && params.data._new;
+          },
+        },
         // domLayout: 'autoHeight', || 'normal'
         // Column Definitions: Defines & controls grid columns.
         columnDefs: options?.gridOptions?.rowData?.[0]
@@ -48,13 +58,17 @@ const AgGrid = {
         }
       };
     });
+    const usePagination = options?.usePagination;
     return html`
-      <div
-        class="${id} ${this.theme}${options?.darkTheme ? `-dark` : ''}"
-        style="${options?.style
-          ? Object.keys(options.style).map((styleKey) => `${styleKey}: ${options.style[styleKey]}; `)
-          : 'height: 500px'}"
-      ></div>
+      <div>
+        <div
+          class="${id} ${this.theme}${options?.darkTheme ? `-dark` : ''}"
+          style="${options?.style
+            ? Object.keys(options.style).map((styleKey) => `${styleKey}: ${options.style[styleKey]}; `)
+            : 'height: 500px'}"
+        ></div>
+        ${usePagination ? `<ag-pagination id="ag-pagination-${id}"></ag-pagination>` : ''}
+      </div>
     `;
   },
   RenderStyle: async function (
@@ -136,6 +150,10 @@ const AgGrid = {
           ${darkTheme
             ? html`
                 <style>
+                  .ag-row.row-new-highlight {
+                    background-color: #6d68ff !important;
+                    transition: background-color 1s ease-out;
+                  }
                   .ag-cell-data-changed,
                   .ag-cell-data-changed-animation {
                     background-color: #6d68ff !important;
@@ -145,6 +163,10 @@ const AgGrid = {
                 </style>
               `
             : html`<style>
+                .ag-row.row-new-highlight {
+                  background-color: #d0eaf8 !important;
+                  transition: background-color 1s ease-out;
+                }
                 .ag-cell-data-changed,
                 .ag-cell-data-changed-animation {
                   background-color: #d1d1d1 !important;

package/src/client/components/core/Auth.js

@@ -8,12 +8,14 @@ import { SignUp } from './SignUp.js';
 import { Translate } from './Translate.js';
 import { s } from './VanillaJs.js';
 
-const logger = loggerFactory(import.meta);
+const logger = loggerFactory(import.meta, { trace: true });
 
 const token = Symbol('token');
 
 const guestToken = Symbol('guestToken');
 
+const refreshTimeout = Symbol('refreshTimeout');
+
 const Auth = {
   [token]: '',
   [guestToken]: '',
@@ -35,50 +37,65 @@ const Auth = {
   getGuestToken: function () {
     return this[guestToken];
   },
-  // jwt
   getJWT: function () {
-    return `Bearer ${this.getToken() ? this.getToken() : this.getGuestToken()}`;
+    if (Auth.getToken()) return `Bearer ${Auth.getToken()}`;
+    if (Auth.getGuestToken()) return `Bearer ${Auth.getGuestToken()}`;
+    return '';
   },
-  signUpToken: async function (
-    result = {
-      data: {
-        token: '',
-        user: null,
-      },
-    },
-  ) {
+  decodeJwt: function (token) {
     try {
-      localStorage.setItem('jwt', result.data.token);
-      await SignUp.Trigger(result.data);
-      await Auth.sessionIn();
-    } catch (error) {
-      logger.error(error);
-      localStorage.removeItem('jwt');
+      return JSON.parse(atob(token.split('.')[1]));
+    } catch (e) {
+      return null;
     }
   },
+  scheduleTokenRefresh: function () {
+    if (this[refreshTimeout]) {
+      clearTimeout(this[refreshTimeout]);
+    }
+
+    const currentToken = Auth.getToken();
+    if (!currentToken) return;
+
+    const payload = Auth.decodeJwt(currentToken);
+    if (!payload || !payload.refreshExpiresAt) return;
+
+    const expiresIn = payload.refreshExpiresAt - Date.now();
+    const refreshBuffer = 2 * 60 * 1000; // 2 minutes
+    const refreshIn = expiresIn - refreshBuffer;
+
+    logger.info(`Token refresh in ${refreshIn / (1000 * 60)} minutes`);
+
+    if (refreshIn <= 0) return; // Already expired or close to it
+
+    this[refreshTimeout] = setTimeout(async () => {
+      const { data, status } = await UserService.get({ id: 'auth' });
+      if (status === 'success') {
+        logger.info('Refreshed access token.');
+        Auth.setToken(data.token);
+        localStorage.setItem('jwt', data.token);
+        Auth.scheduleTokenRefresh();
+      } else Auth.sessionOut();
+    }, refreshIn);
+  },
   sessionIn: async function (userServicePayload) {
     try {
       const token = userServicePayload?.data?.token ? userServicePayload.data.token : localStorage.getItem('jwt');
-
       if (token) {
-        this.setToken(token);
+        Auth.setToken(token);
+
         const result = userServicePayload
-          ? userServicePayload
-          : await (async () => {
-              const _result = await UserService.get({ id: 'auth' });
-              return {
-                status: _result.status,
-                message: _result.message,
-                data: {
-                  user: _result.data,
-                },
-              };
-            })();
+          ? userServicePayload // From login/signup
+          : await UserService.get({ id: 'auth' });
+
         const { status, data, message } = result;
         if (status === 'success') {
+          Auth.setToken(data.token);
           localStorage.setItem('jwt', token);
+          Auth.renderSessionUI();
           await LogIn.Trigger({ user: data.user });
           await Account.updateForm(data.user);
+          Auth.scheduleTokenRefresh();
           return { user: data.user };
         }
         if (message && message.match('expired'))
@@ -89,41 +106,67 @@ const Auth = {
               status: 'warning',
             });
           });
-        return await Auth.sessionOut();
       }
-
-      // anon guest session
-      this.deleteToken();
+      Auth.deleteToken();
       localStorage.removeItem('jwt');
-      let guestToken = localStorage.getItem('jwt.g');
 
-      if (!guestToken) {
-        const result = await UserService.post({ id: 'guest' });
-        localStorage.setItem('jwt.g', result.data.token);
-        guestToken = result.data.token;
-      }
-
-      this.setGuestToken(guestToken);
-      let { data, status, message } = await UserService.get({ id: 'auth' });
-      if (status === 'error') {
-        if (message && message.match('expired')) {
-          localStorage.removeItem('jwt.g');
-          return await Auth.sessionOut();
-        } else throw new Error(message);
+      // Anon guest session
+      let guestToken = localStorage.getItem('jwt.g');
+      if (guestToken) {
+        Auth.setGuestToken(guestToken);
+        let { data, status, message } = await UserService.get({ id: 'auth' });
+        if (status === 'success') {
+          await LogIn.Trigger(data);
+          await Account.updateForm(data.user);
+          return data;
+        } else logger.error(message);
       }
-      await Account.updateForm(data);
-      return { user: data };
+      return await Auth.sessionOut();
     } catch (error) {
       logger.error(error);
       return { user: UserMock.default };
     }
   },
   sessionOut: async function () {
-    this.deleteToken();
-    localStorage.removeItem('jwt');
-    const result = await this.sessionIn();
-    await LogOut.Trigger(result);
-    return result;
+    {
+      const result = await UserService.delete({ id: 'logout' });
+      localStorage.removeItem('jwt');
+      Auth.deleteToken();
+      if (this[refreshTimeout]) {
+        clearTimeout(this[refreshTimeout]);
+      }
+      Auth.renderGuestUi();
+      LogIn.Scope.user.main.model.user = {};
+      await LogOut.Trigger(result);
+    }
+    {
+      localStorage.removeItem('jwt.g');
+      Auth.deleteGuestToken();
+      const result = await UserService.post({ id: 'guest' });
+      localStorage.setItem('jwt.g', result.data.token);
+      Auth.setGuestToken(result.data.token);
+      return await Auth.sessionIn();
+    }
+  },
+  renderSessionUI: function () {
+    s(`.main-btn-log-in`).style.display = 'none';
+    s(`.main-btn-sign-up`).style.display = 'none';
+    s(`.main-btn-log-out`).style.display = null;
+    s(`.main-btn-account`).style.display = null;
+    setTimeout(() => {
+      if (s(`.modal-log-in`)) s(`.btn-close-modal-log-in`).click();
+      if (s(`.modal-sign-up`)) s(`.btn-close-modal-sign-up`).click();
+    });
+  },
+  renderGuestUi: function () {
+    s(`.main-btn-log-in`).style.display = null;
+    s(`.main-btn-sign-up`).style.display = null;
+    s(`.main-btn-log-out`).style.display = 'none';
+    s(`.main-btn-account`).style.display = 'none';
+    setTimeout(() => {
+      if (s(`.modal-log-out`)) s(`.btn-close-modal-log-out`).click();
+      if (s(`.modal-account`)) s(`.btn-close-modal-account`).click();
+    });
   },
 };