Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import {
onConnect,
onDisconnect,
onMessage,
payload,
messageCallback
} from "inversify-socket-utils";

@injectable()
Expand All @@ -51,6 +53,23 @@ export class MessageController {
console.log("message received");
socket.emit("message", "hello!");
}

@onMessage("custom-event")
customEvent(@payload() payload: any[]) {
console.log("payload", payload);
}

@onMessage("get-info")
getInfo(@payload() payload: any[]) {
console.log("payload", payload);
return "info";
}

@onMessage("get-more-info")
getMoreInfo(@payload() payload: any[], @messageCallback() cb: function) {
console.log("payload", payload);
cb("info 1","info 2", "info 3");
}
}
```

Expand Down
1 change: 1 addition & 0 deletions src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export enum PARAMETER_TYPE {
SOCKET_ID,
SOCKET_REQUEST,
SOCKET_ROOMS,
SOCKET_CALLBACK
}

export const NO_CONTROLLERS_FOUND =
Expand Down
3 changes: 3 additions & 0 deletions src/decorators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ export const connectedSocket: () => ParameterDecorator = paramDecoratorFactory(
export const payload: () => ParameterDecorator = paramDecoratorFactory(
PARAMETER_TYPE.SOCKET_BODY,
);
export const messageCallback: () => ParameterDecorator = paramDecoratorFactory(
PARAMETER_TYPE.SOCKET_CALLBACK,
);

export const socketQueryParam: (name: string) => ParameterDecorator =
paramDecoratorFactory(PARAMETER_TYPE.SOCKET_QUERY_PARAM);
Expand Down
26 changes: 21 additions & 5 deletions src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export class InversifySocketServer {
}

if (metadata.type === ACTION_TYPE.MESSAGE) {
socket.on(metadata.name, (payload) => {
socket.on(metadata.name, (...payload) => {
this.handleAction(
socket,
controllerMetadata,
Expand All @@ -97,26 +97,36 @@ export class InversifySocketServer {
controller: interfaces.ControllerMetadata,
action: interfaces.ControllerActionMetadata,
parameters: interfaces.ControllerParameterMetadata,
payload?: unknown,
payload: unknown[],
) {
let paramList: interfaces.ParameterMetadata[] = [];
if (parameters) {
paramList = parameters[action.key] || [];
}

const cb = (typeof payload[payload.length-1] == "function") ? payload.splice(-1,1)[0] : undefined;

const args = this.extractParams(socket, payload, paramList);
(
const args = this.extractParams(socket, payload, paramList, cb);
const result = (
this.container.getNamed<interfaces.Controller>(
TYPE.Controller,
(controller.target as { name: string }).name,
) as Record<string, (...a: Array<unknown>) => unknown>
)[action.key](...args);
if(cb) {
if(result instanceof Promise){
result.then(cb)
} else {
cb(result);
}
}
}

private extractParams(
socket: SocketIO.Socket,
payload: unknown,
params: Array<interfaces.ParameterMetadata>,
cb: function
) {
const args: Array<unknown> = [];

Expand All @@ -140,8 +150,14 @@ export class InversifySocketServer {
case PARAMETER_TYPE.SOCKET_ROOMS:
args[index] = socket.rooms;
return;
default:
case PARAMETER_TYPE.SOCKET_BODY:
args[index] = payload;
return;
case PARAMETER_TYPE.SOCKET_CALLBACK:
args[index] = cb;
return;
default:
args[index] = undefined;
}
});

Expand Down