sam_oneal/fx_cast
1
0
Fork 0
mirror of https://github.com/hensm/fx_cast.git synced 2026-06-08 08:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

TSLint compliance

Browse Source
This commit is contained in:
hensm
2019-03-12 07:16:36 +00:00
parent 0bde5ec46e
commit c67a9a1097
16 changed files with 108 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/src/main.ts
View File

@@ -186,7 +186,7 @@ async function onBeforeSendHeaders (
}; };
} }
async function onOptionsUpdated (alteredOptions?: (keyof Options)[]) { async function onOptionsUpdated (alteredOptions?: Array<(keyof Options)>) {
const { options } = await browser.storage.sync.get("options"); const { options } = await browser.storage.sync.get("options");
// If options aren't set yet, return // If options aren't set yet, return

9
ext/src/shim/cast/classes/ApiConfig.ts
View File

@@ -16,10 +16,13 @@ export default class ApiConfig {
public sessionRequest: SessionRequest public sessionRequest: SessionRequest
, public sessionListener: (session: Session) => void , public sessionListener: (session: Session) => void
, public receiverListener: (availability: string) => void , public receiverListener: (availability: string) => void
, public autoJoinPolicy: string = AutoJoinPolicy.TAB_AND_ORIGIN_SCOPED
, public defaultActionPolicy: string = DefaultActionPolicy.CREATE_SESSION , public autoJoinPolicy: string
= AutoJoinPolicy.TAB_AND_ORIGIN_SCOPED
, public defaultActionPolicy: string
= DefaultActionPolicy.CREATE_SESSION
// TODO: Remove awful hack for mirror casting // TODO: Remove awful hack for mirror casting
, public _selectedMedia: string = "app") { , public _selectedMedia: string = "app") {
} }
}; }

2
ext/src/shim/cast/classes/DialRequest.ts
View File

@@ -6,4 +6,4 @@ export default class DialRequest {
public appName: string public appName: string
, public launchParameter: string = null) { , public launchParameter: string = null) {
} }
}; }

2
ext/src/shim/cast/classes/Error.ts
View File

@@ -7,4 +7,4 @@ export default class Error {
, public description: string = null , public description: string = null
, public details: any = null) { , public details: any = null) {
} }
}; }

2
ext/src/shim/cast/classes/Image.ts
View File

@@ -6,4 +6,4 @@ export default class Image {
public height: number = null; public height: number = null;
constructor (public url: string) {} constructor (public url: string) {}
}; }

2
ext/src/shim/cast/classes/Receiver.ts
View File

@@ -18,4 +18,4 @@ export default class Receiver {
, public capabilities: string[] = [] , public capabilities: string[] = []
, public volume: Volume = null) { , public volume: Volume = null) {
} }
}; }

2
ext/src/shim/cast/classes/ReceiverDisplayStatus.ts
View File

@@ -10,4 +10,4 @@ export default class ReceiverDisplayStatus {
constructor ( constructor (
public statusText: string public statusText: string
, public appImages: Image[]) {} , public appImages: Image[]) {}
}; }

2
ext/src/shim/cast/classes/SenderApplication.ts
View File

@@ -6,4 +6,4 @@ export default class SenderApplication {
public url: string = null; public url: string = null;
constructor (public platform: string) {} constructor (public platform: string) {}
}; }

72
ext/src/shim/cast/classes/Session.ts
View File

@@ -12,23 +12,31 @@ import LoadRequest from "../../media/classes/LoadRequest";
import Media from "../../media/classes/Media"; import Media from "../../media/classes/Media";
import QueueLoadRequest from "../../media/classes/QueueLoadRequest"; import QueueLoadRequest from "../../media/classes/QueueLoadRequest";
import { SessionStatus import { ErrorCode
, ErrorCode , SessionStatus
, VolumeControlType } from "../enums"; , VolumeControlType } from "../enums";
import { onMessage, sendMessageResponse } from "../../messageBridge"; import { onMessage, sendMessageResponse } from "../../messageBridge";
import { SuccessCallback import { Callbacks
, CallbacksMap
, ErrorCallback , ErrorCallback
, LoadSuccessCallback
, MediaListener , MediaListener
, MessageListener , MessageListener
, UpdateListener , SuccessCallback
, LoadSuccessCallback , UpdateListener } from "../../types";
, Callbacks
, CallbacksMap } from "../../types";
export default class Session { export default class Session {
public media: Media[];
public namespaces: Array<{ name: "string" }>;
public senderApps: SenderApplication[];
public status: string;
public statusText: string;
public transportId: string;
private _id: string = uuid(); private _id: string = uuid();
private _messageListeners = new Map<string, Set<MessageListener>>(); private _messageListeners = new Map<string, Set<MessageListener>>();
private _updateListeners = new Set<UpdateListener>(); private _updateListeners = new Set<UpdateListener>();
@@ -39,20 +47,13 @@ export default class Session {
private _setReceiverVolumeLevelCallbacks: CallbacksMap = new Map(); private _setReceiverVolumeLevelCallbacks: CallbacksMap = new Map();
private _stopCallbacks: CallbacksMap = new Map(); private _stopCallbacks: CallbacksMap = new Map();
public media: Media[];
public namespaces: { name: "string" }[];
public senderApps: SenderApplication[];
public status: string;
public statusText: string;
public transportId: string;
constructor ( constructor (
public sessionId: string public sessionId: string
, public appId: string , public appId: string
, public displayName: string , public displayName: string
, public appImages: Image[] , public appImages: Image[]
, public receiver: Receiver , public receiver: Receiver
, successCallback: (session: Session) => void) { , _successCallback: (session: Session) => void) {
this.media = []; this.media = [];
this.namespaces = []; this.namespaces = [];
@@ -85,7 +86,7 @@ export default class Session {
} }
break; break;
}; }
case "shim:/session/connected": { case "shim:/session/connected": {
this.status = SessionStatus.CONNECTED; this.status = SessionStatus.CONNECTED;
@@ -94,12 +95,12 @@ export default class Session {
this.displayName = message.data.displayName; this.displayName = message.data.displayName;
this.statusText = message.data.statusText; this.statusText = message.data.statusText;
if (successCallback) { if (_successCallback) {
successCallback(this); _successCallback(this);
} }
break; break;
}; }
case "shim:/session/updateStatus": { case "shim:/session/updateStatus": {
const volume: Volume = message.data.volume; const volume: Volume = message.data.volume;
@@ -121,22 +122,23 @@ export default class Session {
} }
break; break;
}; }
case "shim:/session/impl_addMessageListener": { case "shim:/session/impl_addMessageListener": {
const { namespace, data } = message.data; const { namespace, data } = message.data;
for (const listener of this._messageListeners.get(namespace)) { for (const listener of
this._messageListeners.get(namespace)) {
listener(namespace, data); listener(namespace, data);
} }
break; break;
}; }
case "shim:/session/impl_sendMessage": { case "shim:/session/impl_sendMessage": {
const { messageId, error } = message.data; const { messageId, error } = message.data;
const [ successCallback, errorCallback ] const [ successCallback, errorCallback ]
= this._sendMessageCallbacks.get(messageId) = this._sendMessageCallbacks.get(messageId);
if (error && errorCallback) { if (error && errorCallback) {
errorCallback(new _Error(ErrorCode.SESSION_ERROR)); errorCallback(new _Error(ErrorCode.SESSION_ERROR));
@@ -147,7 +149,7 @@ export default class Session {
this._sendMessageCallbacks.delete(messageId); this._sendMessageCallbacks.delete(messageId);
break; break;
}; }
case "shim:/session/impl_setReceiverMuted": { case "shim:/session/impl_setReceiverMuted": {
const { volumeId, error } = message.data; const { volumeId, error } = message.data;
@@ -163,12 +165,13 @@ export default class Session {
this._setReceiverMutedCallbacks.delete(volumeId); this._setReceiverMutedCallbacks.delete(volumeId);
break; break;
}; }
case "shim:/session/impl_setReceiverVolumeLevel": { case "shim:/session/impl_setReceiverVolumeLevel": {
const { volumeId, error } = message.data; const { volumeId, error } = message.data;
const [ successCallback, errorCallback ] const [ successCallback, errorCallback ]
= this._setReceiverVolumeLevelCallbacks.get(volumeId); = this._setReceiverVolumeLevelCallbacks
.get(volumeId);
if (error && errorCallback) { if (error && errorCallback) {
errorCallback(new _Error(ErrorCode.SESSION_ERROR)); errorCallback(new _Error(ErrorCode.SESSION_ERROR));
@@ -179,7 +182,7 @@ export default class Session {
this._setReceiverVolumeLevelCallbacks.delete(volumeId); this._setReceiverVolumeLevelCallbacks.delete(volumeId);
break; break;
}; }
case "shim:/session/impl_stop": { case "shim:/session/impl_stop": {
const { stopId, error } = message.data; const { stopId, error } = message.data;
@@ -203,17 +206,20 @@ export default class Session {
this._stopCallbacks.delete(stopId); this._stopCallbacks.delete(stopId);
break; break;
}; }
} }
}); });
} }
public addMediaListener (listener: MediaListener) { public addMediaListener (listener: MediaListener) {
console.info("STUB :: Session#addMediaListener") console.info("STUB :: Session#addMediaListener");
} }
public addMessageListener (namespace: string, listener: MessageListener) { public addMessageListener (
namespace: string
, listener: MessageListener) {
if (!this._messageListeners.has(namespace)) { if (!this._messageListeners.has(namespace)) {
this._messageListeners.set(namespace, new Set()); this._messageListeners.set(namespace, new Set());
} }
@@ -263,7 +269,9 @@ export default class Session {
"urn:x-cast:com.google.cast.media" "urn:x-cast:com.google.cast.media"
, (namespace, data) => { , (namespace, data) => {
if (hasResponded) return; if (hasResponded) {
return;
}
const mediaObject = JSON.parse(data); const mediaObject = JSON.parse(data);
@@ -283,7 +291,7 @@ export default class Session {
} else { } else {
errorCallback(new _Error(ErrorCode.SESSION_ERROR)); errorCallback(new _Error(ErrorCode.SESSION_ERROR));
} }
}) });
} }
public queueLoad ( public queueLoad (

4
ext/src/shim/cast/classes/SessionRequest.ts
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
import { Capability } from "../enums";
import { requestSession } from "../../timeout"; import { requestSession } from "../../timeout";
import { Capability } from "../enums";
// https://developers.google.com/cast/docs/reference/chrome/chrome.cast.SessionRequest // https://developers.google.com/cast/docs/reference/chrome/chrome.cast.SessionRequest
export default class SessionRequest { export default class SessionRequest {
@@ -14,4 +14,4 @@ export default class SessionRequest {
Capability.VIDEO_OUT Capability.VIDEO_OUT
, Capability.AUDIO_OUT ] , Capability.AUDIO_OUT ]
, public requestSessionTimeout: number = requestSession) {} , public requestSessionTimeout: number = requestSession) {}
}; }

2
ext/src/shim/cast/classes/Timeout.ts
View File

@@ -7,4 +7,4 @@ export default class Timeout {
constructor () { constructor () {
Object.assign(this, timeouts); Object.assign(this, timeouts);
} }
}; }

2
ext/src/shim/cast/classes/Volume.ts
View File

@@ -12,4 +12,4 @@ export default class Volume {
public level: number = null public level: number = null
, public muted: boolean = null) { , public muted: boolean = null) {
} }
}; }

28
ext/src/shim/cast/index.ts
View File

@@ -35,7 +35,9 @@ type ReceiverActionListener = (
receiver: Receiver receiver: Receiver
, receiverAction: typeof ReceiverAction) => void; , receiverAction: typeof ReceiverAction) => void;
type RequestSessionSuccessCallback = (session: Session, selectedMedia: string) => void; type RequestSessionSuccessCallback = (
session: Session
, selectedMedia: string) => void;
type SuccessCallback = () => void; type SuccessCallback = () => void;
type ErrorCallback = (err: Error_) => void; type ErrorCallback = (err: Error_) => void;
@@ -43,10 +45,10 @@ type ErrorCallback = (err: Error_) => void;
let apiConfig: ApiConfig; let apiConfig: ApiConfig;
let receiverList: any[] = []; let receiverList: any[] = [];
let sessionList: Session[] = []; const sessionList: Session[] = [];
let sessionRequestInProgress = false; let sessionRequestInProgress = false;
let receiverListeners = new Set<ReceiverActionListener>(); const receiverListeners = new Set<ReceiverActionListener>();
let sessionSuccessCallback: RequestSessionSuccessCallback; let sessionSuccessCallback: RequestSessionSuccessCallback;
let sessionErrorCallback: ErrorCallback; let sessionErrorCallback: ErrorCallback;
@@ -93,8 +95,6 @@ export default {
subject: "bridge:/startDiscovery" subject: "bridge:/startDiscovery"
}); });
console.log(receiverList.length)
apiConfig.receiverListener(receiverList.length apiConfig.receiverListener(receiverList.length
? ReceiverAvailability.AVAILABLE ? ReceiverAvailability.AVAILABLE
: ReceiverAvailability.UNAVAILABLE); : ReceiverAvailability.UNAVAILABLE);
@@ -103,6 +103,7 @@ export default {
} }
, logMessage: (message: string): void => { , logMessage: (message: string): void => {
/* tslint:disable-next-line:no-console */
console.log("CAST MSG:", message); console.log("CAST MSG:", message);
} }
@@ -119,7 +120,8 @@ export default {
, requestSession: ( , requestSession: (
successCallback: RequestSessionSuccessCallback successCallback: RequestSessionSuccessCallback
, errorCallback: ErrorCallback , errorCallback: ErrorCallback
, sessionRequest: SessionRequest = apiConfig.sessionRequest): void => { , sessionRequest: SessionRequest
= apiConfig.sessionRequest): void => {
console.info("fx_cast (Debug): cast.requestSession"); console.info("fx_cast (Debug): cast.requestSession");
@@ -176,7 +178,7 @@ export default {
, unescape: (escaped: string): string => { , unescape: (escaped: string): string => {
return unescape(escaped); return unescape(escaped);
} }
} };
onMessage(message => { onMessage(message => {
switch (message.subject) { switch (message.subject) {
@@ -197,7 +199,7 @@ onMessage(message => {
apiConfig.receiverListener(ReceiverAvailability.AVAILABLE); apiConfig.receiverListener(ReceiverAvailability.AVAILABLE);
break; break;
}; }
/** /**
* Cast destination lost (serviceDown). Remove from the receiver list * Cast destination lost (serviceDown). Remove from the receiver list
@@ -213,7 +215,7 @@ onMessage(message => {
} }
break; break;
}; }
case "shim:/selectReceiver": { case "shim:/selectReceiver": {
console.info("fx_cast (Debug): Selected receiver"); console.info("fx_cast (Debug): Selected receiver");
@@ -239,7 +241,9 @@ onMessage(message => {
apiConfig.sessionListener(session); apiConfig.sessionListener(session);
sessionRequestInProgress = false; sessionRequestInProgress = false;
sessionSuccessCallback(session, message.data.selectedMedia); sessionSuccessCallback(
session
, message.data.selectedMedia);
})); }));
} }
@@ -255,7 +259,7 @@ onMessage(message => {
} }
break; break;
}; }
/** /**
* Popup is ready to receive data to populate the cast destination * Popup is ready to receive data to populate the cast destination
@@ -271,7 +275,7 @@ onMessage(message => {
}); });
break; break;
}; }
/** /**
* Popup closed before session established. * Popup closed before session established.

59
ext/src/shim/media/classes/Media.ts
View File

@@ -4,44 +4,35 @@ import uuid from "uuid/v1";
import EditTracksInfoRequest from "./EditTracksInfoRequest"; import EditTracksInfoRequest from "./EditTracksInfoRequest";
import GetStatusRequest from "./GetStatusRequest"; import GetStatusRequest from "./GetStatusRequest";
import MediaInfo from "./MediaInfo";
import PauseRequest from "./PauseRequest"; import PauseRequest from "./PauseRequest";
import PlayRequest from "./PlayRequest"; import PlayRequest from "./PlayRequest";
import QueueInsertItemsRequest from "./QueueInsertItemsRequest"; import QueueInsertItemsRequest from "./QueueInsertItemsRequest";
import QueueItem from "./QueueItem";
import QueueReorderItemsRequest from "./QueueReorderItemsRequest"; import QueueReorderItemsRequest from "./QueueReorderItemsRequest";
import QueueUpdateItemsRequest from "./QueueUpdateItemsRequest"; import QueueUpdateItemsRequest from "./QueueUpdateItemsRequest";
import SeekRequest from "./SeekRequest"; import SeekRequest from "./SeekRequest";
import VolumeRequest from "./VolumeRequest";
import StopRequest from "./StopRequest"; import StopRequest from "./StopRequest";
import MediaInfo from "./MediaInfo"; import VolumeRequest from "./VolumeRequest";
import QueueItem from "./QueueItem";
import Volume from "../../cast/classes/Volume"; import Volume from "../../cast/classes/Volume";
import { PlayerState import { PlayerState
, RepeatMode , RepeatMode } from "../enums";
, MediaCommand } from "../enums";
import _Error from "../../cast/classes/Error"; import _Error from "../../cast/classes/Error";
import { ErrorCode } from "../../cast/enums"; import { ErrorCode } from "../../cast/enums";
import { onMessage, sendMessageResponse } from "../../messageBridge"; import { onMessage, sendMessageResponse } from "../../messageBridge";
import { SuccessCallback import { Callbacks
, CallbacksMap
, ErrorCallback , ErrorCallback
, UpdateListener , SuccessCallback
, Callbacks , UpdateListener } from "../../types";
, CallbacksMap } from "../../types";
export default class Media { export default class Media {
private _id: string = uuid();
private _updateListeners = new Set<UpdateListener>();
private _sendMediaMessageCallbacks: CallbacksMap = new Map();
private _lastCurrentTime: number;
public activeTrackIds: number[] = null; public activeTrackIds: number[] = null;
public currentItemId: number = null; public currentItemId: number = null;
public customData: any = null; public customData: any = null;
@@ -57,6 +48,14 @@ export default class Media {
public supportedMediaCommands: string[] = []; public supportedMediaCommands: string[] = [];
public volume: Volume = new Volume(); public volume: Volume = new Volume();
private _id: string = uuid();
private _updateListeners = new Set<UpdateListener>();
private _sendMediaMessageCallbacks: CallbacksMap = new Map();
private _lastCurrentTime: number;
constructor ( constructor (
public sessionId: string public sessionId: string
, public mediaSessionId: number , public mediaSessionId: number
@@ -129,7 +128,7 @@ export default class Media {
, successCallback?: SuccessCallback , successCallback?: SuccessCallback
, errorCallback?: ErrorCallback): void { , errorCallback?: ErrorCallback): void {
console.log("STUB :: Media#editTracksInfo"); console.info("STUB :: Media#editTracksInfo");
} }
public getEstimatedTime (): number { public getEstimatedTime (): number {
@@ -172,21 +171,21 @@ export default class Media {
item: QueueItem item: QueueItem
, successCallback?: SuccessCallback , successCallback?: SuccessCallback
, errorCallback?: ErrorCallback) { , errorCallback?: ErrorCallback) {
console.log("STUB :: Media#queueAppendItem"); console.info("STUB :: Media#queueAppendItem");
} }
public queueInsertItems ( public queueInsertItems (
queueInsertItemsRequest: QueueInsertItemsRequest queueInsertItemsRequest: QueueInsertItemsRequest
, successCallback?: SuccessCallback , successCallback?: SuccessCallback
, errorCallback?: ErrorCallback) { , errorCallback?: ErrorCallback) {
console.log("STUB :: Media#queueInsertItems"); console.info("STUB :: Media#queueInsertItems");
} }
public queueJumpToItem ( public queueJumpToItem (
itemId: number itemId: number
, successCallback?: SuccessCallback , successCallback?: SuccessCallback
, errorCallback?: ErrorCallback) { , errorCallback?: ErrorCallback) {
console.log("STUB :: Media#queueJumpToItem"); console.info("STUB :: Media#queueJumpToItem");
} }
public queueMoveItemToNewIndex ( public queueMoveItemToNewIndex (
@@ -194,47 +193,47 @@ export default class Media {
, newIndex: number , newIndex: number
, successCallback?: SuccessCallback , successCallback?: SuccessCallback
, errorCallback?: ErrorCallback) { , errorCallback?: ErrorCallback) {
console.log("STUB :: Media#queueMoveItemToNewIndex"); console.info("STUB :: Media#queueMoveItemToNewIndex");
} }
public queueNext ( public queueNext (
successCallback?: SuccessCallback successCallback?: SuccessCallback
, errorCallback?: ErrorCallback) { , errorCallback?: ErrorCallback) {
console.log("STUB :: Media#queueNext"); console.info("STUB :: Media#queueNext");
} }
public queuePrev ( public queuePrev (
successCallback?: SuccessCallback successCallback?: SuccessCallback
, errorCallback?: ErrorCallback) { , errorCallback?: ErrorCallback) {
console.log("STUB :: Media#queuePrev"); console.info("STUB :: Media#queuePrev");
} }
public queueRemoveItem( public queueRemoveItem (
itemId: number itemId: number
, successCallback?: SuccessCallback , successCallback?: SuccessCallback
, errorCallback?: ErrorCallback) { , errorCallback?: ErrorCallback) {
console.log("STUB :: Media#queueRemoveItem"); console.info("STUB :: Media#queueRemoveItem");
} }
public queueReorderItems ( public queueReorderItems (
queueReorderItemsRequest: QueueReorderItemsRequest queueReorderItemsRequest: QueueReorderItemsRequest
, successCallback?: SuccessCallback , successCallback?: SuccessCallback
, errorCallback?: ErrorCallback) { , errorCallback?: ErrorCallback) {
console.log("STUB :: Media#queueReorderItems"); console.info("STUB :: Media#queueReorderItems");
} }
public queueSetRepeatMode ( public queueSetRepeatMode (
repeatMode: string repeatMode: string
, successCallback?: SuccessCallback , successCallback?: SuccessCallback
, errorCallback?: ErrorCallback) { , errorCallback?: ErrorCallback) {
console.log("STUB :: Media#queueSetRepeatMode"); console.info("STUB :: Media#queueSetRepeatMode");
} }
public queueUpdateItems ( public queueUpdateItems (
queueUpdateItemsRequest: QueueUpdateItemsRequest queueUpdateItemsRequest: QueueUpdateItemsRequest
, successCallback?: SuccessCallback , successCallback?: SuccessCallback
, errorCallback?: ErrorCallback) { , errorCallback?: ErrorCallback) {
console.log("STUB :: Media#queueUpdateItems"); console.info("STUB :: Media#queueUpdateItems");
} }
public removeUpdateListener (listener: UpdateListener) { public removeUpdateListener (listener: UpdateListener) {
@@ -274,7 +273,7 @@ export default class Media {
} }
public supportsCommand (command: string) { public supportsCommand (command: string) {
console.log("STUB :: Media#supportsCommand"); console.info("STUB :: Media#supportsCommand");
} }

2
ext/src/shim/media/classes/MediaInfo.ts
View File

@@ -27,7 +27,7 @@ export default class MediaInfo {
public textTrackStyle: TextTrackStyle = null; public textTrackStyle: TextTrackStyle = null;
public tracks: Track[] = null; public tracks: Track[] = null;
constructor ( constructor (
public contentId: string public contentId: string
, public contentType: string) {} , public contentType: string) {}
} }

5
tslintCommon.json
View File

@@ -21,6 +21,11 @@
, "semicolon": [ true, "always" ] , "semicolon": [ true, "always" ]
, "space-before-function-paren": [ true, "always" ] , "space-before-function-paren": [ true, "always" ]
, "trailing-comma": false , "trailing-comma": false
, "variable-name": [ true
, "ban-keywords"
, "check-format"
, "allow-pascal-case"
, "allow-leading-underscore" ]
} }
, "rulesDirectory": [] , "rulesDirectory": []
} }