mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-04 05:46:07 +02:00
Introduce coordinator
This commit is contained in:
pa
+53
-323
@@ -35,6 +35,8 @@ import {
|
||||
} from '../api';
|
||||
import { processBulk, request } from '../service/request';
|
||||
import { AppDebug } from '../service/appConfig';
|
||||
import { createUserEventCoordinator } from './coordinators/userEventCoordinator';
|
||||
import { createUserSessionCoordinator } from './coordinators/userSessionCoordinator';
|
||||
import { database } from '../service/database';
|
||||
import { patchUserFromEvent } from '../query';
|
||||
import { useAppearanceSettingsStore } from './settings/appearance';
|
||||
@@ -1144,301 +1146,7 @@ export const useUserStore = defineStore('User', () => {
|
||||
* @returns {Promise<void>}
|
||||
*/
|
||||
async function handleUserUpdate(ref, props) {
|
||||
let feed;
|
||||
let newLocation;
|
||||
let previousLocation;
|
||||
const friend = friendStore.friends.get(ref.id);
|
||||
if (typeof friend === 'undefined') {
|
||||
return;
|
||||
}
|
||||
if (props.location) {
|
||||
// update instancePlayerCount
|
||||
previousLocation = props.location[1];
|
||||
newLocation = props.location[0];
|
||||
let oldCount = state.instancePlayerCount.get(previousLocation);
|
||||
if (typeof oldCount !== 'undefined') {
|
||||
oldCount--;
|
||||
if (oldCount <= 0) {
|
||||
state.instancePlayerCount.delete(previousLocation);
|
||||
} else {
|
||||
state.instancePlayerCount.set(previousLocation, oldCount);
|
||||
}
|
||||
}
|
||||
let newCount = state.instancePlayerCount.get(newLocation);
|
||||
if (typeof newCount === 'undefined') {
|
||||
newCount = 0;
|
||||
}
|
||||
newCount++;
|
||||
state.instancePlayerCount.set(newLocation, newCount);
|
||||
|
||||
const previousLocationL = parseLocation(previousLocation);
|
||||
const newLocationL = parseLocation(newLocation);
|
||||
if (
|
||||
previousLocationL.tag === userDialog.value.$location.tag ||
|
||||
newLocationL.tag === userDialog.value.$location.tag
|
||||
) {
|
||||
// update user dialog instance occupants
|
||||
applyUserDialogLocation(true);
|
||||
}
|
||||
if (
|
||||
previousLocationL.worldId === worldStore.worldDialog.id ||
|
||||
newLocationL.worldId === worldStore.worldDialog.id
|
||||
) {
|
||||
instanceStore.applyWorldDialogInstances();
|
||||
}
|
||||
if (
|
||||
previousLocationL.groupId === groupStore.groupDialog.id ||
|
||||
newLocationL.groupId === groupStore.groupDialog.id
|
||||
) {
|
||||
instanceStore.applyGroupDialogInstances();
|
||||
}
|
||||
}
|
||||
if (
|
||||
!props.state &&
|
||||
props.location &&
|
||||
props.location[0] !== 'offline' &&
|
||||
props.location[0] !== '' &&
|
||||
props.location[1] !== 'offline' &&
|
||||
props.location[1] !== '' &&
|
||||
props.location[0] !== 'traveling'
|
||||
) {
|
||||
// skip GPS if user is offline or traveling
|
||||
previousLocation = props.location[1];
|
||||
newLocation = props.location[0];
|
||||
let time = props.location[2];
|
||||
if (previousLocation === 'traveling' && ref.$previousLocation) {
|
||||
previousLocation = ref.$previousLocation;
|
||||
const travelTime = Date.now() - ref.$travelingToTime;
|
||||
time -= travelTime;
|
||||
if (time < 0) {
|
||||
time = 0;
|
||||
}
|
||||
}
|
||||
if (AppDebug.debugFriendState && previousLocation) {
|
||||
console.log(
|
||||
`${ref.displayName} GPS ${previousLocation} -> ${newLocation}`
|
||||
);
|
||||
}
|
||||
if (previousLocation === 'offline') {
|
||||
previousLocation = '';
|
||||
}
|
||||
if (!previousLocation) {
|
||||
// no previous location
|
||||
if (AppDebug.debugFriendState) {
|
||||
console.log(
|
||||
ref.displayName,
|
||||
'Ignoring GPS, no previous location',
|
||||
newLocation
|
||||
);
|
||||
}
|
||||
} else if (ref.$previousLocation === newLocation) {
|
||||
// location traveled to is the same
|
||||
ref.$location_at = Date.now() - time;
|
||||
} else {
|
||||
const worldName = await getWorldName(newLocation);
|
||||
const groupName = await getGroupName(newLocation);
|
||||
feed = {
|
||||
created_at: new Date().toJSON(),
|
||||
type: 'GPS',
|
||||
userId: ref.id,
|
||||
displayName: ref.displayName,
|
||||
location: newLocation,
|
||||
worldName,
|
||||
groupName,
|
||||
previousLocation,
|
||||
time
|
||||
};
|
||||
feedStore.addFeed(feed);
|
||||
database.addGPSToDatabase(feed);
|
||||
// clear previousLocation after GPS
|
||||
ref.$previousLocation = '';
|
||||
ref.$travelingToTime = Date.now();
|
||||
}
|
||||
}
|
||||
if (
|
||||
props.location &&
|
||||
props.location[0] === 'traveling' &&
|
||||
props.location[1] !== 'traveling'
|
||||
) {
|
||||
// store previous location when user is traveling
|
||||
ref.$previousLocation = props.location[1];
|
||||
ref.$travelingToTime = Date.now();
|
||||
}
|
||||
let imageMatches = false;
|
||||
if (
|
||||
props.currentAvatarThumbnailImageUrl &&
|
||||
props.currentAvatarThumbnailImageUrl[0] &&
|
||||
props.currentAvatarThumbnailImageUrl[1] &&
|
||||
props.currentAvatarThumbnailImageUrl[0] ===
|
||||
props.currentAvatarThumbnailImageUrl[1]
|
||||
) {
|
||||
imageMatches = true;
|
||||
}
|
||||
if (
|
||||
(((props.currentAvatarImageUrl ||
|
||||
props.currentAvatarThumbnailImageUrl) &&
|
||||
!ref.profilePicOverride) ||
|
||||
props.currentAvatarTags) &&
|
||||
!imageMatches
|
||||
) {
|
||||
let currentAvatarImageUrl = '';
|
||||
let previousCurrentAvatarImageUrl = '';
|
||||
let currentAvatarThumbnailImageUrl = '';
|
||||
let previousCurrentAvatarThumbnailImageUrl = '';
|
||||
let currentAvatarTags = '';
|
||||
let previousCurrentAvatarTags = '';
|
||||
if (props.currentAvatarImageUrl) {
|
||||
currentAvatarImageUrl = props.currentAvatarImageUrl[0];
|
||||
previousCurrentAvatarImageUrl = props.currentAvatarImageUrl[1];
|
||||
} else {
|
||||
currentAvatarImageUrl = ref.currentAvatarImageUrl;
|
||||
previousCurrentAvatarImageUrl = ref.currentAvatarImageUrl;
|
||||
}
|
||||
if (props.currentAvatarThumbnailImageUrl) {
|
||||
currentAvatarThumbnailImageUrl =
|
||||
props.currentAvatarThumbnailImageUrl[0];
|
||||
previousCurrentAvatarThumbnailImageUrl =
|
||||
props.currentAvatarThumbnailImageUrl[1];
|
||||
} else {
|
||||
currentAvatarThumbnailImageUrl =
|
||||
ref.currentAvatarThumbnailImageUrl;
|
||||
previousCurrentAvatarThumbnailImageUrl =
|
||||
ref.currentAvatarThumbnailImageUrl;
|
||||
}
|
||||
if (props.currentAvatarTags) {
|
||||
currentAvatarTags = props.currentAvatarTags[0];
|
||||
previousCurrentAvatarTags = props.currentAvatarTags[1];
|
||||
if (
|
||||
ref.profilePicOverride &&
|
||||
!props.currentAvatarThumbnailImageUrl
|
||||
) {
|
||||
// forget last seen avatar
|
||||
ref.currentAvatarImageUrl = '';
|
||||
ref.currentAvatarThumbnailImageUrl = '';
|
||||
}
|
||||
} else {
|
||||
currentAvatarTags = ref.currentAvatarTags;
|
||||
previousCurrentAvatarTags = ref.currentAvatarTags;
|
||||
}
|
||||
if (
|
||||
generalSettingsStore.logEmptyAvatars ||
|
||||
ref.currentAvatarImageUrl
|
||||
) {
|
||||
let avatarInfo = {
|
||||
ownerId: '',
|
||||
avatarName: ''
|
||||
};
|
||||
try {
|
||||
avatarInfo = await avatarStore.getAvatarName(
|
||||
currentAvatarImageUrl
|
||||
);
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
let previousAvatarInfo = {
|
||||
ownerId: '',
|
||||
avatarName: ''
|
||||
};
|
||||
try {
|
||||
previousAvatarInfo = await avatarStore.getAvatarName(
|
||||
previousCurrentAvatarImageUrl
|
||||
);
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
feed = {
|
||||
created_at: new Date().toJSON(),
|
||||
type: 'Avatar',
|
||||
userId: ref.id,
|
||||
displayName: ref.displayName,
|
||||
ownerId: avatarInfo.ownerId,
|
||||
previousOwnerId: previousAvatarInfo.ownerId,
|
||||
avatarName: avatarInfo.avatarName,
|
||||
previousAvatarName: previousAvatarInfo.avatarName,
|
||||
currentAvatarImageUrl,
|
||||
currentAvatarThumbnailImageUrl,
|
||||
previousCurrentAvatarImageUrl,
|
||||
previousCurrentAvatarThumbnailImageUrl,
|
||||
currentAvatarTags,
|
||||
previousCurrentAvatarTags
|
||||
};
|
||||
feedStore.addFeed(feed);
|
||||
database.addAvatarToDatabase(feed);
|
||||
}
|
||||
}
|
||||
// if status is offline, ignore status and statusDescription
|
||||
if (
|
||||
(props.status &&
|
||||
props.status[0] !== 'offline' &&
|
||||
props.status[1] !== 'offline') ||
|
||||
(!props.status && props.statusDescription)
|
||||
) {
|
||||
let status = '';
|
||||
let previousStatus = '';
|
||||
let statusDescription = '';
|
||||
let previousStatusDescription = '';
|
||||
if (props.status) {
|
||||
if (props.status[0]) {
|
||||
status = props.status[0];
|
||||
}
|
||||
if (props.status[1]) {
|
||||
previousStatus = props.status[1];
|
||||
}
|
||||
} else if (ref.status) {
|
||||
status = ref.status;
|
||||
previousStatus = ref.status;
|
||||
}
|
||||
if (props.statusDescription) {
|
||||
if (props.statusDescription[0]) {
|
||||
statusDescription = props.statusDescription[0];
|
||||
}
|
||||
if (props.statusDescription[1]) {
|
||||
previousStatusDescription = props.statusDescription[1];
|
||||
}
|
||||
} else if (ref.statusDescription) {
|
||||
statusDescription = ref.statusDescription;
|
||||
previousStatusDescription = ref.statusDescription;
|
||||
}
|
||||
feed = {
|
||||
created_at: new Date().toJSON(),
|
||||
type: 'Status',
|
||||
userId: ref.id,
|
||||
displayName: ref.displayName,
|
||||
status,
|
||||
statusDescription,
|
||||
previousStatus,
|
||||
previousStatusDescription
|
||||
};
|
||||
feedStore.addFeed(feed);
|
||||
database.addStatusToDatabase(feed);
|
||||
}
|
||||
if (props.bio && props.bio[0] && props.bio[1]) {
|
||||
let bio = '';
|
||||
let previousBio = '';
|
||||
if (props.bio[0]) {
|
||||
bio = props.bio[0];
|
||||
}
|
||||
if (props.bio[1]) {
|
||||
previousBio = props.bio[1];
|
||||
}
|
||||
feed = {
|
||||
created_at: new Date().toJSON(),
|
||||
type: 'Bio',
|
||||
userId: ref.id,
|
||||
displayName: ref.displayName,
|
||||
bio,
|
||||
previousBio
|
||||
};
|
||||
feedStore.addFeed(feed);
|
||||
database.addBioToDatabase(feed);
|
||||
}
|
||||
if (
|
||||
props.note &&
|
||||
props.note[0] !== null &&
|
||||
props.note[0] !== props.note[1]
|
||||
) {
|
||||
checkNote(ref.id, props.note[0]);
|
||||
}
|
||||
await userEventCoordinator.runHandleUserUpdateFlow(ref, props);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1718,14 +1426,12 @@ export const useUserStore = defineStore('User', () => {
|
||||
function applyCurrentUser(json) {
|
||||
authStore.setAttemptingAutoLogin(false);
|
||||
let ref = currentUser.value;
|
||||
userSessionCoordinator.runAvatarSwapFlow({
|
||||
json,
|
||||
ref,
|
||||
isLoggedIn: watchState.isLoggedIn
|
||||
});
|
||||
if (watchState.isLoggedIn) {
|
||||
if (json.currentAvatar !== ref.currentAvatar) {
|
||||
avatarStore.addAvatarToHistory(json.currentAvatar);
|
||||
if (gameStore.isGameRunning) {
|
||||
avatarStore.addAvatarWearTime(ref.currentAvatar);
|
||||
ref.$previousAvatarSwapTime = Date.now();
|
||||
}
|
||||
}
|
||||
for (const prop in json) {
|
||||
if (typeof json[prop] !== 'undefined') {
|
||||
ref[prop] = json[prop];
|
||||
@@ -1844,33 +1550,15 @@ export const useUserStore = defineStore('User', () => {
|
||||
$travelingToLocation: '',
|
||||
...json
|
||||
};
|
||||
if (gameStore.isGameRunning) {
|
||||
ref.$previousAvatarSwapTime = Date.now();
|
||||
}
|
||||
cachedUsers.clear(); // clear before running applyUser
|
||||
currentUser.value = ref;
|
||||
authStore.loginComplete();
|
||||
userSessionCoordinator.runFirstLoginFlow(ref);
|
||||
}
|
||||
|
||||
ref.$isVRCPlus = ref.tags.includes('system_supporter');
|
||||
appearanceSettingsStore.applyUserTrustLevel(ref);
|
||||
applyUserLanguage(ref);
|
||||
applyPresenceLocation(ref);
|
||||
groupStore.applyPresenceGroups(ref);
|
||||
instanceStore.applyQueuedInstance(ref.queuedInstance);
|
||||
friendStore.updateUserCurrentStatus(ref);
|
||||
friendStore.updateFriendships(ref);
|
||||
if (ref.homeLocation !== ref.$homeLocation?.tag) {
|
||||
ref.$homeLocation = parseLocation(ref.homeLocation);
|
||||
// apply home location name to user dialog
|
||||
if (userDialog.value.visible && userDialog.value.id === ref.id) {
|
||||
getWorldName(currentUser.value.homeLocation).then(
|
||||
(worldName) => {
|
||||
userDialog.value.$homeLocationName = worldName;
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
userSessionCoordinator.runPostApplySyncFlow(ref);
|
||||
userSessionCoordinator.runHomeLocationSyncFlow(ref);
|
||||
|
||||
// when isGameRunning use gameLog instead of API
|
||||
const $location = parseLocation(locationStore.lastLocation.location);
|
||||
@@ -2024,12 +1712,18 @@ export const useUserStore = defineStore('User', () => {
|
||||
currentUser.value.$travelingToTime = value;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
function markCurrentUserGameStarted() {
|
||||
currentUser.value.$online_for = Date.now();
|
||||
currentUser.value.$offline_for = '';
|
||||
currentUser.value.$previousAvatarSwapTime = Date.now();
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
function markCurrentUserGameStopped() {
|
||||
currentUser.value.$online_for = 0;
|
||||
currentUser.value.$offline_for = Date.now();
|
||||
@@ -2055,6 +1749,42 @@ export const useUserStore = defineStore('User', () => {
|
||||
});
|
||||
}
|
||||
|
||||
const userSessionCoordinator = createUserSessionCoordinator({
|
||||
avatarStore,
|
||||
gameStore,
|
||||
groupStore,
|
||||
instanceStore,
|
||||
friendStore,
|
||||
authStore,
|
||||
cachedUsers,
|
||||
currentUser,
|
||||
userDialog,
|
||||
getWorldName,
|
||||
parseLocation,
|
||||
now: () => Date.now()
|
||||
});
|
||||
|
||||
const userEventCoordinator = createUserEventCoordinator({
|
||||
friendStore,
|
||||
state,
|
||||
parseLocation,
|
||||
userDialog,
|
||||
applyUserDialogLocation,
|
||||
worldStore,
|
||||
groupStore,
|
||||
instanceStore,
|
||||
appDebug: AppDebug,
|
||||
getWorldName,
|
||||
getGroupName,
|
||||
feedStore,
|
||||
database,
|
||||
avatarStore,
|
||||
generalSettingsStore,
|
||||
checkNote,
|
||||
now: () => Date.now(),
|
||||
nowIso: () => new Date().toJSON()
|
||||
});
|
||||
|
||||
return {
|
||||
state,
|
||||
|
||||
|
||||
Reference in New Issue
Block a user