chore: fix linter warnings

LuanRT · Nov 21, 2024 · 42b5bf2 · 42b5bf2
1 parent 878af7c
commit 42b5bf2
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 48 deletions.
diff --git a/src/core/Actions.ts b/src/core/Actions.ts
@@ -1,15 +1,14 @@
-import { Parser, NavigateAction } from '../parser/index.js';
+import type {
+  IBrowseResponse, IGetNotificationsMenuResponse, INextResponse,
+  IParsedResponse, IPlayerResponse, IRawResponse,
+  IResolveURLResponse, ISearchResponse, IUpdatedMetadataResponse
+} from '../parser/index.js';
+
+import { NavigateAction, Parser } from '../parser/index.js';
 import { InnertubeError } from '../utils/Utils.js';
 
 import type { Session } from './index.js';
 
-import type {
-  IBrowseResponse, IGetNotificationsMenuResponse,
-  INextResponse, IPlayerResponse, IResolveURLResponse,
-  ISearchResponse, IUpdatedMetadataResponse,
-  IParsedResponse, IRawResponse
-} from '../parser/types/index.js';
-
 export interface ApiResponse {
   success: boolean;
   status_code: number;
@@ -65,9 +64,7 @@ export default class Actions {
       s_url.searchParams.set(key, params[key]);
     }
 
-    const response = await this.session.http.fetch(s_url);
-
-    return response;
+    return await this.session.http.fetch(s_url);
   }
 
   /**

diff --git a/src/core/OAuth2.ts b/src/core/OAuth2.ts
@@ -35,13 +35,13 @@ export type OAuth2AuthErrorEventHandler = (err: OAuth2Error) => void;
 export default class OAuth2 {
   #session: Session;
 
-  YTTV_URL: URL;
-  AUTH_SERVER_CODE_URL: URL;
-  AUTH_SERVER_TOKEN_URL: URL;
-  AUTH_SERVER_REVOKE_TOKEN_URL: URL;
+  public YTTV_URL: URL;
+  public AUTH_SERVER_CODE_URL: URL;
+  public AUTH_SERVER_TOKEN_URL: URL;
+  public AUTH_SERVER_REVOKE_TOKEN_URL: URL;
 
-  client_id: OAuth2ClientID | undefined;
-  oauth2_tokens: OAuth2Tokens | undefined;
+  public client_id: OAuth2ClientID | undefined;
+  public oauth2_tokens: OAuth2Tokens | undefined;
 
   constructor(session: Session) {
     this.#session = session;
@@ -127,7 +127,7 @@ export default class OAuth2 {
     await this.#session.cache?.remove('youtubei_oauth_credentials');
   }
 
-  async pollForAccessToken(device_and_user_code: DeviceAndUserCode): Promise<void> {
+  pollForAccessToken(device_and_user_code: DeviceAndUserCode): void {
     if (!this.client_id)
       throw new OAuth2Error('Client ID is missing.');
 
@@ -317,19 +317,7 @@ export default class OAuth2 {
   }
 
   validateTokens(tokens: OAuth2Tokens): boolean {
-    const propertiesAreValid = (
-      Boolean(tokens.access_token) &&
-      Boolean(tokens.expiry_date) &&
-      Boolean(tokens.refresh_token)
-    );
-
-    const typesAreValid = (
-      typeof tokens.access_token === 'string' &&
-      typeof tokens.expiry_date === 'string' &&
-      typeof tokens.refresh_token === 'string'
-    );
-
-    return typesAreValid && propertiesAreValid;
+    return !(!tokens.access_token || !tokens.refresh_token || !tokens.expiry_date);
   }
 
   get #http() {

diff --git a/src/core/clients/Music.ts b/src/core/clients/Music.ts
@@ -32,7 +32,7 @@ import type { Actions, Session } from '../index.js';
 
 export default class Music {
   #session: Session;
-  #actions: Actions;
+  readonly #actions: Actions;
 
   constructor(session: Session) {
     this.#session = session;

diff --git a/src/utils/Log.ts b/src/utils/Log.ts
@@ -1,5 +1,5 @@
 export default class Log {
-  private static YTJS_TAG = 'YOUTUBEJS';
+  static #YTJS_TAG = 'YOUTUBEJS';
 
   public static Level = {
     NONE: 0,
@@ -9,41 +9,41 @@ export default class Log {
     DEBUG: 4
   };
 
-  private static log_map_ = {
+  static #log_map_ = {
     [Log.Level.ERROR]: (...args: any[]) => console.error(...args),
     [Log.Level.WARNING]: (...args: any[]) => console.warn(...args),
     [Log.Level.INFO]: (...args: any[]) => console.info(...args),
     [Log.Level.DEBUG]: (...args: any[]) => console.debug(...args)
   };
 
-  private static log_level_ = [ Log.Level.WARNING ];
-  private static one_time_warnings_issued_ = new Set<string>();
+  static #log_level_ = [ Log.Level.WARNING ];
+  static #one_time_warnings_issued_ = new Set<string>();
 
   static warnOnce = (id: string, ...args: any[]) => {
-    if (this.one_time_warnings_issued_.has(id))
+    if (this.#one_time_warnings_issued_.has(id))
       return;
-    this.doLog(Log.Level.WARNING, id, args);
-    this.one_time_warnings_issued_.add(id);
+    this.#doLog(Log.Level.WARNING, id, args);
+    this.#one_time_warnings_issued_.add(id);
   };
 
-  static warn = (tag?: string, ...args: any[]) => this.doLog(Log.Level.WARNING, tag, args);
-  static error = (tag?: string, ...args: any[]) => this.doLog(Log.Level.ERROR, tag, args);
-  static info = (tag?: string, ...args: any[]) => this.doLog(Log.Level.INFO, tag, args);
-  static debug = (tag?: string, ...args: any[]) => this.doLog(Log.Level.DEBUG, tag, args);
+  static warn = (tag?: string, ...args: any[]) => this.#doLog(Log.Level.WARNING, tag, args);
+  static error = (tag?: string, ...args: any[]) => this.#doLog(Log.Level.ERROR, tag, args);
+  static info = (tag?: string, ...args: any[]) => this.#doLog(Log.Level.INFO, tag, args);
+  static debug = (tag?: string, ...args: any[]) => this.#doLog(Log.Level.DEBUG, tag, args);
 
-  private static doLog(level: number, tag?: string, args?: any[]) {
-    if (!this.log_map_[level] || !this.log_level_.includes(level))
+  static #doLog(level: number, tag?: string, args?: any[]) {
+    if (!this.#log_map_ [level] || !this.#log_level_.includes(level))
       return;
 
-    const tags = [ `[${this.YTJS_TAG}]` ];
+    const tags = [ `[${this.#YTJS_TAG}]` ];
 
     if (tag)
       tags.push(`[${tag}]`);
 
-    this.log_map_[level](`${tags.join('')}:`, ...(args || []));
+    this.#log_map_ [level](`${tags.join('')}:`, ...(args || []));
   }
 
   static setLevel(...args: number[]) {
-    this.log_level_ = args;
+    this.#log_level_ = args;
   }
 }