From 7efcbcde8fc9a1bd3877d0a78ca77684fde55df0 Mon Sep 17 00:00:00 2001 From: hensm Date: Sun, 26 Jan 2020 16:10:08 +0000 Subject: [PATCH] Use logger module for shim logging --- ext/src/shim/cast/classes/Session.ts | 8 ++-- ext/src/shim/cast/index.ts | 26 +++++++------ ext/src/shim/cast/media/classes/Media.ts | 26 +++++++------ ext/src/shim/framework/GoogleCastLauncher.ts | 5 ++- ext/src/shim/framework/classes/CastContext.ts | 14 ++++--- ext/src/shim/framework/classes/CastSession.ts | 38 ++++++++++--------- .../classes/RemotePlayerController.ts | 14 ++++--- ext/src/shim/framework/index.ts | 3 +- 8 files changed, 75 insertions(+), 59 deletions(-) diff --git a/ext/src/shim/cast/classes/Session.ts b/ext/src/shim/cast/classes/Session.ts index c1a9e44..a2d531c 100755 --- a/ext/src/shim/cast/classes/Session.ts +++ b/ext/src/shim/cast/classes/Session.ts @@ -2,6 +2,8 @@ import uuid from "uuid/v1"; +import logger from "../../../lib/logger"; + import _Error from "./Error"; import Image from "./Image"; import Receiver from "./Receiver"; @@ -268,7 +270,7 @@ export default class Session { public addMediaListener (_mediaListener: MediaListener) { - console.info("STUB :: Session#addMediaListener"); + logger.info("STUB :: Session#addMediaListener"); } public addMessageListener ( @@ -373,11 +375,11 @@ export default class Session { , _successCallback: LoadSuccessCallback , _errorCallback: ErrorCallback): void { - console.info("STUB :: Session#queueLoad"); + logger.info("STUB :: Session#queueLoad"); } public removeMediaListener (_mediaListener: MediaListener): void { - console.info("STUB :: Session#removeMediaListener"); + logger.info("STUB :: Session#removeMediaListener"); } public removeMessageListener ( diff --git a/ext/src/shim/cast/index.ts b/ext/src/shim/cast/index.ts index 0a99776..f35e88c 100755 --- a/ext/src/shim/cast/index.ts +++ b/ext/src/shim/cast/index.ts @@ -1,5 +1,7 @@ "use strict"; +import logger from "../../lib/logger"; + import ApiConfig from "./classes/ApiConfig"; import DialRequest from "./classes/DialRequest"; import Error_ from "./classes/Error"; @@ -85,7 +87,7 @@ export function initialize ( , successCallback?: SuccessCallback , errorCallback?: ErrorCallback): void { - console.info("fx_cast (Debug): cast.initialize"); + logger.info("cast.initialize"); // Already initialized if (apiConfig) { @@ -119,7 +121,7 @@ export function logMessage (message: string): void { } export function precache (_data: string): void { - console.info("STUB :: cast.precache"); + logger.info("STUB :: cast.precache"); } export function removeReceiverActionListener ( @@ -133,7 +135,7 @@ export function requestSession ( , errorCallback: ErrorCallback , _sessionRequest: SessionRequest = apiConfig.sessionRequest): void { - console.info("fx_cast (Debug): cast.requestSession"); + logger.info("cast.requestSession"); // Called before initialization if (!apiConfig) { @@ -179,7 +181,7 @@ export function _requestSession ( , successCallback: RequestSessionSuccessCallback , errorCallback: ErrorCallback): void { - console.info("fx_cast (Debug): cast._requestSession"); + logger.info("cast._requestSession"); if (!apiConfig) { if (errorCallback) { @@ -249,7 +251,7 @@ export function _requestSession ( } export function requestSessionById (_sessionId: string): void { - console.info("STUB :: cast.requestSessionById"); + logger.info("STUB :: cast.requestSessionById"); } export function setCustomReceivers ( @@ -257,15 +259,15 @@ export function setCustomReceivers ( , _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: cast.setCustomReceivers"); + logger.info("STUB :: cast.setCustomReceivers"); } export function setPageContext (_win: Window): void { - console.info("STUB :: cast.setPageContext"); + logger.info("STUB :: cast.setPageContext"); } export function setReceiverDisplayStatus (_sessionId: string): void { - console.info("STUB :: cast.setReceiverDisplayStatus"); + logger.info("STUB :: cast.setReceiverDisplayStatus"); } export function unescape (escaped: string): string { @@ -322,7 +324,7 @@ onMessage(async message => { } case "shim:/selectReceiverEnd": { - console.info("fx_cast (Debug): Selected receiver"); + logger.info("Selected receiver"); if (!sessionRequestInProgress) { break; @@ -333,7 +335,7 @@ onMessage(async message => { , message.data.receiver.friendlyName); for (const listener of receiverActionListeners) { - console.info("fx_cast (Debug): Calling receiver action listener (CAST)", message.data.receiver); + logger.info("Calling receiver action listener (CAST)", message.data.receiver); listener(selectedReceiver, ReceiverAction.CAST); } @@ -375,7 +377,7 @@ onMessage(async message => { } case "shim:/selectReceiverStop": { - console.info("fx_cast (Debug): Stopped receiver"); + logger.info("Stopped receiver"); if (sessionRequestInProgress) { for (const listener of receiverActionListeners) { @@ -383,7 +385,7 @@ onMessage(async message => { message.data.receiver.id , message.data.receiver.friendlyName); - console.info("fx_cast (Debug): Calling receiver action listener (STOP)", message.data.receiver); + logger.info("Calling receiver action listener (STOP)", message.data.receiver); listener(castReceiver, ReceiverAction.STOP); } } diff --git a/ext/src/shim/cast/media/classes/Media.ts b/ext/src/shim/cast/media/classes/Media.ts index a4a5684..c29bbe3 100644 --- a/ext/src/shim/cast/media/classes/Media.ts +++ b/ext/src/shim/cast/media/classes/Media.ts @@ -1,5 +1,7 @@ "use strict"; +import logger from "../../../../lib/logger"; + import uuid from "uuid/v1"; import EditTracksInfoRequest from "./EditTracksInfoRequest"; @@ -147,7 +149,7 @@ export default class Media { , _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#editTracksInfo"); + logger.info("STUB :: Media#editTracksInfo"); } public getEstimatedTime (): number { @@ -191,21 +193,21 @@ export default class Media { _item: QueueItem , _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#queueAppendItem"); + logger.info("STUB :: Media#queueAppendItem"); } public queueInsertItems ( _queueInsertItemsRequest: QueueInsertItemsRequest , _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#queueInsertItems"); + logger.info("STUB :: Media#queueInsertItems"); } public queueJumpToItem ( _itemId: number , _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#queueJumpToItem"); + logger.info("STUB :: Media#queueJumpToItem"); } public queueMoveItemToNewIndex ( @@ -213,47 +215,47 @@ export default class Media { , _newIndex: number , _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#queueMoveItemToNewIndex"); + logger.info("STUB :: Media#queueMoveItemToNewIndex"); } public queueNext ( _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#queueNext"); + logger.info("STUB :: Media#queueNext"); } public queuePrev ( _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#queuePrev"); + logger.info("STUB :: Media#queuePrev"); } public queueRemoveItem ( _itemId: number , _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#queueRemoveItem"); + logger.info("STUB :: Media#queueRemoveItem"); } public queueReorderItems ( _queueReorderItemsRequest: QueueReorderItemsRequest , _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#queueReorderItems"); + logger.info("STUB :: Media#queueReorderItems"); } public queueSetRepeatMode ( _repeatMode: string , _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#queueSetRepeatMode"); + logger.info("STUB :: Media#queueSetRepeatMode"); } public queueUpdateItems ( _queueUpdateItemsRequest: QueueUpdateItemsRequest , _successCallback?: SuccessCallback , _errorCallback?: ErrorCallback): void { - console.info("STUB :: Media#queueUpdateItems"); + logger.info("STUB :: Media#queueUpdateItems"); } public removeUpdateListener (listener: UpdateListener) { @@ -293,7 +295,7 @@ export default class Media { } public supportsCommand (_command: string): boolean { - console.info("STUB :: Media#supportsCommand"); + logger.info("STUB :: Media#supportsCommand"); return true; } diff --git a/ext/src/shim/framework/GoogleCastLauncher.ts b/ext/src/shim/framework/GoogleCastLauncher.ts index 502abb2..dbb2e67 100644 --- a/ext/src/shim/framework/GoogleCastLauncher.ts +++ b/ext/src/shim/framework/GoogleCastLauncher.ts @@ -1,5 +1,8 @@ "use strict"; +import logger from "../../lib/logger"; + + /** * Custom element for a cast button used by sites that injects * a cast icon and manages visibility state and event handling. @@ -72,7 +75,7 @@ export default class GoogleCastLauncher extends HTMLElement { this.addEventListener("click", () => { - console.info(" onClick"); + logger.info(" onClick"); }); } } diff --git a/ext/src/shim/framework/classes/CastContext.ts b/ext/src/shim/framework/classes/CastContext.ts index ee2bd80..f43ddf6 100644 --- a/ext/src/shim/framework/classes/CastContext.ts +++ b/ext/src/shim/framework/classes/CastContext.ts @@ -1,36 +1,38 @@ "use strict"; +import logger from "../../../lib/logger"; + import CastOptions from "./CastOptions"; import CastSession from "./CastSession"; export default class CastContext extends EventTarget { public endCurrentSession (_stopCasting: boolean): void { - console.info("STUB :: CastContext#endCurrentSession"); + logger.info("STUB :: CastContext#endCurrentSession"); } // @ts-ignore public getCastState (): string { - console.info("STUB :: CastContext#getCastState"); + logger.info("STUB :: CastContext#getCastState"); } // @ts-ignore public getCurrentSession (): CastSession { - console.info("STUB :: CastContext#getCurrentSession"); + logger.info("STUB :: CastContext#getCurrentSession"); } // @ts-ignore public getSessionState (): string { - console.info("STUB :: CastContext#getSessionState"); + logger.info("STUB :: CastContext#getSessionState"); } // @ts-ignore public requestSession (): Promise { - console.info("STUB :: CastContext#requestSession"); + logger.info("STUB :: CastContext#requestSession"); } public setOptions (_options: CastOptions): void { - console.info("STUB :: CastContext#setOptions"); + logger.info("STUB :: CastContext#setOptions"); } } diff --git a/ext/src/shim/framework/classes/CastSession.ts b/ext/src/shim/framework/classes/CastSession.ts index b21262e..560cec6 100644 --- a/ext/src/shim/framework/classes/CastSession.ts +++ b/ext/src/shim/framework/classes/CastSession.ts @@ -1,5 +1,7 @@ "use strict"; +import logger from "../../../lib/logger"; + import * as cast from "../../cast"; import ApplicationMetadata from "./ApplicationMetadata"; @@ -11,80 +13,80 @@ type MessageListener = (namespace: string, message: string) => void; export default class CastSession extends EventTarget { constructor (_sessionObj: cast.Session, _state: string) { super(); - console.info("STUB :: CastSession#constructor"); + logger.info("STUB :: CastSession#constructor"); } public addMessageListener ( _namespace: string , _listener: MessageListener): void { - console.info("STUB :: CastSession#addMessageListener"); + logger.info("STUB :: CastSession#addMessageListener"); } public endSession (_stopCasting: boolean): void { - console.info("STUB :: CastSession#endSession"); + logger.info("STUB :: CastSession#endSession"); } // @ts-ignore public getActiveInputState (): number { - console.info("STUB :: CastSession#getActiveInputState"); + logger.info("STUB :: CastSession#getActiveInputState"); } // @ts-ignore public getApplicationMetadata (): ApplicationMetadata { - console.info("STUB :: CastSession#getApplicationMetadata"); + logger.info("STUB :: CastSession#getApplicationMetadata"); } // @ts-ignore public getApplicationStatus (): string { - console.info("STUB :: CastSession#getApplicationStatus"); + logger.info("STUB :: CastSession#getApplicationStatus"); } // @ts-ignore public getCastDevice (): cast.Receiver { - console.info("STUB :: CastSession#getCastDevice"); + logger.info("STUB :: CastSession#getCastDevice"); } // @ts-ignore public getMediaSession (): cast.media.Media { - console.info("STUB :: CastSession#getMediaSession"); + logger.info("STUB :: CastSession#getMediaSession"); } // @ts-ignore public getSessionId (): string { - console.info("STUB :: CastSession#getSessionId"); + logger.info("STUB :: CastSession#getSessionId"); } // @ts-ignore public getSessionObj (): cast.Session { - console.info("STUB :: CastSession#getSessionObj"); + logger.info("STUB :: CastSession#getSessionObj"); } // @ts-ignore public getSessionState (): string { - console.info("STUB :: CastSession#getSessionState"); + logger.info("STUB :: CastSession#getSessionState"); } // @ts-ignore public getVolume (): number { - console.info("STUB :: CastSession#getVolume"); + logger.info("STUB :: CastSession#getVolume"); } // @ts-ignore public isMute (): boolean { - console.info("STUB :: CastSession#isMute"); + logger.info("STUB :: CastSession#isMute"); } // @ts-ignore public loadMedia (_loadRequest: cast.media.LoadRequest): Promise { - console.info("STUB :: CastSession#loadMedia"); + logger.info("STUB :: CastSession#loadMedia"); } public removeMessageListener ( _namespace: string , _listener: MessageListener): void { - console.info("STUB :: CastSession#removeMessageListener"); + logger.info("STUB :: CastSession#removeMessageListener"); } public sendMessage ( @@ -92,16 +94,16 @@ export default class CastSession extends EventTarget { // @ts-ignore , _data: any): Promise { - console.info("STUB :: CastSession#sendMessage"); + logger.info("STUB :: CastSession#sendMessage"); } // @ts-ignore public setMute (_isMute: boolean): Promise { - console.info("STUB :: CastSession#setMute"); + logger.info("STUB :: CastSession#setMute"); } // @ts-ignore public setVolume (_volume: number): Promise { - console.info("STUB :: CastSession#setVolume"); + logger.info("STUB :: CastSession#setVolume"); } } diff --git a/ext/src/shim/framework/classes/RemotePlayerController.ts b/ext/src/shim/framework/classes/RemotePlayerController.ts index 414ce96..e44e637 100644 --- a/ext/src/shim/framework/classes/RemotePlayerController.ts +++ b/ext/src/shim/framework/classes/RemotePlayerController.ts @@ -1,12 +1,14 @@ "use strict"; +import logger from "../../../lib/logger"; + import RemotePlayer from "./RemotePlayer"; export default class RemotePlayerController extends EventTarget { constructor (_player: RemotePlayer) { super(); - console.info("STUB :: RemotePlayerController#constructor"); + logger.info("STUB :: RemotePlayerController#constructor"); } public getFormattedTime (timeInSec: number): string { @@ -28,22 +30,22 @@ export default class RemotePlayerController extends EventTarget { } public muteOrUnmute (): void { - console.info("STUB :: RemotePlayerController#muteOrUnmute"); + logger.info("STUB :: RemotePlayerController#muteOrUnmute"); } public playOrPause (): void { - console.info("STUB :: RemotePlayerController#playOrPause"); + logger.info("STUB :: RemotePlayerController#playOrPause"); } public seek (): void { - console.info("STUB :: RemotePlayerController#seek"); + logger.info("STUB :: RemotePlayerController#seek"); } public setVolumeLevel (): void { - console.info("STUB :: RemotePlayerController#setVolumeLevel"); + logger.info("STUB :: RemotePlayerController#setVolumeLevel"); } public stop (): void { - console.info("STUB :: RemotePlayerController#stop"); + logger.info("STUB :: RemotePlayerController#stop"); } } diff --git a/ext/src/shim/framework/index.ts b/ext/src/shim/framework/index.ts index a94ca83..b3120a1 100644 --- a/ext/src/shim/framework/index.ts +++ b/ext/src/shim/framework/index.ts @@ -1,5 +1,6 @@ "use strict"; +import logger from "../../lib/logger"; import ActiveInputStateEventData from "./classes/ActiveInputStateEventData"; import ApplicationMetadata from "./classes/ApplicationMetadata"; @@ -55,7 +56,7 @@ export default { , VERSION: "1.0.07" , setLoggerLevel (_level: number) { - console.info("STUB :: cast.framework.setLoggerLevel"); + logger.info("STUB :: cast.framework.setLoggerLevel"); } };