@24i/smartapps-bigscreen-rnv-build-engine 0.17.2-alpha.2165 → 0.17.2-alpha.2167

package/dist/src/resolvers/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveZippedPlatformBuildsRelativeFilePath = exports.resolvePackageVersions = exports.resolveBuildFileExtension = exports.resolveUsedFlavours = exports.resolveSupportedPlatforms = exports.getBaseConfig = exports.resolveBuildFileName = exports.resolveHbbtvDeployConfig = exports.resolveHbbtvDeployUrl = exports.resolveHbbtvRemoteBuildDirRelativePath = exports.resolveDeployLocations = exports.resolveBuildVersionOffset = exports.resolveBuildVersion = exports.resolveBaseUrl = void 0;
+exports.resolveZippedPlatformBuildsRelativeFilePath = exports.resolvePackageVersions = exports.resolveBuildFileExtension = exports.resolveUsedFlavours = exports.resolveSupportedPlatforms = exports.getBaseConfig = exports.resolveBuildFileName = exports.resolveBuildFileBaseName = exports.resolveHbbtvDeployConfig = exports.resolveHbbtvDeployUrl = exports.resolveHbbtvRemoteBuildDirRelativePath = exports.resolveDeployLocations = exports.resolveBuildVersionOffset = exports.resolveBuildVersion = exports.resolveBaseUrl = void 0;
 var resolveBaseUrl_1 = require("./resolveBaseUrl");
 Object.defineProperty(exports, "resolveBaseUrl", { enumerable: true, get: function () { return resolveBaseUrl_1.resolveBaseUrl; } });
 var resolveBuildVersion_1 = require("./resolveBuildVersion");
@@ -15,6 +15,8 @@ var resolveHbbtvDeployUrl_1 = require("./resolveHbbtvDeployUrl");
 Object.defineProperty(exports, "resolveHbbtvDeployUrl", { enumerable: true, get: function () { return resolveHbbtvDeployUrl_1.resolveHbbtvDeployUrl; } });
 var resolveHbbtvDeployConfig_1 = require("./resolveHbbtvDeployConfig");
 Object.defineProperty(exports, "resolveHbbtvDeployConfig", { enumerable: true, get: function () { return resolveHbbtvDeployConfig_1.resolveHbbtvDeployConfig; } });
+var resolveBuildFileBaseName_1 = require("./resolveBuildFileBaseName");
+Object.defineProperty(exports, "resolveBuildFileBaseName", { enumerable: true, get: function () { return resolveBuildFileBaseName_1.resolveBuildFileBaseName; } });
 var resolveBuildFileName_1 = require("./resolveBuildFileName");
 Object.defineProperty(exports, "resolveBuildFileName", { enumerable: true, get: function () { return resolveBuildFileName_1.resolveBuildFileName; } });
 var resolveGenericRnvConfig_1 = require("./resolveGenericRnvConfig");

package/dist/src/resolvers/resolveBuildFileBaseName.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveBuildFileBaseName = void 0;
+const resolveBuildVersion_1 = require("./resolveBuildVersion");
+const constants_1 = require("../constants");
+const getBuildVersionForFileName = (c) => {
+    const { platform, runtime } = c;
+    const { scheme, appId } = runtime;
+    switch (c.runtime.scheme) {
+        case constants_1.BuildSchemes.DEV_LATEST:
+            return 'latest.dev';
+        case constants_1.BuildSchemes.RC_LATEST:
+            return 'latest.rc';
+        case constants_1.BuildSchemes.RELEASE_LATEST:
+            return 'latest.release';
+        default:
+            return (0, resolveBuildVersion_1.resolveBuildVersion)({
+                platform,
+                scheme,
+                flavour: appId,
+            });
+    }
+};
+const resolveBuildFileBaseName = (c) => {
+    const platformName = c.platform;
+    const { appNameInFileName } = c.buildConfig.common;
+    if (!appNameInFileName) {
+        throw new Error('Missing value for "c.buildConfig.common.appNameInFileName"!');
+    }
+    const appConfigId = c.runtime.appId;
+    const buildVersion = getBuildVersionForFileName(c);
+    return `${appNameInFileName}_${platformName}_${buildVersion}_${appConfigId}`;
+};
+exports.resolveBuildFileBaseName = resolveBuildFileBaseName;

package/dist/src/resolvers/resolveBuildFileExtension.js

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

package/dist/src/resolvers/resolveBuildFileName.js

@@ -1,36 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveBuildFileName = void 0;
-const resolveBuildVersion_1 = require("./resolveBuildVersion");
-const constants_1 = require("../constants");
+const resolveBuildFileBaseName_1 = require("./resolveBuildFileBaseName");
 const resolveBuildFileExtension_1 = require("./resolveBuildFileExtension");
-const getBuildVersionForFileName = (c) => {
-    const { platform, runtime } = c;
-    const { scheme, appId } = runtime;
-    switch (c.runtime.scheme) {
-        case constants_1.BuildSchemes.DEV_LATEST:
-            return 'latest.dev';
-        case constants_1.BuildSchemes.RC_LATEST:
-            return 'latest.rc';
-        case constants_1.BuildSchemes.RELEASE_LATEST:
-            return 'latest.release';
-        default:
-            return (0, resolveBuildVersion_1.resolveBuildVersion)({
-                platform,
-                scheme,
-                flavour: appId,
-            });
-    }
-};
 const resolveBuildFileName = (c) => {
     const platformName = c.platform;
-    const { appNameInFileName } = c.buildConfig.common;
-    if (!appNameInFileName) {
-        throw new Error('Missing value for "c.buildConfig.common.appNameInFileName"!');
-    }
-    const appConfigId = c.runtime.appId;
-    const buildVersion = getBuildVersionForFileName(c);
+    const baseName = (0, resolveBuildFileBaseName_1.resolveBuildFileBaseName)(c);
     const extension = (0, resolveBuildFileExtension_1.resolveBuildFileExtension)(platformName);
-    return `${appNameInFileName}_${platformName}_${buildVersion}_${appConfigId}.${extension}`;
+    return `${baseName}.${extension}`;
 };
 exports.resolveBuildFileName = resolveBuildFileName;

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

@@ -37,33 +37,80 @@ const services_1 = require("../sdk-utils/sdk-installer/services");
 const resolvers_1 = require("../../resolvers");
 const constants_1 = require("../../constants");
 const flavourName = 'bigscreenAppstage';
-const buildType = 'debug';
 const capitalizeFirstLetter = (str) => {
     return str.charAt(0).toUpperCase() + str.slice(1);
 };
 const buildAndroidTVProject = async (c) => {
     rnv_1.Logger.logTask('buildAndroidTVProject');
     await (0, sdk_webpack_2.buildCoreWebpackProject)(c);
+    const buildType = c.runtime.scheme === constants_1.BuildSchemes.DEBUG
+        ? 'debug' : 'release';
     if (!c.program.hosted) {
         const projectDir = rnv_1.Common.getPlatformProjectDir(c);
+        const taskBuildType = buildType === 'debug' ? 'Debug' : 'Release';
         const projectParentDir = path.join(projectDir, '..');
-        const tOut = path.join(projectParentDir, 'output');
-        const apkFileName = `app-${flavourName}-debug.apk`;
-        const apkFilePath = path.join(projectDir, `app/build/outputs/apk/${flavourName}/debug/${apkFileName}`);
+        const outputDir = path.join(projectParentDir, 'output');
+        const tmpOutputDir = path.join(projectParentDir, 'tmpOutput');
+        const apkFileName = `app-${flavourName}-${buildType}.apk`;
+        const apkFilePath = path.join(projectDir, `app/build/outputs/apk/${flavourName}/${buildType}/${apkFileName}`);
+        const aabFileName = `app-${flavourName}-${buildType}.aab`;
+        const aabFilePath = path.join(projectDir, `app/build/outputs/bundle/${flavourName}${taskBuildType}/${aabFileName}`);
         const gradlew = './gradlew';
-        const taskBuildType = buildType === 'debug' ? 'Debug' : 'Release';
         const taskFlavourName = capitalizeFirstLetter(flavourName);
-        const taskName = `assemble${taskFlavourName}${taskBuildType}`;
-        (0, child_process_1.execSync)(`cd ${projectDir} && ${gradlew} ${taskName}`);
-        if (!fs.existsSync(tOut)) {
-            fs.mkdirSync(tOut);
+        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}`);
+        fs.rmSync(tmpOutputDir, { recursive: true, force: true });
+        fs.mkdirSync(tmpOutputDir);
+        if (!fs.existsSync(outputDir)) {
+            fs.mkdirSync(outputDir);
         }
-        const outputFilePath = path.join(tOut, apkFileName);
-        fs.copyFileSync(apkFilePath, outputFilePath);
-        rnv_1.Logger.logSuccess(`Your APK package is located in ${rnv_1.Logger.chalk().cyan(tOut)} .`);
+        const newApkFilePath = path.join(tmpOutputDir, `${(0, resolvers_1.resolveBuildFileBaseName)(c)}.apk`);
+        const newAabFilePath = path.join(tmpOutputDir, `${(0, resolvers_1.resolveBuildFileBaseName)(c)}.aab`);
+        fs.copyFileSync(apkFilePath, newApkFilePath);
+        fs.copyFileSync(aabFilePath, newAabFilePath);
+        const zipFileName = `${(0, resolvers_1.resolveBuildFileBaseName)(c)}.zip`;
+        (0, child_process_1.execSync)(`zip -r ${outputDir}/${zipFileName} *`, { cwd: `${tmpOutputDir}` });
+        fs.rmSync(tmpOutputDir, { recursive: true, force: true });
+        rnv_1.Logger.logSuccess(`Your .zip with APK and AAB packages is located in ${rnv_1.Logger.chalk().cyan(outputDir)}.`);
     }
 };
 exports.buildAndroidTVProject = buildAndroidTVProject;
+const configureSigning = (c) => {
+    rnv_1.Logger.logTask('configureSigning');
+    const { getConfigProp } = rnv_1.Common;
+    const storeFile = process.env.ANDROIDTV_STORE_FILE ?? getConfigProp(c, c.platform, 'storeFile');
+    const keyAlias = process.env.ANDROIDTV_KEY_ALIAS ?? getConfigProp(c, c.platform, 'keyAlias');
+    const storePassword = process.env.ANDROIDTV_STORE_PASSWORD ?? getConfigProp(c, c.platform, 'storePassword');
+    const keyPassword = process.env.ANDROIDTV_KEY_PASSWORD ?? getConfigProp(c, c.platform, 'keyPassword');
+    const buildGradleFileName = 'build.gradle';
+    const buildGradleFilePath = path.join(rnv_1.Common.getPlatformProjectDir(c), 'app', buildGradleFileName);
+    const srcStoreFilePath = path.join(process.cwd(), storeFile);
+    const destStoreFilePath = path.join(rnv_1.Common.getPlatformProjectDir(c), storeFile);
+    const destStoreFileDir = path.parse(destStoreFilePath).dir;
+    if (!fs.existsSync(destStoreFileDir)) {
+        fs.mkdirSync(destStoreFileDir, { recursive: true });
+    }
+    fs.copyFileSync(srcStoreFilePath, destStoreFilePath);
+    const injects = [{
+            pattern: '{{STORE_FILE}}',
+            override: destStoreFilePath,
+        }, {
+            pattern: '{{KEY_ALIAS}}',
+            override: keyAlias,
+        }, {
+            pattern: '{{STORE_PASSWORD}}',
+            override: storePassword,
+        }, {
+            pattern: '{{KEY_PASSWORD}}',
+            override: keyPassword,
+        }, {
+            pattern: '{{SIGNING_CONFIG_REF}}',
+            override: `signingConfig signingConfigs.${flavourName}`,
+        }];
+    rnv_1.FileUtils.writeCleanFile(buildGradleFilePath, buildGradleFilePath, injects, null, c);
+};
 const configureProject = (c) => {
     rnv_1.Logger.logTask('configureProject');
     const buildGradleFileName = 'build.gradle';
@@ -120,6 +167,7 @@ const configureAndroidTVProject = async (c) => {
     await configureAndroidProperties(c);
     configureProject(c);
     configureEntryUrl(c);
+    configureSigning(c);
     const gradlew = path.join(rnv_1.Common.getPlatformProjectDir(c), 'gradlew');
     fs.chmodSync(gradlew, '755');
     await rnv_1.ProjectManager.copyBuildsFolder(c, platform);

package/dist/src/tasks/task.rnv.build.js

@@ -84,7 +84,6 @@ const buildFn = async (c, parentTask, originTask) => {
             break;
         case constants_1.Platforms.ANDROIDTV:
             await sdks_1.SDKAndroidtv.buildAndroidTVProject(c);
-            renameOutput(c);
             break;
         default:
             rnv_1.PlatformManager.logErrorPlatform(c);

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

@@ -57,6 +57,14 @@ android {
             keyPassword 'freddie12'
             keyAlias 'iamflix-app'
         }*/
+        bigscreenAppstage {
+            keyAlias '{{KEY_ALIAS}}'
+            keyPassword '{{KEY_PASSWORD}}'
+            storeFile file('{{STORE_FILE}}')
+            storePassword '{{STORE_PASSWORD}}'
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
         kan {
             keyAlias 'ireshet'
             keyPassword 'applicaster'
@@ -252,6 +260,7 @@ android {
             versionName "{{APP_VERSION_NAME}}"
             applicationId "{{APP_ID}}"
             resValue "string", "app_name", "{{configProps.appName}}"
+            {{SIGNING_CONFIG_REF}}
         }
         kan {
             // X.Y.Z XXYYZZUU -> version 1.2.3 will be 01020300, 5th update of 1.2.3 will be 01020305

package/package.json

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

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

@@ -1,184 +0,0 @@
-package com.twentyfouri.tvbridge.global.utils
-
-import android.net.Uri
-import android.text.TextUtils
-import android.util.Base64
-import android.util.Log
-import com.google.android.exoplayer2.C
-import com.google.android.exoplayer2.drm.ExoMediaDrm
-import com.google.android.exoplayer2.upstream.DataSourceInputStream
-import com.google.android.exoplayer2.upstream.DataSpec
-import com.google.android.exoplayer2.upstream.HttpDataSource
-import com.google.android.exoplayer2.util.Assertions
-import com.google.android.exoplayer2.util.Util
-import com.twentyfouri.smartexoplayer.drm.SmartMediaDrmCallback
-import com.twentyfouri.smartexoplayer.model.DrmConfiguration
-import com.twentyfouri.tvbridge.BuildConfig
-import org.json.JSONException
-import org.json.JSONObject
-import java.io.BufferedReader
-import java.io.IOException
-import java.io.InputStreamReader
-import java.net.MalformedURLException
-import java.net.URL
-import java.net.URLEncoder
-import java.util.HashMap
-import java.util.UUID
-
-class HttpMediaDrmCallback(
-        private val defaultLicenseUrl: String?,
-        private val forceDefaultLicenseUrl: Boolean,
-        private val dataSourceFactory: HttpDataSource.Factory
-) : SmartMediaDrmCallback {
-
-    private val keyRequestProperties = HashMap<String, String>()
-
-    /**
-     * @param defaultLicenseUrl The default license URL. Used for key requests that do not specify
-     * their own license URL.
-     * @param dataSourceFactory A factory from which to obtain [HttpDataSource] instances.
-     */
-    constructor(defaultLicenseUrl: String, dataSourceFactory: HttpDataSource.Factory) : this(defaultLicenseUrl, false, dataSourceFactory) {}
-
-    /**
-     * Sets a header for key requests made by the callback.
-     *
-     * @param name The name of the header field.
-     * @param value The value of the field.
-     */
-    override fun setKeyRequestProperty(name: String, value: String) {
-        Log.d(TAG, "setKeyRequestProperty")
-        Assertions.checkNotNull(name)
-        Assertions.checkNotNull(value)
-        synchronized(keyRequestProperties) { keyRequestProperties.put(name, value) }
-    }
-
-    /**
-     * Clears a header for key requests made by the callback.
-     *
-     * @param name The name of the header field.
-     */
-    override fun clearKeyRequestProperty(name: String) {
-        Log.d(TAG, "clearKeyRequestProperty")
-        Assertions.checkNotNull(name)
-        synchronized(keyRequestProperties) { keyRequestProperties.remove(name) }
-    }
-
-    /**
-     * Clears all headers for key requests made by the callback.
-     */
-    override fun clearAllKeyRequestProperties() {
-        Log.d(TAG, "clearAllKeyRequestProperties")
-        synchronized(keyRequestProperties) { keyRequestProperties.clear() }
-    }
-
-    @Throws(IOException::class)
-    override fun executeProvisionRequest(uuid: UUID, request: ExoMediaDrm.ProvisionRequest): ByteArray {
-        Log.d(TAG, "executeProvisionRequest")
-        val url = request.defaultUrl + "&signedRequest=" + String(request.data)
-        return executePost(dataSourceFactory, url, ByteArray(0), null)
-    }
-
-    @Throws(Exception::class)
-    override fun executeKeyRequest(uuid: UUID, request: ExoMediaDrm.KeyRequest): ByteArray {
-        Log.d(TAG, "executeKeyRequest")
-        var url: String? = request.licenseServerUrl
-        if (forceDefaultLicenseUrl || url.isNullOrEmpty()) {
-            url = defaultLicenseUrl
-        }
-        val requestProperties: MutableMap<String, String> = HashMap()
-        // Add standard request properties for supported schemes.
-        val contentType = "text/plain"
-        requestProperties["Content-Type"] = contentType
-        if (C.PLAYREADY_UUID == uuid) {
-            requestProperties["SOAPAction"] = "http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"
-        }
-        // Add additional request properties.
-        synchronized(keyRequestProperties) { requestProperties.putAll(keyRequestProperties) }
-
-        //adding data to url
-        val challenge = request.data
-        val encoded = URLEncoder.encode(Base64.encodeToString(challenge, Base64.NO_WRAP), "UTF-8")
-        url = appendQuery(url, "_widevineChallenge=$encoded")
-        if (BuildConfig.DEBUG) {
-            Log.d(TAG, "Executing post on url $url with content type $contentType")
-        }
-        return executeGet(url)
-    }
-
-    class Factory(
-            private val licenseUrl: String?,
-            private val forceDefaultUrl: Boolean
-    ) : SmartMediaDrmCallback.Factory {
-        override fun build(drm: DrmConfiguration, dataSourceFactory: HttpDataSource.Factory): SmartMediaDrmCallback =
-                HttpMediaDrmCallback(licenseUrl, forceDefaultUrl, dataSourceFactory)
-    }
-
-    companion object {
-        private const val TAG = "DrmCallback"
-
-        private fun executeGet(urlString: String): ByteArray {
-            var licenserRequest: URL? = null
-            try {
-                licenserRequest = URL(urlString)
-                val yc = licenserRequest.openConnection()
-                val input = BufferedReader(InputStreamReader(yc.getInputStream()))
-                val builder = StringBuilder()
-                var inputLine: String?
-                while (input.readLine().also { inputLine = it } != null) {
-                    builder.append(inputLine)
-                }
-                input.close()
-                val jsonObject = JSONObject(builder.toString())
-                val container = jsonObject.getJSONObject("getWidevineLicenseResponse")
-                val license = container.getString("license")
-                if (BuildConfig.DEBUG) {
-                    Log.d(TAG, "Finished post: $license")
-                }
-                return Base64.decode(license, Base64.NO_WRAP)
-            } catch (e: MalformedURLException) {
-                e.printStackTrace()
-            } catch (e: IOException) {
-                e.printStackTrace()
-            } catch (e: JSONException) {
-                e.printStackTrace()
-            }
-            return byteArrayOf()
-        }
-
-        @Throws(IOException::class)
-        private fun executePost(
-                dataSourceFactory: HttpDataSource.Factory,
-                url: String,
-                data: ByteArray,
-                requestProperties: Map<String, String>?
-        ): ByteArray {
-            Log.d(TAG, "executePost")
-            val dataSource = dataSourceFactory.createDataSource()
-            if (requestProperties != null) {
-                for ((key, value) in requestProperties) {
-                    dataSource.setRequestProperty(key, value)
-                }
-            }
-            val dataSpec = DataSpec(Uri.parse(url), data, 0, 0, C.LENGTH_UNSET.toLong(), null,
-                    DataSpec.FLAG_ALLOW_GZIP)
-            val inputStream = DataSourceInputStream(dataSource, dataSpec)
-            return try {
-                Util.toByteArray(inputStream)
-            } finally {
-                Util.closeQuietly(inputStream)
-            }
-        }
-
-        fun appendQuery(url: String?, appendQuery: String): String {
-            val oldUri = Uri.parse(url)
-            var newQuery = oldUri.query
-            if (newQuery == null) {
-                newQuery = appendQuery
-            } else {
-                newQuery += "&$appendQuery"
-            }
-            return oldUri.scheme + "://" + oldUri.authority + oldUri.path + "?" + newQuery
-        }
-    }
-}