Skip to content
Snippets Groups Projects
Commit 4407b3b3 authored by echicken's avatar echicken :chicken:
Browse files

Yeah

parent f7211dbd
No related branches found
No related tags found
No related merge requests found
......@@ -78,7 +78,9 @@ export default abstract class Device extends js.global.EventEmitter {
}
protected log(level: number, msg: string, time?: number, source?: string) {
const _msg = `${this.deviceTag} device ${this.configId}: ${msg}`;
let _msg = '';
if (js.global.server === undefined) msg += js.global.strftime('%Y-%m-%d %H:%M:%S ');
_msg += `${this.deviceTag} device ${this.configId}: ${msg}`;
this.emit('log', level, _msg, time, source);
}
......@@ -184,8 +186,10 @@ export default abstract class Device extends js.global.EventEmitter {
this.ready = true;
if (this.readyEvent > -1) js.clearTimeout(this.readyEvent);
this.emit('ready');
if (this.heartbeatEvent < 0) {
// @ts-expect-error shut up
this.heartbeatEvent = js.setInterval(function () { this.sendHeartbeat(); }, this.heartbeatInterval, this)
this.heartbeatEvent = js.setInterval(function () { this.sendHeartbeat(); }, this.heartbeatInterval, this);
}
}
break;
case 'metadata':
......
......@@ -53,6 +53,7 @@ export default class SocketDevice extends Device {
protected readFromDevice(timeout: number = 0): Uint8Array | undefined {
if (timeout > 0) {
this.log(sbbsdefs.LOG_DEBUG, `waiting ${timeout} seconds for data`);
const stime = js.global.time();
while (!this.socket.data_waiting && js.global.time() - stime < timeout) {
js.global.mswait(5);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment