@camera.ui/camera-ui-tuya 0.0.8 → 0.0.9
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.
- package/config.schema.json +8 -0
- package/dist/camera.d.ts +2 -1
- package/dist/camera.js +20 -10
- package/dist/camera.js.map +1 -1
- package/dist/index.js +14 -10
- package/dist/index.js.map +1 -1
- package/dist/peer.js +17 -25
- package/dist/peer.js.map +1 -1
- package/dist/tuya/cloud.js +3 -3
- package/dist/tuya/cloud.js.map +1 -1
- package/dist/types.d.ts +1 -0
- package/package.json +7 -6
package/config.schema.json
CHANGED
|
@@ -268,6 +268,14 @@
|
|
|
268
268
|
"Åland Islands"
|
|
269
269
|
]
|
|
270
270
|
},
|
|
271
|
+
"useWebRTC": {
|
|
272
|
+
"type": "boolean",
|
|
273
|
+
"title": "Use WebRTC",
|
|
274
|
+
"description": "Use WebRTC to stream video from the camera",
|
|
275
|
+
"required": false,
|
|
276
|
+
"store": true,
|
|
277
|
+
"defaultValue": false
|
|
278
|
+
},
|
|
271
279
|
"homeWhitelist": {
|
|
272
280
|
"type": "array",
|
|
273
281
|
"title": "Home Whitelist",
|
package/dist/camera.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { WebRTCReceiver } from '@camera.ui/rtsp';
|
|
2
2
|
import type { AnswerSDP } from '@camera.ui/rtsp';
|
|
3
3
|
import type { CameraDelegate, CameraDevice, PluginLogger } from '@camera.ui/types';
|
|
4
|
+
import type { RTCIceCandidate } from 'werift';
|
|
4
5
|
import type Tuya from './index.js';
|
|
5
6
|
import type { TuyaCloud } from './tuya/cloud.js';
|
|
6
7
|
import type { TuyaDeviceConfig } from './tuya/const.js';
|
|
@@ -20,7 +21,7 @@ export declare class Camera extends WebRTCReceiver implements CameraDelegate {
|
|
|
20
21
|
constructor(platform: Tuya, cloud: TuyaCloud, cloudCamera: TuyaDeviceConfig, logger: PluginLogger);
|
|
21
22
|
createCameraDevice(): Promise<void>;
|
|
22
23
|
onOffer(offerSdp: string): Promise<AnswerSDP>;
|
|
23
|
-
onCandidate(candidate:
|
|
24
|
+
onCandidate(candidate: RTCIceCandidate): Promise<void>;
|
|
24
25
|
snapshot(): Promise<ArrayBuffer | undefined>;
|
|
25
26
|
reboot(): Promise<void>;
|
|
26
27
|
updateState(): void;
|
package/dist/camera.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { RTSPSingleServer, WebRTCReceiver } from '@camera.ui/rtsp';
|
|
2
|
-
import { MediaStreamTrack,
|
|
2
|
+
import { MediaStreamTrack, RTCPeerConnection, RTCRtpCodecParameters, RTCSessionDescription } from 'werift';
|
|
3
3
|
import { CustomPeerConnection } from './peer.js';
|
|
4
4
|
import { TuyaDevice } from './tuya/device.js';
|
|
5
5
|
export class Camera extends WebRTCReceiver {
|
|
@@ -73,7 +73,7 @@ export class Camera extends WebRTCReceiver {
|
|
|
73
73
|
this.logger.debug(`${this.cameraDevice.name}: Stream stopped!`);
|
|
74
74
|
};
|
|
75
75
|
const tuyaPeerConnection = new CustomPeerConnection(this.platform, this.cameraDevice, this.cloudCamera, this.logger);
|
|
76
|
-
|
|
76
|
+
tuyaPeerConnection.createPeerConnection();
|
|
77
77
|
const audioTrack = new MediaStreamTrack({ kind: 'audio' });
|
|
78
78
|
const videoTrack = new MediaStreamTrack({ kind: 'video' });
|
|
79
79
|
tuyaPeerConnection.onAudioRtp.subscribe((rtp) => {
|
|
@@ -84,7 +84,7 @@ export class Camera extends WebRTCReceiver {
|
|
|
84
84
|
});
|
|
85
85
|
const pc = (this.pc = this.createPeerCoonection());
|
|
86
86
|
pc.onIceCandidate.subscribe((candidate) => {
|
|
87
|
-
this.events.emit('candidate', candidate
|
|
87
|
+
this.events.emit('candidate', candidate);
|
|
88
88
|
});
|
|
89
89
|
pc.connectionStateChange.subscribe((ev) => {
|
|
90
90
|
this.logger.debug(`${this.cameraDevice.name}: connectionStateChange: ${ev}`);
|
|
@@ -118,7 +118,7 @@ export class Camera extends WebRTCReceiver {
|
|
|
118
118
|
return answer.sdp;
|
|
119
119
|
}
|
|
120
120
|
async onCandidate(candidate) {
|
|
121
|
-
await this.pc?.addIceCandidate(
|
|
121
|
+
await this.pc?.addIceCandidate(candidate);
|
|
122
122
|
}
|
|
123
123
|
async snapshot() {
|
|
124
124
|
return;
|
|
@@ -179,11 +179,21 @@ export class Camera extends WebRTCReceiver {
|
|
|
179
179
|
}
|
|
180
180
|
}
|
|
181
181
|
async createRTSPServer() {
|
|
182
|
-
const
|
|
182
|
+
const webrtcStreamConfig = {
|
|
183
183
|
name: 'Tuya',
|
|
184
184
|
receiver: this,
|
|
185
185
|
addBackchannel: true,
|
|
186
186
|
};
|
|
187
|
+
const rtspStreamConfig = {
|
|
188
|
+
name: 'Tuya',
|
|
189
|
+
url: async () => {
|
|
190
|
+
const rtsps = await this.platform.cloud?.getRTSPS(this.cloudCamera);
|
|
191
|
+
if (!rtsps) {
|
|
192
|
+
throw new Error(`Failed to capture stream for ${this.cloudCamera.name}: RTSPS link not found.`);
|
|
193
|
+
}
|
|
194
|
+
return rtsps.url;
|
|
195
|
+
},
|
|
196
|
+
};
|
|
187
197
|
const rtspLogger = {
|
|
188
198
|
// log: this.logger.log.bind(this.logger),
|
|
189
199
|
warn: this.logger.warn.bind(this.logger),
|
|
@@ -191,6 +201,7 @@ export class Camera extends WebRTCReceiver {
|
|
|
191
201
|
// debug: this.logger.debug.bind(this.logger),
|
|
192
202
|
// trace: this.logger.trace.bind(this.logger),
|
|
193
203
|
};
|
|
204
|
+
const stream = this.platform.config.home.useWebRTC ? webrtcStreamConfig : rtspStreamConfig;
|
|
194
205
|
this.rtspServer = await RTSPSingleServer.initialize({ stream }, rtspLogger);
|
|
195
206
|
await this.rtspServer.listen();
|
|
196
207
|
}
|
|
@@ -208,11 +219,10 @@ export class Camera extends WebRTCReceiver {
|
|
|
208
219
|
],
|
|
209
220
|
audio: [
|
|
210
221
|
new RTCRtpCodecParameters({
|
|
211
|
-
mimeType: 'audio/
|
|
212
|
-
clockRate:
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
parameters: 'minptime=10;useinbandfec=1',
|
|
222
|
+
mimeType: 'audio/PCMU',
|
|
223
|
+
clockRate: 8000,
|
|
224
|
+
channels: 1,
|
|
225
|
+
payloadType: 0,
|
|
216
226
|
}),
|
|
217
227
|
],
|
|
218
228
|
},
|
package/dist/camera.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"camera.js","sourceRoot":"","sources":["../src/camera.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"camera.js","sourceRoot":"","sources":["../src/camera.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -15,6 +15,9 @@ export default class Tuya {
|
|
|
15
15
|
this.logger = logger;
|
|
16
16
|
this.api = api;
|
|
17
17
|
this.config = api.configService.all();
|
|
18
|
+
if (!this.config.home) {
|
|
19
|
+
this.config.home = {};
|
|
20
|
+
}
|
|
18
21
|
this.config.home.homeWhitelist = api.configService.get('home.homeWhitelist', [], (value) => Array.isArray(value), false, true);
|
|
19
22
|
this.api.on('finishLaunching', this.start.bind(this));
|
|
20
23
|
this.api.on('shutdown', this.stop.bind(this));
|
|
@@ -86,7 +89,7 @@ export default class Tuya {
|
|
|
86
89
|
accessKey: accessKey,
|
|
87
90
|
url: getTuyaPulsarEndpoint(country),
|
|
88
91
|
};
|
|
89
|
-
this.logger.
|
|
92
|
+
this.logger.debug('Connecting to TuyaPulsar...');
|
|
90
93
|
this.pulsar = new TuyaPulsar(config);
|
|
91
94
|
this.pulsar.open(() => {
|
|
92
95
|
this.logger.log('TulsaPulse: opened connection.');
|
|
@@ -99,15 +102,16 @@ export default class Tuya {
|
|
|
99
102
|
}
|
|
100
103
|
tuyaDevice.updateState();
|
|
101
104
|
});
|
|
102
|
-
this.pulsar.reconnect(() => {
|
|
103
|
-
|
|
104
|
-
});
|
|
105
|
-
this.pulsar.close(() => {
|
|
106
|
-
|
|
107
|
-
});
|
|
108
|
-
this.pulsar.error((ws, error) => {
|
|
109
|
-
|
|
110
|
-
});
|
|
105
|
+
// this.pulsar.reconnect(() => {
|
|
106
|
+
// this.logger.log('TuyaPulse: restarting connection.');
|
|
107
|
+
// });
|
|
108
|
+
// this.pulsar.close(() => {
|
|
109
|
+
// this.logger.warn('TuyaPulse: closed connection.');
|
|
110
|
+
// });
|
|
111
|
+
// this.pulsar.error((ws, error) => {
|
|
112
|
+
// // console.log('TuyaPulse: error', ws, error);
|
|
113
|
+
// // this.logger.error(`TuyaPulse: ${error}`);
|
|
114
|
+
// });
|
|
111
115
|
this.pulsar.maxRetries(() => {
|
|
112
116
|
this.logger.error('There was an error trying to connect to Message Service (TuyaPulse). Connection Max Reconnection Timed Out');
|
|
113
117
|
});
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/peer.js
CHANGED
|
@@ -29,13 +29,11 @@ export class CustomPeerConnection {
|
|
|
29
29
|
async createPeerConnection() {
|
|
30
30
|
const deviceWebRTConfigResponse = await this.platform.cloud?.getDeviceWebRTConfig(this.cloudCamera);
|
|
31
31
|
if (!deviceWebRTConfigResponse?.success) {
|
|
32
|
-
this.logger.error(`[${this.cameraDevice.name}] There was an error retrieving WebRTConfig.`);
|
|
33
32
|
throw new Error(`Failed to create device rtc config for ${this.cameraDevice.name}: request failed: ${deviceWebRTConfigResponse?.result}.`);
|
|
34
33
|
}
|
|
35
34
|
this.deviceWebRTConfig = deviceWebRTConfigResponse.result;
|
|
36
35
|
const mqResponse = await this.platform.cloud?.getWebRTCMQConfig(this.deviceWebRTConfig);
|
|
37
36
|
if (!mqResponse?.success) {
|
|
38
|
-
this.logger.error(`[${this.cameraDevice.name}] There was an error retrieving WebRTC MQTT RTC Config.`);
|
|
39
37
|
throw new Error(`Failed to create rtc mqtt config for ${this.cameraDevice.name}: request failed: ${mqResponse?.result}.`);
|
|
40
38
|
}
|
|
41
39
|
this.mqttWebRTConfig = mqResponse.result;
|
|
@@ -50,12 +48,15 @@ export class CustomPeerConnection {
|
|
|
50
48
|
});
|
|
51
49
|
const pc = (this.pc = new RTCPeerConnection({
|
|
52
50
|
codecs: {
|
|
53
|
-
|
|
51
|
+
video: [
|
|
54
52
|
new RTCRtpCodecParameters({
|
|
55
|
-
mimeType: '
|
|
56
|
-
clockRate:
|
|
57
|
-
|
|
53
|
+
mimeType: 'video/H264',
|
|
54
|
+
clockRate: 90000,
|
|
55
|
+
rtcpFeedback: [{ type: 'transport-cc' }, { type: 'ccm', parameter: 'fir' }, { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'goog-remb' }],
|
|
56
|
+
parameters: 'packetization-mode=1;profile-level-id=640029;level-asymmetry-allowed=1',
|
|
58
57
|
}),
|
|
58
|
+
],
|
|
59
|
+
audio: [
|
|
59
60
|
new RTCRtpCodecParameters({
|
|
60
61
|
mimeType: 'audio/PCMU',
|
|
61
62
|
clockRate: 8000,
|
|
@@ -63,25 +64,17 @@ export class CustomPeerConnection {
|
|
|
63
64
|
payloadType: 0,
|
|
64
65
|
}),
|
|
65
66
|
],
|
|
66
|
-
video: [
|
|
67
|
-
new RTCRtpCodecParameters({
|
|
68
|
-
mimeType: 'video/H264',
|
|
69
|
-
clockRate: 90000,
|
|
70
|
-
rtcpFeedback: [{ type: 'transport-cc' }, { type: 'ccm', parameter: 'fir' }, { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'goog-remb' }],
|
|
71
|
-
parameters: 'packetization-mode=1;profile-level-id=640029;level-asymmetry-allowed=1',
|
|
72
|
-
}),
|
|
73
|
-
],
|
|
74
67
|
},
|
|
75
68
|
iceServers,
|
|
76
69
|
iceTransportPolicy: 'all',
|
|
77
|
-
|
|
70
|
+
bundlePolicy: 'max-bundle',
|
|
78
71
|
}));
|
|
79
|
-
const audioTransceiver = pc.addTransceiver(this.returnAudioTrack, {
|
|
80
|
-
direction: 'sendrecv',
|
|
81
|
-
});
|
|
82
72
|
const videoTransceiver = pc.addTransceiver('video', {
|
|
83
73
|
direction: 'recvonly',
|
|
84
74
|
});
|
|
75
|
+
const audioTransceiver = pc.addTransceiver(this.returnAudioTrack, {
|
|
76
|
+
direction: 'sendrecv',
|
|
77
|
+
});
|
|
85
78
|
audioTransceiver.onTrack.subscribe((track) => {
|
|
86
79
|
track.onReceiveRtp.subscribe((rtp) => {
|
|
87
80
|
this.onAudioRtp.next(rtp);
|
|
@@ -113,9 +106,12 @@ export class CustomPeerConnection {
|
|
|
113
106
|
this.onConnectionState.next(pc.connectionState);
|
|
114
107
|
});
|
|
115
108
|
this.onIceCandidate.subscribe((candidate) => {
|
|
109
|
+
if (!candidate.candidate || candidate.candidate == '') {
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
116
112
|
this.sendIceCandidate(candidate);
|
|
117
113
|
});
|
|
118
|
-
const offer = await
|
|
114
|
+
const offer = await this.createOffer();
|
|
119
115
|
const offerMessage = {
|
|
120
116
|
mode: 'webrtc',
|
|
121
117
|
sdp: offer.sdp,
|
|
@@ -140,7 +136,6 @@ export class CustomPeerConnection {
|
|
|
140
136
|
},
|
|
141
137
|
};
|
|
142
138
|
this.mqtt.publish(JSON.stringify(webRTCMessage));
|
|
143
|
-
this.logger.log('[WebRTC] - TuyaMQ: Sent Offer w/ sdp.');
|
|
144
139
|
const answer = await this.createLocalDescription();
|
|
145
140
|
await this.acceptAnswer(answer);
|
|
146
141
|
}
|
|
@@ -149,7 +144,7 @@ export class CustomPeerConnection {
|
|
|
149
144
|
throw new Error('Peer connection not created');
|
|
150
145
|
}
|
|
151
146
|
const offer = await this.pc.createOffer();
|
|
152
|
-
|
|
147
|
+
this.pc.setLocalDescription(offer);
|
|
153
148
|
return offer;
|
|
154
149
|
}
|
|
155
150
|
async acceptAnswer(answer) {
|
|
@@ -178,7 +173,6 @@ export class CustomPeerConnection {
|
|
|
178
173
|
return new Promise((resolve, reject) => {
|
|
179
174
|
const messageHandler = (_client, message) => {
|
|
180
175
|
const webRTCMessage = JSON.parse(message);
|
|
181
|
-
this.logger.log(`[WebRTC] - TuyaMQ message received: ${JSON.stringify(webRTCMessage)}`);
|
|
182
176
|
if (webRTCMessage.data.header.type == 'answer') {
|
|
183
177
|
const answer = webRTCMessage.data.msg;
|
|
184
178
|
resolve({
|
|
@@ -200,7 +194,7 @@ export class CustomPeerConnection {
|
|
|
200
194
|
else {
|
|
201
195
|
this.logger.error('[WebRTC] - TuyaMQ: There was an error trying to get an answer or candidate from TuyaMQ.');
|
|
202
196
|
this.mqtt?.removeMessageListener(messageHandler);
|
|
203
|
-
this.
|
|
197
|
+
this.close();
|
|
204
198
|
reject(new Error('[WebRTC] - TuyaMQ: There was an error trying to get an answer or candidate from TuyaMQ.'));
|
|
205
199
|
}
|
|
206
200
|
};
|
|
@@ -234,7 +228,6 @@ export class CustomPeerConnection {
|
|
|
234
228
|
},
|
|
235
229
|
};
|
|
236
230
|
this.mqtt.publish(JSON.stringify(webRTCMQMessage));
|
|
237
|
-
this.logger.log('[WebRTC] - TuyaMQ: Sent candidate.');
|
|
238
231
|
}
|
|
239
232
|
endSession() {
|
|
240
233
|
if (!this.deviceWebRTConfig || !this.mqttWebRTConfig || !this.mqtt) {
|
|
@@ -260,7 +253,6 @@ export class CustomPeerConnection {
|
|
|
260
253
|
},
|
|
261
254
|
};
|
|
262
255
|
this.mqtt.publish(JSON.stringify(webRTCMessage));
|
|
263
|
-
this.logger.log('[WebRTC] - TuyaMQ: Sent disconnect.');
|
|
264
256
|
this.mqtt.stop();
|
|
265
257
|
}
|
|
266
258
|
reset() {
|
package/dist/peer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peer.js","sourceRoot":"","sources":["../src/peer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAErG,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAOtC,MAAM,OAAO,oBAAoB;IACvB,EAAE,CAAqB;IACvB,SAAS,CAAS;IAElB,QAAQ,CAAO;IACf,YAAY,CAAe;IAC3B,WAAW,CAAmB;IAC9B,MAAM,CAAe;IAErB,IAAI,CAAU;IACd,iBAAiB,CAAqB;IACtC,eAAe,CAAc;IAE9B,UAAU,GAAG,IAAI,OAAO,EAAa,CAAC;IACtC,WAAW,GAAG,IAAI,OAAO,EAAc,CAAC;IACxC,UAAU,GAAG,IAAI,OAAO,EAAa,CAAC;IACtC,WAAW,GAAG,IAAI,OAAO,EAAc,CAAC;IACxC,cAAc,GAAG,IAAI,OAAO,EAAmB,CAAC;IAChD,iBAAiB,GAAG,IAAI,aAAa,CAAkB,CAAC,CAAC,CAAC;IAC1D,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAElE,YAAY,QAAc,EAAE,YAA0B,EAAE,WAA6B,EAAE,MAAoB;QACzG,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,UAAU,EAAE,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC/B,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEpG,IAAI,CAAC,yBAAyB,EAAE,OAAO,EAAE,CAAC;YACxC,
|
|
1
|
+
{"version":3,"file":"peer.js","sourceRoot":"","sources":["../src/peer.ts"],"names":[],"mappings":"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"}
|
package/dist/tuya/cloud.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import axios from 'axios';
|
|
2
2
|
import { randomBytes } from 'crypto';
|
|
3
3
|
import CryptoJS from 'crypto-js';
|
|
4
4
|
import { getTuyaCloudEndpoint, TUYA_COUNTRIES } from './utils.js';
|
|
@@ -25,7 +25,7 @@ export class TuyaCloud {
|
|
|
25
25
|
this.nonce = CryptoJS.lib.WordArray.random(16).toString();
|
|
26
26
|
this.country = TUYA_COUNTRIES.find((value) => value.country == config.home.country);
|
|
27
27
|
this.whitelist = config.home.homeWhitelist;
|
|
28
|
-
this.client = new Axios({
|
|
28
|
+
this.client = new axios.Axios({
|
|
29
29
|
baseURL: getTuyaCloudEndpoint(this.country),
|
|
30
30
|
timeout: 5 * 1e3,
|
|
31
31
|
});
|
|
@@ -148,7 +148,7 @@ export class TuyaCloud {
|
|
|
148
148
|
sign: sign,
|
|
149
149
|
sign_method: 'HMAC-SHA256',
|
|
150
150
|
t: timestamp,
|
|
151
|
-
access_token: this.session
|
|
151
|
+
access_token: this.session.accessToken,
|
|
152
152
|
'Signature-Headers': Object.keys(headers).join(':'),
|
|
153
153
|
nonce: this.nonce,
|
|
154
154
|
};
|
package/dist/tuya/cloud.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud.js","sourceRoot":"","sources":["../../src/tuya/cloud.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"cloud.js","sourceRoot":"","sources":["../../src/tuya/cloud.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "Tuya",
|
|
3
3
|
"name": "@camera.ui/camera-ui-tuya",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.9",
|
|
5
5
|
"description": "camera.ui tuya plugin",
|
|
6
6
|
"author": "seydx (https://github.com/seydx/camera.ui)",
|
|
7
7
|
"main": "./dist/index.js",
|
|
@@ -15,13 +15,14 @@
|
|
|
15
15
|
"prepublishOnly": "npm i --package-lock-only && npm run lint && npm run format && npm run build"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@camera.ui/rtsp": "^0.0.
|
|
19
|
-
"axios": "^
|
|
18
|
+
"@camera.ui/rtsp": "^0.0.32",
|
|
19
|
+
"axios": "^0.27.2",
|
|
20
20
|
"crypto-js": "^4.2.0",
|
|
21
21
|
"mqtt": "^5.10.0",
|
|
22
22
|
"mqtt-packet": "^9.0.0",
|
|
23
23
|
"rxjs": "^7.8.1",
|
|
24
|
-
"werift": "^0.19.8"
|
|
24
|
+
"werift": "^0.19.8",
|
|
25
|
+
"ws": "^8.18.0"
|
|
25
26
|
},
|
|
26
27
|
"devDependencies": {
|
|
27
28
|
"@camera.ui/types": "^0.0.58",
|
|
@@ -29,8 +30,8 @@
|
|
|
29
30
|
"@types/crypto-js": "^4.2.2",
|
|
30
31
|
"@types/node": "^22.5.0",
|
|
31
32
|
"@types/ws": "^8.5.12",
|
|
32
|
-
"@typescript-eslint/eslint-plugin": "^8.
|
|
33
|
-
"@typescript-eslint/parser": "^8.
|
|
33
|
+
"@typescript-eslint/eslint-plugin": "^8.3.0",
|
|
34
|
+
"@typescript-eslint/parser": "^8.3.0",
|
|
34
35
|
"concurrently": "^8.2.2",
|
|
35
36
|
"eslint": "8.57.0",
|
|
36
37
|
"eslint-config-prettier": "^9.1.0",
|