Merge branch 'master' into 404_authentication_for_registry_and_delta

src/app.coffee

@@ -32,19 +32,23 @@ knex.init.then ->
 
 		bootstrap.done
 		.then ->
-			device.getOSVersion()
-		.then (osVersion) ->
-			# Let API know what version we are, and our api connection info.
-			console.log('Updating supervisor version and api info')
-			device.updateState(
-				api_port: config.listenPort
-				api_secret: secret
-				os_version: osVersion
-				supervisor_version: utils.supervisorVersion
-				provisioning_progress: null
-				provisioning_state: ''
-				download_progress: null
-				logs_channel: logsChannel
+			Promise.join(
+				device.getOSVersion()
+				device.getOSVariant()
+				(osVersion, osVariant) ->
+					osVersion += " (#{osVariant})" if osVersion? and osVariant?
+					# Let API know what version we are, and our api connection info.
+					console.log('Updating supervisor version and api info')
+					device.updateState(
+						api_port: config.listenPort
+						api_secret: secret
+						os_version: osVersion
+						supervisor_version: utils.supervisorVersion
+						provisioning_progress: null
+						provisioning_state: ''
+						download_progress: null
+						logs_channel: logsChannel
+					)
 			)
 
 		console.log('Starting Apps..')

src/application.coffee

@@ -16,6 +16,7 @@ fs = Promise.promisifyAll(require('fs'))
 JSONStream = require 'JSONStream'
 proxyvisor = require './proxyvisor'
 { checkInt, checkTruthy } = require './lib/validation'
+osRelease = require './lib/os-release'
 deviceConfig = require './device-config'
 
 class UpdatesLockedError extends TypedError
@@ -236,7 +237,7 @@ shouldMountKmod = (image) ->
 	device.isResinOSv1().then (isV1) ->
 		return false if not isV1
 		Promise.using docker.imageRootDirMounted(image), (rootDir) ->
-			utils.getOSVersion(rootDir + '/etc/os-release')
+			osRelease.getOSVersion(rootDir + '/etc/os-release')
 		.then (version) ->
 			return version? and /^(Debian|Raspbian)/i.test(version)
 		.catch (err) ->

src/db.coffee

@@ -52,6 +52,9 @@ knex.init = Promise.all([
 				addColumn('app', 'appId', 'string')
 				addColumn('app', 'config', 'json')
 			]
+			.then ->
+				# When updating from older supervisors, config can be null
+				knex('app').update({ config: '{}' }).whereNull('config')
 
 	knex.schema.hasTable('image')
 	.then (exists) ->

src/device.coffee

@@ -11,6 +11,7 @@ execAsync = Promise.promisify(require('child_process').exec)
 fs = Promise.promisifyAll(require('fs'))
 bootstrap = require './bootstrap'
 { checkTruthy } = require './lib/validation'
+osRelease = require './lib/os-release'
 
 memoizePromise = _.partial(memoizee, _, promise: true)
 
@@ -224,7 +225,7 @@ do ->
 		return
 
 exports.getOSVersion = memoizePromise ->
-	utils.getOSVersion(config.hostOsVersionPath)
+	osRelease.getOSVersion(config.hostOsVersionPath)
 
 exports.isResinOSv1 = memoizePromise ->
 	exports.getOSVersion().then (osVersion) ->
@@ -232,7 +233,4 @@ exports.isResinOSv1 = memoizePromise ->
 		return false
 
 exports.getOSVariant = memoizePromise ->
-	utils.getOSReleaseField(config.hostOsVersionPath, 'VARIANT_ID')
-	.catch (err) ->
-		console.error('Failed to get OS variant', err, err.stack)
-		return undefined
+	osRelease.getOSVariant(config.hostOsVersionPath)

src/lib/os-release.coffee

@@ -0,0 +1,32 @@
+Promise = require 'bluebird'
+fs = require 'fs'
+_ = require 'lodash'
+
+exports.getOSReleaseField = (path, field) ->
+	try
+		releaseData = fs.readFileSync(path)
+		lines = releaseData.toString().split('\n')
+		releaseItems = {}
+		for line in lines
+			[ key, val ] = line.split('=')
+			releaseItems[_.trim(key)] = _.trim(val)
+		# Remove enclosing quotes: http://stackoverflow.com/a/19156197/2549019
+		return releaseItems[field].replace(/^"(.+(?="$))"$/, '$1')
+	catch err
+		console.log('Could not get OS release field: ', err, err.stack)
+		return undefined
+
+
+exports.getOSVersionSync = (path) ->
+	exports.getOSReleaseField(path, 'PRETTY_NAME')
+
+exports.getOSVersion = (path) ->
+	Promise.try ->
+		exports.getOSVersionSync(path)
+
+exports.getOSVariantSync = (path) ->
+	exports.getOSReleaseField(path, 'VARIANT_ID')
+
+exports.getOSVariant = (path) ->
+	Promise.try ->
+		exports.getOSVariantSync(path)

src/lib/supervisor-version.coffee

@@ -0,0 +1,6 @@
+# Parses package.json and returns resin-supervisor's version
+_ = require 'lodash'
+version = require('../../package.json').version
+tagExtra = process.env.SUPERVISOR_TAG_EXTRA
+version += '+' + tagExtra if !_.isEmpty(tagExtra)
+module.exports = version

src/request.coffee

@@ -3,10 +3,24 @@ PlatformAPI = require 'pinejs-client'
 Promise = require 'bluebird'
 request = require 'request'
 url = require 'url'
+osRelease = require './lib/os-release'
+
+osVersion = osRelease.getOSVersionSync(config.hostOsVersionPath)
+osVariant = osRelease.getOSVariantSync(config.hostOsVersionPath)
+supervisorVersion = require('./lib/supervisor-version')
+
+userAgent = "Supervisor/#{supervisorVersion}"
+if osVersion?
+	if osVariant?
+		userAgent += " (Linux; #{osVersion}; #{osVariant})"
+	else
+		userAgent += " (Linux; #{osVersion})"
 
 requestOpts =
 	gzip: true
 	timeout: 30000
+	headers:
+		'User-Agent': userAgent
 
 PLATFORM_ENDPOINT = url.resolve(config.apiEndpoint, '/v2/')
 exports.resinApi = resinApi = new PlatformAPI

src/utils.coffee

@@ -15,11 +15,7 @@ execAsync = Promise.promisify(require('child_process').exec)
 device = require './device'
 { checkTruthy } = require './lib/validation'
 
-# Parses package.json and returns resin-supervisor's version
-version = require('../package.json').version
-tagExtra = process.env.SUPERVISOR_TAG_EXTRA
-version += '+' + tagExtra if !_.isEmpty(tagExtra)
-exports.supervisorVersion = version
+exports.supervisorVersion = require('./lib/supervisor-version')
 
 configJson = require('/boot/config.json')
 if Boolean(configJson.supervisorOfflineMode)
@@ -230,23 +226,6 @@ exports.getKnexApp = (appId, columns) ->
 exports.getKnexApps = (columns) ->
 	knex('app').select(columns)
 
-exports.getOSReleaseField = (path, field) ->
-	fs.readFileAsync(path)
-	.then (releaseData) ->
-		lines = releaseData.toString().split('\n')
-		releaseItems = {}
-		for line in lines
-			[ key, val ] = line.split('=')
-			releaseItems[_.trim(key)] = _.trim(val)
-		# Remove enclosing quotes: http://stackoverflow.com/a/19156197/2549019
-		return releaseItems[field].replace(/^"(.+(?="$))"$/, '$1')
-
-exports.getOSVersion = (path) ->
-	exports.getOSReleaseField(path, 'PRETTY_NAME')
-	.catch (err) ->
-		console.log('Could not get OS Version: ', err, err.stack)
-		return undefined
-
 exports.defaultVolumes = (includeV1Volumes) ->
 	volumes = {
 		'/data': {}