Merge branch 'master' into ssl-support

Author: widatama

api/parts/data/usage.js

@@ -1117,6 +1117,16 @@ plugins.register("/sdk/user_properties", async function(ob) {
                 userProps.av_major = versionComponents.major;
                 userProps.av_minor = versionComponents.minor;
                 userProps.av_patch = versionComponents.patch;
+                userProps.av_prerel = versionComponents.prerelease;
+                userProps.av_build = versionComponents.build;
+            }
+            else {
+                log.w("Invalid app version format: %s", params.qstring.metrics._app_version);
+                userProps.av_major = null;
+                userProps.av_minor = null;
+                userProps.av_patch = null;
+                userProps.av_rel = null;
+                userProps.av_build = null;
             }
         }
     }

api/utils/common.js

@@ -2069,19 +2069,16 @@ common.parseAppVersion = function(version) {
             version = String(version);
         }
 
-        // Ensure version has at least one decimal point
-        if (version.indexOf('.') === -1) {
-            version += '.0';
-        }
-
-        const parsedVersion = semver.valid(semver.coerce(version));
-        if (parsedVersion) {
-            const versionObj = semver.parse(parsedVersion);
+        const isValid = semver.valid(semver.coerce(version, {includePrerelease: true}));
+        if (isValid) {
+            const versionObj = semver.parse(semver.coerce(version, {includePrerelease: true}));
             if (versionObj) {
                 return {
                     major: versionObj.major,
                     minor: versionObj.minor,
                     patch: versionObj.patch,
+                    prerelease: versionObj.prerelease,
+                    build: versionObj.build,
                     original: version,
                     success: true
                 };

plugins/crashes/api/api.js

@@ -477,6 +477,8 @@ plugins.setConfigs("crashes", {
                             report.app_version_major = versionComponents.major;
                             report.app_version_minor = versionComponents.minor;
                             report.app_version_patch = versionComponents.patch;
+                            report.app_version_prerelease = versionComponents.prerelease;
+                            report.app_version_build = versionComponents.build;
                         }
                     }
 
@@ -526,6 +528,8 @@ plugins.setConfigs("crashes", {
                                     { name: "app_version_major", type: "n" },
                                     { name: "app_version_minor", type: "n" },
                                     { name: "app_version_patch", type: "n" },
+                                    { name: "app_version_prerelease", type: "l" },
+                                    { name: "app_version_build", type: "l" },
                                     { name: "ram_current", type: "n" },
                                     { name: "ram_total", type: "n" },
                                     { name: "disk_current", type: "n" },

test/unit-tests/api.utils.common.js

@@ -317,4 +317,70 @@ describe("Common API utility functions", function() {
 
         });
     });
+
+    describe('Parsing app version', () => {
+        it('should not parse invalid semver', () => {
+            should.deepEqual(common.parseAppVersion('abcd'), { original: 'abcd', success: false });
+        });
+
+        it('should parse semver into its parts', () => {
+            should.deepEqual(common.parseAppVersion('1.0.0'), {
+                major: 1,
+                minor: 0,
+                patch: 0,
+                prerelease: [],
+                build: [],
+                original: '1.0.0',
+                success: true,
+            });
+        });
+
+        it('should coerce incomplete semver', () => {
+            should.deepEqual(common.parseAppVersion('1'), {
+                major: 1,
+                minor: 0,
+                patch: 0,
+                prerelease: [],
+                build: [],
+                original: '1',
+                success: true,
+            });
+        });
+
+        it('should parse semver prerelease', () => {
+            should.deepEqual(common.parseAppVersion('1.0.0-prerelease'), {
+                major: 1,
+                minor: 0,
+                patch: 0,
+                prerelease: ['prerelease'],
+                build: [],
+                original: '1.0.0-prerelease',
+                success: true,
+            });
+        });
+
+        it('should parse semver build', () => {
+            should.deepEqual(common.parseAppVersion('1.0.0+build'), {
+                major: 1,
+                minor: 0,
+                patch: 0,
+                prerelease: [],
+                build: ['build'],
+                original: '1.0.0+build',
+                success: true,
+            });
+        });
+
+        it('should parse semver prerelease and build', () => {
+            should.deepEqual(common.parseAppVersion('1.0.0-prerelease+build'), {
+                major: 1,
+                minor: 0,
+                patch: 0,
+                prerelease: ['prerelease'],
+                build: ['build'],
+                original: '1.0.0-prerelease+build',
+                success: true,
+            });
+        });
+    });
 });

types/common.d.ts

@@ -708,6 +708,8 @@ export interface Common {
         major?: number;
         minor?: number;
         patch?: number;
+        prerelease?: string|number[];
+        build?: string|number[];
         original: string;
         success: boolean;
     };