Skip to content

Fix possible memory leak #1

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.

Sign up for GitHub

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

Open
zivCheng wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix possible memory leak #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions src/impl/Protocol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,19 @@ export class Protocol {
messageId,
request,
payload]);
this.socket.send(result);
const timeout =setTimeout(() => {
// timeout error
this.onCallError(messageId, ERROR_INTERNALERROR, 'No response from the client', {});
}, 10000);
this.pendingCalls[messageId] = {
resolve,
reject,
timeout
};
this.socket.send(result);


setTimeout(() => {
// timeout error
this.onCallError(messageId, ERROR_INTERNALERROR, 'No response from the client', {});
}, 10000);

} catch (e) {
console.error(e);
reject(e);
Expand Down Expand Up @@ -100,20 +103,22 @@ export class Protocol {
errorDetails: any,
) {
if (this.pendingCalls[messageId]) {
const { reject } = this.pendingCalls[messageId];
const { reject, timeout } = this.pendingCalls[messageId];
if (reject) {
reject(new OcppError(errorCode, errorDescription, errorDetails));
}
clearTimeout(timeout);
delete this.pendingCalls[messageId];
}
}

private onCallResult(messageId: string, payload: any) {
if (this.pendingCalls[messageId]) {
const { resolve } = this.pendingCalls[messageId];
const { resolve, timeout } = this.pendingCalls[messageId];
if (resolve) {
resolve(payload);
}
clearTimeout(timeout);
delete this.pendingCalls[messageId];
}
}
Expand All @@ -126,15 +131,17 @@ export class Protocol {
const validator = new SchemaValidator(schema);
validator.validate(payload);
const response = await new Promise((resolve, reject) => {
setTimeout(() => {
const timeout = setTimeout(() => {
// timeout error
reject(new OcppError(ERROR_INTERNALERROR, 'No response from the handler'));
}, 10000);

const hasListener = this.eventEmitter.emit(request, payload, (result: any) => {
clearTimeout(timeout)
resolve(result);
});
if (!hasListener) {
clearTimeout(timeout)
reject(new OcppError(ERROR_NOTIMPLEMENTED, `Listener for action "${request}" not set`));
}
});
Expand Down