Skip to content

Commit e38cc00

Browse files
luixavilesluixaviles
committed
Upgrading TypeScript version
1 parent 323ea12 commit e38cc00

File tree

4 files changed

+97
-101
lines changed

4 files changed

+97
-101
lines changed

‎server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"devDependencies": {
1818
"gulp": "~3.9.1",
1919
"gulp-typescript": "~3.2.1",
20-
"typescript": "~2.4.2"
20+
"typescript": "~2.5.0"
2121
}
2222
}

‎server/src/index.ts‎

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,4 @@
1-
import * as express from "express";
2-
import * as http from "http";
3-
import * as socketIo from "socket.io";
1+
import { Server } from './server';
42

5-
import { Message } from "./model";
6-
7-
class Server {
8-
public static readonly PORT:number = 8080;
9-
public app: any;
10-
private server: any;
11-
private io: any;
12-
private port: string | number;
13-
14-
public static bootstrap(): Server {
15-
return new Server();
16-
}
17-
18-
constructor() {
19-
this.createApp();
20-
this.config();
21-
this.createServer();
22-
this.sockets();
23-
this.listen();
24-
}
25-
26-
private createApp(): void {
27-
this.app = express();
28-
}
29-
30-
private createServer(): void {
31-
this.server = http.createServer(this.app);
32-
}
33-
34-
private config(): void {
35-
this.port = process.env.PORT || Server.PORT;
36-
}
37-
38-
private sockets(): void {
39-
this.io = socketIo(this.server);
40-
}
41-
42-
private listen(): void {
43-
this.server.listen(this.port, () => {
44-
console.log('Running server on port %s', this.port);
45-
});
46-
47-
this.io.on('connect', (socket: any) => {
48-
console.log('Connected client on port %s.', this.port);
49-
socket.on('message', (m: Message) => {
50-
console.log('[server](message): %s', JSON.stringify(m));
51-
this.io.emit('message', m);
52-
});
53-
54-
socket.on('disconnect', () => {
55-
console.log('Client disconnected');
56-
});
57-
});
58-
}
59-
}
60-
61-
let server = Server.bootstrap();
3+
let server = new Server();
624
export default server.app;

‎server/src/server.ts‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import * as express from "express";
2+
import * as http from "http";
3+
import * as socketIo from "socket.io";
4+
5+
import { Message } from "./model";
6+
7+
export class Server {
8+
public static readonly PORT:number = 8080;
9+
public app: any;
10+
private server: any;
11+
private io: any;
12+
private port: string | number;
13+
14+
constructor() {
15+
this.createApp();
16+
this.config();
17+
this.createServer();
18+
this.sockets();
19+
this.listen();
20+
}
21+
22+
private createApp(): void {
23+
this.app = express();
24+
}
25+
26+
private createServer(): void {
27+
this.server = http.createServer(this.app);
28+
}
29+
30+
private config(): void {
31+
this.port = process.env.PORT || Server.PORT;
32+
}
33+
34+
private sockets(): void {
35+
this.io = socketIo(this.server);
36+
}
37+
38+
private listen(): void {
39+
this.server.listen(this.port, () => {
40+
console.log('Running server on port %s', this.port);
41+
});
42+
43+
this.io.on('connect', (socket: any) => {
44+
console.log('Connected client on port %s.', this.port);
45+
socket.on('message', (m: Message) => {
46+
console.log('[server](message): %s', JSON.stringify(m));
47+
this.io.emit('message', m);
48+
});
49+
50+
socket.on('disconnect', () => {
51+
console.log('Client disconnected');
52+
});
53+
});
54+
}
55+
}

‎server/yarn.lock‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44

55
"@types/express-serve-static-core@*":
6-
version "4.0.49"
7-
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.0.49.tgz#3438d68d26e39db934ba941f18e3862a1beeb722"
6+
version "4.0.50"
7+
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.0.50.tgz#c5a139b5d29d2305aae6d982f69cef36120beacf"
88
dependencies:
99
"@types/node" "*"
1010

1111
"@types/express@~4.0.36":
12-
version "4.0.36"
13-
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.0.36.tgz#14eb47de7ecb10319f0a2fb1cf971aa8680758c2"
12+
version "4.0.37"
13+
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.0.37.tgz#625ac3765169676e01897ca47011c26375784971"
1414
dependencies:
1515
"@types/express-serve-static-core" "*"
1616
"@types/serve-static" "*"
@@ -20,19 +20,19 @@
2020
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.1.tgz#2cf42972d0931c1060c7d5fa6627fce6bd876f2f"
2121

2222
"@types/node@*":
23-
version "8.0.22"
24-
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.22.tgz#9c6bfee1f45f5e9952ff6b487e657ecca48c7777"
23+
version "8.0.26"
24+
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.26.tgz#4d58be925306fd22b1141085535a0268b8beb189"
2525

2626
"@types/serve-static@*":
27-
version "1.7.31"
28-
resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.7.31.tgz#15456de8d98d6b4cff31be6c6af7492ae63f521a"
27+
version "1.7.32"
28+
resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.7.32.tgz#0f6732e4dab0813771dd8fc8fe14940f34728b4c"
2929
dependencies:
3030
"@types/express-serve-static-core" "*"
3131
"@types/mime" "*"
3232

3333
"@types/socket.io@~1.4.29":
34-
version "1.4.29"
35-
resolved "https://registry.yarnpkg.com/@types/socket.io/-/socket.io-1.4.29.tgz#86a6b3a9ab78cf9a900ceef85b9b68b6bea86712"
34+
version "1.4.30"
35+
resolved "https://registry.yarnpkg.com/@types/socket.io/-/socket.io-1.4.30.tgz#8d27e595ed488f80ae475ceea612a2afd3f22106"
3636
dependencies:
3737
"@types/node" "*"
3838

@@ -314,8 +314,8 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
314314
has-binary2 "~1.0.2"
315315

316316
engine.io@~3.1.0:
317-
version "3.1.0"
318-
resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.0.tgz#5ca438e3ce9fdbc915c4a21c8dd9e1266706e57e"
317+
version "3.1.1"
318+
resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.1.tgz#08051ffb951907a3267e72e0bcb3d0f377e4660b"
319319
dependencies:
320320
accepts "1.3.3"
321321
base64id "1.0.0"
@@ -641,8 +641,8 @@ gulp-sourcemaps@1.6.0:
641641
vinyl "^1.0.0"
642642

643643
gulp-typescript@~3.2.1:
644-
version "3.2.1"
645-
resolved "https://registry.yarnpkg.com/gulp-typescript/-/gulp-typescript-3.2.1.tgz#52cd77e9c6844e3b9a8bddd88e884ceb46a5db79"
644+
version "3.2.2"
645+
resolved "https://registry.yarnpkg.com/gulp-typescript/-/gulp-typescript-3.2.2.tgz#b7e5e1d3cb35f772e53e604026601826e2be77fc"
646646
dependencies:
647647
gulp-util "~3.0.7"
648648
source-map "~0.5.3"
@@ -870,7 +870,7 @@ isexe@^2.0.0:
870870
version "2.0.0"
871871
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
872872

873-
isobject@^2.0.0, isobject@^2.1.0:
873+
isobject@^2.0.0:
874874
version "2.1.0"
875875
resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
876876
dependencies:
@@ -1073,9 +1073,9 @@ mime-db@~1.12.0:
10731073
version "1.12.0"
10741074
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.12.0.tgz#3d0c63180f458eb10d325aaa37d7c58ae312e9d7"
10751075

1076-
mime-db@~1.29.0:
1077-
version "1.29.0"
1078-
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878"
1076+
mime-db@~1.30.0:
1077+
version "1.30.0"
1078+
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
10791079

10801080
mime-types@~2.0.4, mime-types@~2.0.9:
10811081
version "2.0.14"
@@ -1084,10 +1084,10 @@ mime-types@~2.0.4, mime-types@~2.0.9:
10841084
mime-db "~1.12.0"
10851085

10861086
mime-types@~2.1.11:
1087-
version "2.1.16"
1088-
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.16.tgz#2b858a52e5ecd516db897ac2be87487830698e23"
1087+
version "2.1.17"
1088+
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
10891089
dependencies:
1090-
mime-db "~1.29.0"
1090+
mime-db "~1.30.0"
10911091

10921092
mime@1.2.11:
10931093
version "1.2.11"
@@ -1185,10 +1185,10 @@ object.omit@^2.0.0:
11851185
is-extendable "^0.1.1"
11861186

11871187
object.pick@^1.2.0:
1188-
version "1.2.0"
1189-
resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.2.0.tgz#b5392bee9782da6d9fb7d6afaf539779f1234c2b"
1188+
version "1.3.0"
1189+
resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
11901190
dependencies:
1191-
isobject "^2.1.0"
1191+
isobject "^3.0.1"
11921192

11931193
on-finished@~2.1.1:
11941194
version "2.1.1"
@@ -1202,15 +1202,15 @@ on-finished@~2.2.0:
12021202
dependencies:
12031203
ee-first "1.1.0"
12041204

1205-
once@^1.3.0, once@~1.3.0:
1206-
version "1.3.3"
1207-
resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
1205+
once@^1.3.0, once@^1.4.0:
1206+
version "1.4.0"
1207+
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
12081208
dependencies:
12091209
wrappy "1"
12101210

1211-
once@^1.4.0:
1212-
version "1.4.0"
1213-
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
1211+
once@~1.3.0:
1212+
version "1.3.3"
1213+
resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
12141214
dependencies:
12151215
wrappy "1"
12161216

@@ -1377,15 +1377,14 @@ rechoir@^0.6.2:
13771377
resolve "^1.1.6"
13781378

13791379
regex-cache@^0.4.2:
1380-
version "0.4.3"
1381-
resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
1380+
version "0.4.4"
1381+
resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
13821382
dependencies:
13831383
is-equal-shallow "^0.1.3"
1384-
is-primitive "^2.0.0"
13851384

13861385
remove-trailing-separator@^1.0.1:
1387-
version "1.0.2"
1388-
resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511"
1386+
version "1.1.0"
1387+
resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
13891388

13901389
repeat-element@^1.1.2:
13911390
version "1.1.2"
@@ -1499,8 +1498,8 @@ socket.io@~2.0.3:
14991498
socket.io-parser "~3.1.1"
15001499

15011500
source-map@~0.5.3:
1502-
version "0.5.6"
1503-
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
1501+
version "0.5.7"
1502+
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
15041503

15051504
sparkles@^1.0.0:
15061505
version "1.0.0"
@@ -1602,9 +1601,9 @@ type-is@~1.5.5:
16021601
media-typer "0.3.0"
16031602
mime-types "~2.0.9"
16041603

1605-
typescript@~2.4.2:
1606-
version "2.4.2"
1607-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
1604+
typescript@~2.5.0:
1605+
version "2.5.2"
1606+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
16081607

16091608
ultron@~1.1.0:
16101609
version "1.1.0"

0 commit comments

Comments
 (0)