Skip to content

Commit

Permalink
style: init prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
Vilsafur committed Jan 7, 2020
1 parent 0c73180 commit a0595b9
Show file tree
Hide file tree
Showing 16 changed files with 286 additions and 251 deletions.
7 changes: 7 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": false,
"arrowParens": "always"
}
12 changes: 12 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"dev": "concurrently -k -n \"Typescript,NodeJS\" -p \"[{name}]\" -c \"blue,green\" \"tsc --watch\" \"nodemon dist/index.js\"",
"test": "nyc mocha",
"cover": "tsc && nyc mocha && nyc report --reporter=text-lcov | coveralls",
"format": "prettier --write 'src/**/*.ts'",
"lint": "tslint -c tslint.json 'src/**/*.ts'",
"clean": "npm run format && npm run lint",
"doc:src": "typedoc --out docs/code ./src",
"doc:rtd": ".\\docs\\rtd\\make html",
"doc": "concurrently -k -n \"doc:src,doc:rtd\" -p \"[{name}]\" -c \"blue,green\" \"npm run doc:src\" \"npm run doc:rtd\""
Expand All @@ -34,9 +36,11 @@
"mocha-lcov-reporter": "^1.3.0",
"nodemon": "^1.19.4",
"nyc": "^14.1.1",
"prettier": "^1.19.1",
"source-map-support": "^0.5.16",
"ts-node": "^8.5.4",
"tslint": "^5.20.1",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typedoc": "^0.15.5",
"typescript": "^3.7.4"
Expand Down
13 changes: 8 additions & 5 deletions src/controllers/messagesController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import logger from "@/utils/logger";
import { Request, Response } from "express";

export default class MessagesController {
private lastUuid: {[name: string]: string} = {};
private lastUuid: { [name: string]: string } = {};

/**
* Retrieve a message and send it to the corresponding services
Expand Down Expand Up @@ -37,23 +37,26 @@ export default class MessagesController {
}

if (errors.length > 0) {
logger.error({messageType, data, errors});
logger.error({ messageType, data, errors });

response.status(422);
response.json(errors);
} else {
const servicesByName = Services.getByMessageType(messageType);
logger.info({messageType, data});
logger.info({ messageType, data });

const responses: {[serviceName: string]: JSON} = {};
const responses: { [serviceName: string]: JSON } = {};

for (const name in servicesByName) {
if (servicesByName.hasOwnProperty(name)) {
const service = this.getNextService(name, servicesByName[name]);
const res = await service.sendMessage(data.message);
const serviceName = service.getName();

if (data.responseFrom !== undefined && data.responseFrom.indexOf(serviceName) !== -1) {
if (
data.responseFrom !== undefined &&
data.responseFrom.indexOf(serviceName) !== -1
) {
responses[serviceName] = res;
}
}
Expand Down
10 changes: 6 additions & 4 deletions src/controllers/serviceController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default class ServiceController {
}

if (errors.length > 0) {
logger.error({ data, errors});
logger.error({ data, errors });

response.status(422);
response.json(errors);
Expand All @@ -68,10 +68,12 @@ export default class ServiceController {
uuid: data.uuid,
version: global.version,
});
} else {
} else {
const uuid = Services.getServiceUUIDByIpAndPort(data.ip, data.port);
errors.push("This instance already registered by this UUID : " + uuid);
logger.error({ data, errors});
errors.push(
"This instance already registered by this UUID : " + uuid,
);
logger.error({ data, errors });

response.status(422);
response.json(errors);
Expand Down

0 comments on commit a0595b9

Please sign in to comment.