tsvesync 1.0.16 → 1.0.17

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 (3) hide show
  1. package/dist/lib/vesyncOutlet.js +63 -16
  2. package/package.json +1 -1
  3. package/src/lib/vesyncOutlet.ts +62 -17
package/dist/lib/vesyncOutlet.js CHANGED
@@ -117,14 +117,58 @@ class VeSyncOutlet extends vesyncBaseDevice_1.VeSyncBaseDevice {
117
117
  return;
118
118
  }
119
119
  logger_1.logger.debug(`[${this.deviceName}] Updating energy data`);
120
- const url = `/v1/${this.deviceType}/${this.deviceType}-${this.cid}/energy/detail`;
121
- const [response] = await helpers_1.Helpers.callApi(url, 'get', null, helpers_1.Helpers.reqHeaders(this.manager));
122
- if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
120
+ // Different endpoints for different device types
121
+ let url;
122
+ if (this.deviceType === 'wifi-switch-1.3') {
123
+ url = `/v1/device/${this.deviceType}-${this.cid}/energy/detail`;
124
+ }
125
+ else if (this.deviceType.startsWith('ESO15')) {
126
+ url = '/outdoorsocket15a/v1/device/energy';
127
+ }
128
+ else if (this.deviceType.startsWith('ESW15')) {
129
+ url = '/15a/v1/device/energy';
130
+ }
131
+ else if (this.deviceType.startsWith('ESW03') || this.deviceType.startsWith('ESW01')) {
132
+ url = '/10a/v1/device/energy';
133
+ }
134
+ else {
135
+ url = '/v1/device/energy';
136
+ }
137
+ const body = this.deviceType === 'wifi-switch-1.3' ? null : {
138
+ ...helpers_1.Helpers.reqBody(this.manager, 'energy'),
139
+ uuid: this.uuid
140
+ };
141
+ const [response] = await helpers_1.Helpers.callApi(url, this.deviceType === 'wifi-switch-1.3' ? 'get' : 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
142
+ // Handle different response formats
143
+ if ((response === null || response === void 0 ? void 0 : response.code) === 0 && response.result) {
123
144
  this.energy = response.result;
124
145
  logger_1.logger.debug(`[${this.deviceName}] Successfully updated energy data`);
125
146
  }
147
+ else if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
148
+ // Some devices return data directly in response
149
+ this.energy = {
150
+ power: response.power || '0',
151
+ voltage: response.voltage || '0',
152
+ energy: response.energy || '0',
153
+ energyToday: response.energy || '0',
154
+ energyWeek: response.energy || '0',
155
+ energyMonth: response.energy || '0',
156
+ energyYear: response.energy || '0'
157
+ };
158
+ logger_1.logger.debug(`[${this.deviceName}] Successfully updated energy data`);
159
+ }
126
160
  else {
127
- logger_1.logger.error(`[${this.deviceName}] Failed to update energy data: ${JSON.stringify(response)}`);
161
+ // For error responses, set defaults but don't log as error
162
+ this.energy = {
163
+ power: '0',
164
+ voltage: '0',
165
+ energy: '0',
166
+ energyToday: '0',
167
+ energyWeek: '0',
168
+ energyMonth: '0',
169
+ energyYear: '0'
170
+ };
171
+ logger_1.logger.debug(`[${this.deviceName}] Failed to update energy data: ${JSON.stringify(response)}`);
128
172
  }
129
173
  }
130
174
  /**
@@ -144,12 +188,12 @@ class VeSyncOutlet extends vesyncBaseDevice_1.VeSyncBaseDevice {
144
188
  }
145
189
  await this.updateEnergy();
146
190
  return {
147
- power: this.energy.power || 'Not available',
148
- voltage: this.energy.voltage || 'Not available',
149
- energy_today: this.energy.energyToday || 'Not available',
150
- energy_week: this.energy.energyWeek || 'Not available',
151
- energy_month: this.energy.energyMonth || 'Not available',
152
- energy_year: this.energy.energyYear || 'Not available'
191
+ power: this.energy.power || '0',
192
+ voltage: this.energy.voltage || '0',
193
+ energy_today: this.energy.energyToday || '0',
194
+ energy_week: this.energy.energyWeek || '0',
195
+ energy_month: this.energy.energyMonth || '0',
196
+ energy_year: this.energy.energyYear || '0'
153
197
  };
154
198
  }
155
199
  /**
@@ -191,11 +235,12 @@ class VeSyncOutlet extends vesyncBaseDevice_1.VeSyncBaseDevice {
191
235
  };
192
236
  const [response] = await helpers_1.Helpers.callApi(isLegacyDevice ? `/${this.getApiPrefix()}/energy/week` : `/${this.getApiPrefix()}/energyweek`, isLegacyDevice ? 'get' : 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
193
237
  if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
194
- this.energy.week = response.result;
238
+ this.energy.week = response.result || response.energyWeek || '0';
195
239
  logger_1.logger.debug(`[${this.deviceName}] Successfully retrieved weekly energy data`);
196
240
  }
197
241
  else {
198
- logger_1.logger.error(`[${this.deviceName}] Failed to get weekly energy data: ${JSON.stringify(response)}`);
242
+ this.energy.week = '0';
243
+ logger_1.logger.debug(`[${this.deviceName}] Failed to get weekly energy data: ${JSON.stringify(response)}`);
199
244
  }
200
245
  }
201
246
  /**
@@ -214,11 +259,12 @@ class VeSyncOutlet extends vesyncBaseDevice_1.VeSyncBaseDevice {
214
259
  };
215
260
  const [response] = await helpers_1.Helpers.callApi(isLegacyDevice ? `/${this.getApiPrefix()}/energy/month` : `/${this.getApiPrefix()}/energymonth`, isLegacyDevice ? 'get' : 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
216
261
  if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
217
- this.energy.month = response.result;
262
+ this.energy.month = response.result || response.energyMonth || '0';
218
263
  logger_1.logger.debug(`[${this.deviceName}] Successfully retrieved monthly energy data`);
219
264
  }
220
265
  else {
221
- logger_1.logger.error(`[${this.deviceName}] Failed to get monthly energy data: ${JSON.stringify(response)}`);
266
+ this.energy.month = '0';
267
+ logger_1.logger.debug(`[${this.deviceName}] Failed to get monthly energy data: ${JSON.stringify(response)}`);
222
268
  }
223
269
  }
224
270
  /**
@@ -237,11 +283,12 @@ class VeSyncOutlet extends vesyncBaseDevice_1.VeSyncBaseDevice {
237
283
  };
238
284
  const [response] = await helpers_1.Helpers.callApi(isLegacyDevice ? `/${this.getApiPrefix()}/energy/year` : `/${this.getApiPrefix()}/energyyear`, isLegacyDevice ? 'get' : 'post', body, helpers_1.Helpers.reqHeaders(this.manager));
239
285
  if ((response === null || response === void 0 ? void 0 : response.code) === 0) {
240
- this.energy.year = response.result;
286
+ this.energy.year = response.result || response.energyYear || '0';
241
287
  logger_1.logger.debug(`[${this.deviceName}] Successfully retrieved yearly energy data`);
242
288
  }
243
289
  else {
244
- logger_1.logger.error(`[${this.deviceName}] Failed to get yearly energy data: ${JSON.stringify(response)}`);
290
+ this.energy.year = '0';
291
+ logger_1.logger.debug(`[${this.deviceName}] Failed to get yearly energy data: ${JSON.stringify(response)}`);
245
292
  }
246
293
  }
247
294
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tsvesync",
3
- "version": "1.0.16",
3
+ "version": "1.0.17",
4
4
  "description": "A TypeScript library for interacting with VeSync smart home devices",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/lib/vesyncOutlet.ts CHANGED
@@ -138,19 +138,61 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
138
138
  }
139
139
 
140
140
  logger.debug(`[${this.deviceName}] Updating energy data`);
141
- const url = `/v1/${this.deviceType}/${this.deviceType}-${this.cid}/energy/detail`;
141
+
142
+ // Different endpoints for different device types
143
+ let url: string;
144
+ if (this.deviceType === 'wifi-switch-1.3') {
145
+ url = `/v1/device/${this.deviceType}-${this.cid}/energy/detail`;
146
+ } else if (this.deviceType.startsWith('ESO15')) {
147
+ url = '/outdoorsocket15a/v1/device/energy';
148
+ } else if (this.deviceType.startsWith('ESW15')) {
149
+ url = '/15a/v1/device/energy';
150
+ } else if (this.deviceType.startsWith('ESW03') || this.deviceType.startsWith('ESW01')) {
151
+ url = '/10a/v1/device/energy';
152
+ } else {
153
+ url = '/v1/device/energy';
154
+ }
155
+
156
+ const body = this.deviceType === 'wifi-switch-1.3' ? null : {
157
+ ...Helpers.reqBody(this.manager, 'energy'),
158
+ uuid: this.uuid
159
+ };
160
+
142
161
  const [response] = await Helpers.callApi(
143
162
  url,
144
- 'get',
145
- null,
163
+ this.deviceType === 'wifi-switch-1.3' ? 'get' : 'post',
164
+ body,
146
165
  Helpers.reqHeaders(this.manager)
147
166
  );
148
167
 
149
- if (response?.code === 0) {
168
+ // Handle different response formats
169
+ if (response?.code === 0 && response.result) {
150
170
  this.energy = response.result;
151
171
  logger.debug(`[${this.deviceName}] Successfully updated energy data`);
172
+ } else if (response?.code === 0) {
173
+ // Some devices return data directly in response
174
+ this.energy = {
175
+ power: response.power || '0',
176
+ voltage: response.voltage || '0',
177
+ energy: response.energy || '0',
178
+ energyToday: response.energy || '0',
179
+ energyWeek: response.energy || '0',
180
+ energyMonth: response.energy || '0',
181
+ energyYear: response.energy || '0'
182
+ };
183
+ logger.debug(`[${this.deviceName}] Successfully updated energy data`);
152
184
  } else {
153
- logger.error(`[${this.deviceName}] Failed to update energy data: ${JSON.stringify(response)}`);
185
+ // For error responses, set defaults but don't log as error
186
+ this.energy = {
187
+ power: '0',
188
+ voltage: '0',
189
+ energy: '0',
190
+ energyToday: '0',
191
+ energyWeek: '0',
192
+ energyMonth: '0',
193
+ energyYear: '0'
194
+ };
195
+ logger.debug(`[${this.deviceName}] Failed to update energy data: ${JSON.stringify(response)}`);
154
196
  }
155
197
  }
156
198
 
@@ -172,12 +214,12 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
172
214
 
173
215
  await this.updateEnergy();
174
216
  return {
175
- power: this.energy.power || 'Not available',
176
- voltage: this.energy.voltage || 'Not available',
177
- energy_today: this.energy.energyToday || 'Not available',
178
- energy_week: this.energy.energyWeek || 'Not available',
179
- energy_month: this.energy.energyMonth || 'Not available',
180
- energy_year: this.energy.energyYear || 'Not available'
217
+ power: this.energy.power || '0',
218
+ voltage: this.energy.voltage || '0',
219
+ energy_today: this.energy.energyToday || '0',
220
+ energy_week: this.energy.energyWeek || '0',
221
+ energy_month: this.energy.energyMonth || '0',
222
+ energy_year: this.energy.energyYear || '0'
181
223
  };
182
224
  }
183
225
 
@@ -228,10 +270,11 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
228
270
  );
229
271
 
230
272
  if (response?.code === 0) {
231
- this.energy.week = response.result;
273
+ this.energy.week = response.result || response.energyWeek || '0';
232
274
  logger.debug(`[${this.deviceName}] Successfully retrieved weekly energy data`);
233
275
  } else {
234
- logger.error(`[${this.deviceName}] Failed to get weekly energy data: ${JSON.stringify(response)}`);
276
+ this.energy.week = '0';
277
+ logger.debug(`[${this.deviceName}] Failed to get weekly energy data: ${JSON.stringify(response)}`);
235
278
  }
236
279
  }
237
280
 
@@ -259,10 +302,11 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
259
302
  );
260
303
 
261
304
  if (response?.code === 0) {
262
- this.energy.month = response.result;
305
+ this.energy.month = response.result || response.energyMonth || '0';
263
306
  logger.debug(`[${this.deviceName}] Successfully retrieved monthly energy data`);
264
307
  } else {
265
- logger.error(`[${this.deviceName}] Failed to get monthly energy data: ${JSON.stringify(response)}`);
308
+ this.energy.month = '0';
309
+ logger.debug(`[${this.deviceName}] Failed to get monthly energy data: ${JSON.stringify(response)}`);
266
310
  }
267
311
  }
268
312
 
@@ -290,10 +334,11 @@ export abstract class VeSyncOutlet extends VeSyncBaseDevice {
290
334
  );
291
335
 
292
336
  if (response?.code === 0) {
293
- this.energy.year = response.result;
337
+ this.energy.year = response.result || response.energyYear || '0';
294
338
  logger.debug(`[${this.deviceName}] Successfully retrieved yearly energy data`);
295
339
  } else {
296
- logger.error(`[${this.deviceName}] Failed to get yearly energy data: ${JSON.stringify(response)}`);
340
+ this.energy.year = '0';
341
+ logger.debug(`[${this.deviceName}] Failed to get yearly energy data: ${JSON.stringify(response)}`);
297
342
  }
298
343
  }
299
344