@peassoft/mnr-web-topline 4.0.1 → 4.2.0

package/dist/en/shared/procedures/process-response.js

@@ -1,4 +1,4 @@
-import WebError from '@memnrev/web-error';
+import VError from '@peassoft/verror';
 import { updateUser, updateGrantToken, updateRefreshToken, updateIsUserKnown } from '../../modules/local-db/index.js';
 import { setGrantToken, setRefreshToken } from '../../modules/tokens/index.js';
 import { openWebsocket } from '../../modules/websocket/index.js';
@@ -28,7 +28,7 @@ export default async function processResponse(response, url, eventName) {
         error: null
       };
     }
-    logError(new WebError({
+    logError(new VError({
       name: 'UnexpectedError'
     }, `unexpected payload of response to request to ${url}`));
     return {
@@ -36,7 +36,7 @@ export default async function processResponse(response, url, eventName) {
       error: 'network'
     };
   } catch (e) {
-    logError(new WebError({
+    logError(new VError({
       name: 'UnexpectedError',
       ...(e instanceof Error ? {
         cause: e

package/dist/ru/modules/env/index.d.ts

@@ -1,7 +1,15 @@
+/**
+ * Detect whether the app is running in local environment
+ */
+export declare function isLocal(): boolean;
 /**
  * Return base URL for requests to backend API
  */
 export declare function getApiBaseUrl(): string;
+/**
+ * Return URL for logs backend
+ */
+export declare function getLogsUrl(): string;
 /**
  * Return URL for websocket connection
  */

package/dist/ru/modules/env/index.js

@@ -1,3 +1,9 @@
+/**
+ * Detect whether the app is running in local environment
+ */
+export function isLocal() {
+  return window.location.hostname === 'localhost';
+}
 /**
  * Return base URL for requests to backend API
  */
@@ -7,6 +13,15 @@ export function getApiBaseUrl() {
   }
   return '/api';
 }
+/**
+ * Return URL for logs backend
+ */
+export function getLogsUrl() {
+  if (window.location.hostname === 'localhost') {
+    return 'http://localhost:5005/logs';
+  }
+  return '/front-logs/logs';
+}
 /**
  * Return URL for websocket connection
  */

package/dist/ru/modules/local-db/create-request-error.d.ts

@@ -1,5 +1,5 @@
-import WebError from '@memnrev/web-error';
+import VError from '@peassoft/verror';
 /**
  * Create error for failed request to local database
  */
-export default function createRequestError(reason: string): WebError;
+export default function createRequestError(reason: string): VError;

package/dist/ru/modules/local-db/create-request-error.js

@@ -1,9 +1,9 @@
-import WebError from '@memnrev/web-error';
+import VError from '@peassoft/verror';
 /**
  * Create error for failed request to local database
  */
 export default function createRequestError(reason) {
-  return new WebError({
+  return new VError({
     name: 'LocalDbRequestError'
   }, `request to local database failed (${reason})`);
 }

package/dist/ru/modules/local-db/init-db.js

@@ -1,4 +1,4 @@
-import WebError from '@memnrev/web-error';
+import VError from '@peassoft/verror';
 const DB_NAME = 'mnr_topline';
 const DB_VERSION = 2;
 // Main store data is deleted when a user logs out.
@@ -27,7 +27,7 @@ export function initDb() {
   return new Promise((resolve, reject) => {
     const openDbReq = window.indexedDB.open(DB_NAME, DB_VERSION);
     openDbReq.onerror = function (_e) {
-      reject(new WebError({
+      reject(new VError({
         name: 'LocalDbInitializationError'
       }, 'opening local database failed'));
     };
@@ -53,7 +53,7 @@ export function initDb() {
       }
     };
     openDbReq.onblocked = function () {
-      reject(new WebError({
+      reject(new VError({
         name: 'LocalDbInitializationError'
       }, 'failed upgrading local database due to it is blocked'));
     };

package/dist/ru/modules/logger/index.d.ts

@@ -1,2 +1,2 @@
-export declare function logError(err: Error): void;
+export declare function logError(err: Error | DOMException): void;
 export declare function logInvariant(msg: string): void;

package/dist/ru/modules/logger/index.js

@@ -1,6 +1,23 @@
+import { WebLogger } from '@peassoft/web-logger';
+import { getLogsUrl, isLocal } from '../env/index.js';
+let _logger = null;
 export function logError(err) {
-  console.error(err);
+  if (!_logger) {
+    _logger = createLogger();
+  }
+  _logger.error(err);
+  if (isLocal()) console.error(err);
 }
 export function logInvariant(msg) {
-  console.error(msg);
+  if (!_logger) {
+    _logger = createLogger();
+  }
+  _logger.info(msg);
+  if (isLocal()) console.log(msg);
+}
+function createLogger() {
+  return new WebLogger({
+    appName: 'mnr-web-topline',
+    url: getLogsUrl()
+  });
 }

package/dist/ru/modules/request/index.js

@@ -1,4 +1,4 @@
-import WebError from '@memnrev/web-error';
+import VError from '@peassoft/verror';
 import normalizeRequestOpts from './normalize-request-opts.js';
 import { logError } from '../logger/index.js';
 import shouldRetry from './should-retry.js';
@@ -37,11 +37,11 @@ export default async function request(url, fetchApiOpts, requestOpts = {}) {
   } catch (e) {
     if (e instanceof Error) {
       if (e.name === 'AbortError') {
-        logError(new WebError({
+        logError(new VError({
           name: 'RequestError'
         }, `request to ${url} was aborted due to timeout`));
       } else {
-        logError(new WebError({
+        logError(new VError({
           name: 'RequestError',
           cause: e
         }, `request to ${url} failed`));
@@ -65,12 +65,12 @@ export default async function request(url, fetchApiOpts, requestOpts = {}) {
     });
   }
   if (response.status >= 500 && response.status < 600) {
-    logError(new WebError({
+    logError(new VError({
       name: 'ServiceUnavailable'
     }, `request to ${url} failed with ${response.status} status code`));
     return null;
   }
-  logError(new WebError({
+  logError(new VError({
     name: 'UnexpectedError'
   }, `request to ${url} returned unexpected status code ${response.status}`));
   return null;

package/dist/ru/modules/topline-service/inner-service.js

@@ -1,4 +1,4 @@
-import WebError from '@memnrev/web-error';
+import VError from '@peassoft/verror';
 import { getGrantToken, getRefreshToken, setGrantToken, setRefreshToken } from '../tokens/index.js';
 import { deleteAllData as deleteAllDataFromDb, updateGrantToken as updateGrantTokenInDb, updateRefreshToken as updateRefreshTokenInDb, updateUser as updateUserInDb } from '../local-db/index.js';
 import { getApiBaseUrl } from '../env/index.js';
@@ -143,13 +143,13 @@ export class InnerService {
           }
           return grantToken;
         } else {
-          this.#logError(new WebError({
+          this.#logError(new VError({
             name: 'UnexpectedError'
           }, `unexpected payload of response to request to ${url}`));
           return null;
         }
       } catch (err) {
-        this.#logError(new WebError({
+        this.#logError(new VError({
           name: 'UnexpectedError',
           cause: err
         }, `parsing 200 response of request to ${url} failed`));

package/dist/ru/modules/ui-lang/index.d.ts

@@ -1,8 +1,4 @@
-import type { NonEmptyArray } from '../../types/helpers.js';
-type UiLangDescriptor = {
-    code: string;
-    name: string;
-};
-export declare function getSupportedUiLangs(): NonEmptyArray<UiLangDescriptor>;
-export declare function getDefaultUiLangForUser(): UiLangDescriptor;
-export {};
+import { type SupportedLanguage } from '@peassoft/mnr-langs';
+import type { ToplineUser } from '../../types/data.js';
+export declare function getPageLang(): SupportedLanguage;
+export declare function getInitialUiLang(user: ToplineUser): string;

package/dist/ru/modules/ui-lang/index.js

@@ -1,20 +1,8 @@
-const supportedUiLangs = [{
-  code: 'en',
-  name: 'English'
-}, {
-  code: 'ru',
-  name: 'Русский'
-}];
-export function getSupportedUiLangs() {
-  return window.structuredClone(supportedUiLangs);
+import { defaultLanguage, validateLanguage } from '@peassoft/mnr-langs';
+export function getPageLang() {
+  const currPageLang = document.querySelector('html')?.lang;
+  return validateLanguage(currPageLang) || defaultLanguage;
 }
-export function getDefaultUiLangForUser() {
-  for (const lang of window.navigator.languages) {
-    const normalizedLangCode = lang.slice(0, 2).toLowerCase();
-    const matchedDescriptor = supportedUiLangs.find(x => x.code === normalizedLangCode);
-    if (matchedDescriptor) {
-      return window.structuredClone(matchedDescriptor);
-    }
-  }
-  return supportedUiLangs[0];
+export function getInitialUiLang(user) {
+  return user.uiLang ?? getPageLang();
 }

package/dist/ru/modules/websocket/index.js

@@ -1,4 +1,4 @@
-import WebError from '@memnrev/web-error';
+import VError from '@peassoft/verror';
 import { getWebsocketUrl } from '../env/index.js';
 import { getGrantToken } from '../tokens/index.js';
 import { logError } from '../logger/index.js';
@@ -97,7 +97,7 @@ async function handleSocketClose(e) {
       break;
     default:
       // Unexpected closing code
-      logError(new WebError({
+      logError(new VError({
         name: 'UnexpectedWsClosingCode'
       }, `websocket was closed with unexpected code ${e.code}`));
       reconnect();

package/dist/ru/parts/logout/actions/perform-logout/index.d.ts

@@ -1,23 +1,4 @@
-import stampit from 'stampit';
-import { closeWebsocket } from '../../../../modules/websocket/index.js';
-import { getGrantToken } from '../../../../modules/tokens/index.js';
-import { type InnerService } from '../../../../modules/topline-service/index.js';
-import { getApiBaseUrl } from '../../../../modules/env/index.js';
-import request from '../../../../modules/request/index.js';
-import makeSecondAttempt from './make-second-attempt.js';
-export type This = {
-    closeWebsocket: typeof closeWebsocket;
-    getGrantToken: typeof getGrantToken;
-    innerToplineService: Pick<InnerService, 'processLogout' | 'upgradeGrantToken'>;
-    getApiBaseUrl: typeof getApiBaseUrl;
-    request: typeof request;
-    makeSecondAttempt: typeof makeSecondAttempt;
-    performLogout: typeof performLogout;
-};
-export declare const PerformLogout: stampit.Stamp<This>;
-declare const self: () => Promise<void>;
-export default self;
 /**
  * Make logout request to api
  */
-declare function performLogout(this: This): Promise<void>;
+export default function performLogout(): Promise<void>;

package/dist/ru/parts/logout/actions/perform-logout/index.js

@@ -1,33 +1,20 @@
-import stampit from 'stampit';
 import { closeWebsocket } from '../../../../modules/websocket/index.js';
 import { getGrantToken } from '../../../../modules/tokens/index.js';
 import { innerToplineService } from '../../../../modules/topline-service/index.js';
 import { getApiBaseUrl } from '../../../../modules/env/index.js';
 import request from '../../../../modules/request/index.js';
 import makeSecondAttempt from './make-second-attempt.js';
-export const PerformLogout = stampit().props({
-  closeWebsocket,
-  getGrantToken,
-  innerToplineService,
-  getApiBaseUrl,
-  request,
-  makeSecondAttempt
-}).methods({
-  performLogout
-});
-const self = performLogout.bind(PerformLogout());
-export default self;
 /**
  * Make logout request to api
  */
-async function performLogout() {
-  this.closeWebsocket();
-  const grantToken = this.getGrantToken();
+export default async function performLogout() {
+  closeWebsocket();
+  const grantToken = getGrantToken();
   if (!grantToken) {
-    this.innerToplineService.processLogout();
+    innerToplineService.processLogout();
     return;
   }
-  const url = `${this.getApiBaseUrl()}/private/log-out`;
+  const url = `${getApiBaseUrl()}/private/log-out`;
   const options = {
     method: 'POST',
     headers: {
@@ -36,19 +23,19 @@ async function performLogout() {
     cache: 'no-store',
     redirect: 'error'
   };
-  const response = await this.request(url, options, {
+  const response = await request(url, options, {
     maxRetries: 1
   });
   if (!response || response.status !== 401) {
-    this.innerToplineService.processLogout();
+    innerToplineService.processLogout();
     return;
   }
   if (response.status === 401) {
     // innerToplineService.upgradeGrantToken() makes all necessary clean-up in case
     // the upgrade fails
-    const grantToken = await this.innerToplineService.upgradeGrantToken();
+    const grantToken = await innerToplineService.upgradeGrantToken();
     if (grantToken) {
-      await this.makeSecondAttempt(self);
+      await makeSecondAttempt(performLogout);
     }
   }
 }

package/dist/ru/parts/password-recovery/actions/create-claim/index.d.ts

@@ -1,6 +1,3 @@
-import stampit from 'stampit';
-import { getApiBaseUrl, getRequestCredentialsMode } from '../../../../modules/env/index.js';
-import request from '../../../../modules/request/index.js';
 export type ReturnValue = {
     error: 'network' | null;
 };
@@ -10,13 +7,4 @@ export type ReturnValue = {
  * Returns `null` if claim creation succeeds; otherwise:
  *   - on network error or if backend responds with 5xx - "network".
  */
-declare function createClaim(this: This, email: string): Promise<ReturnValue>;
-export type This = {
-    getApiBaseUrl: typeof getApiBaseUrl;
-    getRequestCredentialsMode: typeof getRequestCredentialsMode;
-    request: typeof request;
-    createClaim: typeof createClaim;
-};
-export declare const CreateClaim: stampit.Stamp<This>;
-declare const _default: (email: string) => Promise<ReturnValue>;
-export default _default;
+export default function createClaim(email: string): Promise<ReturnValue>;

package/dist/ru/parts/password-recovery/actions/create-claim/index.js

@@ -1,4 +1,3 @@
-import stampit from 'stampit';
 import { getApiBaseUrl, getRequestCredentialsMode } from '../../../../modules/env/index.js';
 import request from '../../../../modules/request/index.js';
 /**
@@ -7,8 +6,8 @@ import request from '../../../../modules/request/index.js';
  * Returns `null` if claim creation succeeds; otherwise:
  *   - on network error or if backend responds with 5xx - "network".
  */
-async function createClaim(email) {
-  const url = `${this.getApiBaseUrl()}/public/create-password-recovery-claim`;
+export default async function createClaim(email) {
+  const url = `${getApiBaseUrl()}/public/create-password-recovery-claim`;
   const options = {
     method: 'POST',
     headers: {
@@ -17,11 +16,11 @@ async function createClaim(email) {
     body: JSON.stringify({
       email
     }),
-    credentials: this.getRequestCredentialsMode(),
+    credentials: getRequestCredentialsMode(),
     cache: 'no-store',
     redirect: 'error'
   };
-  const response = await this.request(url, options);
+  const response = await request(url, options);
   if (!response) {
     return {
       error: 'network'
@@ -30,12 +29,4 @@ async function createClaim(email) {
   return {
     error: null
   };
-}
-export const CreateClaim = stampit().props({
-  getApiBaseUrl,
-  getRequestCredentialsMode,
-  request
-}).methods({
-  createClaim
-});
-export default createClaim.bind(CreateClaim());
+}

package/dist/ru/parts/profile/actions/change-password/index.js

@@ -1,4 +1,4 @@
-import WebError from '@memnrev/web-error';
+import VError from '@peassoft/verror';
 import { getGrantToken, setGrantToken, setRefreshToken } from '../../../../modules/tokens/index.js';
 import { logInvariant, logError } from '../../../../modules/logger/index.js';
 import { getApiBaseUrl, getRequestCredentialsMode } from '../../../../modules/env/index.js';
@@ -65,7 +65,7 @@ export default async function changePassword(beacon, oldPassword, newPassword) {
   try {
     payload = await response.json();
   } catch (e) {
-    logError(new WebError({
+    logError(new VError({
       name: 'UnexpectedError',
       ...(e instanceof Error ? {
         cause: e

package/dist/ru/parts/profile/ui/root/has-changes.js

@@ -1,5 +1,5 @@
 import getInitialUserName from './get-initial-user-name.js';
-import getInitialUiLang from './get-initial-ui-lang.js';
+import { getInitialUiLang } from '../../../../modules/ui-lang/index.js';
 export default function hasChanges(user, currData) {
   if (getInitialUserName(user) !== currData.userName) {
     return true;

package/dist/ru/parts/profile/ui/root/index.js

@@ -1,17 +1,17 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useMemo, useCallback } from 'react';
+import { supportedLanguagesDescriptors } from '@peassoft/mnr-langs';
 import { InputField } from '@peassoft/mnr-web-ui-kit/input-field/index.js';
 import { Select } from '@peassoft/mnr-web-ui-kit/select/index.js';
 import { TextButton } from '@peassoft/mnr-web-ui-kit/text-button/index.js';
 import { Button } from '@peassoft/mnr-web-ui-kit/button/index.js';
 import { ErrorMessage } from '@peassoft/mnr-web-ui-kit/error-message/index.js';
 import { createUserDataChangeBeacon } from '../../../../modules/user-data-change-beacon/index.js';
-import { getSupportedUiLangs } from '../../../../modules/ui-lang/index.js';
 import { updateUser } from '../../../../modules/local-db/index.js';
 import { innerToplineService, ToplineEventName } from '../../../../modules/topline-service/index.js';
 import saveUserData from '../../actions/save-user-data/index.js';
+import { getInitialUiLang } from '../../../../modules/ui-lang/index.js';
 import getInitialUserName from './get-initial-user-name.js';
-import getInitialUiLang from './get-initial-ui-lang.js';
 import hasChanges from './has-changes.js';
 export default function Root(props) {
   const {
@@ -23,7 +23,7 @@ export default function Root(props) {
   const [uiLang, setUiLang] = useState(getInitialUiLang(user));
   const [isInProgress, setIsInProgress] = useState(false);
   const [hasSavingError, setHasSavingError] = useState(false);
-  const uiLangOptions = useMemo(() => getSupportedUiLangs().map(langDescriptor => ({
+  const uiLangOptions = useMemo(() => supportedLanguagesDescriptors().map(langDescriptor => ({
     id: langDescriptor.code,
     value: langDescriptor.name
   })), []);

package/dist/ru/parts/shell/actions/refresh-user/index.d.ts

@@ -1,28 +1,7 @@
-import stampit from 'stampit';
-import { getGrantToken } from '../../../../modules/tokens/index.js';
-import { type InnerService } from '../../../../modules/topline-service/index.js';
-import { getApiBaseUrl } from '../../../../modules/env/index.js';
-import request from '../../../../modules/request/index.js';
-import hasUserBeenChanged from './has-user-been-changed.js';
-import { logError } from '../../../../modules/logger/index.js';
-import makeSecondAttempt from './make-second-attempt.js';
 import { type ToplineUser } from '../../../../types/data.js';
-export type This = {
-    getGrantToken: typeof getGrantToken;
-    innerToplineService: Pick<InnerService, 'processLogout' | 'updateUser' | 'upgradeGrantToken'>;
-    getApiBaseUrl: typeof getApiBaseUrl;
-    request: typeof request;
-    hasUserBeenChanged: typeof hasUserBeenChanged;
-    logError: typeof logError;
-    makeSecondAttempt: typeof makeSecondAttempt;
-    refreshUser: typeof refreshUser;
-};
-export declare const RefreshUser: stampit.Stamp<This>;
-declare const self: (currUser: ToplineUser) => Promise<void>;
-export default self;
 /**
  * Try to refresh user data after initialization
  *
  * @param currUser User data fetched from local DB on initialization
  */
-declare function refreshUser(this: This, currUser: ToplineUser): Promise<void>;
+export default function refreshUser(currUser: ToplineUser): Promise<void>;

package/dist/ru/parts/shell/actions/refresh-user/index.js

@@ -1,5 +1,4 @@
-import stampit from 'stampit';
-import WebError from '@memnrev/web-error';
+import VError from '@peassoft/verror';
 import { getGrantToken } from '../../../../modules/tokens/index.js';
 import { innerToplineService } from '../../../../modules/topline-service/index.js';
 import { getApiBaseUrl } from '../../../../modules/env/index.js';
@@ -9,28 +8,15 @@ import { logError } from '../../../../modules/logger/index.js';
 import makeSecondAttempt from './make-second-attempt.js';
 import { isToplineUser } from '../../../../types/data.js';
 import { isObject } from '../../../../types/helpers.js';
-export const RefreshUser = stampit().props({
-  getGrantToken,
-  innerToplineService,
-  getApiBaseUrl,
-  request,
-  hasUserBeenChanged,
-  logError,
-  makeSecondAttempt
-}).methods({
-  refreshUser
-});
-const self = refreshUser.bind(RefreshUser());
-export default self;
 /**
  * Try to refresh user data after initialization
  *
  * @param currUser User data fetched from local DB on initialization
  */
-async function refreshUser(currUser) {
-  const grantToken = this.getGrantToken();
+export default async function refreshUser(currUser) {
+  const grantToken = getGrantToken();
   if (!grantToken) return;
-  const url = `${this.getApiBaseUrl()}/private/user`;
+  const url = `${getApiBaseUrl()}/private/user`;
   const options = {
     method: 'GET',
     headers: {
@@ -39,7 +25,7 @@ async function refreshUser(currUser) {
     cache: 'no-store',
     redirect: 'error'
   };
-  const response = await this.request(url, options, {
+  const response = await request(url, options, {
     maxRetries: 1
   });
   if (!response) return;
@@ -50,12 +36,12 @@ async function refreshUser(currUser) {
       if (isObject(responsePayload) && 'user' in responsePayload && (isToplineUser(responsePayload.user) || responsePayload.user === null)) {
         newUser = responsePayload.user;
       } else {
-        this.logError(new WebError({
+        logError(new VError({
           name: 'UnexpectedPayload'
-        }, `unexpected payload of request to ${url}`));
+        }, `unexpected payload of response to request to ${url}`));
       }
     } catch (err) {
-      this.logError(new WebError({
+      logError(new VError({
         name: 'UnexpectedError',
         ...(err instanceof Error ? {
           cause: err
@@ -64,16 +50,16 @@ async function refreshUser(currUser) {
       return;
     }
     if (!newUser) {
-      this.innerToplineService.processLogout();
+      innerToplineService.processLogout();
       return;
     }
-    if (this.hasUserBeenChanged(currUser, newUser)) {
-      await this.innerToplineService.updateUser(newUser);
+    if (hasUserBeenChanged(currUser, newUser)) {
+      await innerToplineService.updateUser(newUser);
     }
     return;
   }
   if (response.status === 401) {
-    await this.innerToplineService.upgradeGrantToken();
-    await this.makeSecondAttempt(currUser, self);
+    await innerToplineService.upgradeGrantToken();
+    await makeSecondAttempt(currUser, refreshUser);
   }
 }

package/dist/ru/parts/signup/actions/perform-signup/index.d.ts

@@ -1,9 +1,10 @@
+import type { SupportedLanguage } from '@peassoft/mnr-langs';
 import type { ToplineUser } from '../../../../types/data.js';
 export type UserData = {
     email: string;
     password: string;
     userName?: string;
-    uiLang?: string;
+    uiLang: SupportedLanguage;
 };
 export type ReturnValue = {
     user: ToplineUser | null;