Use double quotes

Convert existing mix of double quotes and single quotes to only use
double quotes unless the string contains double quotes.
This commit is contained in:
Hornwitser committed 2020-06-17 20:53:18 +02:00
1 parent efd759bec5
commit 34aaeee354
48 files changed
+708 -712

No files matched your search

+3 -3
View File
@@ -356,7 +356,7 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
}
let { seq, type, data } = message;
if (type == 'hello') {
if (type == "hello") {
console.log(`SOCKET | received hello from master version ${data.version}`);
this.emit("hello", data);
if (this._sessionToken) {
@@ -369,7 +369,7 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
this.register();
}
} else if (type === 'ready') {
} else if (type === "ready") {
console.log("SOCKET | received ready from master");
this._state = "connected";
this._sessionToken = data.session_token;
@@ -452,7 +452,7 @@ class VirtualConnector extends events.EventEmitter {
* @returns the sequence number of the message sent
*/
send(type, data) {
this.other.emit('message', { seq: this._seq, type, data });
this.other.emit("message", { seq: this._seq, type, data });
return this._seq++;
}
}
+3 -3
View File
@@ -4,7 +4,7 @@
* @author Hornwitser
*/
module.exports = {
...require('lib/link/link'),
...require('lib/link/messages'),
...require('lib/link/connectors'),
...require("lib/link/link"),
...require("lib/link/messages"),
...require("lib/link/connectors"),
};
+2 -2
View File
@@ -30,7 +30,7 @@ class Link {
this._validators = new Map();
// Process messages received by the connector
connector.on('message', payload => {
connector.on("message", payload => {
try {
this.processMessage(payload);
} catch (err) {
@@ -40,7 +40,7 @@ class Link {
console.error(err.errors);
}
} else {
this.connector.emit('error', err);
this.connector.emit("error", err);
}
}
});
+49 -49
View File
@@ -67,8 +67,8 @@ class Request extends Message {
this.permission = permission || null;
this.forwardTo = forwardTo;
this.requestType = type + '_request';
this.responseType = type + '_response';
this.requestType = type + "_request";
this.responseType = type + "_response";
if (permission === undefined && links.includes("control-master")) {
throw new Error(`permission is required for ${this.type} request over control-master links`);
@@ -77,7 +77,7 @@ class Request extends Message {
throw new Error(`permission is not allowed on ${this.type} request as it is not over control-master link`);
}
if (forwardTo === 'instance') {
if (forwardTo === "instance") {
requestProperties = Object.assign(
{"instance_id": { type: "integer" }}, requestProperties
);
@@ -158,7 +158,7 @@ class Request extends Message {
// Use forwarder if handler is not present.
if (!handler) {
if (this.forwardTo === 'instance') {
if (this.forwardTo === "instance") {
handler = link.forwardRequestToInstance;
} else if (this.forwardTo === "master") {
handler = link.forwardRequestToMaster;
@@ -256,8 +256,8 @@ messages.debugDumpWs = new Request({
// Management requests
messages.listSlaves = new Request({
type: 'list_slaves',
links: ['control-master'],
type: "list_slaves",
links: ["control-master"],
permission: "core.slave.list",
responseProperties: {
"list": {
@@ -278,8 +278,8 @@ messages.listSlaves = new Request({
});
messages.listInstances = new Request({
type: 'list_instances',
links: ['control-master'],
type: "list_instances",
links: ["control-master"],
permission: "core.instance.list",
responseProperties: {
"list": {
@@ -324,8 +324,8 @@ messages.createSlaveConfig = new Request({
});
messages.setInstanceOutputSubscriptions = new Request({
type: 'set_instance_output_subscriptions',
links: ['control-master'],
type: "set_instance_output_subscriptions",
links: ["control-master"],
permission: "core.instance.follow_log",
requestProperties: {
"instance_ids": {
@@ -336,8 +336,8 @@ messages.setInstanceOutputSubscriptions = new Request({
});
messages.createInstance = new Request({
type: 'create_instance',
links: ['control-master'],
type: "create_instance",
links: ["control-master"],
permission: "core.instance.create",
requestProperties: {
"serialized_config": { type: "object" },
@@ -380,8 +380,8 @@ messages.setInstanceConfigProp = new Request({
});
messages.assignInstanceCommand = new Request({
type: 'assign_instance_command',
links: ['control-master'],
type: "assign_instance_command",
links: ["control-master"],
permission: "core.instance.assign",
requestProperties: {
"instance_id": { type: "integer" },
@@ -390,29 +390,29 @@ messages.assignInstanceCommand = new Request({
});
messages.assignInstance = new Request({
type: 'assign_instance',
links: ['master-slave'],
type: "assign_instance",
links: ["master-slave"],
requestProperties: {
"serialized_config": { type: "object" },
},
forwardTo: 'instance',
forwardTo: "instance",
})
messages.startInstance = new Request({
type: 'start_instance',
links: ['control-master', 'master-slave', 'slave-instance'],
type: "start_instance",
links: ["control-master", "master-slave", "slave-instance"],
permission: "core.instance.start",
requestProperties: {
"save": { type: ["string", "null"] },
},
forwardTo: 'instance',
forwardTo: "instance",
});
messages.createSave = new Request({
type: 'create_save',
links: ['control-master', 'master-slave', 'slave-instance'],
type: "create_save",
links: ["control-master", "master-slave", "slave-instance"],
permission: "core.instance.create_save",
forwardTo: 'instance',
forwardTo: "instance",
});
messages.exportData = new Request({
@@ -423,24 +423,24 @@ messages.exportData = new Request({
});
messages.stopInstance = new Request({
type: 'stop_instance',
links: ['control-master', 'master-slave', 'slave-instance'],
type: "stop_instance",
links: ["control-master", "master-slave", "slave-instance"],
permission: "core.instance.stop",
forwardTo: 'instance',
forwardTo: "instance",
});
messages.deleteInstance = new Request({
type: 'delete_instance',
links: ['control-master', 'master-slave'],
type: "delete_instance",
links: ["control-master", "master-slave"],
permission: "core.instance.delete",
forwardTo: 'instance',
forwardTo: "instance",
});
messages.sendRcon = new Request({
type: 'send_rcon',
links: ['control-master', 'master-slave', 'slave-instance'],
type: "send_rcon",
links: ["control-master", "master-slave", "slave-instance"],
permission: "core.instance.send_rcon",
forwardTo: 'instance',
forwardTo: "instance",
requestProperties: {
"command": { type: "string" },
},
@@ -583,8 +583,8 @@ messages.deleteUser = new Request({
});
messages.getMetrics = new Request({
type: 'statistics_exporter:get_metrics',
links: ['master-slave', 'slave-instance'],
type: "statistics_exporter:get_metrics",
links: ["master-slave", "slave-instance"],
responseProperties: {
"results": { type: "array" },
},
@@ -632,20 +632,20 @@ class Event extends Message {
this.forwardTo = forwardTo;
this.broadcastTo = broadcastTo;
if (forwardTo === 'instance') {
if (forwardTo === "instance") {
eventProperties = Object.assign(
{"instance_id": { type: "integer" }}, eventProperties
);
} else if (forwardTo !== 'master' && forwardTo !== null) {
} else if (forwardTo !== "master" && forwardTo !== null) {
throw new Error(`Invalid forwardTo value ${forwardTo}`);
}
if (broadcastTo !== 'instance' && broadcastTo !== null) {
if (broadcastTo !== "instance" && broadcastTo !== null) {
throw new Error(`Invalid broadcastTo value ${broadcastTo}`);
}
this.eventType = type + '_event';
this.eventType = type + "_event";
this._eventValidator = schema.compile({
$schema: "http://json-schema.org/draft-07/schema#",
properties: {
@@ -685,17 +685,17 @@ class Event extends Message {
if (this.links.includes(`${link.target}-${link.source}`)) {
// Use forwarder if handler is not present.
if (!handler) {
if (this.forwardTo === 'instance') {
if (this.forwardTo === "instance") {
handler = link.forwardEventToInstance;
} else if (this.forwardTo === 'master') {
} else if (this.forwardTo === "master") {
handler = link.forwardEventToMaster;
}
}
if (
this.broadcastTo === 'instance'
this.broadcastTo === "instance"
&& [
'instance-slave', 'slave-master', 'control-master', 'master-slave'
"instance-slave", "slave-master", "control-master", "master-slave"
].includes(`${link.target}-${link.source}`)
) {
if (!handler) {
@@ -765,7 +765,7 @@ messages.instanceStarted = new Event({
},
});
messages.instanceStopped = new Event({
type: 'instance_stopped',
type: "instance_stopped",
links: ["instance-slave", "slave-master"],
eventProperties: {
"instance_id": { type: "integer" },
@@ -773,8 +773,8 @@ messages.instanceStopped = new Event({
});
messages.updateInstances = new Event({
type: 'update_instances',
links: ['slave-master'],
type: "update_instances",
links: ["slave-master"],
eventProperties: {
"instances": {
type: "array",
@@ -792,9 +792,9 @@ messages.updateInstances = new Event({
});
messages.instanceOutput = new Event({
type: 'instance_output',
links: ['instance-slave', 'slave-master', 'master-control'],
forwardTo: 'master',
type: "instance_output",
links: ["instance-slave", "slave-master", "master-control"],
forwardTo: "master",
eventProperties: {
"instance_id": { type: "integer" },
"output": {
@@ -847,7 +847,7 @@ messages.playerEvent = new Event({
*/
function attachAllMessages(link) {
for (let [name, message] of Object.entries(messages)) {
message.attach(link, link[name + message.constructor.name + 'Handler']);
message.attach(link, link[name + message.constructor.name + "Handler"]);
}
}