-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(core): socket pushes not working #82
Merged
Merged
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
50d6586
fix(core): socket pushes not working
kkopanidis b2bbff1
chore(database): remove redundant async (#85)
kon14 f4cc8c2
fix(router, admin): Admin Swagger headers and route paths (#83)
kon14 a572921
chore(release): 0.12.3
kkopanidis 6512912
chore: proper update of changelog
kkopanidis fc5b6ac
refactor(grpc-sdk): consistent routing functions
kkopanidis 60e69e5
Makefile updates (v0.12.3) (#87)
kon14 59f171d
fix(router,admin): admin requests not passing through master key midd…
kon14 6a08cca
fix(router): excessive REST router refreshes (#90)
kon14 5557f5c
fix(router): socket push
kkopanidis c09db7b
fix(grpc-sdk): ParsedRouterRequest param type
kon14 e8fc2bc
Merge branch 'main' into socket-push-fix
kkopanidis bfd7f8b
refactor(grpc-sdk): cleanup router types
kkopanidis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,7 @@ import ConduitGrpcSdk, { | |
ParsedRouterRequest, | ||
RoutingManager, | ||
TYPE, | ||
ParsedSocketRequest, | ||
UnparsedRouterResponse, | ||
UnparsedSocketResponse, | ||
} from '@conduitplatform/grpc-sdk'; | ||
|
@@ -289,14 +290,14 @@ export class ChatRoutes { | |
return 'Message updated successfully'; | ||
} | ||
|
||
async connect(call: ParsedRouterRequest): Promise<UnparsedSocketResponse> { | ||
async connect(call: ParsedSocketRequest): Promise<UnparsedSocketResponse> { | ||
const { user } = call.request.context; | ||
const rooms = await ChatRoom.getInstance() | ||
.findMany({ participants: user._id }); | ||
return { rooms: (rooms as ChatRoom[]).map((room: any) => room._id) }; | ||
} | ||
|
||
async onMessage(call: ParsedRouterRequest): Promise<UnparsedSocketResponse> { | ||
async onMessage(call: ParsedSocketRequest): Promise<UnparsedSocketResponse> { | ||
const { user } = call.request.context; | ||
const { roomId, message } = call.request.params; | ||
const room = await ChatRoom.getInstance().findOne({ _id: roomId }); | ||
|
@@ -320,7 +321,7 @@ export class ChatRoutes { | |
}; | ||
} | ||
|
||
async onMessagesRead(call: ParsedRouterRequest): Promise<UnparsedSocketResponse> { | ||
async onMessagesRead(call: ParsedSocketRequest): Promise<UnparsedSocketResponse> { | ||
const { user } = call.request.context; | ||
const { roomId } = call.request.params; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same ^ |
||
const room = await ChatRoom.getInstance() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,4 +3,5 @@ export interface SocketPush { | |
data: any; | ||
receivers: string[]; | ||
rooms: string[]; | ||
namespace: string; | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be
[ roomId, message ]
. Socket params are an array.