Skip to content

Melhoria da Função connectToWhatsapp e connectionState #14

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
moskoweb wants to merge 2 commits into from
Closed

Melhoria da Função connectToWhatsapp e connectionState #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b87883
Melhoria da Função connectToWhatsapp e connectionState
moskoweb Jul 21, 2023
f4dbeba
Merge branch 'main' into connection-state
moskoweb Jul 22, 2023
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
45 changes: 28 additions & 17 deletions src/whatsapp/controllers/instance.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,23 +200,29 @@ export class InstanceController {
this.logger.verbose(
'requested connectToWhatsapp from ' + instanceName + ' instance',
);

const instance = this.waMonitor.waInstances[instanceName];
const state = instance?.connectionStatus?.state;

this.logger.verbose('state: ' + state);

switch (state) {
case 'close':
this.logger.verbose('connecting');

if (state == 'open') {
return await this.connectionState({ instanceName });
}

if (state == 'close') {
this.logger.verbose('connecting');
await instance.connectToWhatsapp();
await delay(2000);
return instance.qrCode;
case 'connecting':
return instance.qrCode;
default:
return await this.connectionState({ instanceName });
}

return {
instance: {
instanceName: instanceName,
status: state,
},
qrcode: instance?.qrCode
};
} catch (error) {
this.logger.error(error);
}
Expand All @@ -237,7 +243,12 @@ export class InstanceController {

public async connectionState({ instanceName }: InstanceDto) {
this.logger.verbose('requested connectionState from ' + instanceName + ' instance');
return this.waMonitor.waInstances[instanceName]?.connectionStatus;
return {
instance: {
instanceName: instanceName,
state: this.waMonitor.waInstances[instanceName]?.connectionStatus?.state,
}
};
}

public async fetchInstances({ instanceName }: InstanceDto) {
Expand All @@ -252,9 +263,9 @@ export class InstanceController {

public async logout({ instanceName }: InstanceDto) {
this.logger.verbose('requested logout from ' + instanceName + ' instance');
const stateConn = await this.connectionState({ instanceName });
const { instance } = await this.connectionState({ instanceName });

if (stateConn.state === 'close') {
if (instance.state === 'close') {
throw new BadRequestException(
'The "' + instanceName + '" instance is not connected',
);
Expand All @@ -277,15 +288,15 @@ export class InstanceController {

public async deleteInstance({ instanceName }: InstanceDto) {
this.logger.verbose('requested deleteInstance from ' + instanceName + ' instance');
const stateConn = await this.connectionState({ instanceName });
const { instance } = await this.connectionState({ instanceName });

if (stateConn.state === 'open') {
if (instance.state === 'open') {
throw new BadRequestException(
'The "' + instanceName + '" instance needs to be disconnected',
);
}
try {
if (stateConn.state === 'connecting') {
if (instance.state === 'connecting') {
this.logger.verbose('logging out instance: ' + instanceName);

await this.logout({ instanceName });
Expand Down