Skip to content

Added debug option and remove unneded async #11

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

Closed
jalamprea wants to merge 1 commit into from
Closed

Added debug option and remove unneded async #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/sender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class Sender {
}
this.resize(options && options.bufferSize ? options.bufferSize : DEFAULT_BUFFER_SIZE);
this.reset();
this.debug = options.debug || false;
Copy link
Collaborator

@glasstiger glasstiger Jan 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

|| false likely does nothing.

this line could look like this instead:

this.debug = options && options.debug;
}

/**
Expand Down Expand Up @@ -101,7 +102,7 @@ class Sender {
* @param {net.NetConnectOpts | tls.ConnectionOptions} options - Connection options, host and port are required.
* @param {boolean} [secure = false] - If true connection will use TLS encryption.
*/
async connect(options, secure = false) {
connect(options, secure = false) {
let self = this;

return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -132,9 +133,9 @@ class Sender {
}
})
.on("ready", async () => {
console.info(`Successfully connected to ${options.host}:${options.port}`);
this.debug && console.info(`Successfully connected to ${options.host}:${options.port}`);
if (self.jwk) {
console.info(`Authenticating with ${options.host}:${options.port}`);
this.debug && console.info(`Authenticating with ${options.host}:${options.port}`);
await self.socket.write(`${self.jwk.kid}\n`, err => {
if (err) {
reject(err);
Expand All @@ -156,12 +157,12 @@ class Sender {
* Closes the connection to the database. <br>
* Data sitting in the Sender's buffer will be lost unless flush() is called before close().
*/
async close() {
close() {
return new Promise(resolve => {
const address = this.socket.remoteAddress;
const port = this.socket.remotePort;
this.socket.destroy();
console.info(`Connection to ${address}:${port} is closed`);
this.debug && console.info(`Connection to ${address}:${port} is closed`);
resolve();
});
}
Expand All @@ -172,7 +173,7 @@ class Sender {
*
* @return {Promise<boolean>} Resolves to true if there was data in the buffer to send.
*/
async flush() {
flush() {
Copy link
Collaborator

@glasstiger glasstiger Jan 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would keep async here because of the return false; line
const data = this.toBuffer(this.endOfLastRow);
if (!data) {
return false;
Expand Down