@24i/smartapps-bigscreen-rnv-build-engine 0.18.2-test.1 → 5.0.0-alpha.16

package/dist/src/utils/zipStagingProdBuildsByPlatforms.js

@@ -42,8 +42,7 @@ const getPlatformBuildsPaths = (c, platformName, scheme) => {
     const platformBuildsGlob = `${outputGlob}/*.${(0, index_1.resolveBuildFileExtension)(platformName)}`;
     try {
         const buildsPathsCandidates = glob.sync(platformBuildsGlob) || [];
-        const platformBuildsPaths = buildsPathsCandidates.filter((path) => path.includes(platformName));
-        return platformBuildsPaths;
+        return buildsPathsCandidates.filter((buildPath) => buildPath.includes(platformName));
     }
     catch (e) {
         return [];
@@ -56,8 +55,7 @@ const getPublicDirPath = (c, platform, flavour, scheme) => {
     const baseC = (0, index_1.getBaseConfig)({ scheme });
     const { isBuildHosted } = getConfigProp(baseC, platform, 'webpackConfig', {});
     const sourceDirPath = isBuildHosted ? `${sourcePath}-public` : sourcePath;
-    const contentDirPath = path.join(sourceDirPath, 'project', 'public');
-    return contentDirPath;
+    return path.join(sourceDirPath, 'project', 'public');
 };
 const copyProdContentIntoTempPlatformFlavourDir = (c, platform, flavour, prodScheme, destPlatformFlavourPath) => {
     const srcPublicDirPath = getPublicDirPath(c, platform, flavour, prodScheme);
@@ -75,13 +73,16 @@ const processPlatform = (c, platformName, schemes) => {
         throw new Error('Missing production scheme.');
     }
     const outputZipFilePath = (0, index_1.resolveZippedPlatformBuildsRelativeFilePath)(c, platformName);
-    const stagingBuildsPaths = stagingScheme ? getPlatformBuildsPaths(c, platformName, stagingScheme) : [];
-    const prodBuildsPaths = prodScheme ? getPlatformBuildsPaths(c, platformName, prodScheme) : [];
+    const stagingBuildPaths = stagingScheme
+        ? getPlatformBuildsPaths(c, platformName, stagingScheme) : [];
+    const prodBuildPaths = getPlatformBuildsPaths(c, platformName, prodScheme);
     const flavourBuilds = [];
     const supportedFlavours = (0, index_1.resolveSupportedFlavoursForPlatform)(c, platformName);
     supportedFlavours.forEach((flavour) => {
-        const flavourStagingBuildsPaths = stagingBuildsPaths.filter((path) => path.includes(flavour));
-        const flavourProdBuildsPaths = prodBuildsPaths.filter((path) => path.includes(flavour));
+        const flavourStagingBuildsPaths = stagingBuildPaths
+            .filter((buildPath) => buildPath.includes(flavour));
+        const flavourProdBuildsPaths = prodBuildPaths
+            .filter((buildPath) => buildPath.includes(flavour));
         flavourBuilds.push({
             flavour,
             stagingBuildsPaths: flavourStagingBuildsPaths,
@@ -90,15 +91,15 @@ const processPlatform = (c, platformName, schemes) => {
     });
     const tempPlatformDir = `${path.dirname(outputZipFilePath)}/${platformName}`;
     flavourBuilds.forEach((flavourBuild) => {
-        const { flavour, stagingBuildsPaths, prodBuildsPaths } = flavourBuild;
-        const tempPFDir = path.join(tempPlatformDir, flavour);
-        const tempPFBuildsDir = path.join(tempPFDir, 'builds');
-        (0, fs_1.mkdirSync)(tempPFDir, { recursive: true });
-        (0, fs_1.mkdirSync)(tempPFBuildsDir, { recursive: true });
-        [...stagingBuildsPaths, ...prodBuildsPaths].forEach((buildFilePath) => {
-            copyBuildFileIntoTempPlatformFlavourDir(buildFilePath, tempPFBuildsDir);
+        const { flavour, stagingBuildsPaths: stagingPaths, prodBuildsPaths: prodPaths, } = flavourBuild;
+        const tempPlatformFlavourDir = path.join(tempPlatformDir, flavour);
+        const tempPlatformFlavourBuildsDir = path.join(tempPlatformFlavourDir, 'builds');
+        (0, fs_1.mkdirSync)(tempPlatformFlavourDir, { recursive: true });
+        (0, fs_1.mkdirSync)(tempPlatformFlavourBuildsDir, { recursive: true });
+        [...stagingPaths, ...prodPaths].forEach((buildFilePath) => {
+            copyBuildFileIntoTempPlatformFlavourDir(buildFilePath, tempPlatformFlavourBuildsDir);
         });
-        copyProdContentIntoTempPlatformFlavourDir(c, platformName, flavour, prodScheme, tempPFDir);
+        copyProdContentIntoTempPlatformFlavourDir(c, platformName, flavour, prodScheme, tempPlatformFlavourDir);
     });
     zipDir(tempPlatformDir, path.resolve(outputZipFilePath));
     (0, fs_1.rmdirSync)(tempPlatformDir, { recursive: true });

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

@@ -40,7 +40,8 @@ const htmlTemp = (options) => {
     if (platform === 'tizen') {
         tizenScripts = '<script type="text/javascript" src="$WEBAPIS/webapis/webapis.js"></script>';
     }
-    let faviconTag = '<link id="favicon" rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo=">';
+    let faviconTag = '<link id="favicon" rel="icon" type="image/png" '
+        + 'href="data:image/png;base64,iVBORw0KGgo=">';
     if (platform === 'webtv') {
         faviconTag = `
             <script>

package/dist/templates/platforms/_shared/webpack.base.js

@@ -43,6 +43,12 @@ const getAppContentPath = (baseUrl, isBuildHosted = false) => {
         ? `${baseUrl}/${relativePath}`
         : `./${relativePath}`;
 };
+const getBuildEnginePackageRoot = (projectDir) => path_1.default.dirname(require.resolve('@24i/smartapps-bigscreen-rnv-build-engine/package.json', { paths: [projectDir, __dirname] }));
+const resolveFromProject = (moduleName, projectDir) => require.resolve(moduleName, { paths: [projectDir, getBuildEnginePackageRoot(projectDir), __dirname] });
+const makeTypeScriptOptions = (projectDir) => ({
+    typescriptPath: resolveFromProject('typescript', projectDir),
+    configFile: path_1.default.join(projectDir, 'tsconfig.json'),
+});
 const makeRules = (config, projectDir, isDevServer) => ({
     babel: {
         test: /\.[tj]sx?$/,
@@ -51,6 +57,8 @@ const makeRules = (config, projectDir, isDevServer) => ({
             {
                 loader: 'ts-loader',
                 options: {
+                    compiler: makeTypeScriptOptions(projectDir).typescriptPath,
+                    configFile: makeTypeScriptOptions(projectDir).configFile,
                     transpileOnly: true,
                     allowTsInNodeModules: true,
                 },
@@ -66,6 +74,7 @@ const makeRules = (config, projectDir, isDevServer) => ({
             {
                 loader: 'sass-loader',
                 options: {
+                    implementation: require(resolveFromProject('sass', projectDir)),
                     sourceMap: false,
                     additionalData: (0, extendSass_1.extendSass)(config),
                 },
@@ -135,10 +144,13 @@ function generateConfig(config) {
     const isBuildHosted = config.isBuildHosted || false;
     const appContentPath = getAppContentPath(baseUrl, isBuildHosted);
     const copiedDirWithPublicContentPath = path_1.default.join(appBuildDir, `../${path_1.default.parse(appBuildDir).name}-public`);
+    const typeScriptOptions = makeTypeScriptOptions(projectDir);
     const plugins = {
         forkTsChecker: new fork_ts_checker_webpack_plugin_1.default({
             typescript: {
+                configFile: typeScriptOptions.configFile,
                 memoryLimit: 4096,
+                typescriptPath: typeScriptOptions.typescriptPath,
             },
         }),
         webpack: new webpack_1.default.DefinePlugin({

package/dist/templates/platforms/androidtv/project/app/build.gradle

@@ -7,12 +7,13 @@ plugins {
 }
 
 def bitmovinLicense = '{{BITMOVIN_LICENSE}}'
+def bitmovinAnalytics = '{{BITMOVIN_ANALYTICS}}'
 def useBitmovin = bitmovinLicense != ''
 def npawAccountCode = '{{NPAW_ACCOUNT_CODE}}'
 def useNpawPlugin = npawAccountCode != ''
 def useImaSdk = {{ENABLE_IMA_SDK}}
 
-def player_version = '0.8.0-alpha.41'
+def player_version = '0.8.0-alpha.43'
 
 android {
     namespace = 'com.twentyfouri.tvbridge'
@@ -42,6 +43,7 @@ android {
 
         buildConfigField "String", "APP_URL", '"{{APP_URL}}"'
         buildConfigField "String", "BITMOVIN_LICENSE", "\"$bitmovinLicense\""
+        buildConfigField "String", "BITMOVIN_ANALYTICS", "\"$bitmovinAnalytics\""
         buildConfigField "String", "NPAW_ACCOUNT_CODE", "\"$npawAccountCode\""
         buildConfigField "Boolean", "startWithHighVideoQuality", "true"
     }

package/dist/templates/platforms/androidtv/project/app/src/main/kotlin/com/twentyfouri/tvbridge/configuration/BridgeConfig.kt

@@ -14,5 +14,6 @@ class BridgeConfig {
     var customizableUrl: Boolean = BuildConfig.DEBUG
     var startWithHighVideoQuality: Boolean = false
     var bitmovinLicense: String = BuildConfig.BITMOVIN_LICENSE
+    var bitmovinAnalytics: String = BuildConfig.BITMOVIN_ANALYTICS
     var npawAccount: String = BuildConfig.NPAW_ACCOUNT_CODE
 }

package/dist/templates/platforms/androidtv/project/app/src/main/kotlin/com/twentyfouri/tvbridge/global/utils/PlayerFactoryBitmovinCustomized.kt

@@ -2,6 +2,7 @@ package com.twentyfouri.tvbridge.global.utils
 
 import android.app.Application
 import com.twentyfouri.player.bitmovin.NpawConfig
+import com.twentyfouri.player.bitmovin.PlayerBitmovin
 import com.twentyfouri.player.bitmovin.PlayerFactoryBitmovin
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 
@@ -12,6 +13,7 @@ class PlayerFactoryBitmovinCustomized(config: BridgeConfig, application: Applica
             NpawConfig(config.npawAccount, application)
         } else {
             null
-        }
+        },
+        config.bitmovinAnalytics.ifEmpty { PlayerBitmovin.ANALYTICS_LICENSE_DEFERRED }
     ),
     PlayerFactoryVersion

package/dist/templates/platforms/androidtv/project/app/src/main/kotlin/com/twentyfouri/tvbridge/webview/model/MediaEventType.kt

@@ -14,6 +14,7 @@ object MediaEventType {
     const val LOADEDMETADATA = "loadedmetadata"
     const val LOADEDDATA = "loadeddata"
     const val WAITING = "waiting"
+    const val DURATION_CHANGE = "durationchange"
     const val SEEKING = "seeking"
     const val SEEKED = "seeked"
     const val KEY_PRESS = "keypress"

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

@@ -29,6 +29,7 @@ import com.twentyfouri.player.base.AudioTrack
 import com.twentyfouri.player.base.CanPlayEvent
 import com.twentyfouri.player.base.ChangeAudioTrackEvent
 import com.twentyfouri.player.base.ChangeTextTrackEvent
+import com.twentyfouri.player.base.DurationChangeEvent
 import com.twentyfouri.player.base.EndedEvent
 import com.twentyfouri.player.base.ErrorEvent
 import com.twentyfouri.player.base.Event
@@ -46,6 +47,7 @@ import com.twentyfouri.player.base.SeekingEvent
 import com.twentyfouri.player.base.Source
 import com.twentyfouri.player.base.SourceDrmPlayready
 import com.twentyfouri.player.base.SourceDrmWidevine
+import com.twentyfouri.player.base.SourceImaAds
 import com.twentyfouri.player.base.TextTrack
 import com.twentyfouri.player.base.TimeUpdateEvent
 import com.twentyfouri.player.base.TrackKind
@@ -178,6 +180,11 @@ class WebViewModel @Inject constructor(
 
     private fun logSource(source: Source) {
         Log.i("BridgeVideo", "Url: ${source.url}")
+        when (val ads = source.ads) {
+            is SourceImaAds -> {
+                Log.i("BridgeVideo", "Ads: ${ads.url}")
+            }
+        }
         when (val drmModel = source.drm.firstOrNull()) {
             is SourceDrmWidevine -> {
                 Log.i("BridgeVideo", "DRM: " + drmModel.packageName)
@@ -366,6 +373,10 @@ class WebViewModel @Inject constructor(
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.PLAYING)
             }
 
+            is DurationChangeEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.DURATION_CHANGE)
+            }
+
             is SeekingEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.SEEKING)
             }

package/dist/templates/platforms/vegaos/project/manifest.toml

@@ -49,6 +49,20 @@ id = "com.amazon.audio.control"
 [[wants.service]]
 id = "com.amazon.audio.system"
 
+[[wants.service]]
+id = "com.amazon.admanager.service.main"
+
+[[wants.service]]
+id = "com.amazon.iap.core.service"
+
+[[wants.module]]
+id = "/com.amazon.iap.core@IIAPCoreUI"
+
+[needs]
+
+[[needs.module]]
+id = "/com.amazon.kepler.appstore.iap.purchase.core@IAppstoreIAPPurchaseCoreService"
+
 [offers]
 
 [[offers.service]]