cotugno/zigbee2mqtt
2
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2024-11-16 10:28:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make frontend non-experimental. https://github.com/Koenkk/zigbee2mqtt/issues/4266

Browse Source
This commit is contained in:
Koen Kanters 2020-09-27 22:14:29 +02:00
parent 546d6193a3
commit 4bb3ddcff2
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/controller.js
View File

@ -68,7 +68,7 @@ class Controller {
this.extensions.push(new ExtensionBridge(...args, this.enableDisableExtension)); this.extensions.push(new ExtensionBridge(...args, this.enableDisableExtension));
} }
if (settings.get().experimental.frontend) { if (settings.get().frontend) {
this.extensions.push(new ExtensionFrontend(...args)); this.extensions.push(new ExtensionFrontend(...args));
} }

4
lib/extension/frontend.js
View File

@ -25,9 +25,9 @@ class Frontend extends Extension {
this.onWebSocketConnection = this.onWebSocketConnection.bind(this); this.onWebSocketConnection = this.onWebSocketConnection.bind(this);
this.server = http.createServer(this.onRequest); this.server = http.createServer(this.onRequest);
this.server.on('upgrade', this.onUpgrade); this.server.on('upgrade', this.onUpgrade);
this.developmentServer = settings.get().experimental.frontend.development_server; this.developmentServer = settings.get().frontend.development_server;
this.development = !!this.developmentServer; this.development = !!this.developmentServer;
this.port = settings.get().experimental.frontend.port || 8080; this.port = settings.get().frontend.port || 8080;
this.retainedMessages = new Map(); this.retainedMessages = new Map();
if (this.development) { if (this.development) {

5
test/frontend.test.js
View File

@ -84,7 +84,8 @@ describe('Frontend', () => {
data.writeDefaultConfiguration(); data.writeDefaultConfiguration();
data.writeDefaultState(); data.writeDefaultState();
settings._reRead(); settings._reRead();
settings.set(['experimental'], {new_api: true, frontend: {port: 8081}}); settings.set(['experimental'], {new_api: true});
settings.set(['frontend'], {port: 8081});
settings.set(['homeassistant'], true); settings.set(['homeassistant'], true);
}); });
@ -177,7 +178,7 @@ describe('Frontend', () => {
}); });
it('Development server', async () => { it('Development server', async () => {
settings.set(['experimental', 'frontend'], {development_server: 'localhost:3001'}); settings.set(['frontend'], {development_server: 'localhost:3001'});
controller = new Controller(); controller = new Controller();
await controller.start(); await controller.start();
expect(mockHTTPProxy.variables.initParameter).toStrictEqual({ws: true}); expect(mockHTTPProxy.variables.initParameter).toStrictEqual({ws: true});