@24i/smartapps-bigscreen-rnv-build-engine 0.17.6-alpha.12 → 0.17.6-alpha.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/src/resolvers/index.js +3 -1
  2. package/dist/src/resolvers/resolveBaseUrl.js +4 -25
  3. package/dist/src/resolvers/resolveS3BucketAppPath.js +15 -0
  4. package/dist/src/resolvers/shared/constructFullUrl.js +25 -0
  5. package/dist/src/tasks/deploy/aswS3/deployS3.js +3 -10
  6. package/dist/src/tasks/deploy/aswS3/distToLiveS3.js +4 -5
  7. package/package.json +1 -1
package/dist/src/resolvers/index.js CHANGED
@@ -1,9 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getProductionZipFileRelativePath = exports.resolveZippedPlatformBuildsRelativeFilePath = exports.resolvePackageVersions = exports.resolveBuildFileExtension = exports.resolveUsedFlavours = exports.resolveSupportedFlavoursForPlatform = exports.resolveSupportedPlatforms = exports.getBaseConfig = exports.resolveBuildFileName = exports.resolveBuildFileBaseName = exports.resolveHbbtvDeployConfig = exports.resolveHbbtvDeployUrl = exports.resolveHbbtvRemoteBuildDirRelativePath = exports.resolveDeployLocations = exports.resolveBuildVersionOffset = exports.resolveBuildVersion = exports.resolveBuildEnvName = exports.resolveProductionPackagesBaseUrl = exports.resolveBaseUrl = void 0;
3
+ exports.getProductionZipFileRelativePath = exports.resolveZippedPlatformBuildsRelativeFilePath = exports.resolvePackageVersions = exports.resolveBuildFileExtension = exports.resolveUsedFlavours = exports.resolveSupportedFlavoursForPlatform = exports.resolveSupportedPlatforms = exports.getBaseConfig = exports.resolveBuildFileName = exports.resolveBuildFileBaseName = exports.resolveHbbtvDeployConfig = exports.resolveHbbtvDeployUrl = exports.resolveHbbtvRemoteBuildDirRelativePath = exports.resolveDeployLocations = exports.resolveBuildVersionOffset = exports.resolveBuildVersion = exports.resolveBuildEnvName = exports.resolveS3BucketAppPath = exports.resolveProductionPackagesBaseUrl = exports.resolveBaseUrl = void 0;
4
4
  var resolveBaseUrl_1 = require("./resolveBaseUrl");
5
5
  Object.defineProperty(exports, "resolveBaseUrl", { enumerable: true, get: function () { return resolveBaseUrl_1.resolveBaseUrl; } });
6
6
  Object.defineProperty(exports, "resolveProductionPackagesBaseUrl", { enumerable: true, get: function () { return resolveBaseUrl_1.resolveProductionPackagesBaseUrl; } });
7
+ var resolveS3BucketAppPath_1 = require("./resolveS3BucketAppPath");
8
+ Object.defineProperty(exports, "resolveS3BucketAppPath", { enumerable: true, get: function () { return resolveS3BucketAppPath_1.resolveS3BucketAppPath; } });
7
9
  var resolveBuildEnvName_1 = require("./resolveBuildEnvName");
8
10
  Object.defineProperty(exports, "resolveBuildEnvName", { enumerable: true, get: function () { return resolveBuildEnvName_1.resolveBuildEnvName; } });
9
11
  var resolveBuildVersion_1 = require("./resolveBuildVersion");
package/dist/src/resolvers/resolveBaseUrl.js CHANGED
@@ -2,36 +2,15 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.resolveProductionPackagesBaseUrl = exports.resolveBaseUrl = void 0;
4
4
  const resolveGenericRnvConfig_1 = require("./resolveGenericRnvConfig");
5
- const resolveBuildEnvName_1 = require("./resolveBuildEnvName");
6
- const constants_1 = require("../constants");
5
+ const constructFullUrl_1 = require("./shared/constructFullUrl");
7
6
  const resolveBaseUrl = ({ platform, scheme, flavour }) => {
8
7
  const c = (0, resolveGenericRnvConfig_1.getBaseConfig)();
9
8
  c.platform = platform;
10
9
  c.runtime.scheme = scheme;
11
10
  c.runtime.appId = flavour;
12
- const { packageVersion, deploy } = c.buildConfig?.common;
13
- const bucketName = deploy?.aws3?.bucketName || '';
14
- if (!packageVersion || !bucketName) {
15
- return '';
16
- }
17
- const bucketUrl = `http://${bucketName}.s3.amazonaws.com`;
18
- const appFolderUrl = `${bucketUrl}/builds/${platform}/${flavour}`;
19
- const envName = (0, resolveBuildEnvName_1.resolveBuildEnvName)(c.runtime.scheme);
20
- switch (scheme) {
21
- case constants_1.BuildSchemes.DEV_LATEST:
22
- return `${appFolderUrl}/latest/dev`;
23
- case constants_1.BuildSchemes.RC_STAGING_LATEST:
24
- case constants_1.BuildSchemes.RC_PROD_LATEST:
25
- return `${appFolderUrl}/latest/rc/${envName}`;
26
- case constants_1.BuildSchemes.RELEASE_STAGING_LATEST:
27
- case constants_1.BuildSchemes.RELEASE_PROD_LATEST:
28
- return `${appFolderUrl}/latest/release/${envName}`;
29
- case constants_1.BuildSchemes.RELEASE_STAGING_DIST:
30
- case constants_1.BuildSchemes.RELEASE_PROD_DIST:
31
- return `${appFolderUrl}/dist/v${packageVersion}/${envName}`;
32
- default:
33
- return '';
34
- }
11
+ const hostedBaseUrl = c.buildConfig?.common.hostedUrl.baseUrl;
12
+ const fullBaseUrl = `${hostedBaseUrl}/builds/${platform}/${flavour}`;
13
+ return (0, constructFullUrl_1.constructFullUrl)({ baseUrl: fullBaseUrl, scheme, c });
35
14
  };
36
15
  exports.resolveBaseUrl = resolveBaseUrl;
37
16
  const resolveProductionPackagesBaseUrl = (c) => {
package/dist/src/resolvers/resolveS3BucketAppPath.js ADDED
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.resolveS3BucketAppPath = void 0;
4
+ const resolveGenericRnvConfig_1 = require("./resolveGenericRnvConfig");
5
+ const constructFullUrl_1 = require("./shared/constructFullUrl");
6
+ const resolveS3BucketAppPath = ({ platform, scheme, flavour }) => {
7
+ const c = (0, resolveGenericRnvConfig_1.getBaseConfig)();
8
+ c.platform = platform;
9
+ c.runtime.scheme = scheme;
10
+ c.runtime.appId = flavour;
11
+ const bucketName = c.buildConfig?.common.deploy?.aws3?.bucketName || '';
12
+ const appFolderUrl = `${bucketName}/builds/${platform}/${flavour}`;
13
+ return (0, constructFullUrl_1.constructFullUrl)({ baseUrl: appFolderUrl, scheme, c });
14
+ };
15
+ exports.resolveS3BucketAppPath = resolveS3BucketAppPath;
package/dist/src/resolvers/shared/constructFullUrl.js ADDED
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.constructFullUrl = void 0;
4
+ const resolveBuildEnvName_1 = require("../resolveBuildEnvName");
5
+ const constants_1 = require("../../constants");
6
+ const constructFullUrl = ({ baseUrl, scheme, c }) => {
7
+ const { packageVersion } = c.buildConfig?.common;
8
+ const envName = (0, resolveBuildEnvName_1.resolveBuildEnvName)(scheme);
9
+ switch (scheme) {
10
+ case constants_1.BuildSchemes.DEV_LATEST:
11
+ return `${baseUrl}/latest/dev`;
12
+ case constants_1.BuildSchemes.RC_STAGING_LATEST:
13
+ case constants_1.BuildSchemes.RC_PROD_LATEST:
14
+ return `${baseUrl}/latest/rc/${envName}`;
15
+ case constants_1.BuildSchemes.RELEASE_STAGING_LATEST:
16
+ case constants_1.BuildSchemes.RELEASE_PROD_LATEST:
17
+ return `${baseUrl}/latest/release/${envName}`;
18
+ case constants_1.BuildSchemes.RELEASE_STAGING_DIST:
19
+ case constants_1.BuildSchemes.RELEASE_PROD_DIST:
20
+ return `${baseUrl}/dist/v${packageVersion}/${envName}`;
21
+ default:
22
+ return '';
23
+ }
24
+ };
25
+ exports.constructFullUrl = constructFullUrl;
package/dist/src/tasks/deploy/aswS3/deployS3.js CHANGED
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.deployToS3 = exports.urlToS3Protocol = void 0;
26
+ exports.deployToS3 = void 0;
27
27
  const path = __importStar(require("path"));
28
28
  const rnv_1 = require("rnv");
29
29
  const aws = __importStar(require("./aws"));
@@ -45,27 +45,20 @@ const uploadPublicDir = (sourcePath, uploadPath) => {
45
45
  rnv_1.Logger.logDebug(`uploadPublicDir: src: ${publicDirLocalPath}, dest: ${publicDirRemotePath}`);
46
46
  aws.cp(publicDirLocalPath, publicDirRemotePath);
47
47
  };
48
- const urlToS3Protocol = (url) => {
49
- const hostWithPath = url.split('://')[1];
50
- const bucketHostnameAwsPostfix = '.s3.amazonaws.com';
51
- return hostWithPath.replace(bucketHostnameAwsPostfix, '');
52
- };
53
- exports.urlToS3Protocol = urlToS3Protocol;
54
48
  const deployToS3 = async (c) => {
55
49
  rnv_1.Logger.logTask(`deployToS3`);
56
50
  const { platform, runtime } = c;
57
51
  const schemeDirName = c.program.schemeFolder ? (0, getSafeSchemeString_1.getSafeSchemeString)(runtime.scheme) : '';
58
52
  const sourcePath = path.join(c.paths.project.builds.dir, schemeDirName, `${runtime.appId}_${platform}`);
59
53
  const { isBuildHosted } = getConfigProp(c, platform, 'webpackConfig', {});
60
- const baseUrl = (0, resolvers_1.resolveBaseUrl)({
54
+ const uploadPath = (0, resolvers_1.resolveS3BucketAppPath)({
61
55
  platform,
62
56
  scheme: runtime.scheme || '',
63
57
  flavour: runtime.appId,
64
58
  });
65
- if (!baseUrl) {
59
+ if (!uploadPath) {
66
60
  return false;
67
61
  }
68
- const uploadPath = urlToS3Protocol(baseUrl);
69
62
  aws.rm(`${uploadPath}/`);
70
63
  uploadPackage(c, sourcePath, uploadPath);
71
64
  if (platform === constants_1.Platforms.HBBTV) {
package/dist/src/tasks/deploy/aswS3/distToLiveS3.js CHANGED
@@ -24,17 +24,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.checkAWSAuth = exports.checkDistVersionAvailability = exports.distToLiveS3 = void 0;
27
- const resolveBaseUrl_1 = require("../../../resolvers/resolveBaseUrl");
27
+ const resolvers_1 = require("../../../resolvers");
28
28
  const resolveGenericRnvConfig_1 = require("../../../resolvers/resolveGenericRnvConfig");
29
- const deployS3_1 = require("./deployS3");
30
29
  const aws = __importStar(require("./aws"));
31
30
  const getUploadPath = (options, version) => {
32
31
  const { packageVersion } = (0, resolveGenericRnvConfig_1.getBaseConfig)().buildConfig?.common;
33
- const baseUrl = (0, resolveBaseUrl_1.resolveBaseUrl)(options);
34
- if (!baseUrl) {
32
+ const s3BucketAppPath = (0, resolvers_1.resolveS3BucketAppPath)(options);
33
+ if (!s3BucketAppPath) {
35
34
  return undefined;
36
35
  }
37
- return (0, deployS3_1.urlToS3Protocol)(baseUrl).replace(packageVersion, version);
36
+ return s3BucketAppPath.replace(packageVersion, version);
38
37
  };
39
38
  const checkAWSAuth = () => {
40
39
  try {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@24i/smartapps-bigscreen-rnv-build-engine",
3
- "version": "0.17.6-alpha.12",
3
+ "version": "0.17.6-alpha.13",
4
4
  "description": "Package with build engine for SmartApps BIGscreen projects...",
5
5
  "main": "dist/src/index.js",
6
6
  "scripts": {