@24i/smartapps-bigscreen-rnv-build-engine 0.17.2-alpha.2168 → 0.17.3-alpha.1

package/dist/src/scripts/releaseAllWithScheme.js

@@ -76,4 +76,4 @@ const startTimestamp = Date.now();
 releaseAllWithScheme();
 const msPerSecond = 1000;
 const scriptTotalTimeInSeconds = Math.ceil((Date.now() - startTimestamp) / msPerSecond);
-console.log(`buildAllWithScheme: done in ${scriptTotalTimeInSeconds} second(s)!`);
+console.log(`releaseAllWithScheme: done in ${scriptTotalTimeInSeconds} second(s)!`);

package/dist/src/sdks/sdk-androidtv/sdkAndroidtv.js

@@ -59,8 +59,12 @@ const buildAndroidTVProject = async (c) => {
         const taskFlavourName = capitalizeFirstLetter(flavourName);
         const taskAssembleName = `assemble${taskFlavourName}${taskBuildType}`;
         const taskBundleName = `bundle${taskFlavourName}${taskBuildType}`;
-        (0, child_process_1.execSync)(`cd ${projectDir} && ${gradlew} ${taskAssembleName}`);
-        (0, child_process_1.execSync)(`cd ${projectDir} && ${gradlew} ${taskBundleName}`);
+        const cmd1 = `cd ${projectDir} && ${gradlew} ${taskAssembleName} --stacktrace --debug`;
+        const cmd2 = `cd ${projectDir} && ${gradlew} ${taskBundleName} --stacktrace --debug`;
+        console.log(`Running command: ${cmd1}`);
+        (0, child_process_1.execSync)(cmd1);
+        console.log(`Running command: ${cmd2}`);
+        (0, child_process_1.execSync)(cmd2);
         fs.rmSync(tmpOutputDir, { recursive: true, force: true });
         fs.mkdirSync(tmpOutputDir);
         if (!fs.existsSync(outputDir)) {

package/dist/templates/platforms/_shared/template.js

@@ -40,9 +40,9 @@ const htmlTemp = (options) => {
     if (platform === 'tizen') {
         tizenScripts = '<script type="text/javascript" src="$WEBAPIS/webapis/webapis.js"></script>';
     }
-    let webtvScripts = '';
+    let faviconTag = '<link id="favicon" rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo=">';
     if (platform === 'webtv') {
-        webtvScripts = `
+        faviconTag = `
             <script>
                 window.onload = function(err) {
                     var faviconElement = document.getElementById('favicon');
@@ -71,7 +71,7 @@ ${htmlTag}
         ${isDebug ? errScript : ''}
         ${tizenScripts}
         ${xboxScripts}
-        ${webtvScripts}
+        ${faviconTag}
         ${headAppend}
     </head>
     <body>

package/dist/templates/platforms/androidtv/project/README.md

@@ -31,7 +31,6 @@ The application by default has a front-loading page where you can enter the URL
 
 This file determines which URL is loaded.
 
-
     productFlavors {
             flavourName {
                 resValue "string", "app_name", "24i Bridge"
@@ -40,7 +39,6 @@ This file determines which URL is loaded.
             ...
         }
 
-
 #### Adding new environments
 Add a new flavour to let Android Studio generate a new version pointing to the new url.
 
@@ -69,7 +67,7 @@ Possible mediaEvents:
 Send a message/Toast to Android app
 
 #### void bridgeJavaScriptToAndroid_SetVideoPath(final String jsonString)
-Sets the content to the player. Can be only a stream Url exmaple `http://www.stream.nl?lsadlk.m3u8`  
+Sets the content to the player. Can be only a stream Url example `http://www.stream.nl?lsadlk.m3u8`  
 Or:  
 Json string expected format:
 ```json
@@ -166,7 +164,7 @@ trackJson format:
 Disable the tracks again. Set `off` in language
 
 #### void bridgeJavaScriptToAndroid_SaveToLocalStorage(String key, String value)
-Save an string to Android localstorage
+Save an string to Android localStorage
 * key: a constant set in JS app to save/get the saved value
 * value: the value you want to save(can be a json string)
 

package/dist/templates/platforms/androidtv/project/app/src/main/AndroidManifest.xml

@@ -6,7 +6,6 @@
     <!-- Allow the app to run on non-touch devices. -->
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-feature android:name="android.hardware.screen.portrait" android:required="false" />
-    <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
     <!-- Limit the app to running on Android TV devices. -->
     <uses-feature android:name="android.software.leanback" android:required="true" />
 
@@ -27,6 +26,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         tools:ignore="GoogleAppIndexingWarning"
         android:usesCleartextTraffic="true"
+        android:extractNativeLibs="false"
         android:theme="@style/AppTheme">
         <activity
             android:name=".webview.view.WebViewActivity"

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/bridge/BridgeFromJavaScript.kt

@@ -9,7 +9,6 @@ import com.google.gson.JsonObject
 import com.twentyfouri.player.base.TextTrack
 import com.twentyfouri.player.base.TrackKind
 import com.twentyfouri.tvbridge.webview.parser.ContentModelParser.stringToJson
-import com.twentyfouri.tvbridge.webview.parser.DeviceInfoParser.deviceInfoParsed
 import com.twentyfouri.tvbridge.webview.parser.PlaybackInfoParser.parse
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.audioFromJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.textFromJson
@@ -150,6 +149,14 @@ class BridgeFromJavaScript(
         viewModel.currentPosition.toFloat() / 1000
     } ?: 0f
 
+    /*
+      Bridge JS 2 Android to get the live status
+     */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_IsLive(): Boolean = runBlocking("bridgeJavaScriptToAndroid_IsLive") {
+        viewModel.player?.live
+    } ?: false
+
     /*
       Bridge JS 2 Android to get the current time
       Deprecated - use bridgeJavaScriptToAndroid_SetTrack("false") instead to disable
@@ -306,8 +313,8 @@ class BridgeFromJavaScript(
      * Bridget JS 2 Android to get the device information
      */
     @JavascriptInterface
-    fun bridgeJavaScriptToAndroid_GetDeviceInfo(): String? {
-        return deviceInfoParsed
+    fun bridgeJavaScriptToAndroid_GetDeviceInfo(): String? = runBlocking("bridgeJavaScriptToAndroid_GetDeviceInfo") {
+        viewModel.detectDeviceInfo().toString()
     }
 
     @JavascriptInterface

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/bridge/BridgeToJavaScript.kt

@@ -35,6 +35,12 @@ class BridgeToJavaScript(
         Log.d(LOG_TAG, "bridgeAndroidToJavaScript_MediaEvent $mediaEventPrefix$mediaEvent")
         executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$mediaEventPrefix$mediaEvent',true,true);document.dispatchEvent(evt);})())")
     }
+    fun bridgeAndroidToJavaScript_ErrorEvent(mediaEvent: String, message: String?) {
+        Log.d(LOG_TAG, "bridgeAndroidToJavaScript_ErrorEvent $mediaEventPrefix$mediaEvent: $message")
+        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$mediaEventPrefix$mediaEvent',true,true);evt.name='PlayerError';evt.message='$message';document.dispatchEvent(evt);})())")
+
+    }
+
 
     /**
      * Android 2 JavaScript media Event. Dispatch key custom event to the page document element

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/di/ActivityModule.kt

@@ -14,8 +14,4 @@ class ActivityModule(
     @Provides
     fun provideActivity() =
             activity
-
-    @Provides
-    fun providePlayerFactory(config: BridgeConfig): PlayerFactoryBase =
-            PlayerFactoryExoPlayerCustomized(config)
 }

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/di/ApplicationComponent.kt

@@ -1,6 +1,7 @@
 package com.twentyfouri.tvbridge.global.di
 
 import android.content.Context
+import com.twentyfouri.player.base.PlayerFactoryBase
 import com.twentyfouri.tvbridge.common.IapService
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.global.BaseApplication
@@ -18,6 +19,7 @@ interface ApplicationComponent {
     val application: BaseApplication
     val localStorage: LocalStorage
     val configuration: BridgeConfig
+    val playerFactory: PlayerFactoryBase
     val applicationContext: Context
     val touchPlayer: TouchPlayer
     val iapService: IapService

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/di/ApplicationModule.kt

@@ -1,11 +1,13 @@
 package com.twentyfouri.tvbridge.global.di
 
 import android.content.Context
+import com.twentyfouri.player.base.PlayerFactoryBase
 import com.twentyfouri.tvbridge.Flavor
 import com.twentyfouri.tvbridge.common.NullIapService
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.global.BaseApplication
 import com.twentyfouri.tvbridge.global.utils.LocalStorage
+import com.twentyfouri.tvbridge.global.utils.PlayerFactoryExoPlayerCustomized
 import com.twentyfouri.tvbridge.sound.TouchPlayer
 import dagger.Module
 import dagger.Provides
@@ -40,4 +42,10 @@ class ApplicationModule(
             .firstOrNull { it.detectSupport(baseApplication) }
             ?.build(baseApplication)
             ?: NullIapService()
+
+    @Provides
+    @Singleton
+    fun providePlayerFactory(config: BridgeConfig): PlayerFactoryBase =
+        PlayerFactoryExoPlayerCustomized(config)
+
 }

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/view/WebViewActivity.kt

@@ -42,6 +42,7 @@ import java.net.CookiePolicy
 
 class WebViewActivity : AppCompatActivity(), Mainview {
 
+    private var initialized: Boolean = false
     private lateinit var component: ActivityComponent
     private lateinit var binding: ActivityWebViewBinding
     private lateinit var config: BridgeConfig
@@ -105,6 +106,8 @@ class WebViewActivity : AppCompatActivity(), Mainview {
             Log.v("FOCUS", "global focus changed old = $oldFocus")
             Log.v("FOCUS", "global focus changed new = $newFocus")
         }
+
+        initialized = true
     }
 
     override fun hideKeyboard() {
@@ -165,8 +168,10 @@ class WebViewActivity : AppCompatActivity(), Mainview {
     }
 
     public override fun onDestroy() {
-        viewModel.releasePlayer()
-        binding.unbind()
+        if (initialized) {
+            viewModel.releasePlayer()
+            binding.unbind()
+        }
         super.onDestroy()
     }
 

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/viewmodel/WebViewModel.kt

@@ -40,6 +40,10 @@ import com.twentyfouri.tvbridge.webview.model.DrmModel
 import com.twentyfouri.tvbridge.webview.model.MediaEventType
 import com.twentyfouri.tvbridge.webview.view.Mainview
 import com.twentyfouri.tvbridge.webview.view.PlayerCache
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+import java.net.NetworkInterface
 import java.net.URI
 import javax.inject.Inject
 
@@ -348,7 +352,7 @@ class WebViewModel @Inject constructor(
         when (event) {
             is ErrorEvent -> {
                 Log.e("AndroidPlayer", "Player error", event.error)
-                jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.ERROR)
+                jsBridge.bridgeAndroidToJavaScript_ErrorEvent(MediaEventType.ERROR, "${event.error.message} - ${event.error.nativeCode}")
                 stopPlayer()
             }
             is EndedEvent -> {
@@ -506,6 +510,40 @@ class WebViewModel @Inject constructor(
         return false
     }
 
+    fun detectDeviceInfo(): JSONObject {
+        val deviceInfo = JSONObject()
+        try {
+            deviceInfo.put("deviceBrand", Build.MANUFACTURER)
+            deviceInfo.put("deviceModel", Build.MODEL)
+            deviceInfo.put("osVersion", Build.VERSION.RELEASE)
+            deviceInfo.put("appFlavor", BuildConfig.FLAVOR)
+            deviceInfo.put("appVersion", BuildConfig.VERSION_NAME)
+
+            val drmKeySystems = mutableSetOf<String>()
+            playerFactory.getSupportedFormats(context).manifest.forEach { manifest ->
+                manifest.drm.forEach { drm ->
+                    drmKeySystems.addAll(drm.keySystems)
+                }
+            }
+            deviceInfo.put("drmKeySystems", JSONArray(drmKeySystems))
+
+            val ipAddresses = mutableSetOf<String>()
+            for (networkInterface in NetworkInterface.getNetworkInterfaces()) {
+                for (inetAddress in networkInterface.inetAddresses) {
+                    if (inetAddress.isLoopbackAddress) continue
+                    ipAddresses.add(inetAddress.hostAddress)
+                }
+            }
+            deviceInfo.put("ipLocal", JSONArray(ipAddresses))
+
+        } catch (e: JSONException) {
+            deviceInfo.put("errorType", e.javaClass.simpleName)
+            deviceInfo.put("errorMessage", e.message)
+        }
+        return deviceInfo
+    }
+
+
     private inner class InnerIapCallback : IapCallback {
         override fun checkNewPurchasesFinished(result: List<IapPurchase>) {
             // not actually used at the moment

package/dist/templates/platforms/androidtv/project/app/src/main/res/xml/network_security_config.xml

@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
     <base-config cleartextTrafficPermitted="true" />
-    <!--only for debug-->
-    <debug-overrides>
-        <trust-anchors>
-            <!--user added certificates-->
-            <certificates src="user" />
-            <certificates src="@raw/proxy_milanwilczak" />
-        </trust-anchors>
-    </debug-overrides>
 </network-security-config>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.17.2-alpha.2168",
+	"version": "0.17.3-alpha.1",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {

package/dist/templates/platforms/androidtv/project/app/src/main/res/raw/proxy_milanwilczak.pem

@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFRjCCBC6gAwIBAgIGAXEMw2WFMA0GCSqGSIb3DQEBCwUAMIGnMTgwNgYDVQQDDC9DaGFybGVz
-IFByb3h5IENBICgyNCBNYXIgMjAyMCwgTWlsYW5zLU1CUC5ob21lKTElMCMGA1UECwwcaHR0cHM6
-Ly9jaGFybGVzcHJveHkuY29tL3NzbDERMA8GA1UECgwIWEs3MiBMdGQxETAPBgNVBAcMCEF1Y2ts
-YW5kMREwDwYDVQQIDAhBdWNrbGFuZDELMAkGA1UEBhMCTlowHhcNMDAwMTAxMDAwMDAwWhcNNDkw
-NTIxMTMzNzQ0WjCBpzE4MDYGA1UEAwwvQ2hhcmxlcyBQcm94eSBDQSAoMjQgTWFyIDIwMjAsIE1p
-bGFucy1NQlAuaG9tZSkxJTAjBgNVBAsMHGh0dHBzOi8vY2hhcmxlc3Byb3h5LmNvbS9zc2wxETAP
-BgNVBAoMCFhLNzIgTHRkMREwDwYDVQQHDAhBdWNrbGFuZDERMA8GA1UECAwIQXVja2xhbmQxCzAJ
-BgNVBAYTAk5aMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApILCDZsm0ht5SbPtL/V6
-ecr2IRdWAuRSX/O04VtAwSvOwPj8Pykxau0ZEwen+gHTaHLdedfh1m1uiw0NKaNXQuuA6l87leo3
-UREkFsbV91Re0GLzKAgefEPxkEQXzOrr4QbPsKMjeO4RW/ZCsQyL0O8wxzEvoR2CgzpWhaiui2Vb
-qDXsD2j84VL59ASKbrzCGLsSeKZZwz94JezHnzu9GMqta1A4QxPxhyD8RUNrhQkPfvOoptsPQude
-H1leJ6bEOSMuqV/V0ebFapR75veJKEQIR0KKFYFfYD0/wWTWs+WbjwKq1xkG+9IY22Ls8GaFCKzc
-lapvQokXaITme85GdwIDAQABo4IBdDCCAXAwDwYDVR0TAQH/BAUwAwEB/zCCASwGCWCGSAGG+EIB
-DQSCAR0TggEZVGhpcyBSb290IGNlcnRpZmljYXRlIHdhcyBnZW5lcmF0ZWQgYnkgQ2hhcmxlcyBQ
-cm94eSBmb3IgU1NMIFByb3h5aW5nLiBJZiB0aGlzIGNlcnRpZmljYXRlIGlzIHBhcnQgb2YgYSBj
-ZXJ0aWZpY2F0ZSBjaGFpbiwgdGhpcyBtZWFucyB0aGF0IHlvdSdyZSBicm93c2luZyB0aHJvdWdo
-IENoYXJsZXMgUHJveHkgd2l0aCBTU0wgUHJveHlpbmcgZW5hYmxlZCBmb3IgdGhpcyB3ZWJzaXRl
-LiBQbGVhc2Ugc2VlIGh0dHA6Ly9jaGFybGVzcHJveHkuY29tL3NzbCBmb3IgbW9yZSBpbmZvcm1h
-dGlvbi4wDgYDVR0PAQH/BAQDAgIEMB0GA1UdDgQWBBRDH7tSgaNbHdsxzAO7Jgz3d/DH6TANBgkq
-hkiG9w0BAQsFAAOCAQEAoyXVSlN8BoVA5iXLTI1Lri1JpLTSGRzfwC8NmBP1cXUQS1scAym4Aaqe
-bvNhTZUZy9G6wz2e0mY15mI7X0Hu/CSLRXTuIlX7zP3vODmEnavG9VX5dwBzW9W45K1sccddMS6C
-kgf8deh7emWjJoz/PseAwJvQO/Qvs/SIHjTRYs48YpcunW3g3pv4bQm0hHcW7XhcB/N/ESme086O
-MiDqxoOzWlkP+I77A0ttpmAyGPMH1s0TXfjCj5u4qJkScIkxuBw68nQztRQwDro1ZFJ+GrEwpis9
-jTd9LOvuSnOCLRko8FtYiyDEnCGuQSsh0ubbRlk5816zb23CCLJmJj88RQ==
------END CERTIFICATE-----