Skip to content

Commit bc34550

Browse files
authored
private/group chat with file
1 parent 00f94b7 commit bc34550

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

main.js

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,22 @@ function VerifyJsonSignature(json) {
7878
}
7979

8080
let ActionCode = {
81-
"ServerMessage": 0,
82-
83-
"Declare": 200,
84-
"ObjectResponse": 201,
85-
86-
"BulletinRequest": 211,
87-
"BulletinFileRequest": 212,
88-
89-
"ChatDH": 221,
90-
"ChatMessage": 222,
91-
"ChatSync": 223,
92-
93-
"GroupRequest": 231,
94-
"GroupManageSync": 232,
95-
"GroupDH": 233,
96-
"GroupMessageSync": 234
81+
"Declare": 100,
82+
"ObjectResponse": 101,
83+
84+
"BulletinRequest": 201,
85+
"BulletinFileRequest": 202,
86+
87+
"ChatDH": 301,
88+
"ChatMessage": 302,
89+
"ChatSync": 303,
90+
"PrivateFileRequest": 304,
91+
92+
"GroupRequest": 401,
93+
"GroupManageSync": 402,
94+
"GroupDH": 403,
95+
"GroupMessageSync": 404,
96+
"GroupFileRequest": 405
9797
}
9898

9999
//message
@@ -111,11 +111,14 @@ const MessageCode = {
111111
}
112112

113113
const ObjectType = {
114-
"Bulletin": 111,
115-
"BulletinFile": 112,
114+
"Bulletin": 101,
115+
"BulletinFile": 102,
116+
117+
"PrivateFile": 201,
116118

117-
"GroupManage": 131,
118-
"GroupMessage": 132
119+
"GroupManage": 301,
120+
"GroupMessage": 302,
121+
"GroupFile": 303
119122
}
120123

121124
function strServerMessage(msgCode) {
@@ -304,7 +307,7 @@ function startClientServer() {
304307
ClientServer = new WebSocket.Server({
305308
port: 3000, //to bind on 80, must use 'sudo node main.js'
306309
clientTracking: true,
307-
maxPayload: 102400
310+
maxPayload: 150 * 1024
308311
})
309312

310313
ClientServer.on('connection', function connection(ws) {

schema.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ let BulletinRequestSchema = {
7676
}
7777
}
7878

79-
let BulletinFileRequestSchema = {
79+
let FileRequestSchema = {
8080
"type": "object",
8181
"required": ["Action", "SHA1", "CurrentChunk", "To", "Timestamp", "PublicKey", "Signature"],
8282
"maxProperties": 7,
@@ -343,7 +343,7 @@ var vDeclare = ajv.compile(DeclareSchema)
343343
var vObjectResponseSchema = ajv.compile(ObjectResponseSchema)
344344

345345
var vBulletinRequestSchema = ajv.compile(BulletinRequestSchema)
346-
var vBulletinFileRequestSchema = ajv.compile(BulletinFileRequestSchema)
346+
var vFileRequestSchema = ajv.compile(FileRequestSchema)
347347

348348
var vChatMessageSchema = ajv.compile(ChatMessageSchema)
349349
var vChatSyncSchema = ajv.compile(ChatSyncSchema)
@@ -358,7 +358,7 @@ function checkClientSchema(strJson) {
358358
if (typeof strJson == "string") {
359359
try {
360360
let json = JSON.parse(strJson)
361-
if (vObjectResponseSchema(json) || vBulletinRequestSchema(json) || vBulletinFileRequestSchema(json) || vChatMessageSchema(json) || vChatSyncSchema(json) || vChatDHSchema(json) || vDeclare(json) || vGroupRequestSchema(json) || vGroupManageSyncSchema(json) || vGroupDHSchema(json) || vGroupMessageSyncSchema(json)) {
361+
if (vObjectResponseSchema(json) || vBulletinRequestSchema(json) || vFileRequestSchema(json) || vChatMessageSchema(json) || vChatSyncSchema(json) || vChatDHSchema(json) || vDeclare(json) || vGroupRequestSchema(json) || vGroupManageSyncSchema(json) || vGroupDHSchema(json) || vGroupMessageSyncSchema(json)) {
362362
return json
363363
} else {
364364
return false

0 commit comments

Comments
 (0)