homebridge-weatherlink-cloud 0.1.4 → 0.1.5

package/config.schema.json

@@ -25,10 +25,9 @@
 		"required": true
 	  },
 	  "stationId": {
-		"title": "Station ID",
-		"description": "Numeric station ID from GET /v2/stations.",
-		"type": "integer",
-		"required": true
+		"title": "Station ID (optional)",
+		"description": "Leave blank to auto-discover from your account. Only needed if you have more than one station and want to pin a specific one.",
+		"type": "integer"
 	  },
 	  "pollMinutes": {
 		"title": "Poll interval (minutes)",
@@ -39,7 +38,7 @@
 	  },
 	  "manufacturer": {
 		"title": "Manufacturer",
-		"description": "Shown in the Home app accessory tails. Defaults to Davis Instruments.",
+		"description": "Shown in the Home app accessory details. Defaults to Davis Instruments.",
 		"type": "string",
 		"default": "Davis Instruments"
 	  },

package/index.js

@@ -4,6 +4,7 @@ const https = require('https');
 
 const PLUGIN_NAME = 'homebridge-weatherlink-cloud';
 const PLATFORM_NAME = 'WeatherLinkCloud';
+const PLUGIN_VERSION = require('./package.json').version;
 
 let Service, Characteristic;
 
@@ -25,9 +26,19 @@ class WeatherLinkCloudPlatform {
 	// Polling faster than the data refreshes just wastes API calls.
 	this.pollSeconds = (config.pollMinutes || 15) * 60;
 
+	// Shown in the Home app's accessory details (Manufacturer / Model).
+	this.manufacturer = config.manufacturer || 'Davis Instruments';
+	this.model = config.model || 'Vantage Vue';
+
 	this.accessories = new Map(); // UUID -> cached accessory
 
-	this.api.on('didFinishLaunching', () => {
+	this.api.on('didFinishLaunching', async () => {
+	  try {
+		await this.resolveStationId();
+	  } catch (err) {
+		this.log.error('Cannot start: ' + err.message);
+		return; // No station ID -> don't create accessories or poll.
+	  }
 	  this.setupAccessories();
 	  this.poll();
 	  setInterval(() => this.poll(), this.pollSeconds * 1000);
@@ -51,6 +62,17 @@ class WeatherLinkCloudPlatform {
 	  this.accessories.set(uuid, accessory);
 	  this.log(`Created accessory: ${name}`);
 	}
+
+	// Set the AccessoryInformation service every time (not just on creation) so
+	// that already-cached accessories showing "Default" get corrected on restart.
+	// The serial must be UNIQUE per accessory, or HomeKit may merge or misbehave.
+	accessory
+	  .getService(Service.AccessoryInformation)
+	  .setCharacteristic(Characteristic.Manufacturer, this.manufacturer)
+	  .setCharacteristic(Characteristic.Model, this.model)
+	  .setCharacteristic(Characteristic.SerialNumber, `${this.stationId}-${idSuffix}`)
+	  .setCharacteristic(Characteristic.FirmwareRevision, PLUGIN_VERSION);
+
 	return accessory;
   }
 
@@ -77,6 +99,14 @@ class WeatherLinkCloudPlatform {
   }
 
   fetchCurrent() {
+	return this.apiGet(`/v2/current/${this.stationId}`);
+  }
+
+  fetchStations() {
+	return this.apiGet('/v2/stations');
+  }
+
+  apiGet(basePath) {
 	// v2 API: api-key as a query param, secret in the X-Api-Secret header.
 	// (v2 also supports an older HMAC api-signature scheme — the header
 	//  method below is the simpler one. Confirm against the official docs:
@@ -84,7 +114,7 @@ class WeatherLinkCloudPlatform {
 	return new Promise((resolve, reject) => {
 	  const options = {
 		hostname: 'api.weatherlink.com',
-		path: `/v2/current/${this.stationId}?api-key=${this.apiKey}`,
+		path: `${basePath}?api-key=${this.apiKey}`,
 		method: 'GET',
 		headers: { 'X-Api-Secret': this.apiSecret },
 	  };
@@ -104,6 +134,41 @@ class WeatherLinkCloudPlatform {
 	});
   }
 
+  // Resolve this.stationId: use the configured value if present, otherwise
+  // discover it from /v2/stations. Throws if it can't be determined.
+  async resolveStationId() {
+	if (this.stationId) {
+	  this.log(`Using configured station ID ${this.stationId}.`);
+	  return;
+	}
+
+	this.log('No station ID configured — fetching from /v2/stations ...');
+	const data = await this.fetchStations();
+	const stations = (data && data.stations) || [];
+
+	if (stations.length === 0) {
+	  throw new Error('No stations found on this WeatherLink account (check your API key/secret).');
+	}
+
+	if (stations.length === 1) {
+	  this.stationId = stations[0].station_id;
+	  this.log(`Discovered station "${stations[0].station_name}" (ID ${this.stationId}).`);
+	  return;
+	}
+
+	// More than one station: we can't guess which you want, so list them all
+	// and default to the first, telling you how to pin a specific one.
+	this.log.warn('Multiple stations found on this account:');
+	for (const s of stations) {
+	  this.log.warn(`  - "${s.station_name}" -> stationId ${s.station_id}`);
+	}
+	this.stationId = stations[0].station_id;
+	this.log.warn(
+	  `Defaulting to "${stations[0].station_name}" (ID ${this.stationId}). ` +
+	  'Set "stationId" in the plugin config to pin a specific station.'
+	);
+  }
+
   applyData(data) {
 	// The /current payload nests readings under sensors[].data[]. Each sensor
 	// block has a sensor_type and data_structure_type; you need to locate the

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-weatherlink-cloud",
   "displayName": "WeatherLink Cloud",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Exposes Davis WeatherLink (v2 cloud API) weather data to HomeKit via Homebridge.",
   "main": "index.js",
   "license": "MIT",