Skip to content

Commit fdfd5c7

Browse files
rustamwinrustamwin
committed
fix samples
1 parent 56a46c1 commit fdfd5c7

File tree

12 files changed

+42
-23
lines changed

12 files changed

+42
-23
lines changed

‎package.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,26 @@
66
"license": "MIT",
77
"readmeFilename": "README.md",
88
"main": "index.js",
9-
"tags": [
9+
"keywords": [
1010
"websocket",
1111
"websockets",
1212
"typescript",
1313
"typescript-websocket",
1414
"typescript-websockets",
15-
"socket-controllers"
15+
"socket-controllers",
16+
"socket.io",
17+
"socket-server"
1618
],
1719
"author": {
1820
"name": "Umed Khudoiberdiev",
1921
"email": "[email protected]"
2022
},
23+
"contributors": [
24+
{
25+
"name": "Rustam Mamadaminov",
26+
"email": "[email protected]"
27+
}
28+
],
2129
"repository": {
2230
"type": "git",
2331
"url": "https://github.com/pleerock/socket-controllers.git"

‎sample/sample1-simple-controller/app.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import "reflect-metadata";
22
import {createSocketServer} from "../../src/index";
3-
import "./MessageController";
3+
import {MessageController} from "./MessageController";
44

5-
createSocketServer(3001); // creates socket.io server and registers all controllers there
5+
createSocketServer(3001, {
6+
controllers: [MessageController],
7+
}); // creates socket.io server and registers all controllers there
68

79
console.log("Socket.io is up and running on port 3001. Send messages via socket-io client.");

‎sample/sample1-simple-controller/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<body>
1414

1515
Watch console for events.<br/>
16-
<button onclick="onClick()">Click to send a save event to the /messages namespace.</button>
16+
<button onclick="onClick()">Click to send a save event to the socket server.</button>
1717

1818
</body>
1919
</html>

‎sample/sample2-use-created-socket-io/app.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import "reflect-metadata";
22
import {useSocketServer} from "../../src/index";
3-
import "./MessageController";
3+
import {MessageController} from "./MessageController";
44

55
const app = require("express")();
66
const server = require("http").Server(app);
@@ -16,6 +16,8 @@ io.use((socket: any, next: Function) => {
1616
console.log("Custom middleware");
1717
next();
1818
});
19-
useSocketServer(io);
19+
useSocketServer(io, {
20+
controllers: [MessageController]
21+
});
2022

2123
console.log("Socket.io is up and running on port 3001. Send messages via socket-io client.");

‎sample/sample2-use-created-socket-io/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<body>
1414

1515
Watch console for events.<br/>
16-
<button onclick="onClick()">Click to send a save event to the /messages namespace.</button>
16+
<button onclick="onClick()">Click to send a save event to the socket server.</button>
1717

1818
</body>
1919
</html>

‎sample/sample3-namespaces/app.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import "reflect-metadata";
22
import {createSocketServer} from "../../src/index";
3-
import "./MessageController";
3+
import {MessageController} from "./MessageController";
44

5-
createSocketServer(3001); // creates socket.io server and registers all controllers there
5+
createSocketServer(3001, {
6+
controllers: [MessageController]
7+
}); // creates socket.io server and registers all controllers there
68

79
console.log("Socket.io is up and running on port 3001. Send messages via socket-io client.");

‎sample/sample4-emitters/app.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import "reflect-metadata";
22
import {createSocketServer} from "../../src/index";
3-
import "./MessageController";
3+
import {MessageController} from "./MessageController";
44

5-
createSocketServer(3001); // creates socket.io server and registers all controllers there
5+
createSocketServer(3001, {
6+
controllers: [MessageController]
7+
}); // creates socket.io server and registers all controllers there
68

79
console.log("Socket.io is up and running on port 3001. Send messages via socket-io client.");

‎sample/sample4-emitters/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<body>
2020

2121
Watch console for events.<br/>
22-
<button onclick="onClick()">Click to send a save event to the /messages namespace.</button><br/>
22+
<button onclick="onClick()">Click to send a save event to the socket server.</button><br/>
2323
<button onclick="tryToSave()">Try to save and you'll get an error</button>
2424

2525
</body>

‎sample/sample5-middlewares/app.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import "reflect-metadata";
22
import {createSocketServer} from "../../src/index";
3-
import "./AuthenticationMiddleware";
4-
import "./MessageController";
3+
import {AuthenticationMiddleware} from "./AuthenticationMiddleware";
4+
import {MessageController} from "./MessageController";
55

6-
// import all required files
7-
8-
createSocketServer(3001); // creates socket.io server and registers all controllers there
6+
createSocketServer(3001, {
7+
controllers: [MessageController],
8+
middlewares: [AuthenticationMiddleware]
9+
}); // creates socket.io server and registers all controllers and middlewares there
910

1011
console.log("Socket.io is up and running on port 3001. Send messages via socket-io client.");

‎sample/sample5-middlewares/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<body>
1414

1515
Watch console for events.<br/>
16-
<button onclick="onClick()">Click to send a save event to the /messages namespace.</button>
16+
<button onclick="onClick()">Click to send a save event to the socket server.</button>
1717

1818
</body>
1919
</html>

‎sample/sample6-dynamic-namespaces/app.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import "reflect-metadata";
22
import {createSocketServer} from "../../src/index";
3-
import "./MessageController";
3+
import {MessageController} from "./MessageController";
44

5-
createSocketServer(3001); // creates socket.io server and registers all controllers there
5+
createSocketServer(3001, {
6+
controllers: [MessageController],
7+
}); // creates socket.io server and registers all controllers there
68

79
console.log("Socket.io is up and running on port 3001. Send messages via socket-io client.");

‎src/SocketControllerExecutor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {MetadataBuilder} from "./metadata-builder/MetadataBuilder";
22
import {ActionMetadata} from "./metadata/ActionMetadata";
3-
import {ClassTransformOptions, plainToClass, classToPlain} from "class-transformer";
3+
import {classToPlain, ClassTransformOptions, plainToClass} from "class-transformer";
44
import {ActionTypes} from "./metadata/types/ActionTypes";
55
import {ParamMetadata} from "./metadata/ParamMetadata";
66
import {ParameterParseJsonError} from "./error/ParameterParseJsonError";
@@ -118,7 +118,7 @@ export class SocketControllerExecutor {
118118
});
119119

120120
} else if (action.type === ActionTypes.MESSAGE) {
121-
socket.on(action.name, (data: any) => {
121+
socket.on(action.name, (data: any[]) => { // todo get multiple args
122122
this.handleAction(action, {socket: socket, data: data})
123123
.then(result => this.handleSuccessResult(result, action, socket))
124124
.catch(error => this.handleFailResult(error, action, socket));

0 commit comments

Comments
 (0)