Skip to content

Commit 9ba3aef

Browse files
nikgrafnikgraf
authored
improve server logging (#485)
1 parent 8ab0100 commit 9ba3aef

File tree

1 file changed

+31
-6
lines changed

1 file changed

+31
-6
lines changed

‎apps/server/src/index.ts‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -797,38 +797,46 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
797797

798798
console.log('Connection established', accountAddress);
799799
webSocket.on('message', async (message) => {
800+
console.log('Received websocket message');
800801
try {
801802
const rawData = Messages.deserialize(message.toString());
802803
const result = decodeRequestMessage(rawData);
803804
if (result._tag === 'Right') {
804805
const data = result.right;
805806
switch (data.type) {
806807
case 'subscribe-space': {
808+
console.log('--- Received subscribe-space message');
807809
const space = await getSpace({ accountAddress, spaceId: data.id, appIdentityAddress });
808810
const outgoingMessage: Messages.ResponseSpace = {
809811
...space,
810812
type: 'space',
811813
};
812814
webSocket.subscribedSpaces.add(data.id);
813815
webSocket.send(Messages.serialize(outgoingMessage));
816+
console.log('--- Sent subscribe-space response');
814817
break;
815818
}
816819
case 'list-spaces': {
820+
console.log('--- Received list-spaces message');
817821
const spaces = await listSpacesByAppIdentity({ appIdentityAddress });
818822
const outgoingMessage: Messages.ResponseListSpaces = { type: 'list-spaces', spaces: spaces };
819823
webSocket.send(Messages.serialize(outgoingMessage));
824+
console.log('--- Sent list-spaces response');
820825
break;
821826
}
822827
case 'list-invitations': {
828+
console.log('--- Received list-invitations message');
823829
const invitations = await listInvitations({ accountAddress });
824830
const outgoingMessage: Messages.ResponseListInvitations = {
825831
type: 'list-invitations',
826832
invitations: invitations,
827833
};
828834
webSocket.send(Messages.serialize(outgoingMessage));
835+
console.log('--- Sent list-invitations response');
829836
break;
830837
}
831838
case 'create-space-event': {
839+
console.log('--- Received create-space-event message');
832840
const getVerifiedIdentity = (accountAddressToFetch: string, publicKey: string) => {
833841
if (accountAddressToFetch !== accountAddress) {
834842
return Effect.fail(new Identity.InvalidIdentityError());
@@ -867,14 +875,16 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
867875
type: 'space',
868876
};
869877
webSocket.send(Messages.serialize(outgoingMessage));
878+
console.log('--- Sent create-space-event response');
870879
} else {
871-
console.log('Failed to apply create space event');
880+
console.log('--- Failed to apply create space event');
872881
console.log(applyEventResult);
873882
}
874883
// TODO send back error
875884
break;
876885
}
877886
case 'create-invitation-event': {
887+
console.log('--- Received create-invitation-event message');
878888
await applySpaceEvent({
879889
accountAddress,
880890
spaceId: data.spaceId,
@@ -887,6 +897,7 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
887897
type: 'space',
888898
};
889899
webSocket.send(Messages.serialize(outgoingMessage));
900+
console.log('--- Sent create-invitation-event response');
890901
for (const client of webSocketServer.clients as Set<CustomWebSocket>) {
891902
if (
892903
client.readyState === WebSocket.OPEN &&
@@ -906,17 +917,20 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
906917
break;
907918
}
908919
case 'accept-invitation-event': {
920+
console.log('--- Received accept-invitation-event message');
909921
await applySpaceEvent({ accountAddress, spaceId: data.spaceId, event: data.event, keyBoxes: [] });
910922
const spaceWithEvents = await getSpace({ accountAddress, spaceId: data.spaceId, appIdentityAddress });
911923
const outgoingMessage: Messages.ResponseSpace = {
912924
...spaceWithEvents,
913925
type: 'space',
914926
};
915927
webSocket.send(Messages.serialize(outgoingMessage));
928+
console.log('--- Sent accept-invitation-event response');
916929
broadcastSpaceEvents({ spaceId: data.spaceId, event: data.event, currentClient: webSocket });
917930
break;
918931
}
919932
case 'create-space-inbox-event': {
933+
console.log('--- Received create-space-inbox-event message');
920934
await applySpaceEvent({ accountAddress, spaceId: data.spaceId, event: data.event, keyBoxes: [] });
921935
const spaceWithEvents = await getSpace({ accountAddress, spaceId: data.spaceId, appIdentityAddress });
922936
// TODO send back confirmation instead of the entire space
@@ -925,10 +939,12 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
925939
type: 'space',
926940
};
927941
webSocket.send(Messages.serialize(outgoingMessage));
942+
console.log('--- Sent create-space-inbox-event response');
928943
broadcastSpaceEvents({ spaceId: data.spaceId, event: data.event, currentClient: webSocket });
929944
break;
930945
}
931946
case 'create-account-inbox': {
947+
console.log('--- Received create-account-inbox message');
932948
try {
933949
// Check that the signature is valid for the corresponding accountAddress
934950
if (data.accountAddress !== accountAddress) {
@@ -946,13 +962,15 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
946962
await createAccountInbox(data);
947963
// Broadcast the inbox to other clients from the same account
948964
broadcastAccountInbox({ inbox: data });
965+
console.log('--- Broadcasted create-account-inbox');
949966
} catch (error) {
950-
console.error('Error creating account inbox:', error);
967+
console.error('--- Error creating account inbox:', error);
951968
return;
952969
}
953970
break;
954971
}
955972
case 'get-latest-space-inbox-messages': {
973+
console.log('--- Received get-latest-space-inbox-messages message');
956974
try {
957975
// Check that the user has access to this space
958976
await getSpace({ accountAddress, spaceId: data.spaceId, appIdentityAddress });
@@ -968,12 +986,14 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
968986
};
969987
webSocket.send(Messages.serialize(outgoingMessage));
970988
} catch (error) {
971-
console.error('Error getting latest space inbox messages:', error);
989+
console.error('--- Error getting latest space inbox messages:', error);
972990
return;
973991
}
992+
console.log('--- Sent get-latest-space-inbox-messages response');
974993
break;
975994
}
976995
case 'get-latest-account-inbox-messages': {
996+
console.log('--- Received get-latest-account-inbox-messages message');
977997
try {
978998
// Check that the user has access to this inbox
979999
await getAccountInbox({ accountAddress, inboxId: data.inboxId });
@@ -989,21 +1009,25 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
9891009
};
9901010
webSocket.send(Messages.serialize(outgoingMessage));
9911011
} catch (error) {
992-
console.error('Error getting latest account inbox messages:', error);
1012+
console.error('--- Error getting latest account inbox messages:', error);
9931013
return;
9941014
}
1015+
console.log('--- Sent get-latest-account-inbox-messages response');
9951016
break;
9961017
}
9971018
case 'get-account-inboxes': {
1019+
console.log('--- Received get-account-inboxes message');
9981020
const inboxes = await listAccountInboxes({ accountAddress });
9991021
const outgoingMessage: Messages.ResponseAccountInboxes = {
10001022
type: 'account-inboxes',
10011023
inboxes,
10021024
};
10031025
webSocket.send(Messages.serialize(outgoingMessage));
1026+
console.log('--- Sent get-account-inboxes response');
10041027
break;
10051028
}
10061029
case 'create-update': {
1030+
console.log('--- Received create-update message');
10071031
try {
10081032
// Check that the update was signed by a valid identity
10091033
// belonging to this accountAddress
@@ -1029,6 +1053,7 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
10291053
clock: update.clock,
10301054
spaceId: data.spaceId,
10311055
};
1056+
console.log('--- Sent create-update response');
10321057
webSocket.send(Messages.serialize(outgoingMessage));
10331058

10341059
broadcastUpdates({
@@ -1048,7 +1073,7 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
10481073
currentClient: webSocket,
10491074
});
10501075
} catch (err) {
1051-
console.error('Error creating update:', err);
1076+
console.error('--- Error creating update:', err);
10521077
}
10531078
break;
10541079
}
@@ -1058,7 +1083,7 @@ webSocketServer.on('connection', async (webSocket: CustomWebSocket, request: Req
10581083
}
10591084
}
10601085
} catch (error) {
1061-
console.error('Error processing message:', error);
1086+
console.error('--- Error processing message:', error);
10621087
}
10631088
});
10641089
webSocket.on('close', () => {

0 commit comments

Comments
 (0)