Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
259c4d6
commit 4296b93
Showing
2 changed files
with
183 additions
and
183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,109 +1,109 @@ | ||
| // Copyright 2020 Vircadia Contributors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| 'use strict' | ||
|
|
||
| import { Config } from '@Base/config'; | ||
|
|
||
| import os from 'os'; | ||
|
|
||
| import { Accounts } from '@Entities/Accounts'; | ||
|
|
||
| import { Monitoring } from '@Monitoring/Monitoring'; | ||
| import { Stat } from '@Monitoring/Stat'; | ||
| import { ValueStat } from '@Monitoring/ValueStat'; | ||
| import { ValueHistogram } from '@Monitoring/ValueHistogram'; | ||
| import { Logger } from '@Tools/Logging'; | ||
| import { GenericFilter } from '@Entities/EntityFilters/GenericFilter'; | ||
| import { Domain } from 'domain'; | ||
| import { Domains } from '@Entities/Domains'; | ||
|
|
||
| // All the OS statistics | ||
| export class StatsMetaverse extends Stat { | ||
|
|
||
| constructor() { | ||
| super('metaverse', 'metaverse', ''); | ||
|
|
||
| // Count of all accounts that are sending heartbeats | ||
| const totalOnline = new ValueStat('totalOnline', 'metaverse', 'count', async (stat) => { | ||
| const numOnline = await Accounts.accountCount( | ||
| new GenericFilter( { 'timeOfLastHeartbeat': { '$gte': Accounts.dateWhenNotOnline }}) | ||
| ); | ||
| Logger.debug(`StatsMetaverse.totalOnline: counting ${numOnline}`); | ||
| stat.Event(numOnline); | ||
| }); | ||
| if (Config.monitoring.history) { | ||
| totalOnline.AddHistogram('perDay', new ValueHistogram(24*12, 5*60*1000));// one day's worth of 5 minute buckets | ||
| totalOnline.AddHistogram('perWeek', new ValueHistogram(24*7, 60*60*1000));// one week per hour | ||
| }; | ||
| Monitoring.addStat(totalOnline); | ||
|
|
||
| // Sum of all users reported by domains. | ||
| // NOTE: this also sets the value for the anon user stat to save the extra DB query | ||
| const domainTotalUsers = new ValueStat('domainTotalUsers', 'metaverse', 'count', async (stat) => { | ||
| let totalUsers = 0; | ||
| let anonUsers = 0; | ||
| for await (const aDomain of Domains.enumerateAsync(new GenericFilter( | ||
| { '$or': [ { 'numUsers': { '$gt': 0 } }, { 'anonUsers': { '$gt': 0 } } ] | ||
| }) ) ) { | ||
| totalUsers += aDomain.numUsers + aDomain.anonUsers; | ||
| anonUsers += aDomain.anonUsers; | ||
| }; | ||
| stat.Event(totalUsers); | ||
| Monitoring.getStat('domainAnonUsers')?.Event(anonUsers); | ||
| }); | ||
| if (Config.monitoring.history) { | ||
| domainTotalUsers.AddHistogram('perDay', new ValueHistogram(24*12, 5*60*1000));// one day's worth of 5 minute buckets | ||
| domainTotalUsers.AddHistogram('perWeek', new ValueHistogram(24*7, 60*60*1000));// one week per hour | ||
| }; | ||
| Monitoring.addStat(domainTotalUsers); | ||
|
|
||
| // Sum of all anon users reported by domains. | ||
| // NOTE: value is set by domainTotalUsers | ||
| const domainAnonUsers = new ValueStat('domainAnonUsers', 'metaverse', 'count'); | ||
| if (Config.monitoring.history) { | ||
| domainAnonUsers.AddHistogram('perDay', new ValueHistogram(24*12, 5*60*1000));// one day's worth of 5 minute buckets | ||
| domainAnonUsers.AddHistogram('perWeek', new ValueHistogram(24*7, 60*60*1000));// one week per hour | ||
| }; | ||
| Monitoring.addStat(domainAnonUsers); | ||
|
|
||
| // Number of domains that are sending heartbeats | ||
| const activeDomains = new ValueStat('activeDomains', 'metaverse', 'count', async (stat) => { | ||
| const numDomains = await Domains.domainCount( | ||
| new GenericFilter( { 'timeOfLastHeartbeat': { '$gte': Domains.dateWhenNotActive }}) | ||
| ); | ||
| stat.Event(numDomains); | ||
| }); | ||
| if (Config.monitoring.history) { | ||
| activeDomains.AddHistogram('perDay', new ValueHistogram(24*12, 5*60*1000));// one day's worth of 5 minute buckets | ||
| activeDomains.AddHistogram('perWeek', new ValueHistogram(24*7, 60*60*1000));// one week per hour | ||
| }; | ||
| Monitoring.addStat(activeDomains); | ||
| }; | ||
|
|
||
| Event(pCount: number): void { | ||
| throw new Error('Method not implemented.'); | ||
| } | ||
| async Gather(): Promise<void> { | ||
| return; | ||
| } | ||
| Report(pReturnHistogram: boolean = true): any { | ||
| return { | ||
| 'totalOnline': Monitoring.getStat('totalOnline')?.Report(pReturnHistogram), | ||
| 'domainTotalUsers': Monitoring.getStat('domainTotalUsers')?.Report(pReturnHistogram), | ||
| 'domainAnonUsers': Monitoring.getStat('domainAnonUsers')?.Report(pReturnHistogram), | ||
| 'activeDomains': Monitoring.getStat('activeDomains')?.Report(pReturnHistogram), | ||
| }; | ||
| } | ||
| }; | ||
| // Copyright 2020 Vircadia Contributors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| 'use strict' | ||
|
|
||
| import { Config } from '@Base/config'; | ||
|
|
||
| import os from 'os'; | ||
|
|
||
| import { Accounts } from '@Entities/Accounts'; | ||
|
|
||
| import { Monitoring } from '@Monitoring/Monitoring'; | ||
| import { Stat } from '@Monitoring/Stat'; | ||
| import { ValueStat } from '@Monitoring/ValueStat'; | ||
| import { ValueHistogram } from '@Monitoring/ValueHistogram'; | ||
| import { Logger } from '@Tools/Logging'; | ||
| import { GenericFilter } from '@Entities/EntityFilters/GenericFilter'; | ||
| import { Domain } from 'domain'; | ||
| import { Domains } from '@Entities/Domains'; | ||
|
|
||
| // All the OS statistics | ||
| export class StatsMetaverse extends Stat { | ||
|
|
||
| constructor() { | ||
| super('metaverse', 'metaverse', ''); | ||
|
|
||
| // Count of all accounts that are sending heartbeats | ||
| const totalOnline = new ValueStat('totalOnline', 'metaverse', 'count', async (stat) => { | ||
| const numOnline = await Accounts.accountCount( | ||
| new GenericFilter( { 'timeOfLastHeartbeat': { '$gte': Accounts.dateWhenNotOnline }}) | ||
| ); | ||
| Logger.debug(`StatsMetaverse.totalOnline: counting ${numOnline}`); | ||
| stat.Event(numOnline); | ||
| }); | ||
| if (Config.monitoring.history) { | ||
| totalOnline.AddHistogram('perDay', new ValueHistogram(24*12, 5*60*1000));// one day's worth of 5 minute buckets | ||
| totalOnline.AddHistogram('perWeek', new ValueHistogram(24*7, 60*60*1000));// one week per hour | ||
| }; | ||
| Monitoring.addStat(totalOnline); | ||
|
|
||
| // Sum of all users reported by domains. | ||
| // NOTE: this also sets the value for the anon user stat to save the extra DB query | ||
| const domainTotalUsers = new ValueStat('domainTotalUsers', 'metaverse', 'count', async (stat) => { | ||
| let totalUsers = 0; | ||
| let anonUsers = 0; | ||
| for await (const aDomain of Domains.enumerateAsync(new GenericFilter( | ||
| { '$or': [ { 'numUsers': { '$gt': 0 } }, { 'anonUsers': { '$gt': 0 } } ] | ||
| }) ) ) { | ||
| totalUsers += aDomain.numUsers + aDomain.anonUsers; | ||
| anonUsers += aDomain.anonUsers; | ||
| }; | ||
| stat.Event(totalUsers); | ||
| Monitoring.getStat('domainAnonUsers')?.Event(anonUsers); | ||
| }); | ||
| if (Config.monitoring.history) { | ||
| domainTotalUsers.AddHistogram('perDay', new ValueHistogram(24*12, 5*60*1000));// one day's worth of 5 minute buckets | ||
| domainTotalUsers.AddHistogram('perWeek', new ValueHistogram(24*7, 60*60*1000));// one week per hour | ||
| }; | ||
| Monitoring.addStat(domainTotalUsers); | ||
|
|
||
| // Sum of all anon users reported by domains. | ||
| // NOTE: value is set by domainTotalUsers | ||
| const domainAnonUsers = new ValueStat('domainAnonUsers', 'metaverse', 'count'); | ||
| if (Config.monitoring.history) { | ||
| domainAnonUsers.AddHistogram('perDay', new ValueHistogram(24*12, 5*60*1000));// one day's worth of 5 minute buckets | ||
| domainAnonUsers.AddHistogram('perWeek', new ValueHistogram(24*7, 60*60*1000));// one week per hour | ||
| }; | ||
| Monitoring.addStat(domainAnonUsers); | ||
|
|
||
| // Number of domains that are sending heartbeats | ||
| const activeDomains = new ValueStat('activeDomains', 'metaverse', 'count', async (stat) => { | ||
| const numDomains = await Domains.domainCount( | ||
| new GenericFilter( { 'timeOfLastHeartbeat': { '$gte': Domains.dateWhenNotActive }}) | ||
| ); | ||
| stat.Event(numDomains); | ||
| }); | ||
| if (Config.monitoring.history) { | ||
| activeDomains.AddHistogram('perDay', new ValueHistogram(24*12, 5*60*1000));// one day's worth of 5 minute buckets | ||
| activeDomains.AddHistogram('perWeek', new ValueHistogram(24*7, 60*60*1000));// one week per hour | ||
| }; | ||
| Monitoring.addStat(activeDomains); | ||
| }; | ||
|
|
||
| Event(pCount: number): void { | ||
| throw new Error('Method not implemented.'); | ||
| } | ||
| async Gather(): Promise<void> { | ||
| return; | ||
| } | ||
| Report(pReturnHistogram: boolean = true): any { | ||
| return { | ||
| 'totalOnline': Monitoring.getStat('totalOnline')?.Report(pReturnHistogram), | ||
| 'domainTotalUsers': Monitoring.getStat('domainTotalUsers')?.Report(pReturnHistogram), | ||
| 'domainAnonUsers': Monitoring.getStat('domainAnonUsers')?.Report(pReturnHistogram), | ||
| 'activeDomains': Monitoring.getStat('activeDomains')?.Report(pReturnHistogram), | ||
| }; | ||
| } | ||
| }; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,74 @@ | ||
| // Copyright 2020 Vircadia Contributors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| 'use strict'; | ||
|
|
||
| import { Router, RequestHandler, Request, Response, NextFunction } from 'express'; | ||
|
|
||
| import { setupMetaverseAPI, finishMetaverseAPI } from '@Route-Tools/middleware'; | ||
| import { accountFromAuthToken, usernameFromParams } from '@Route-Tools/middleware'; | ||
| import { Accounts } from '@Entities/Accounts'; | ||
| import { getAccountField, setAccountField } from '@Entities/AccountEntity'; | ||
|
|
||
| import { PaginationInfo } from '@Entities/EntityFilters/PaginationInfo'; | ||
|
|
||
| import { SArray, VKeyedCollection } from '@Tools/vTypes'; | ||
| import { IsNullOrEmpty, IsNotNullOrEmpty } from '@Tools/Misc'; | ||
| import { buildLocationInfo, buildImageInfo } from '@Route-Tools/Util'; | ||
|
|
||
| // Get the connections of the logged in account | ||
| const procGetUsersConnections: RequestHandler = async (req: Request, resp: Response, next: NextFunction) => { | ||
| if (req.vAuthAccount) { | ||
| const pager = new PaginationInfo(); | ||
| pager.parametersFromRequest(req); | ||
|
|
||
| let connections: string[] = await getAccountField(req.vAuthToken, req.vAuthAccount, 'connections', req.vAuthAccount); | ||
| connections = IsNullOrEmpty(connections) | ||
| ? [] // if no connections info, return empty list | ||
| : connections; | ||
| req.vRestResp.Data = { | ||
| 'users': connections.map( async (connectionUsername) => { | ||
| const aAccount = await Accounts.getAccountWithUsername(connectionUsername); | ||
| if (aAccount) { | ||
| return { | ||
| 'username': connectionUsername, | ||
| 'connection': SArray.has(req.vAuthAccount.friends, connectionUsername) ? 'is_friend' : 'is_connection', | ||
| 'images': await buildImageInfo(aAccount), | ||
| 'placeName': await buildLocationInfo(aAccount) | ||
| }; | ||
| }; | ||
| return { | ||
| 'username': connectionUsername, | ||
| 'connection': 'unknown' | ||
| }; | ||
|
|
||
| } ) | ||
| }; | ||
| } | ||
| else { | ||
| req.vRestResp.respondFailure('unauthorized'); | ||
| }; | ||
| next(); | ||
| }; | ||
|
|
||
| export const name = '/api/v1/users/connections'; | ||
|
|
||
| export const router = Router(); | ||
|
|
||
| router.get('/api/v1/users/connections', [ setupMetaverseAPI, | ||
| accountFromAuthToken, | ||
| procGetUsersConnections, | ||
| finishMetaverseAPI | ||
| ] ); | ||
| // Copyright 2020 Vircadia Contributors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| 'use strict'; | ||
|
|
||
| import { Router, RequestHandler, Request, Response, NextFunction } from 'express'; | ||
|
|
||
| import { setupMetaverseAPI, finishMetaverseAPI } from '@Route-Tools/middleware'; | ||
| import { accountFromAuthToken, usernameFromParams } from '@Route-Tools/middleware'; | ||
| import { Accounts } from '@Entities/Accounts'; | ||
| import { getAccountField, setAccountField } from '@Entities/AccountEntity'; | ||
|
|
||
| import { PaginationInfo } from '@Entities/EntityFilters/PaginationInfo'; | ||
|
|
||
| import { SArray, VKeyedCollection } from '@Tools/vTypes'; | ||
| import { IsNullOrEmpty, IsNotNullOrEmpty } from '@Tools/Misc'; | ||
| import { buildLocationInfo, buildImageInfo } from '@Route-Tools/Util'; | ||
|
|
||
| // Get the connections of the logged in account | ||
| const procGetUsersConnections: RequestHandler = async (req: Request, resp: Response, next: NextFunction) => { | ||
| if (req.vAuthAccount) { | ||
| const pager = new PaginationInfo(); | ||
| pager.parametersFromRequest(req); | ||
|
|
||
| let connections: string[] = await getAccountField(req.vAuthToken, req.vAuthAccount, 'connections', req.vAuthAccount); | ||
| connections = IsNullOrEmpty(connections) | ||
| ? [] // if no connections info, return empty list | ||
| : connections; | ||
| req.vRestResp.Data = { | ||
| 'users': connections.map( async (connectionUsername) => { | ||
| const aAccount = await Accounts.getAccountWithUsername(connectionUsername); | ||
| if (aAccount) { | ||
| return { | ||
| 'username': connectionUsername, | ||
| 'connection': SArray.has(req.vAuthAccount.friends, connectionUsername) ? 'is_friend' : 'is_connection', | ||
| 'images': await buildImageInfo(aAccount), | ||
| 'placeName': await buildLocationInfo(aAccount) | ||
| }; | ||
| }; | ||
| return { | ||
| 'username': connectionUsername, | ||
| 'connection': 'unknown' | ||
| }; | ||
|
|
||
| } ) | ||
| }; | ||
| } | ||
| else { | ||
| req.vRestResp.respondFailure('unauthorized'); | ||
| }; | ||
| next(); | ||
| }; | ||
|
|
||
| export const name = '/api/v1/users/connections'; | ||
|
|
||
| export const router = Router(); | ||
|
|
||
| router.get('/api/v1/users/connections', [ setupMetaverseAPI, | ||
| accountFromAuthToken, | ||
| procGetUsersConnections, | ||
| finishMetaverseAPI | ||
| ] ); | ||
|
|