Skip to content
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

fix(nano-server): handle utf8 reply issue #514

Merged
merged 2 commits into from
Dec 18, 2022
Merged

fix(nano-server): handle utf8 reply issue #514

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33aa238
fix(nano-server): handle utf8 reply issue
alimd Dec 18, 2022
9c141c0
Merge branch 'next' into fix/nano-server
alimd Dec 18, 2022
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
27 changes: 11 additions & 16 deletions core/nano-server/src/nano-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,24 +320,22 @@ export class AlwatrConnection {
*/
reply(content: AlwatrServiceResponse): void {
content.statusCode ??= 200;
// this._logger.logMethodArgs('reply', {
// ok: content.ok,
// statusCode: content.statusCode,
// errorCode: content.errorCode,
// });

// this._logger.logMethodArgs('reply', content);
this._logger.logMethodArgs('reply', {ok: content.ok, statusCode: content.statusCode});

if (this.serverResponse.headersSent) {
this._logger.accident('reply', 'http_header_sent', 'Response headers already sent');
return;
}

let contentStr: string;
let buffer: Buffer;

try {
contentStr = JSON.stringify(content);
this._logger.logMethodArgs('reply', contentStr.length > 400 ? contentStr.substring(0, 200) + '...' : content);
buffer = Buffer.from(JSON.stringify(content), 'utf8');
}
catch {
this._logger.accident('responseData', 'data_stringify_failed', 'JSON.stringify(data) failed!');
catch (err) {
this._logger.accident('responseData', 'data_stringify_failed', 'JSON.stringify(data) failed!', err);
return this.reply(
content.ok === false
? {
Expand All @@ -354,7 +352,7 @@ export class AlwatrConnection {
}

const headers: Record<string, string | number> = {
'Content-Length': contentStr.length,
'Content-Length': buffer.byteLength,
'Content-Type': 'application/json',
'Server': 'Alwatr NanoServer',
};
Expand All @@ -365,12 +363,9 @@ export class AlwatrConnection {

this.serverResponse.writeHead(content.statusCode ?? 200, headers);

this.serverResponse.write(contentStr, 'utf8', (error: NodeJS.ErrnoException | null | undefined) => {
this.serverResponse.write(buffer, 'binary', (error: NodeJS.ErrnoException | null | undefined) => {
if (error == null) return;
this._logger.accident('reply', 'http_response_write_failed', 'Response write failed', {
errCode: error.code,
errMessage: error.message,
});
this._logger.error('reply', 'http_response_write_failed', 'reply failed', error);
});

this.serverResponse.end();
Expand Down