Fix type of RFAMessages with non-String results

This commit is contained in:
Zoë Hoekstra 2022-08-25 23:34:29 +02:00
parent 2463fc2012
commit ceb4a05289
No known key found for this signature in database
GPG Key ID: F9B7B7D8130F3323
2 changed files with 4 additions and 4 deletions

@ -1,13 +1,13 @@
export class RFAMessage { export class RFAMessage {
jsonrpc = "2.0"; // Transmits version of JSON-RPC. Compliance maybe allows some funky interaction with external tools? jsonrpc = "2.0"; // Transmits version of JSON-RPC. Compliance maybe allows some funky interaction with external tools?
public method?: string; // Is defined when it's a request/notification, otherwise undefined public method?: string; // Is defined when it's a request/notification, otherwise undefined
public result?: string | number; // Is defined when it's a response, otherwise undefined public result?: string | Array<string> | number; // Is defined when it's a response, otherwise undefined
public params?: FileMetadata; // Optional parameters to method public params?: FileMetadata; // Optional parameters to method
public error?: string; // Only defined on error public error?: string; // Only defined on error
public id?: number; // ID to keep track of request -> response interaction, undefined with notifications, defined with request/response public id?: number; // ID to keep track of request -> response interaction, undefined with notifications, defined with request/response
constructor( constructor(
obj: { method?: string; result?: string | number; params?: FileMetadata; error?: string; id?: number } = {}, obj: { method?: string; result?: string | Array<string> | number; params?: FileMetadata; error?: string; id?: number } = {},
) { ) {
this.method = obj.method; this.method = obj.method;
this.result = obj.result; this.result = obj.result;

@ -93,7 +93,7 @@ export const RFARequestHandler: Record<string, (message: RFAMessage) => void | R
...server.scripts.map((scr): string => scr.filename), ...server.scripts.map((scr): string => scr.filename),
]; ];
return new RFAMessage({ result: JSON.stringify(fileNameList), id: msg.id }); return new RFAMessage({ result: fileNameList, id: msg.id });
}, },
getAllFiles: function (msg: RFAMessage): RFAMessage { getAllFiles: function (msg: RFAMessage): RFAMessage {
@ -111,7 +111,7 @@ export const RFARequestHandler: Record<string, (message: RFAMessage) => void | R
}), }),
]; ];
return new RFAMessage({ result: JSON.stringify(fileList), id: msg.id }); return new RFAMessage({ result: fileList, id: msg.id });
}, },
calculateRam: function (msg: RFAMessage): RFAMessage { calculateRam: function (msg: RFAMessage): RFAMessage {