Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hard reset #1252

Merged
merged 1 commit into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/bin/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,11 @@ interface Args {
let server: ZwavejsServer;

driver.once("driver ready", async () => {
server = new ZwavejsServer(
driver,
{
port: args.port,
host: args.host,
enableDNSServiceDiscovery: !args["disable-dns-sd"],
},
true,
);
server = new ZwavejsServer(driver, {
port: args.port,
host: args.host,
enableDNSServiceDiscovery: !args["disable-dns-sd"],
});
await server.start(true);
});

Expand Down
24 changes: 6 additions & 18 deletions src/lib/driver/message_handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,13 @@ import { DriverResultTypes } from "./outgoing_message";
import { dumpDriver, dumpLogConfig } from "../state";

export class DriverMessageHandler {
private remoteController: ZwavejsServerRemoteController;
private clientsController: ClientsController;
private logger: Logger;
private driver: Driver;
private client: Client;

constructor(
remoteController: ZwavejsServerRemoteController,
clientsController: ClientsController,
logger: Logger,
driver: Driver,
client: Client,
) {
this.remoteController = remoteController;
this.clientsController = clientsController;
this.logger = logger;
this.driver = driver;
this.client = client;
}
private remoteController: ZwavejsServerRemoteController,
private clientsController: ClientsController,
private logger: Logger,
private driver: Driver,
private client: Client,
) {}

async handle(
message: IncomingMessageDriver,
Expand Down
15 changes: 1 addition & 14 deletions src/lib/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -469,19 +469,11 @@ export interface Logger {
*/
export class ZwavejsServerRemoteController {
constructor(
private destroyServerOnHardReset: boolean = false,
private driver: Driver,
private zwaveJsServer: ZwavejsServer,
) {}

public async hardResetController() {
if (this.destroyServerOnHardReset) {
await this.zwaveJsServer.destroy();

this.driver.once("driver ready", () => {
this.zwaveJsServer.start(true);
});
}
await this.driver.hardReset();
this.zwaveJsServer.emit("hard reset");
}
Expand All @@ -500,14 +492,9 @@ export class ZwavejsServer extends EventEmitter {
constructor(
private driver: Driver,
private options: ZwavejsServerOptions = {},
destroyServerOnHardReset: boolean = false,
) {
super();
this.remoteController = new ZwavejsServerRemoteController(
destroyServerOnHardReset,
driver,
this,
);
this.remoteController = new ZwavejsServerRemoteController(driver, this);
this.logger = options.logger ?? console;
}

Expand Down
Loading