align app copy and helpers with beOS naming

apps/packages/app/src/components/profile/avatar/ProfileTerminusAvatar.vue

@@ -34,11 +34,11 @@
 <script lang="ts" setup>
 import { ref, PropType, computed } from 'vue';
 import { getNftUrl } from './encoder';
-import { OlaresInfo } from '@bytetrade/core';
+import { BeOSInfo } from 'src/utils/beos-core';
 
 const props = defineProps({
 	info: {
-		type: Object as PropType<OlaresInfo>,
+		type: Object as PropType<BeOSInfo>,
 		require: false
 	},
 	size: {

apps/packages/app/src/constant/index.ts

@@ -4,7 +4,7 @@ import {
 	BackupFrequency,
 	BackupLocation,
 	IntegrationAccountMiniData
-} from '@bytetrade/core';
+} from 'src/utils/beos-core';
 
 import { i18n } from '../boot/i18n';
 import { getRequireImage } from '../utils/rss-utils';

apps/packages/app/src/pages/Electron/import/InputMnemonicPage.vue

@@ -46,7 +46,7 @@ import { useI18n } from 'vue-i18n';
 import { parsingMnemonics } from '../../Mobile/login/account/ImportUserBusiness';
 import TerminusPageTitle from '../../../components/common/TerminusPageTitle.vue';
 import { importUser } from '../../../utils/BindTerminusBusiness';
-import { TerminusDefaultDomain, TerminusInfo } from '@bytetrade/core';
+import { TerminusDefaultDomain, TerminusInfo } from 'src/utils/beos-core';
 import PadInputContentScrollView from '../../../components/ios/PadInputContentScrollView.vue';
 import {
 	notifyWarning,

apps/packages/app/src/pages/Mobile/connect/activate/ActivateWizard.vue

@@ -39,7 +39,7 @@
 <script lang="ts" setup>
 import { ref, onMounted, onUnmounted, onBeforeUnmount } from 'vue';
 import { useUserStore } from '../../../../stores/user';
-import { OlaresInfo } from '@bytetrade/core';
+import { BeOSInfo } from 'src/utils/beos-core';
 import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
@@ -118,7 +118,7 @@ async function updateTerminusInfo(): Promise<string | undefined> {
 	updateTerminusInfoIng = true;
 
 	try {
-		const data: OlaresInfo = await getBeOSInfo(baseURL, 5000, {
+		const data: BeOSInfo = await getBeOSInfo(baseURL, 5000, {
 			t: new Date().getTime()
 		});
 

apps/packages/app/src/pages/Mobile/login/account/InputMnemonic.vue

@@ -66,7 +66,7 @@ import {
 	notifyWarning
 } from '../../../../utils/notifyRedefinedUtil';
 import { onUnmounted } from 'vue';
-import { TerminusDefaultDomain, TerminusInfo } from '@bytetrade/core';
+import { TerminusDefaultDomain, TerminusInfo } from 'src/utils/beos-core';
 import { getBeOSInfo as getBaseBeOSInfo } from '../../../../utils/account';
 
 const $q = useQuasar();

apps/packages/app/src/pages/settings/Backup2/pages/BackupNew.vue

@@ -321,7 +321,7 @@ import { useBackupStore } from 'src/stores/settings/backup';
 import { useDeviceStore } from 'src/stores/settings/device';
 import { computed, onMounted, ref } from 'vue';
 import { BtDialog, useColor } from '@bytetrade/ui';
-import { BackupFrequency } from '@bytetrade/core';
+import { BackupFrequency } from 'src/utils/beos-core';
 import { useRoute, useRouter } from 'vue-router';
 import { FilePath } from 'src/stores/files';
 import { useQuasar } from 'quasar';

apps/packages/app/src/stores/desktop/app.ts

@@ -5,7 +5,7 @@ import {
 	DesktopAppInfo,
 	DesktopPosition
 } from '@apps/desktop/type/types';
-import { TerminusApp, TerminusEntrance } from '@bytetrade/core';
+import { TerminusApp, TerminusEntrance } from 'src/utils/beos-core';
 import { useTokenStore } from './token';
 import { AppInfo } from 'src/utils/interface/applications';
 import { SearchCategory } from 'src/utils/interface/search';

apps/packages/app/src/stores/mdns.ts

@@ -31,7 +31,7 @@ import { i18n } from 'src/boot/i18n';
 import { busEmit, busOff, busOn } from 'src/utils/bus';
 import { passwordAddSort } from 'src/utils/account';
 import { getDID, getPrivateJWK } from 'src/did/did-key';
-import { compareOlaresVersion, GolbalHost, PrivateJwk } from '@bytetrade/core';
+import { compareBeOSVersion, GolbalHost, PrivateJwk } from 'src/utils/beos-core';
 import { signJWS } from 'src/layouts/dialog/sign';
 import { axiosInstanceProxy } from 'src/platform/httpProxy';
 import { UpgradeMode } from 'src/constant/beos';
@@ -112,7 +112,7 @@ export const useMDNSStore = defineStore('mdnsStore', {
 				return this.mdnsMachine;
 			}
 			if (
-				compareOlaresVersion(
+				compareBeOSVersion(
 					this.apiMachine.status.terminusVersion,
 					apiMachineMineVersion
 				).compare < 0
@@ -351,7 +351,7 @@ export const useMDNSStore = defineStore('mdnsStore', {
 			}
 
 			return (
-				compareOlaresVersion(
+				compareBeOSVersion(
 					activeM.status.terminusVersion,
 					activeM.version.upgradeableVersion
 				).compare < 0
@@ -1325,7 +1325,7 @@ export const useMDNSStore = defineStore('mdnsStore', {
 			}
 		},
 		isNewActivedMineVersion(version: string) {
-			return compareOlaresVersion(version, newActivedMineVersion).compare >= 0;
+			return compareBeOSVersion(version, newActivedMineVersion).compare >= 0;
 		}
 	}
 });

apps/packages/app/src/stores/settings/account.ts

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { defineStore } from 'pinia';
 import { useTokenStore } from './token';
-import { SpaceSaveData, Secret } from '@bytetrade/core';
+import { SpaceSaveData, Secret } from 'src/utils/beos-core';
 import { remoteSpaceUrl } from 'src/constant/index';
 
 export interface AccountData {

apps/packages/app/src/stores/settings/integration.ts

@@ -1,6 +1,6 @@
 import { IntegrationAccount } from 'src/services/abstractions/integration/integrationService';
 import integrationService from 'src/services/integration/index';
-import { AccountType, IntegrationAccountMiniData } from '@bytetrade/core';
+import { AccountType, IntegrationAccountMiniData } from 'src/utils/beos-core';
 import { useTokenStore } from './token';
 import { defineStore } from 'pinia';
 import axios from 'axios';

apps/packages/app/src/stores/user.ts

@@ -2,12 +2,12 @@ import { defineStore } from 'pinia';
 import {
 	PrivateJwk,
 	TerminusInfo,
-	OlaresInfo,
+	BeOSInfo,
 	Token,
 	DefaultTerminusInfo,
-	DefaultOlaresInfo,
+	DefaultBeOSInfo,
 	TerminusDefaultDomain
-} from '@bytetrade/core';
+} from 'src/utils/beos-core';
 import {
 	LocalUserVault,
 	UserItem,
@@ -89,7 +89,7 @@ export interface UserSate {
 	defaultDomain: DefaultDomainValueType;
 }
 
-export let UsersTerminusInfo: Record<string, OlaresInfo | undefined> = {};
+export let UsersTerminusInfo: Record<string, BeOSInfo | undefined> = {};
 
 export const useUserStore = defineStore('user', {
 	state: () => {
@@ -871,13 +871,13 @@ export const useUserStore = defineStore('user', {
 			}
 		},
 
-		currentUserSaveTerminusInfo(terminusInfo: OlaresInfo | undefined) {
+		currentUserSaveTerminusInfo(terminusInfo: BeOSInfo | undefined) {
 			UsersTerminusInfo[this.current_id || ''] = terminusInfo;
 		},
 
 		async setUserTerminusInfo(
 			userId: string,
-			terminusInfo: OlaresInfo | undefined
+			terminusInfo: BeOSInfo | undefined
 		) {
 			if (terminusInfo) {
 				UsersTerminusInfo[userId] = terminusInfo;
@@ -902,7 +902,7 @@ export const useUserStore = defineStore('user', {
 		getUserTerminusInfo(userId: string) {
 			return (
 				UsersTerminusInfo[userId] || {
-					...DefaultOlaresInfo,
+					...DefaultBeOSInfo,
 					olaresId: this.users?.items.get(userId)?.name || ''
 				}
 			);
@@ -915,7 +915,7 @@ export const useUserStore = defineStore('user', {
 
 		terminusInfo() {
 			const olaresInfo = UsersTerminusInfo[this.current_id || ''] || {
-				...DefaultOlaresInfo,
+				...DefaultBeOSInfo,
 				olaresId: this.current_user?.name || ''
 			};
 			return olaresInfo;

apps/packages/app/src/utils/account.ts

@@ -1,4 +1,4 @@
-import { OlaresInfo, TerminusInfo, Token } from '@bytetrade/core';
+import { BeOSInfo, TerminusInfo, Token } from 'src/utils/beos-core';
 import { axiosInstanceProxy } from 'src/platform/httpProxy';
 import { i18n } from '../boot/i18n';
 import { saltedMD5 } from './salted-md5';
@@ -174,7 +174,7 @@ export const getTerminusInfo = async (
 		(baseURL.endsWith('/') ? baseURL : baseURL + '/') +
 			'bfl/info/v1/terminus-info'
 	);
-	const terminusInfo: OlaresInfo = res.data.data;
+	const terminusInfo: BeOSInfo = res.data.data;
 	return terminusInfo;
 };
 
@@ -199,7 +199,7 @@ export const getBeOSInfo = async (
 			(baseURL.endsWith('/') ? baseURL : baseURL + '/') +
 				'bfl/info/v1/beos-info'
 		);
-		const terminusInfo: OlaresInfo = res.data.data;
+		const terminusInfo: BeOSInfo = res.data.data;
 		return terminusInfo;
 	} catch (error) {
 		return await getTerminusInfo(baseURL, timeout, params);

apps/packages/app/src/utils/beos-core.ts

@@ -0,0 +1,4 @@
+export * from '@bytetrade/core';
+export { compareOlaresVersion as compareBeOSVersion } from '@bytetrade/core';
+export { DefaultOlaresInfo as DefaultBeOSInfo } from '@bytetrade/core';
+export type { OlaresInfo as BeOSInfo } from '@bytetrade/core';