Added RPC type definitions

OrionNebula · Jun 7, 2018 · 11ffa85 · 11ffa85
1 parent 9083d23
commit 11ffa85
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/src/components/MediaBar.tsx b/src/components/MediaBar.tsx
@@ -7,6 +7,7 @@ import { MediaPlugin } from '../types/MediaPlugin'
 import { Status } from '../types/Status'
 import { State } from '../types/State'
 import { EventEmitter } from 'events'
+import '../types/Rpc'
 
 interface MediaBarProps {
   playerManager: PlayerManager
@@ -40,24 +41,23 @@ function MediaBarFactory (React: typeof ExternReact) {
 
     componentDidMount () {
       const { playerManager } = this.props
-      const { rpc }: { rpc: EventEmitter } = window as any
 
-      rpc.on('hyper-media-control:previousTrack', () => {
+      window.rpc.on('hyper-media-control:previousTrack', () => {
         const { plugin } = this.state
         if (plugin) this.handleActionResult(plugin.previousTrack())
       })
 
-      rpc.on('hyper-media-control:playPause', () => {
+      window.rpc.on('hyper-media-control:playPause', () => {
         const { plugin } = this.state
         if (plugin) this.handleActionResult(plugin.playPause())
       })
 
-      rpc.on('hyper-media-control:nextTrack', () => {
+      window.rpc.on('hyper-media-control:nextTrack', () => {
         const { plugin } = this.state
         if (plugin) this.handleActionResult(plugin.nextTrack())
       })
 
-      rpc.on('hyper-media-control:nextPlayer', () => {
+      window.rpc.on('hyper-media-control:nextPlayer', () => {
         this.cyclePlugin()
       })
 

diff --git a/src/index.tsx b/src/index.tsx
@@ -5,6 +5,7 @@ import { MediaPluginConstructor, MediaPlugin } from './types/MediaPlugin'
 import { State } from './types/State'
 import { Status } from './types/Status'
 import { FooterFactory } from './components/Footer'
+import './types/Rpc'
 import * as ExternReact from 'react'
 
 const parentPluginName = 'hyper-media-control'
@@ -80,7 +81,7 @@ function decorateMenu (menu) {
         submenu: [
           {
             label: 'Previous Track',
-            click: (clickedItem, focusedWindow) => {
+            click: (clickedItem, focusedWindow: Window) => {
               if (focusedWindow) {
                 focusedWindow.rpc.emit('hyper-media-control:previousTrack', { focusedWindow })
               }
@@ -89,15 +90,15 @@ function decorateMenu (menu) {
           {
             label: 'Play/Pause',
             accelerator: `CmdOrCtrl+Alt+Space`,
-            click: (clickedItem, focusedWindow) => {
+            click: (clickedItem, focusedWindow: Window) => {
               if (focusedWindow) {
                 focusedWindow.rpc.emit('hyper-media-control:playPause', { focusedWindow })
               }
             }
           },
           {
             label: 'Next Track',
-            click: (clickedItem, focusedWindow) => {
+            click: (clickedItem, focusedWindow: Window) => {
               if (focusedWindow) {
                 focusedWindow.rpc.emit('hyper-media-control:nextTrack', { focusedWindow })
               }
@@ -106,7 +107,7 @@ function decorateMenu (menu) {
           {
             label: 'Next Media Player',
             accelerator: `CmdOrCtrl+Shift+Space`,
-            click: (clickedItem, focusedWindow) => {
+            click: (clickedItem, focusedWindow: Window) => {
               if (focusedWindow) {
                 focusedWindow.rpc.emit('hyper-media-control:nextPlayer', { focusedWindow })
               }

diff --git a/src/types/Rpc.ts b/src/types/Rpc.ts
@@ -0,0 +1,15 @@
+declare global {
+  interface Window {
+    rpc: RpcClient
+  }
+}
+
+export interface RpcClient {
+  on (ev: string, fn: (...args: any[]) => void)
+  once (ev: string, fn: (...args: any[]) => void)
+  emit (ev: string, data: any)
+  removeListener (ev: string, fn: (...args: any[]) => void)
+  removeAllListeners ()
+  destroy ()
+  ipcListener (event: any, { ch, data }: { ch: string, data: any })
+}