Merge pull request #25 from markolofsen/dev

fix

src/components/Player/defaultConfig.ts

@@ -5,7 +5,7 @@ import { PlayerConfigProps } from 'pixel-streaming'
 const defaultConfig: PlayerConfigProps = {
   debugMode: 'on',
   showToolbar: true,
-  psHost: '',
+  psHost: 'ws://127.0.0.1:80',
   psConfig: {
     // https://metaeditor.io/docs/metaeditor/settings/player
     autoPlay: false,

src/pages/player.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react'
+import { useRouter } from 'next/router'
 
 // libs
 import { PlayerConfigProps } from 'pixel-streaming'
@@ -9,26 +10,42 @@ import defaultConfig from 'src/components/Player/defaultConfig'
 
 export default function Page() {
 
+  const router = useRouter()
+
+  // states
   const [mounted, setMounted] = React.useState(false)
   const [config, setConfig] = React.useState<PlayerConfigProps>(defaultConfig)
 
+  const applyConfig = (cfg: object) => {
+    const mergedConfig: PlayerConfigProps = {
+      ...defaultConfig,
+      ...cfg,
+    }
+
+    // alert(JSON.stringify(mergedConfig, null, 2))
+    setConfig(mergedConfig)
+  }
+
   React.useEffect(() => {
+    if (!router.isReady) return
+
     let cfg = localStorage.getItem('playerConfig')
     if (cfg) {
       const jsonConfig = JSON.parse(cfg)
+      applyConfig(jsonConfig)
 
-      const mergedConfig: PlayerConfigProps = {
-        ...defaultConfig,
-        ...jsonConfig,
+    } else {
+      const psHost = router.query.ss
+      if (psHost) {
+        applyConfig({
+          psHost,
+        })
       }
-
-      // alert(JSON.stringify(mergedConfig, null, 2))
-      setConfig(mergedConfig)
     }
 
     setMounted(true)
 
-  }, [])
+  }, [router.isReady])
 
   // return (
   //   <div>