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: retry when no network #4

Merged
merged 1 commit into from
Oct 8, 2024
Merged

fix: retry when no network #4

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 13 additions & 10 deletions src/core/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Parser from './utils/parser.js';

const HOST = 'mtalk.google.com';
const PORT = 5228;
const MAX_RETRY_TIMEOUT = 15;
const RETRY_INTERVAL = 5000;

let proto: protobuf.Root | null = null;

Expand Down Expand Up @@ -48,10 +48,9 @@ export class Client extends EventEmitter {
private _tcpSocket: net.Socket | null;
private _credentials: Credentials;
private _persistentIds: string[];
private _retryCount: number;
private _socket: tls.TLSSocket | null;
private _parser: Parser | null;
private _retryTimeout: NodeJS.Timeout | null;
private _retryInterval: NodeJS.Timeout | null;

static async init(): Promise<void> {
if (proto) {
Expand All @@ -64,11 +63,10 @@ export class Client extends EventEmitter {
super();
this._credentials = credentials;
this._persistentIds = persistentIds;
this._retryCount = 0;
this._tcpSocket = null;
this._socket = null;
this._parser = null;
this._retryTimeout = null;
this._retryInterval = null;
}

async connect(): Promise<void> {
Expand Down Expand Up @@ -115,8 +113,8 @@ export class Client extends EventEmitter {
}

private _destroy(): void {
if (this._retryTimeout) {
clearTimeout(this._retryTimeout);
if (this._retryInterval) {
clearInterval(this._retryInterval);
}
if (this._socket) {
this._socket.removeListener('connect', this._onSocketConnect);
Expand Down Expand Up @@ -167,7 +165,10 @@ export class Client extends EventEmitter {
}

private _onSocketConnect = (): void => {
this._retryCount = 0;
if (this._retryInterval) {
clearInterval(this._retryInterval);
this._retryInterval = null;
}
this.emit('connect');
};

Expand All @@ -188,8 +189,10 @@ export class Client extends EventEmitter {

private _retry(): void {
this._destroy();
const timeout = Math.min(++this._retryCount, MAX_RETRY_TIMEOUT) * 1000;
this._retryTimeout = setTimeout(() => this.connect(), timeout);
this._retryInterval = setInterval(() => {
console.log('trying to reconnect to mtalk.google.com...');
this.connect();
}, RETRY_INTERVAL);
}

private _onMessage = ({ tag, object }: { tag: number; object: any }): void => {
Expand Down
Loading