refactor: Reorganized conn events

src/conn/eventEmitter.ts

@@ -24,9 +24,9 @@ const debug = Debug('WA-JS:event:conn');
 export type UnsubscribeFn = () => void;
 
 export interface EventTypes {
-  change: AuthCode;
-  idle: undefined;
+  auth_code_change: AuthCode | null;
   logout: undefined;
+  qrcode_idle: undefined;
 }
 
 export const eventEmitter = new Emittery<EventTypes, EventTypes>({

src/conn/events/index.ts

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-import './registerChangeEvent';
-import './registerIdleEvent';
+import './registerAuthCodeChangeEvent';
+import './registerQRCodeIdleEvent';
 import './registerLogoutEvent';

src/conn/events/registerChangeEvent.ts → src/conn/events/registerAuthCodeChangeEvent.ts

@@ -23,15 +23,16 @@ import { eventEmitter } from '../eventEmitter';
 
 const debug = Debug('WA-JS:conn');
 
-webpack.onInjected(() => registerChangeEvent());
+webpack.onInjected(registerAuthCodeChangeEvent);
 
-function registerChangeEvent() {
-  Conn.on('change:ref', async () => {
+function registerAuthCodeChangeEvent() {
+  const trigger = async () => {
     const authCode = await getAuthCode().catch(() => null);
-    if (authCode) {
-      eventEmitter.emit('change', authCode);
-    }
-  });
+    eventEmitter.emit('auth_code_change', authCode);
+  };
+
+  trigger();
+  Conn.on('change:ref', trigger);
 
   debug('change event registered');
 }

src/conn/events/registerLogoutEvent.ts

@@ -22,7 +22,7 @@ import { eventEmitter } from '../eventEmitter';
 
 const debug = Debug('WA-JS:conn');
 
-webpack.onInjected(() => registerLogoutEvent());
+webpack.onInjected(registerLogoutEvent);
 
 function registerLogoutEvent() {
   Cmd.on('logout', () => eventEmitter.emit('logout'));

src/conn/events/registerIdleEvent.ts → src/conn/events/registerQRCodeIdleEvent.ts

@@ -23,14 +23,17 @@ import { eventEmitter } from '../eventEmitter';
 
 const debug = Debug('WA-JS:conn');
 
-webpack.onInjected(() => registerIdleEvent());
+webpack.onInjected(registerQRCodeIdleEvent);
 
-function registerIdleEvent() {
-  State.on('change:state', async () => {
+function registerQRCodeIdleEvent() {
+  const trigger = async () => {
     const idle = isIdle();
     if (idle) {
-      eventEmitter.emit('idle');
+      eventEmitter.emit('qrcode_idle');
     }
-  });
+  };
+  trigger();
+  State.on('change:state', trigger);
+
   debug('idle event registered');
 }

src/index.ts

@@ -31,10 +31,6 @@ export * as config from './config';
 export * as blocklist from './blocklist';
 export * as chat from './chat';
 export * as conn from './conn';
-/**
- * @deprecated
- */
-export * as auth from './conn';
 export * as contact from './contact';
 export * as group from './group';
 export * as labels from './labels';