fix: use new data from bus watcher

This commit is contained in:
Alexis Tyler
2021-05-03 20:02:25 +09:30
parent 41197a63b2
commit f9eac11ff6
2 changed files with 5 additions and 5 deletions

View File

@@ -3,13 +3,13 @@ import { promises } from 'fs';
import { varState } from '../../states';
// Get key file
export const getKeyFile = async function () {
export const getKeyFile = async function (regFile: string = varState.data.regFile) {
// Bail if key is missing
if (varState.data.regFile.trim() === '') {
if (regFile.trim() === '') {
return '';
}
return promises.readFile(varState.data.regFile, 'binary').then(keyFile => {
return promises.readFile(regFile, 'binary').then(keyFile => {
return btoa(keyFile).trim().replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
}).catch(() => '');
};

View File

@@ -5,7 +5,7 @@
import { coreLogger, logger } from '../log';
import { pubsub } from '../pubsub';
import { getKeyFile } from '../utils';
import { getKeyFile, sleep } from '../utils';
import { bus } from '../bus';
export const keyFile = () => {
@@ -14,7 +14,7 @@ export const keyFile = () => {
coreLogger.debug('Var state updated, publishing registration event.');
// Get key file
const keyFile = data.var.node.regFile ? await getKeyFile() : '';
const keyFile = data.var.node.regFile ? await getKeyFile(data.var.node.regFile) : '';
const registration = {
guid: data.var.node.regGuid,
type: data.var.node.regTy.toUpperCase(),