Skip to content

Commit 0c2c240

Browse files
bretambrosebretambrose
authored
Major version upgrades for typescript and typedoc (#266)
1 parent 6dbde81 commit 0c2c240

File tree

23 files changed

+477
-523
lines changed

23 files changed

+477
-523
lines changed

‎lib/browser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Browser entry point for AWS IoT SDK.
88
* @packageDocumentation
99
* @module aws-iot-device-sdk
10-
* @preferred
10+
* @mergeTarget
1111
*/
1212

1313
import { mqtt, http, io, iot, auth } from 'aws-crt/dist.browser/browser';

‎lib/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
* @packageDocumentation
1515
* @module aws-iot-device-sdk
16-
* @preferred
16+
* @mergeTarget
1717
*/
1818

1919
import * as iotidentity from './iotidentity/iotidentityclient';

‎lib/iotidentity/iotidentityclient.ts

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ export class IotIdentityClient {
4646

4747
private decoder = new TextDecoder('utf-8');
4848

49+
private static INVALID_PAYLOAD_PARSING_ERROR = "Invalid/unknown error parsing payload into response";
50+
51+
private static createClientError(err: any, payload: ArrayBuffer) : IotIdentityError {
52+
if (err instanceof Error) {
53+
return new IotIdentityError(err.message, payload);
54+
} else {
55+
return new IotIdentityError( IotIdentityClient.INVALID_PAYLOAD_PARSING_ERROR, payload);
56+
}
57+
}
58+
4959
constructor(private connection: mqtt.MqttClientConnection) {
5060
}
5161

@@ -113,7 +123,7 @@ export class IotIdentityClient {
113123
const payload_text = this.decoder.decode(payload);
114124
response = JSON.parse(payload_text) as model.CreateKeysAndCertificateResponse;
115125
} catch (err) {
116-
error = new IotIdentityError(err.message, payload);
126+
error = IotIdentityClient.createClientError(err, payload);
117127
}
118128
finally {
119129
messageHandler(error, response);
@@ -160,7 +170,7 @@ export class IotIdentityClient {
160170
const payload_text = this.decoder.decode(payload);
161171
response = JSON.parse(payload_text) as model.ErrorResponse;
162172
} catch (err) {
163-
error = new IotIdentityError(err.message, payload);
173+
error = IotIdentityClient.createClientError(err, payload);
164174
}
165175
finally {
166176
messageHandler(error, response);
@@ -208,7 +218,7 @@ export class IotIdentityClient {
208218
const payload_text = this.decoder.decode(payload);
209219
response = JSON.parse(payload_text) as model.ErrorResponse;
210220
} catch (err) {
211-
error = new IotIdentityError(err.message, payload);
221+
error = IotIdentityClient.createClientError(err, payload);
212222
}
213223
finally {
214224
messageHandler(error, response);
@@ -255,7 +265,7 @@ export class IotIdentityClient {
255265
const payload_text = this.decoder.decode(payload);
256266
response = JSON.parse(payload_text) as model.CreateCertificateFromCsrResponse;
257267
} catch (err) {
258-
error = new IotIdentityError(err.message, payload);
268+
error = IotIdentityClient.createClientError(err, payload);
259269
}
260270
finally {
261271
messageHandler(error, response);
@@ -331,7 +341,7 @@ export class IotIdentityClient {
331341
const payload_text = this.decoder.decode(payload);
332342
response = JSON.parse(payload_text) as model.RegisterThingResponse;
333343
} catch (err) {
334-
error = new IotIdentityError(err.message, payload);
344+
error = IotIdentityClient.createClientError(err, payload);
335345
}
336346
finally {
337347
messageHandler(error, response);
@@ -378,7 +388,7 @@ export class IotIdentityClient {
378388
const payload_text = this.decoder.decode(payload);
379389
response = JSON.parse(payload_text) as model.ErrorResponse;
380390
} catch (err) {
381-
error = new IotIdentityError(err.message, payload);
391+
error = IotIdentityClient.createClientError(err, payload);
382392
}
383393
finally {
384394
messageHandler(error, response);

‎lib/iotjobs/iotjobsclient.ts

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ export class IotJobsClient {
4646

4747
private decoder = new TextDecoder('utf-8');
4848

49+
private static INVALID_PAYLOAD_PARSING_ERROR = "Invalid/unknown error parsing payload into response";
50+
51+
private static createClientError(err: any, payload: ArrayBuffer) : IotJobsError {
52+
if (err instanceof Error) {
53+
return new IotJobsError(err.message, payload);
54+
} else {
55+
return new IotJobsError( IotJobsClient.INVALID_PAYLOAD_PARSING_ERROR, payload);
56+
}
57+
}
58+
4959
constructor(private connection: mqtt.MqttClientConnection) {
5060
}
5161

@@ -87,7 +97,7 @@ export class IotJobsClient {
8797
const payload_text = this.decoder.decode(payload);
8898
response = JSON.parse(payload_text) as model.JobExecutionsChangedEvent;
8999
} catch (err) {
90-
error = new IotJobsError(err.message, payload);
100+
error = IotJobsClient.createClientError(err, payload);
91101
}
92102
finally {
93103
messageHandler(error, response);
@@ -135,7 +145,7 @@ export class IotJobsClient {
135145
const payload_text = this.decoder.decode(payload);
136146
response = JSON.parse(payload_text) as model.StartNextJobExecutionResponse;
137147
} catch (err) {
138-
error = new IotJobsError(err.message, payload);
148+
error = IotJobsClient.createClientError(err, payload);
139149
}
140150
finally {
141151
messageHandler(error, response);
@@ -184,7 +194,7 @@ export class IotJobsClient {
184194
const payload_text = this.decoder.decode(payload);
185195
response = JSON.parse(payload_text) as model.RejectedErrorResponse;
186196
} catch (err) {
187-
error = new IotJobsError(err.message, payload);
197+
error = IotJobsClient.createClientError(err, payload);
188198
}
189199
finally {
190200
messageHandler(error, response);
@@ -232,7 +242,7 @@ export class IotJobsClient {
232242
const payload_text = this.decoder.decode(payload);
233243
response = JSON.parse(payload_text) as model.NextJobExecutionChangedEvent;
234244
} catch (err) {
235-
error = new IotJobsError(err.message, payload);
245+
error = IotJobsClient.createClientError(err, payload);
236246
}
237247
finally {
238248
messageHandler(error, response);
@@ -281,7 +291,7 @@ export class IotJobsClient {
281291
const payload_text = this.decoder.decode(payload);
282292
response = JSON.parse(payload_text) as model.RejectedErrorResponse;
283293
} catch (err) {
284-
error = new IotJobsError(err.message, payload);
294+
error = IotJobsClient.createClientError(err, payload);
285295
}
286296
finally {
287297
messageHandler(error, response);
@@ -330,7 +340,7 @@ export class IotJobsClient {
330340
const payload_text = this.decoder.decode(payload);
331341
response = JSON.parse(payload_text) as model.UpdateJobExecutionResponse;
332342
} catch (err) {
333-
error = new IotJobsError(err.message, payload);
343+
error = IotJobsClient.createClientError(err, payload);
334344
}
335345
finally {
336346
messageHandler(error, response);
@@ -408,7 +418,7 @@ export class IotJobsClient {
408418
const payload_text = this.decoder.decode(payload);
409419
response = JSON.parse(payload_text) as model.DescribeJobExecutionResponse;
410420
} catch (err) {
411-
error = new IotJobsError(err.message, payload);
421+
error = IotJobsClient.createClientError(err, payload);
412422
}
413423
finally {
414424
messageHandler(error, response);
@@ -484,7 +494,7 @@ export class IotJobsClient {
484494
const payload_text = this.decoder.decode(payload);
485495
response = JSON.parse(payload_text) as model.GetPendingJobExecutionsResponse;
486496
} catch (err) {
487-
error = new IotJobsError(err.message, payload);
497+
error = IotJobsClient.createClientError(err, payload);
488498
}
489499
finally {
490500
messageHandler(error, response);
@@ -532,7 +542,7 @@ export class IotJobsClient {
532542
const payload_text = this.decoder.decode(payload);
533543
response = JSON.parse(payload_text) as model.RejectedErrorResponse;
534544
} catch (err) {
535-
error = new IotJobsError(err.message, payload);
545+
error = IotJobsClient.createClientError(err, payload);
536546
}
537547
finally {
538548
messageHandler(error, response);
@@ -580,7 +590,7 @@ export class IotJobsClient {
580590
const payload_text = this.decoder.decode(payload);
581591
response = JSON.parse(payload_text) as model.RejectedErrorResponse;
582592
} catch (err) {
583-
error = new IotJobsError(err.message, payload);
593+
error = IotJobsClient.createClientError(err, payload);
584594
}
585595
finally {
586596
messageHandler(error, response);

‎lib/iotshadow/iotshadowclient.ts

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ export class IotShadowClient {
4646

4747
private decoder = new TextDecoder('utf-8');
4848

49+
private static INVALID_PAYLOAD_PARSING_ERROR = "Invalid/unknown error parsing payload into response";
50+
51+
private static createClientError(err: any, payload: ArrayBuffer) : IotShadowError {
52+
if (err instanceof Error) {
53+
return new IotShadowError(err.message, payload);
54+
} else {
55+
return new IotShadowError( IotShadowClient.INVALID_PAYLOAD_PARSING_ERROR, payload);
56+
}
57+
}
58+
4959
constructor(private connection: mqtt.MqttClientConnection) {
5060
}
5161

@@ -87,7 +97,7 @@ export class IotShadowClient {
8797
const payload_text = this.decoder.decode(payload);
8898
response = JSON.parse(payload_text) as model.ErrorResponse;
8999
} catch (err) {
90-
error = new IotShadowError(err.message, payload);
100+
error = IotShadowClient.createClientError(err, payload);
91101
}
92102
finally {
93103
messageHandler(error, response);
@@ -135,7 +145,7 @@ export class IotShadowClient {
135145
const payload_text = this.decoder.decode(payload);
136146
response = JSON.parse(payload_text) as model.ShadowDeltaUpdatedEvent;
137147
} catch (err) {
138-
error = new IotShadowError(err.message, payload);
148+
error = IotShadowClient.createClientError(err, payload);
139149
}
140150
finally {
141151
messageHandler(error, response);
@@ -184,7 +194,7 @@ export class IotShadowClient {
184194
const payload_text = this.decoder.decode(payload);
185195
response = JSON.parse(payload_text) as model.ErrorResponse;
186196
} catch (err) {
187-
error = new IotShadowError(err.message, payload);
197+
error = IotShadowClient.createClientError(err, payload);
188198
}
189199
finally {
190200
messageHandler(error, response);
@@ -233,7 +243,7 @@ export class IotShadowClient {
233243
const payload_text = this.decoder.decode(payload);
234244
response = JSON.parse(payload_text) as model.ErrorResponse;
235245
} catch (err) {
236-
error = new IotShadowError(err.message, payload);
246+
error = IotShadowClient.createClientError(err, payload);
237247
}
238248
finally {
239249
messageHandler(error, response);
@@ -338,7 +348,7 @@ export class IotShadowClient {
338348
const payload_text = this.decoder.decode(payload);
339349
response = JSON.parse(payload_text) as model.DeleteShadowResponse;
340350
} catch (err) {
341-
error = new IotShadowError(err.message, payload);
351+
error = IotShadowClient.createClientError(err, payload);
342352
}
343353
finally {
344354
messageHandler(error, response);
@@ -386,7 +396,7 @@ export class IotShadowClient {
386396
const payload_text = this.decoder.decode(payload);
387397
response = JSON.parse(payload_text) as model.GetShadowResponse;
388398
} catch (err) {
389-
error = new IotShadowError(err.message, payload);
399+
error = IotShadowClient.createClientError(err, payload);
390400
}
391401
finally {
392402
messageHandler(error, response);
@@ -435,7 +445,7 @@ export class IotShadowClient {
435445
const payload_text = this.decoder.decode(payload);
436446
response = JSON.parse(payload_text) as model.GetShadowResponse;
437447
} catch (err) {
438-
error = new IotShadowError(err.message, payload);
448+
error = IotShadowClient.createClientError(err, payload);
439449
}
440450
finally {
441451
messageHandler(error, response);
@@ -484,7 +494,7 @@ export class IotShadowClient {
484494
const payload_text = this.decoder.decode(payload);
485495
response = JSON.parse(payload_text) as model.ShadowUpdatedEvent;
486496
} catch (err) {
487-
error = new IotShadowError(err.message, payload);
497+
error = IotShadowClient.createClientError(err, payload);
488498
}
489499
finally {
490500
messageHandler(error, response);
@@ -532,7 +542,7 @@ export class IotShadowClient {
532542
const payload_text = this.decoder.decode(payload);
533543
response = JSON.parse(payload_text) as model.ShadowUpdatedEvent;
534544
} catch (err) {
535-
error = new IotShadowError(err.message, payload);
545+
error = IotShadowClient.createClientError(err, payload);
536546
}
537547
finally {
538548
messageHandler(error, response);
@@ -610,7 +620,7 @@ export class IotShadowClient {
610620
const payload_text = this.decoder.decode(payload);
611621
response = JSON.parse(payload_text) as model.DeleteShadowResponse;
612622
} catch (err) {
613-
error = new IotShadowError(err.message, payload);
623+
error = IotShadowClient.createClientError(err, payload);
614624
}
615625
finally {
616626
messageHandler(error, response);
@@ -658,7 +668,7 @@ export class IotShadowClient {
658668
const payload_text = this.decoder.decode(payload);
659669
response = JSON.parse(payload_text) as model.ErrorResponse;
660670
} catch (err) {
661-
error = new IotShadowError(err.message, payload);
671+
error = IotShadowClient.createClientError(err, payload);
662672
}
663673
finally {
664674
messageHandler(error, response);
@@ -706,7 +716,7 @@ export class IotShadowClient {
706716
const payload_text = this.decoder.decode(payload);
707717
response = JSON.parse(payload_text) as model.ErrorResponse;
708718
} catch (err) {
709-
error = new IotShadowError(err.message, payload);
719+
error = IotShadowClient.createClientError(err, payload);
710720
}
711721
finally {
712722
messageHandler(error, response);
@@ -810,7 +820,7 @@ export class IotShadowClient {
810820
const payload_text = this.decoder.decode(payload);
811821
response = JSON.parse(payload_text) as model.UpdateShadowResponse;
812822
} catch (err) {
813-
error = new IotShadowError(err.message, payload);
823+
error = IotShadowClient.createClientError(err, payload);
814824
}
815825
finally {
816826
messageHandler(error, response);
@@ -859,7 +869,7 @@ export class IotShadowClient {
859869
const payload_text = this.decoder.decode(payload);
860870
response = JSON.parse(payload_text) as model.ErrorResponse;
861871
} catch (err) {
862-
error = new IotShadowError(err.message, payload);
872+
error = IotShadowClient.createClientError(err, payload);
863873
}
864874
finally {
865875
messageHandler(error, response);
@@ -937,7 +947,7 @@ export class IotShadowClient {
937947
const payload_text = this.decoder.decode(payload);
938948
response = JSON.parse(payload_text) as model.ShadowDeltaUpdatedEvent;
939949
} catch (err) {
940-
error = new IotShadowError(err.message, payload);
950+
error = IotShadowClient.createClientError(err, payload);
941951
}
942952
finally {
943953
messageHandler(error, response);
@@ -986,7 +996,7 @@ export class IotShadowClient {
986996
const payload_text = this.decoder.decode(payload);
987997
response = JSON.parse(payload_text) as model.UpdateShadowResponse;
988998
} catch (err) {
989-
error = new IotShadowError(err.message, payload);
999+
error = IotShadowClient.createClientError(err, payload);
9901000
}
9911001
finally {
9921002
messageHandler(error, response);

0 commit comments

Comments
 (0)