accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2024-12-31 14:01:51 +00:00
Code Issues Releases Activity

fix: minor fixes to telemetry

Browse Source
This commit is contained in:
18alantom 2022-05-23 14:58:33 +05:30
parent 2c596b11c8
commit 2392dbe2fd
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fyo/telemetry/helpers.ts
View File

@ -25,11 +25,17 @@ export function getDeviceId(fyo: Fyo): UniqueId {
return deviceId;
}
export function getInstanceId(fyo: Fyo): UniqueId {
const files = (fyo.config.get(ConfigKeys.Files) ?? []) as ConfigFile[];
const instanceId = fyo.singles.SystemSettings!.instanceId as string;
export async function getInstanceId(fyo: Fyo): Promise<UniqueId> {
const instanceId = (await fyo.getValue(
ModelNameEnum.SystemSettings,
'instanceId'
)) as string;
const companyName = (await fyo.getValue(
ModelNameEnum.AccountingSettings,
'companyName'
)) as string;
const dbPath = fyo.db.dbPath!;
const companyName = fyo.singles.AccountingSettings!.companyName as string;
const files = (fyo.config.get(ConfigKeys.Files) ?? []) as ConfigFile[];
let file = files.find((f) => f.id === instanceId);

14
fyo/telemetry/telemetry.ts
View File

@ -65,8 +65,8 @@ export class TelemetryManager {
async start(openCount?: number) {
this.#telemetryObject.country ||= getCountry(this.fyo);
this.#telemetryObject.language ??= getLanguage(this.fyo);
this.#telemetryObject.device ||= getDeviceId(this.fyo);
this.#telemetryObject.instance ||= getInstanceId(this.fyo);
this.#telemetryObject.deviceId ||= getDeviceId(this.fyo);
this.#telemetryObject.instanceId ||= await getInstanceId(this.fyo);
this.#telemetryObject.version ||= await getVersion(this.fyo);
this.#started = true;
@ -91,7 +91,7 @@ export class TelemetryManager {
}
log(verb: Verb, noun: Noun, more?: Record<string, unknown>) {
if (!this.#started) {
if (!this.#started && this.fyo.db.isConnected) {
this.start().then(() => this.#sendBeacon(verb, noun, more));
return;
}
@ -131,8 +131,8 @@ export class TelemetryManager {
return {
country: this.#telemetryObject.country!,
language: this.#telemetryObject.language!,
device: this.#telemetryObject.device!,
instance: this.#telemetryObject.instance!,
deviceId: this.#telemetryObject.deviceId!,
instanceId: this.#telemetryObject.instanceId!,
version: this.#telemetryObject.version!,
openCount: this.#telemetryObject.openCount!,
timestamp: DateTime.now().toMillis().toString(),
@ -145,8 +145,8 @@ export class TelemetryManager {
#clear() {
delete this.#telemetryObject.country;
delete this.#telemetryObject.language;
delete this.#telemetryObject.device;
delete this.#telemetryObject.instance;
delete this.#telemetryObject.deviceId;
delete this.#telemetryObject.instanceId;
delete this.#telemetryObject.version;
delete this.#telemetryObject.openCount;
}

4
fyo/telemetry/types.ts
View File

@ -19,8 +19,8 @@ export enum Verb {
export type Noun = string;
export interface Telemetry {
device: UniqueId;
instance: UniqueId;
deviceId: UniqueId;
instanceId: UniqueId;
platform?: Platform;
country: string;
language: string;