rename app internals away from Olares branding

This commit is contained in:
2026-03-09 11:45:47 +01:00
parent be5918878c
commit e4eae0361d
50 changed files with 137 additions and 140 deletions

View File

@@ -362,7 +362,7 @@ export function getDownloadUrl(item: FileItem, params = {}) {
const store = useDataStore();
const baseURL = store.baseURL();
if (item.isDir && process.env.APPLICATION === 'LAREPASS') {
if (item.isDir && process.env.APPLICATION === 'BEOS') {
return getStreamListUrl(item);
}

View File

@@ -13,7 +13,7 @@
</div>
<bt-select
v-model="host"
:options="olaresTunnelsV2Options()"
:options="beosTunnelsV2Options()"
:border="true"
color="text-blue-default"
/>
@@ -23,7 +23,7 @@
<script setup lang="ts">
import { useI18n } from 'vue-i18n';
import BtSelect from '../base/BtSelect.vue';
import { OlaresTunneV2Interface } from '../../utils/interface/frp';
import { BeOSTunnelV2Interface } from '../../utils/interface/frp';
import { PropType, ref } from 'vue';
import { i18n } from '../../boot/i18n';
@@ -37,9 +37,9 @@ const props = defineProps({
position: String,
showCancel: Boolean,
frpList: {
type: Array as PropType<OlaresTunneV2Interface[]>,
type: Array as PropType<BeOSTunnelV2Interface[]>,
required: true,
default: [] as OlaresTunneV2Interface[]
default: [] as BeOSTunnelV2Interface[]
}
});
@@ -52,8 +52,8 @@ if (props.frpList.length > 0) {
host.value = props.frpList[0].machine[0].host;
}
const olaresTunnelsV2Options = () => {
return props.frpList.map((item: OlaresTunneV2Interface) => {
const beosTunnelsV2Options = () => {
return props.frpList.map((item: BeOSTunnelV2Interface) => {
const label = (item.name as any)[i18n.global.locale.value]
? (item.name as any)[i18n.global.locale.value]
: (item.name as any)['en-US']

View File

@@ -32,7 +32,7 @@
t(
'The latest version of {productName} is {lastVersion}. Your current version is {currentVersion}',
{
productName: 'LarePass',
productName: 'beOS Pro',
lastVersion: lastVersion,
currentVersion: currentVersion
}

View File

@@ -37,7 +37,7 @@
<script setup lang="ts">
import { useI18n } from 'vue-i18n';
import { upgradeModeOptions, UpgradeMode } from '../../constant/larepass';
import { upgradeModeOptions, UpgradeMode } from '../../constant/beos';
import { ref } from 'vue';

View File

@@ -1,5 +1,5 @@
<template>
<div class="olares-info-root">
<div class="beos-info-root">
<div class="row items-center justify-between">
<div class="text-body2 text-ink-1">
{{ title }}

View File

@@ -1,5 +1,5 @@
<template>
<div class="row items-center olares_status">
<div class="row items-center beos-status">
<div
class="node"
:class="
@@ -42,7 +42,7 @@ defineProps({
</script>
<style scoped lang="scss">
.olares_status {
.beos-status {
height: 20px;
.node {
width: 8px;

View File

@@ -1,7 +1,7 @@
<template>
<div class="olares-unreachable-bg q-pa-md">
<div class="beos-unreachable-bg q-pa-md">
<div class="title text-suntitle3">
{{ t('Olares unreachable. Try Search Olares if:') }}
{{ t('beOS Pro is unreachable. Try searching again if:') }}
</div>
<div class="row items-center justify-between bottom-bg">
<div class="info">
@@ -26,13 +26,13 @@
<div
class="search text-body3 q-mt-md q-px-md row items-center justify-center"
@click="searchOlares"
@click="searchBeOS"
>
<div>
<q-icon name="sym_r_search" size="16px" color="grey-10"></q-icon>
</div>
<div class="q-ml-xs">
{{ t('Search Olares') }}
{{ t('Search beOS Pro') }}
</div>
</div>
</div>
@@ -50,19 +50,19 @@ import { useI18n } from 'vue-i18n';
const { t } = useI18n();
const reminderList = ref([
t('Olares is nearby but on a different network.'),
t('Olares is on the same network and still starting up.')
t('beOS Pro is nearby but on a different network.'),
t('beOS Pro is on the same network and still starting up.')
]);
const emit = defineEmits(['searchOlares']);
const emit = defineEmits(['searchBeOS']);
const searchOlares = () => {
emit('searchOlares');
const searchBeOS = () => {
emit('searchBeOS');
};
</script>
<style scoped lang="scss">
.olares-unreachable-bg {
.beos-unreachable-bg {
background: #fff7f2;
border: 1px solid $separator;
border-radius: 12px;

View File

@@ -10,7 +10,7 @@ import { useApproval } from 'src/pages/Mobile/wallet/approval';
import { sendUnlock } from 'src/utils/bexFront';
import { useQuasar } from 'quasar';
import { useI18n } from 'vue-i18n';
import { useLarepassWebsocketManagerStore } from 'src/stores/larepassWebsocketManager';
import { useBeOSWebsocketManagerStore } from 'src/stores/beosWebsocketManager';
import TerminusTipDialog from 'src/components/dialog/TerminusTipDialog.vue';
import { notifyFailed } from 'src/utils/notifyRedefinedUtil';
import { getNativeAppPlatform } from 'src/application/platform';
@@ -169,7 +169,7 @@ export const useAccountList = () => {
await app.lock();
const socketStore = useLarepassWebsocketManagerStore();
const socketStore = useBeOSWebsocketManagerStore();
socketStore.dispose();
if (userStore.users?.items.size == 0) {

View File

@@ -2,12 +2,12 @@ import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
import { useRoute } from 'vue-router';
import { getAppPlatform } from '../../application/platform';
import { useMenuStore } from '../../stores/menu';
import { useLarepassWebsocketManagerStore } from '../../stores/larepassWebsocketManager';
import { useBeOSWebsocketManagerStore } from '../../stores/beosWebsocketManager';
export function useMobileMainLayout() {
const Route = useRoute();
const menuStore = useMenuStore();
const socketStore = useLarepassWebsocketManagerStore();
const socketStore = useBeOSWebsocketManagerStore();
const isBex = process.env.IS_BEX;
onMounted(async () => {

View File

@@ -347,13 +347,13 @@ export default {
'Please keep your device connected to the internet':
'Please keep your device connected to the internet',
Upgrade: 'Upgrade',
'Olares unreachable. Try Search Olares if:':
'Olares unreachable. Try Search Olares if:',
'Olares is nearby but on a different network.':
'Olares is nearby but on a different network.',
'Olares is on the same network and still starting up.':
'Olares is on the same network and still starting up.',
'Search Olares': 'Search Olares',
'beOS Pro is unreachable. Try searching again if:':
'beOS Pro is unreachable. Try searching again if:',
'beOS Pro is nearby but on a different network.':
'beOS Pro is nearby but on a different network.',
'beOS Pro is on the same network and still starting up.':
'beOS Pro is on the same network and still starting up.',
'Search beOS Pro': 'Search beOS Pro',
'Cancel download': 'Cancel download',
'Upgrading system': 'Upgrading system',
'Keep your device connected to power during the installation process.':

View File

@@ -326,13 +326,13 @@ export default {
'Please keep your device connected to the internet':
'请保持你的设备连接到互联网',
Upgrade: '升级',
'Olares unreachable. Try Search Olares if:':
'beOS Pro is unreachable. Try searching again if:':
'无法访问 Olares。请尝试搜索 Olares',
'Olares is nearby but on a different network.':
'beOS Pro is nearby but on a different network.':
'Olares 就在附近,但属于不同的网络。',
'Olares is on the same network and still starting up.':
'beOS Pro is on the same network and still starting up.':
'Olares 位于同一网络上并且仍在启动。',
'Search Olares': '搜索 Olares',
'Search beOS Pro': '搜索 Olares',
'Cancel download': '取消下载',
'Upgrading system': '系统更新中',
'Keep your device connected to power during the installation process.':

View File

@@ -118,7 +118,7 @@ import AccountCenter from './../pages/Electron/SettingsPage/Account.vue';
import DesktopDefaultHeaderView from '../components/DesktopDefaultHeaderView.vue';
import { useDataStore } from '../stores/data';
import { useLarepassWebsocketManagerStore } from '../stores/larepassWebsocketManager';
import { useBeOSWebsocketManagerStore } from '../stores/beosWebsocketManager';
import TerminusMenu from './../components/TerminusMenu.vue';
import SearchPage from './../components/search/LarePass/IndexPage.vue';
@@ -134,7 +134,7 @@ import '../css/terminus.scss';
const route = useRoute();
const userStore = useUserStore();
const menuStore = useMenuStore();
const socketStore = useLarepassWebsocketManagerStore();
const socketStore = useBeOSWebsocketManagerStore();
const searchStore = useSearchStore();
const { t } = useI18n();

View File

@@ -45,8 +45,8 @@ import { ROUTE_CONST } from 'src/router/route-const';
import '../css/terminus.scss';
import { useRouter } from 'vue-router';
import { onMounted } from 'vue';
import { useLarepassWebsocketManagerStore } from 'src/stores/larepassWebsocketManager';
const socketStore = useLarepassWebsocketManagerStore();
import { useBeOSWebsocketManagerStore } from 'src/stores/beosWebsocketManager';
const socketStore = useBeOSWebsocketManagerStore();
const router = useRouter();

View File

@@ -203,9 +203,9 @@ import { LayoutMenuIdetify } from '../../../utils/constants';
import TerminusSetTheme from '../../../components/common/TerminusSetTheme.vue';
import { notifySuccess } from '../../../utils/notifyRedefinedUtil';
import { LarePassElectronUpdateStatus } from 'src/platform/interface/electron/interface';
import { BeOSElectronUpdateStatus } from 'src/platform/interface/electron/interface';
import { busOff, busOn } from '../../../utils/bus';
import LarePassUpdateReminderDialog from '../../../components/dialog/LarePassUpdateReminderDialog.vue';
import BeOSUpdateReminderDialog from '../../../components/dialog/BeOSUpdateReminderDialog.vue';
import TerminusSetLanguage from 'src/components/common/TerminusSetLanguage.vue';
import TerminusSetSecurity from 'src/components/common/TerminusSetSecurity.vue';
import TerminusCheckBox from 'src/components/common/TerminusCheckBox.vue';
@@ -229,7 +229,7 @@ const settings = reactive({
downloadLocation: '',
appVersion: '',
updateStatus: {
status: 'normal' as LarePassElectronUpdateStatus,
status: 'normal' as BeOSElectronUpdateStatus,
process: 30.1,
message: '',
version: '1.3.10'
@@ -324,7 +324,7 @@ const checkNewVersion = async () => {
} else {
// notifySuccess(t('Currently the latest version'));
$q.dialog({
component: LarePassUpdateReminderDialog
component: BeOSUpdateReminderDialog
}).onOk((options: { action: 'skip' | 'update'; autoUpdate: boolean }) => {
console.log(options);
});

View File

@@ -92,7 +92,7 @@ import { onFirstFactor } from '../../../../utils/account';
import { ConfirmButtonStatus } from '../../../../utils/constants';
import TerminusTipDialog from '../../../../components/dialog/TerminusTipDialog.vue';
import { useDeviceStore } from '../../../../stores/device';
import ActiveOlaresReminderDialog from '../../../../components/dialog/ActiveOlaresReminderDialog.vue';
import ActivateBeOSReminderDialog from '../../../../components/dialog/ActivateBeOSReminderDialog.vue';
import './wizard.scss';
import { ThemeDefinedMode } from '@bytetrade/ui';
@@ -270,7 +270,7 @@ const activeTerminus = async (
}
$q.dialog({
component: ActiveOlaresReminderDialog,
component: ActivateBeOSReminderDialog,
componentProps: {
frpList
}

View File

@@ -252,7 +252,7 @@ import TerminusItem from '../../../components/common/TerminusItem.vue';
import LocalMachineOpeationDialog from '../../../components/wizard/LocalMachineOpeationDialog.vue';
import { getPlatform } from '@didvault/sdk/src/core';
import ConfirmButton from '../../../components/common/ConfirmButton.vue';
import OlaresStatus from '../../../components/base/OlaresStatus.vue';
import BeOSStatus from '../../../components/base/BeOSStatus.vue';
import {
displayStatus,

View File

@@ -165,11 +165,11 @@ import { useTermipassStore } from '../../../stores/termipass';
import SwitchComponent from '../../../components/common/SwitchComponent.vue';
import OlaresInfo from '../../../components/setting/OlaresInfo.vue';
import TerminusUserStatus from '../../../components/common/TerminusUserStatus.vue';
import OlaresStatus from '../../../components/setting/OlaresStatus.vue';
import BeOSStatus from '../../../components/setting/BeOSStatus.vue';
import MonitorInfo2 from '../../../components/setting/MonitorInfo2.vue';
import { useScaleStore } from '../../../stores/scale';
import { useMDNSStore } from '../../../stores/mdns';
import OlaresUnreachable from '../../../components/setting/OlaresUnreachable.vue';
import BeOSUnreachable from '../../../components/setting/BeOSUnreachable.vue';
import TerminusTipDialog from '../../../components/dialog/TerminusTipDialog.vue';
const { t } = useI18n();
@@ -376,7 +376,7 @@ const updateOffLineMode = async () => {
// height: 72px;
}
.olares-unreachable-bg {
.beos-unreachable-bg {
background: #fff7f2;
border: 1px solid $separator;
border-radius: 12px;

View File

@@ -8,7 +8,7 @@ import { ClientSchema } from '../../../../globals';
// } from '@capacitor-community/facebook-login';
import { i18n } from '../../../../boot/i18n';
import { VCCardInfo, getSubmitApplicationJWS } from 'src/utils/vc';
import { LarePassSocialLogin } from 'src/platform/interface/capacitor/plugins/social';
import { BeOSSocialLogin } from 'src/platform/interface/capacitor/plugins/social';
import { getAppPlatform } from 'src/application/platform';
export async function facebookLogin(
@@ -23,12 +23,12 @@ export async function facebookLogin(
}
const manifest = stringToBase64(JSON.stringify(schema?.manifest));
await LarePassSocialLogin.initialize({
await BeOSSocialLogin.initialize({
facebook: getAppPlatform().socialKeys.facebook
});
const FACEBOOK_PERMISSIONS = ['email'];
const result = await LarePassSocialLogin.login({
const result = await BeOSSocialLogin.login({
// permissions: FACEBOOK_PERMISSIONS
provider: 'facebook',
// permissions: FACEBOOK_PERMISSIONS

View File

@@ -4,7 +4,7 @@ import { useSSIStore } from '../../../../stores/ssi';
import { ClientSchema } from '../../../../globals';
import { i18n } from '../../../../boot/i18n';
import { VCCardInfo, getSubmitApplicationJWS } from 'src/utils/vc';
import { LarePassSocialLogin } from 'src/platform/interface/capacitor/plugins/social';
import { BeOSSocialLogin } from 'src/platform/interface/capacitor/plugins/social';
import { getAppPlatform } from 'src/application/platform';
export async function googleLogin(
@@ -20,15 +20,15 @@ export async function googleLogin(
}
const manifest = stringToBase64(JSON.stringify(schema?.manifest));
await LarePassSocialLogin.initialize({
await BeOSSocialLogin.initialize({
google: {
webClientId: getAppPlatform().socialKeys.google.webClientId,
iOSClientId: getAppPlatform().socialKeys.google.iOSClientId,
mode: 'online'
}
});
await LarePassSocialLogin.logout({ provider: 'google' });
const googleResponse: any = await LarePassSocialLogin.login({
await BeOSSocialLogin.logout({ provider: 'google' });
const googleResponse: any = await BeOSSocialLogin.login({
provider: 'google',
options: {
scopes: ['email'],

View File

@@ -22,7 +22,7 @@
<q-select
:menu-offset="[0, 4]"
v-model="tokenStore.selectedFrp"
:options="tokenStore.olaresTunnelsV2Options()"
:options="tokenStore.beosTunnelsV2Options()"
class="Account_input"
popup-content-class="options_selected_Account"
emit-value

View File

@@ -165,7 +165,7 @@ const configData = () => {
);
}
const olaresOptions = networkStore.olaresTunnelsV2Options();
const olaresOptions = networkStore.beosTunnelsV2Options();
olaresTunnelsOptions.value = olaresOptions;
const option = olaresOptions.find(

View File

@@ -96,7 +96,7 @@ import {
getSettingsServerMdnsRequestApi,
MdnsApiEmum
} from '../../../services/abstractions/mdns/service';
import OlaresStatus from '../../../components/base/OlaresStatus.vue';
import BeOSStatus from '../../../components/base/BeOSStatus.vue';
import { useTerminusDStore } from '../../../stores/settings/terminusd';
import { computed, onMounted, ref, watch } from 'vue';
import { useAdminStore } from '../../../stores/settings/admin';

View File

@@ -21,7 +21,7 @@
:title="t('olares_space')"
:description="t('Check your subscribed plan and usage in Remote Space')"
:chevron-right="true"
@click="gotoPage('/olares_space')"
@click="gotoPage('/remote_space')"
/>
<bt-form-item
@click="updatePassword"

View File

@@ -8,7 +8,7 @@ import {
import { SocialLoginPlugin } from '@capgo/capacitor-social-login';
export * from './definitions';
export interface LarePassGoogleLoginResponseOffline {
export interface BeOSGoogleLoginResponseOffline {
serverAuthCode: string;
profile?: {
email: string | null;
@@ -20,11 +20,11 @@ export interface LarePassGoogleLoginResponseOffline {
};
responseType: 'offline';
}
export type LarePassGoogleLoginResponse =
export type BeOSGoogleLoginResponse =
| GoogleLoginResponseOnline
| LarePassGoogleLoginResponseOffline;
| BeOSGoogleLoginResponseOffline;
export interface LarePassSocialLoginPlugin extends SocialLoginPlugin {
export interface BeOSSocialLoginPlugin extends SocialLoginPlugin {
/**
* Login with the selected provider
* @description login with the selected provider
@@ -38,13 +38,13 @@ export interface LarePassSocialLoginPlugin extends SocialLoginPlugin {
>
): Promise<{
provider: T;
result: LarePassProviderResponseMap[T];
result: BeOSProviderResponseMap[T];
}>;
}
export type LarePassProviderResponseMap = {
export type BeOSProviderResponseMap = {
facebook: FacebookLoginResponse;
google: LarePassGoogleLoginResponse;
google: BeOSGoogleLoginResponse;
apple: AppleProviderResponse;
twitter: TwitterLoginResponse;
};

View File

@@ -1,6 +1,6 @@
import { registerPlugin } from '@capacitor/core';
import { LarePassSocialLoginPlugin } from './definitions';
const LarePassSocialLogin = registerPlugin<LarePassSocialLoginPlugin>(
'LarePassSocialLoginPlugin'
import { BeOSSocialLoginPlugin } from './definitions';
const BeOSSocialLogin = registerPlugin<BeOSSocialLoginPlugin>(
'BeOSSocialLoginPlugin'
);
export { LarePassSocialLogin };
export { BeOSSocialLogin };

View File

@@ -240,7 +240,7 @@ export interface IDownloadStartFile {
savePath?: string;
}
export type LarePassElectronUpdateStatus =
export type BeOSElectronUpdateStatus =
| 'normal'
| 'checking'
| 'latest'
@@ -429,7 +429,7 @@ declare global {
updateLanguage: (language: SupportLanguageType) => Promise<boolean>;
checkNewVersion: () => Promise<boolean>;
getUpdateStatus: () => Promise<{
status: LarePassElectronUpdateStatus;
status: BeOSElectronUpdateStatus;
process: number;
message: string;
version: string;
@@ -438,7 +438,7 @@ declare global {
callback: (
_event: any,
data: {
status: LarePassElectronUpdateStatus;
status: BeOSElectronUpdateStatus;
process: number;
message: string;
version: string;

View File

@@ -272,7 +272,7 @@ const optionLogin: RouteRecordRaw[] = [
const mobile: RouteRecordRaw[] = [
{
path: '/',
component: () => import('layouts/LarepassLoginLayout.vue'),
component: () => import('layouts/BeOSLoginLayout.vue'),
children: [
{
path: '/',
@@ -389,7 +389,7 @@ const bexOptions: RouteRecordRaw[] = [
const desktopOptions: RouteRecordRaw[] = [
{
path: '/',
component: () => import('layouts/LarepassLoginLayout.vue'),
component: () => import('layouts/BeOSLoginLayout.vue'),
children: [
{
path: '/welcome',

View File

@@ -33,7 +33,7 @@ if (process.env.APPLICATION == 'VAULT') {
routes = [...require('./routes/routes-studio').default];
} else if (process.env.APPLICATION == 'SHARE') {
routes = [...require('./routes/routes-share').default];
} else if (process.env.APPLICATION == 'LAREPASS') {
} else if (process.env.APPLICATION == 'BEOS') {
if (process.env.PLATFORM == 'MOBILE') {
if (isPad()) {
routes = [...routes, ...require('./routes/routes-pad').default];
@@ -48,10 +48,7 @@ if (process.env.APPLICATION == 'VAULT') {
];
}
} else if (process.env.PLATFORM == 'DESKTOP') {
routes = [
...routes,
...require('./routes/routes-larepass-desktop').default
];
routes = [...routes, ...require('./routes/routes-beos-desktop').default];
}
} else if (process.env.APPLICATION === 'DESKTOP') {
routes = [...routes, ...require('./routes/routes-desktop').default];

View File

@@ -3,7 +3,7 @@ import { RouteRecordRaw } from 'vue-router';
const electron: RouteRecordRaw[] = [
{
path: '/',
component: () => import('layouts/LarepassLoginLayout.vue'),
component: () => import('layouts/BeOSLoginLayout.vue'),
children: [
{
path: '/welcome',
@@ -42,8 +42,8 @@ const electron: RouteRecordRaw[] = [
},
{
path: '/',
component: () => import('layouts/TermipassMainLayout.vue'),
name: 'TermipassMainLayout',
component: () => import('layouts/BeOSMainLayout.vue'),
name: 'BeOSMainLayout',
children: [
{
path: 'transmission',

View File

@@ -114,8 +114,8 @@ const desktop: RouteRecordRaw[] = [
},
{
path: '/',
component: () => import('layouts/TermipassMainLayout.vue'),
name: 'TermipassMainLayout',
component: () => import('layouts/BeOSMainLayout.vue'),
name: 'BeOSMainLayout',
children: [
{
path: '/transmission',

View File

@@ -16,8 +16,8 @@ const routes: RouteRecordRaw[] = [
component: () => import('src/pages/settings/Person/IndexPage.vue')
},
{
path: '/olares_space',
component: () => import('src/pages/settings/Person/OlaresSpacePage.vue')
path: '/remote_space',
component: () => import('src/pages/settings/Person/RemoteSpacePage.vue')
},
{
path: 'loginHistory/:name?',

View File

@@ -7,7 +7,7 @@ import { getAppPlatform } from 'src/application/platform';
import { axiosInstanceProxy } from 'src/platform/httpProxy';
import { i18n } from 'src/boot/i18n';
import { AccountType, IntegrationAccountMiniData } from '@bytetrade/core';
import { LarePassSocialLogin } from 'src/platform/interface/capacitor/plugins/social';
import { BeOSSocialLogin } from 'src/platform/interface/capacitor/plugins/social';
export class GoogleAuthService extends OperateIntegrationAuth<GoogleIntegrationAccount> {
type = AccountType.Google;
@@ -17,7 +17,7 @@ export class GoogleAuthService extends OperateIntegrationAuth<GoogleIntegrationA
'https://www.googleapis.com/auth/drive',
'https://www.googleapis.com/auth/drive.file'
];
await LarePassSocialLogin.initialize({
await BeOSSocialLogin.initialize({
google: {
webClientId: getAppPlatform().socialKeys.google.webClientId,
iOSClientId: getAppPlatform().socialKeys.google.iOSClientId,
@@ -27,11 +27,11 @@ export class GoogleAuthService extends OperateIntegrationAuth<GoogleIntegrationA
}
});
if (getAppPlatform().getQuasar()?.platform.is?.ios) {
await LarePassSocialLogin.logout({
await BeOSSocialLogin.logout({
provider: 'google'
});
}
const googleResponse: any = await LarePassSocialLogin.login({
const googleResponse: any = await BeOSSocialLogin.login({
provider: 'google',
options: {
scopes: scopes,

View File

@@ -1,13 +1,13 @@
import { defineStore } from 'pinia';
import { useVaultSocketStore } from './larepassVaultWebsocket';
import { useVaultSocketStore } from './vaultWebsocket';
import { useUserStore } from './user';
import { useDeviceStore } from './device';
import { useWebsocketManager2Store } from './websocketManager2';
import { useAppAbilitiesStore } from './appAbilities';
import { useLarePassWiseSocket } from './larepassWiseSocket';
import { useBeOSWiseSocket } from './beosWiseSocket';
export const useLarepassWebsocketManagerStore = defineStore(
'larepassWebsocketManager',
export const useBeOSWebsocketManagerStore = defineStore(
'beosWebsocketManager',
{
state: () => ({
vaultConnectedUserId: '',
@@ -84,11 +84,11 @@ export const useLarepassWebsocketManagerStore = defineStore(
},
startWiseSocket() {
const wiseWSStore = useLarePassWiseSocket();
const wiseWSStore = useBeOSWiseSocket();
wiseWSStore.start();
},
disposeWiseSocket() {
const wiseWSStore = useLarePassWiseSocket();
const wiseWSStore = useBeOSWiseSocket();
wiseWSStore.dispose();
}
}

View File

@@ -12,7 +12,7 @@ export interface WebSocketState {
workerWebSocketStatus: WebSocketStatusEnum;
}
export const useLarePassWiseSocket = defineStore('larepassWiseSocket', {
export const useBeOSWiseSocket = defineStore('beosWiseSocket', {
state: () => {
return {
worker: null,
@@ -36,7 +36,7 @@ export const useLarePassWiseSocket = defineStore('larepassWiseSocket', {
const url = userStore.getModuleSever(abilityStore.wise.id, 'wss:', '/ws');
const websockConfig = getApplication().websocketConfig;
if (!this.socketbean) {
const applicationName = WebsocketApplicationEnum.LarePass_WISE;
const applicationName = WebsocketApplicationEnum.BeOS_WISE;
const bean = getWebSocketBean(applicationName);
this.socketbean = bean;
const externalInfo = websockConfig.externalInfo();

View File

@@ -1273,7 +1273,7 @@ export const useFilesStore = defineStore('files', {
shareBaseUrl() {
if (process.env.APPLICATION === 'FILES') {
return this.getModuleSever('share', 'https:');
} else if (process.env.APPLICATION == 'LAREPASS') {
} else if (process.env.APPLICATION == 'BEOS') {
const user = useUserStore();
const baseURL = user.getModuleSever('share');
return baseURL;

View File

@@ -85,7 +85,7 @@ export const useIntegrationStore = defineStore('integration', {
return [];
}
if (process.env.APPLICATION == 'LAREPASS') {
if (process.env.APPLICATION == 'BEOS') {
return [AccountType.Google, AccountType.Dropbox, AccountType.AWSS3];
}

View File

@@ -25,7 +25,7 @@ import {
import { useUserStore } from './user';
import { generatePasword } from 'src/utils/utils';
import TerminusTipDialog from '../components/dialog/TerminusTipDialog.vue';
import OlaresUpgradeReminderDialog from '../components/dialog/OlaresUpgradeReminderDialog.vue';
import BeOSUpgradeReminderDialog from '../components/dialog/BeOSUpgradeReminderDialog.vue';
import UserStatusCommonDialog from '../components/userStatusDialog/UserStatusCommonDialog.vue';
import { i18n } from 'src/boot/i18n';
import { busEmit, busOff, busOn } from 'src/utils/bus';
@@ -34,10 +34,10 @@ import { getDID, getPrivateJWK } from 'src/did/did-key';
import { compareOlaresVersion, GolbalHost, PrivateJwk } from '@bytetrade/core';
import { signJWS } from 'src/layouts/dialog/sign';
import { axiosInstanceProxy } from 'src/platform/httpProxy';
import { UpgradeMode } from 'src/constant/larepass';
import { UpgradeMode } from 'src/constant/beos';
import { Platform } from 'quasar';
import { userModeSetItem, userModeGetItem } from './userStorageAction';
import { OlaresTunneV2Interface } from 'src/utils/interface/frp';
import { BeOSTunnelV2Interface } from 'src/utils/interface/frp';
import { getNativeAppPlatform } from 'src/application/platform';
import { DNSService } from 'src/platform/interface/capacitor/plugins/dns';
@@ -63,7 +63,7 @@ export type MDNSStoreState = {
bluetoothMachines: TerminusServiceInfo[];
blueConfigNetworkMachine: TerminusServiceInfo | undefined;
includeRC: boolean;
frpMap: Record<string, OlaresTunneV2Interface[]>;
frpMap: Record<string, BeOSTunnelV2Interface[]>;
};
export interface SystemIPS {
@@ -661,7 +661,7 @@ export const useMDNSStore = defineStore('mdnsStore', {
getNativeAppPlatform()
.getQuasar()
?.dialog({
component: OlaresUpgradeReminderDialog,
component: BeOSUpgradeReminderDialog,
componentProps: {
title: i18n.global.t('Select upgrade option')
}
@@ -1317,7 +1317,7 @@ export const useMDNSStore = defineStore('mdnsStore', {
if (response.data.length > 0) {
this.frpMap[username] = response.data;
}
return response.data as OlaresTunneV2Interface[];
return response.data as BeOSTunnelV2Interface[];
}
return undefined;
} catch (error) {

View File

@@ -477,7 +477,7 @@ export const useOperateinStore = defineStore('operation', {
}
let origin = window.location.origin;
if (process.env.APPLICATION == 'LAREPASS') {
if (process.env.APPLICATION == 'BEOS') {
const user = useUserStore();
origin = user.getModuleSever('files');
}

View File

@@ -4,7 +4,7 @@ import { notifyFailed } from 'src/utils/settings/btNotify';
import axios from 'axios';
import { useBackgroundStore } from './background';
import { useAdminStore } from './admin';
import { OlaresTunneV2Interface } from 'src/utils/interface/frp';
import { BeOSTunnelV2Interface } from 'src/utils/interface/frp';
export interface ReverseProxy {
frp_server: string;
@@ -24,7 +24,7 @@ export interface OlaresTunnelInterface {
export type NetworkState = {
reverseProxy?: ReverseProxy;
olaresTunnels: OlaresTunnelInterface[];
olaresTunnelsV2: OlaresTunneV2Interface[];
olaresTunnelsV2: BeOSTunnelV2Interface[];
};
export const useNetworkStore = defineStore('network', {
@@ -90,9 +90,9 @@ export const useNetworkStore = defineStore('network', {
enable: true
}));
},
olaresTunnelsV2Options() {
beosTunnelsV2Options() {
const backgroundStore = useBackgroundStore();
return this.olaresTunnelsV2.map((item: OlaresTunneV2Interface) => {
return this.olaresTunnelsV2.map((item: BeOSTunnelV2Interface) => {
const label = item.name[backgroundStore.locale as string]
? item.name[backgroundStore.locale as string]
: item.name['en-US']

View File

@@ -34,7 +34,7 @@ import { useIntegrationStore } from './integration';
import { unlockByPwd } from '../utils/UnlockBusiness';
import { useFilesStore, FilesIdType } from './files';
import { DefaultDomainValueType } from '../utils/contact';
import { useLarepassWebsocketManagerStore } from './larepassWebsocketManager';
import { useBeOSWebsocketManagerStore } from './beosWebsocketManager';
import { useAppsStore } from 'src/stores/bex/apps';
import { useMDNSStore } from './mdns';
import { useDeviceStore } from './device';
@@ -442,7 +442,7 @@ export const useUserStore = defineStore('user', {
await app.removeState(id);
await this.removeBackupByUserId(id);
const socketStore = useLarepassWebsocketManagerStore();
const socketStore = useBeOSWebsocketManagerStore();
socketStore.dispose();
if (this.users.items.size > 0) {
@@ -706,7 +706,7 @@ export const useUserStore = defineStore('user', {
fileStore.nodes = [];
fileStore.currentNode = {};
const socketStore = useLarepassWebsocketManagerStore();
const socketStore = useBeOSWebsocketManagerStore();
socketStore.dispose();
const appsStore = useAppsStore();

View File

@@ -4,7 +4,7 @@ import { i18n } from '../boot/i18n';
import { Token, Encoder, OlaresInfo, GolbalHost } from '@bytetrade/core';
import { saltedMD5 } from './../utils/salted-md5';
import { WizardInfo } from 'src/utils/interface/wizard';
import { OlaresTunneV2Interface } from 'src/utils/interface/frp';
import { BeOSTunnelV2Interface } from 'src/utils/interface/frp';
// export interface SystemOption {
// location: string;
@@ -39,7 +39,7 @@ export type RootState = {
pingResult: boolean;
raw_login_loading: boolean;
wizard: WizardInfo;
frpList: OlaresTunneV2Interface[];
frpList: BeOSTunnelV2Interface[];
selectedFrp: string;
};
@@ -68,7 +68,7 @@ export const useTokenStore = defineStore('token', {
pingResult: false,
raw_login_loading: false,
wizard: {},
frpList: [] as OlaresTunneV2Interface[],
frpList: [] as BeOSTunnelV2Interface[],
selectedFrp: ''
} as RootState;
},
@@ -294,8 +294,8 @@ export const useTokenStore = defineStore('token', {
this.setWizard(this.wizard);
},
olaresTunnelsV2Options() {
return this.frpList.map((item: OlaresTunneV2Interface) => {
beosTunnelsV2Options() {
return this.frpList.map((item: BeOSTunnelV2Interface) => {
const label = item.name[i18n.global.locale.value]
? item.name[i18n.global.locale.value]
: item.name['en-US']

View File

@@ -1,4 +1,4 @@
export interface OlaresTunneV2Interface {
export interface BeOSTunnelV2Interface {
region: string;
name: object;
machine: [

View File

@@ -1,6 +1,6 @@
import { BaserWebsocketBeanClass, BaseWebsocketBean } from './base';
import { LarePassWebsocketBean } from './larepass';
import { BeOSWebsocketBean } from './beos';
// import { VaultWebsocketBean } from './vault';
// import { DashboardWebsocketBean } from './dashboard';
// import { MarketWebsocketBean } from './market';
@@ -12,8 +12,8 @@ const WebsocketBeanClassRecord: Record<
WebsocketApplicationEnum,
BaserWebsocketBeanClass
> = {
[WebsocketApplicationEnum.LAREPASS]: LarePassWebsocketBean,
[WebsocketApplicationEnum.LarePass_WISE]: LarePassWebsocketBean
[WebsocketApplicationEnum.BEOS]: BeOSWebsocketBean,
[WebsocketApplicationEnum.BeOS_WISE]: BeOSWebsocketBean
// [WebsocketApplicationEnum.VAULT]: VaultWebsocketBean,
// [WebsocketApplicationEnum.DASHBOARD]: DashboardWebsocketBean,
// [WebsocketApplicationEnum.MARKET]: MarketWebsocketBean,
@@ -25,8 +25,8 @@ const websocketBeansRecord: Record<
WebsocketApplicationEnum,
BaseWebsocketBean | null
> = {
[WebsocketApplicationEnum.LAREPASS]: null,
[WebsocketApplicationEnum.LarePass_WISE]: null
[WebsocketApplicationEnum.BEOS]: null,
[WebsocketApplicationEnum.BeOS_WISE]: null
// [WebsocketApplicationEnum.VAULT]: null,
// [WebsocketApplicationEnum.DASHBOARD]: null,
// [WebsocketApplicationEnum.MARKET]: null,

View File

@@ -4,7 +4,7 @@ import { TransferDatabase } from 'src/utils/interface/transferDB';
import { wiseInsertTransferItem, WiseWSType } from '../public/wise';
import { busEmit } from 'src/utils/bus';
export class LarePassWebsocketBean extends BaseWebsocketBean {
export class BeOSWebsocketBean extends BaseWebsocketBean {
private terminusId = '';
private db = new TransferDatabase();

View File

@@ -1,17 +1,17 @@
export enum WebsocketSharedWorkerEnum {
WISE_NAME = 'olares-wise-socket-worker',
FILES_NAME = 'olares-files-socket-worker',
MARKET_NAME = 'olares-market-socket-worker',
SETTINGS_NAME = 'olares-settings-socket-worker',
VAULT_NAME = 'olares-vault-socket-worker',
DESKTOP_NAME = 'olares-desktop-socket-worker',
DASHBOARD_NAME = 'olares-dashboard-socket-worker',
STUDIO_NAME = 'olares-studio-socket-worker'
WISE_NAME = 'beos-wise-socket-worker',
FILES_NAME = 'beos-files-socket-worker',
MARKET_NAME = 'beos-market-socket-worker',
SETTINGS_NAME = 'beos-settings-socket-worker',
VAULT_NAME = 'beos-vault-socket-worker',
DESKTOP_NAME = 'beos-desktop-socket-worker',
DASHBOARD_NAME = 'beos-dashboard-socket-worker',
STUDIO_NAME = 'beos-studio-socket-worker'
}
export enum WebsocketApplicationEnum {
LAREPASS = 'larepass',
LarePass_WISE = 'larepass_wise'
BEOS = 'beos',
BeOS_WISE = 'beos_wise'
// VAULT = 'vault',
// DASHBOARD = 'dashboard',
// MARKET = 'market',