Merge branch 'spencer/accounts-web-workers' into 'master'

Move accounts query to a web worker.

See merge request grassrootseconomics/cic-staff-client!42
This commit is contained in:
Spencer Ofwiti 2021-07-13 17:04:47 +00:00
commit 4ba9f959fe
4 changed files with 93 additions and 5 deletions

View File

@ -37,7 +37,8 @@
"scripts": [
"node_modules/jquery/dist/jquery.js",
"node_modules/bootstrap/dist/js/bootstrap.js"
]
],
"webWorkerTsConfig": "tsconfig.worker.json"
},
"configurations": {
"production": {
@ -126,7 +127,8 @@
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
"e2e/tsconfig.json",
"tsconfig.worker.json"
],
"exclude": [
"**/node_modules/**"

View File

@ -200,10 +200,31 @@ export class UserService {
async loadAccounts(limit: number = 100, offset: number = 0): Promise<void> {
try {
const accountRegistry = await RegistryService.getAccountRegistry();
const accountAddresses: Array<string> = await accountRegistry.last(limit);
const accountAddresses: Array<string> = await accountRegistry.last(offset + limit);
this.loggingService.sendInfoLevelMessage(accountAddresses);
for (const accountAddress of accountAddresses.slice(offset, offset + limit)) {
await this.getAccountByAddress(accountAddress, limit);
if (typeof Worker !== 'undefined') {
const worker = new Worker('@app/_workers/fetch-accounts.worker', { type: 'module' });
worker.onmessage = ({ data }) => {
this.tokenService.load.subscribe(async (status: boolean) => {
if (status) {
data.balance = await this.tokenService.getTokenBalance(
data.identities.evm[`bloxberg:${environment.bloxbergChainId}`][0]
);
}
});
this.addAccount(data, limit);
};
worker.postMessage({
addresses: accountAddresses.slice(offset, offset + limit),
url: environment.cicMetaUrl,
});
} else {
this.loggingService.sendInfoLevelMessage(
'Web workers are not supported in this environment'
);
for (const accountAddress of accountAddresses.slice(offset, offset + limit)) {
await this.getAccountByAddress(accountAddress, limit);
}
}
} catch (error) {
this.loggingService.sendErrorLevelMessage('Unable to load accounts.', 'user.service', error);

View File

@ -0,0 +1,50 @@
/// <reference lib="webworker" />
import { Envelope, Syncable, User } from 'cic-client-meta';
import { add0x } from '@src/assets/js/ethtx/dist/hex';
import { personValidation, vcardValidation } from '@app/_helpers/schema-validation';
import * as vCard from 'vcard-parser';
const headers = {
'x-cic-automerge': 'client',
};
const options = {
headers,
};
addEventListener('message', async ({ data }) => {
if (data.addresses instanceof Array) {
for (const accountAddress of data.addresses) {
try {
const account = await getAccountByAddress(accountAddress, data.url);
postMessage(account);
} catch (error) {
throw Error(error);
}
}
}
});
async function getAccountByAddress(accountAddress: string, metaUrl: string): Promise<any> {
const userKey = await User.toKey(add0x(accountAddress));
const response = await fetch(`${metaUrl}/${userKey}`, options)
.then((res) => {
if (res.ok) {
return res.json();
} else {
return Promise.reject({
status: res.status,
statusText: res.statusText,
});
}
})
.catch((error) => {
throw Error(`${error.status}: ${error.statusText}`);
});
const account: Syncable = Envelope.fromJSON(JSON.stringify(response)).unwrap();
const accountInfo = account.m.data;
await personValidation(accountInfo);
accountInfo.vcard = vCard.parse(atob(accountInfo.vcard));
await vcardValidation(accountInfo.vcard);
return accountInfo;
}

15
tsconfig.worker.json Normal file
View File

@ -0,0 +1,15 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/worker",
"lib": [
"es2018",
"webworker"
],
"types": []
},
"include": [
"src/**/*.worker.ts"
]
}