@24i/smartapps-bigscreen-rnv-build-engine 0.18.2-test.0 → 0.18.2

package/dist/src/__tests__/engine.spec.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const engine_1 = __importDefault(require("../engine"));
 const constants_1 = require("../constants");
 const engineTasks_1 = require("../tasks/engineTasks");
+jest.mock('manifoldjs-windows10', () => ({}));
 jest.mock('../../../renative.engine.json', () => ({ __esModule: true, id: 'engineID', plugins: {} }), { virtual: true });
 describe('engine config', () => {
     afterAll(() => {

package/dist/src/__tests__/resolvers/resolveBaseUrl.spec.js

@@ -5,7 +5,7 @@ const resolveGenericRnvConfig_1 = require("../../resolvers/resolveGenericRnvConf
 const constants_1 = require("../../constants");
 jest.mock('../../resolvers/resolveGenericRnvConfig');
 describe('resolveBaseUrl', () => {
-    const bucketName = 'test-bucket';
+    const hostedBaseUrl = 'http://test-bucket.s3.amazonaws.com';
     const flavour = 'test_flavour';
     const packageVersion = '1.0.0';
     const expectEmptyStringOutputForEachPlatformAndSchemeByFlavour = (customFlavour) => {
@@ -20,19 +20,23 @@ describe('resolveBaseUrl', () => {
         jest.resetAllMocks();
         jest.resetModules();
     });
-    it('returns empty string when c.common.packageVersion is not set', () => {
+    it('returns latest URL when packageVersion is not set', () => {
         resolveGenericRnvConfig_1.getBaseConfig.mockReturnValue({
             runtime: {},
             buildConfig: {
                 common: {
                     packageVersion: '',
-                    deploy: { aws3: { bucketName } },
+                    hostedUrl: { baseUrl: hostedBaseUrl },
                 },
             },
         });
-        expectEmptyStringOutputForEachPlatformAndSchemeByFlavour(flavour);
+        Object.values(constants_1.Platforms).forEach((platform) => {
+            expect((0, resolveBaseUrl_1.resolveBaseUrl)({
+                platform, scheme: constants_1.BuildSchemes.DEV_LATEST, flavour,
+            })).toBe(`${hostedBaseUrl}/builds/${platform}/${flavour}/latest/dev`);
+        });
     });
-    it('returns empty string when c.buildConfig.common.deploy.aws3.bucketName is not set', () => {
+    it('returns empty string when c.buildConfig.common.hostedUrl.baseUrl is not set', () => {
         resolveGenericRnvConfig_1.getBaseConfig.mockReturnValue({
             runtime: {},
             buildConfig: { common: { packageVersion } },
@@ -40,14 +44,13 @@ describe('resolveBaseUrl', () => {
         expectEmptyStringOutputForEachPlatformAndSchemeByFlavour(flavour);
     });
     describe('resolving baseUrl for configured schemes', () => {
-        const bucketUrl = `http://${bucketName}.s3.amazonaws.com`;
         beforeEach(() => {
             resolveGenericRnvConfig_1.getBaseConfig.mockReturnValue({
                 runtime: {},
                 buildConfig: {
                     common: {
                         packageVersion,
-                        deploy: { aws3: { bucketName } },
+                        hostedUrl: { baseUrl: hostedBaseUrl },
                     },
                 },
             });
@@ -77,43 +80,45 @@ describe('resolveBaseUrl', () => {
         it('returns proper url for "latest development" build scheme', () => {
             const scheme = constants_1.BuildSchemes.DEV_LATEST;
             Object.values(constants_1.Platforms).forEach((platform) => {
-                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${bucketUrl}/builds/${platform}/${flavour}/latest/dev`);
+                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${hostedBaseUrl}/builds/${platform}/${flavour}/latest/dev`);
             });
         });
         it('returns proper url for "latest release candidate (staging)" scheme', () => {
             const scheme = constants_1.BuildSchemes.RC_STAGING_LATEST;
             Object.values(constants_1.Platforms).forEach((platform) => {
-                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${bucketUrl}/builds/${platform}/${flavour}/latest/rc/staging`);
+                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${hostedBaseUrl}/builds/${platform}/${flavour}/latest/rc/staging`);
             });
         });
         it('returns proper url for "latest release candidate (production)" scheme', () => {
             const scheme = constants_1.BuildSchemes.RC_PROD_LATEST;
             Object.values(constants_1.Platforms).forEach((platform) => {
-                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${bucketUrl}/builds/${platform}/${flavour}/latest/rc/production`);
+                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${hostedBaseUrl}/builds/${platform}/${flavour}/latest/rc/production`);
             });
         });
         it('returns proper url for "latest release (staging)" build scheme', () => {
             const scheme = constants_1.BuildSchemes.RELEASE_STAGING_LATEST;
             Object.values(constants_1.Platforms).forEach((platform) => {
-                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${bucketUrl}/builds/${platform}/${flavour}/latest/release/staging`);
+                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${hostedBaseUrl}/builds/${platform}/${flavour}/latest/release/staging`);
             });
         });
         it('returns proper url for "latest release (production)" build scheme', () => {
             const scheme = constants_1.BuildSchemes.RELEASE_PROD_LATEST;
             Object.values(constants_1.Platforms).forEach((platform) => {
-                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${bucketUrl}/builds/${platform}/${flavour}/latest/release/production`);
+                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${hostedBaseUrl}/builds/${platform}/${flavour}/latest/release/production`);
             });
         });
         it('returns proper url for "distribution release (staging)" build scheme', () => {
             const scheme = constants_1.BuildSchemes.RELEASE_STAGING_DIST;
             Object.values(constants_1.Platforms).forEach((platform) => {
-                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${bucketUrl}/builds/${platform}/${flavour}/dist/v${packageVersion}/staging`);
+                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${hostedBaseUrl}/builds/${platform}/${flavour}`
+                    + `/dist/v${packageVersion}/staging`);
             });
         });
         it('returns proper url for "distribution release (production)" build scheme', () => {
             const scheme = constants_1.BuildSchemes.RELEASE_PROD_DIST;
             Object.values(constants_1.Platforms).forEach((platform) => {
-                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${bucketUrl}/builds/${platform}/${flavour}/dist/v${packageVersion}/production`);
+                expect((0, resolveBaseUrl_1.resolveBaseUrl)({ platform, flavour, scheme })).toBe(`${hostedBaseUrl}/builds/${platform}/${flavour}`
+                    + `/dist/v${packageVersion}/production`);
             });
         });
     });

package/dist/src/__tests__/resolvers/resolveBuildFileName.spec.js

@@ -10,6 +10,7 @@ const getPackageExtensionByPlatform = (platform) => {
     switch (platform) {
         case constants_1.Platforms.TIZEN: return 'wgt';
         case constants_1.Platforms.WEBOS: return 'ipk';
+        case constants_1.Platforms.VEGAOS: return 'vpkg';
         default: return 'zip';
     }
 };

package/dist/src/__tests__/resolvers/resolveDeployLocations.spec.js

@@ -17,6 +17,9 @@ const c = {
         common: {
             appNameInFileName: 'appName',
             packageVersion: '1.0.0',
+            hostedUrl: {
+                baseUrl: 'http://bucketName.s3.amazonaws.com',
+            },
             deploy: {
                 aws3: {
                     bucketName: 'bucketName',

package/dist/src/__tests__/resolvers/resolveZippedPlatformBuildsRelativeFilePath.spec.js

@@ -12,7 +12,7 @@ describe('resolveZippedPlatformBuildsRelativeFilePath', () => {
         };
         Object.values(constants_1.Platforms).forEach((platform) => {
             const r = (0, resolveZippedPlatformBuildsRelativeFilePath_1.resolveZippedPlatformBuildsRelativeFilePath)(c, platform);
-            expect(r).toBe(`./dir1/dir2/dir3/zipped_by_platform/appName_${platform}_1.0.0.zip`);
+            expect(r).toBe(`dir1/dir2/dir3/zipped_by_platform/appName_${platform}_1.0.0.zip`);
         });
     });
 });

package/dist/src/__tests__/utils/zipBuildsByPlatforms.spec.js

@@ -24,6 +24,8 @@ describe('zipBuildsByPlatforms', () => {
                 fs_1.default.writeFileSync(path_1.default.resolve(outputPath, 'another_build.wgt'), 'data');
                 fs_1.default.writeFileSync(path_1.default.resolve(outputPath, 'build.ipk'), 'data');
                 fs_1.default.writeFileSync(path_1.default.resolve(outputPath, 'another_build.ipk'), 'data');
+                fs_1.default.writeFileSync(path_1.default.resolve(outputPath, 'build.vpkg'), 'data');
+                fs_1.default.writeFileSync(path_1.default.resolve(outputPath, 'another_build.vpkg'), 'data');
             });
         });
     });
@@ -32,6 +34,8 @@ describe('zipBuildsByPlatforms', () => {
     });
     it('create zip file for each supported platform', () => {
         const rnvC = {
+            program: { schemeFolder: false },
+            runtime: {},
             buildConfig: {
                 paths: {
                     platformBuildsDir: platformBuildsPath,
@@ -61,6 +65,9 @@ describe('zipBuildsByPlatforms', () => {
             else if (platform === constants_1.Platforms.WEBOS) {
                 expect(zipFileContent).toStrictEqual(['another_build.ipk', 'build.ipk']);
             }
+            else if (platform === constants_1.Platforms.VEGAOS) {
+                expect(zipFileContent).toStrictEqual(['another_build.vpkg', 'build.vpkg']);
+            }
             else {
                 expect(zipFileContent).toStrictEqual(['another_build.zip', 'build.zip']);
             }

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

@@ -200,6 +200,8 @@ const configureEntryUrl = (c) => {
     const entryUrl = getHostedAppEntryUrl(c);
     const bitmovinLicense = process.env.BITMOVIN_LICENSE
         || rnv_1.Common.getConfigProp(c, c.platform, 'bitmovinLicense', '');
+    const bitmovinAnalytics = process.env.BITMOVIN_ANALYTICS
+        || rnv_1.Common.getConfigProp(c, c.platform, 'bitmovinAnalytics', '');
     const npawAccountCode = process.env.NPAW_ACCOUNT_CODE
         || rnv_1.Common.getConfigProp(c, c.platform, 'npawAccountCode', '');
     const enableImaSdk = !!rnv_1.Common.getConfigProp(c, c.platform, 'enableImaSdk', false);
@@ -209,6 +211,9 @@ const configureEntryUrl = (c) => {
         }, {
             pattern: '{{BITMOVIN_LICENSE}}',
             override: bitmovinLicense,
+        }, {
+            pattern: '{{BITMOVIN_ANALYTICS}}',
+            override: bitmovinAnalytics,
         }, {
             pattern: '{{NPAW_ACCOUNT_CODE}}',
             override: npawAccountCode,

package/dist/src/sdks/sdk-vegaos/sdkVegaOS.js

@@ -35,6 +35,7 @@ const rnv_1 = require("rnv");
 const sdk_webpack_1 = require("@rnv/sdk-webpack");
 const resolvers_1 = require("../../resolvers");
 const copyEnvironmentFolder_1 = require("../../utils/copyEnvironmentFolder");
+const resolveBuildEnvType_1 = require("../../resolvers/resolveBuildEnvType");
 const constants_1 = require("../../constants");
 const sdk_webpack_2 = require("../sdk-webpack");
 const getHostedAppUrl = (c) => {
@@ -92,7 +93,20 @@ const copyAppIcon = (c) => {
     if (!fs.existsSync(destDir)) {
         fs.mkdirSync(destDir, { recursive: true });
     }
-    rnv_1.Logger.logDebug(`App icon destination: ${destIconPath}`);
+    const envType = (0, resolveBuildEnvType_1.resolveBuildEnvType)(c.runtime.scheme);
+    const envHierarchy = ['dev', 'staging', 'prod'];
+    const envIndex = envHierarchy.indexOf(envType);
+    const srcIconPath = envHierarchy
+        .slice(envIndex)
+        .map((env) => path.join(destDir, `_${env}`, 'app_icon.png'))
+        .find((candidate) => fs.existsSync(candidate));
+    if (srcIconPath) {
+        fs.copyFileSync(srcIconPath, destIconPath);
+        rnv_1.Logger.logInfo(`App icon copied from: ${srcIconPath}`);
+    }
+    else {
+        rnv_1.Logger.logDebug(`No environment-specific app icon found, skipping copy.`);
+    }
 };
 const installDependencies = (c) => {
     rnv_1.Logger.logTask('installDependencies');
@@ -113,6 +127,8 @@ const buildVegaOSProject = async (c) => {
     const projectParentDir = path.join(projectDir, '..');
     const outputDir = path.join(projectParentDir, 'output');
     const buildType = c.runtime.scheme === constants_1.BuildSchemes.DEBUG ? 'Debug' : 'Release';
+    const appVersion = rnv_1.Common.getAppVersion(c, c.platform) || '0.0.1';
+    const versionCode = rnv_1.Common.getConfigProp(c, c.platform, 'versionCode', '1');
     try {
         const watchListOutput = (0, child_process_1.execSync)('watchman watch-list', { stdio: 'pipe' }).toString();
         const watchList = JSON.parse(watchListOutput);
@@ -124,7 +140,7 @@ const buildVegaOSProject = async (c) => {
     catch {
     }
     rnv_1.Logger.logInfo(`Building VegaOS project (${buildType})...`);
-    const buildCmd = `npx react-native build-vega --build-type ${buildType}`;
+    const buildCmd = `npx react-native build-vega --build-type ${buildType} --build-version ${appVersion} --build-number ${versionCode}`;
     (0, child_process_1.execSync)(buildCmd, { cwd: projectDir, stdio: 'inherit' });
     if (!fs.existsSync(outputDir)) {
         fs.mkdirSync(outputDir, { recursive: true });
@@ -174,11 +190,12 @@ exports.configureVegaOSProject = configureVegaOSProject;
 const handleVegaOSSdk = async (_c) => {
     rnv_1.Logger.logTask('handleVegaOSSdk');
     try {
-        (0, child_process_1.execSync)('npm --version', { stdio: 'pipe' });
-        rnv_1.Logger.logInfo('VegaOS SDK: npm is available. Kepler CLI will be installed via npm install during project configuration.');
+        (0, child_process_1.execSync)('kepler --version', { stdio: 'pipe' });
+        rnv_1.Logger.logInfo('Kepler CLI is available.');
     }
     catch {
-        throw new Error('VegaOS SDK: npm not found. Please install Node.js and npm to build VegaOS projects.');
+        throw new Error('Kepler CLI not found. Please install the Kepler SDK before building VegaOS projects.\n'
+            + 'See: https://developer.amazon.com/docs/vega/0.21/install-vega-sdk.html');
     }
 };
 exports.handleVegaOSSdk = handleVegaOSSdk;

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]]