@switchbot/homebridge-switchbot 3.5.0-beta.2 → 3.5.0-beta.21

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 (151) hide show
  1. package/CHANGELOG.md +4 -1
  2. package/config.schema.json +57 -6
  3. package/dist/device/blindtilt.d.ts +4 -0
  4. package/dist/device/blindtilt.d.ts.map +1 -1
  5. package/dist/device/blindtilt.js +37 -1
  6. package/dist/device/blindtilt.js.map +1 -1
  7. package/dist/device/bot.d.ts +4 -0
  8. package/dist/device/bot.d.ts.map +1 -1
  9. package/dist/device/bot.js +31 -1
  10. package/dist/device/bot.js.map +1 -1
  11. package/dist/device/ceilinglight.d.ts +4 -0
  12. package/dist/device/ceilinglight.d.ts.map +1 -1
  13. package/dist/device/ceilinglight.js +37 -3
  14. package/dist/device/ceilinglight.js.map +1 -1
  15. package/dist/device/colorbulb.d.ts +4 -0
  16. package/dist/device/colorbulb.d.ts.map +1 -1
  17. package/dist/device/colorbulb.js +39 -3
  18. package/dist/device/colorbulb.js.map +1 -1
  19. package/dist/device/contact.d.ts +4 -0
  20. package/dist/device/contact.d.ts.map +1 -1
  21. package/dist/device/contact.js +27 -2
  22. package/dist/device/contact.js.map +1 -1
  23. package/dist/device/curtain.d.ts +4 -0
  24. package/dist/device/curtain.d.ts.map +1 -1
  25. package/dist/device/curtain.js +31 -1
  26. package/dist/device/curtain.js.map +1 -1
  27. package/dist/device/hub.d.ts +4 -0
  28. package/dist/device/hub.d.ts.map +1 -1
  29. package/dist/device/hub.js +27 -2
  30. package/dist/device/hub.js.map +1 -1
  31. package/dist/device/humidifier.d.ts +4 -0
  32. package/dist/device/humidifier.d.ts.map +1 -1
  33. package/dist/device/humidifier.js +36 -2
  34. package/dist/device/humidifier.js.map +1 -1
  35. package/dist/device/iosensor.d.ts +4 -0
  36. package/dist/device/iosensor.d.ts.map +1 -1
  37. package/dist/device/iosensor.js +27 -2
  38. package/dist/device/iosensor.js.map +1 -1
  39. package/dist/device/lightstrip.d.ts +4 -0
  40. package/dist/device/lightstrip.d.ts.map +1 -1
  41. package/dist/device/lightstrip.js +37 -3
  42. package/dist/device/lightstrip.js.map +1 -1
  43. package/dist/device/lock.d.ts +4 -0
  44. package/dist/device/lock.d.ts.map +1 -1
  45. package/dist/device/lock.js +31 -1
  46. package/dist/device/lock.js.map +1 -1
  47. package/dist/device/meter.d.ts +4 -0
  48. package/dist/device/meter.d.ts.map +1 -1
  49. package/dist/device/meter.js +27 -2
  50. package/dist/device/meter.js.map +1 -1
  51. package/dist/device/meterplus.d.ts +4 -0
  52. package/dist/device/meterplus.d.ts.map +1 -1
  53. package/dist/device/meterplus.js +27 -2
  54. package/dist/device/meterplus.js.map +1 -1
  55. package/dist/device/motion.d.ts +4 -0
  56. package/dist/device/motion.d.ts.map +1 -1
  57. package/dist/device/motion.js +27 -2
  58. package/dist/device/motion.js.map +1 -1
  59. package/dist/device/plug.d.ts +4 -0
  60. package/dist/device/plug.d.ts.map +1 -1
  61. package/dist/device/plug.js +31 -1
  62. package/dist/device/plug.js.map +1 -1
  63. package/dist/device/robotvacuumcleaner.d.ts +4 -0
  64. package/dist/device/robotvacuumcleaner.d.ts.map +1 -1
  65. package/dist/device/robotvacuumcleaner.js +38 -5
  66. package/dist/device/robotvacuumcleaner.js.map +1 -1
  67. package/dist/device/waterdetector.d.ts +7 -11
  68. package/dist/device/waterdetector.d.ts.map +1 -1
  69. package/dist/device/waterdetector.js +54 -224
  70. package/dist/device/waterdetector.js.map +1 -1
  71. package/dist/index.js +1 -1
  72. package/dist/irdevice/airconditioner.d.ts +1 -0
  73. package/dist/irdevice/airconditioner.d.ts.map +1 -1
  74. package/dist/irdevice/airconditioner.js +6 -0
  75. package/dist/irdevice/airconditioner.js.map +1 -1
  76. package/dist/irdevice/airpurifier.d.ts +1 -0
  77. package/dist/irdevice/airpurifier.d.ts.map +1 -1
  78. package/dist/irdevice/airpurifier.js +6 -0
  79. package/dist/irdevice/airpurifier.js.map +1 -1
  80. package/dist/irdevice/camera.d.ts +1 -0
  81. package/dist/irdevice/camera.d.ts.map +1 -1
  82. package/dist/irdevice/camera.js +6 -0
  83. package/dist/irdevice/camera.js.map +1 -1
  84. package/dist/irdevice/fan.d.ts +1 -0
  85. package/dist/irdevice/fan.d.ts.map +1 -1
  86. package/dist/irdevice/fan.js +6 -0
  87. package/dist/irdevice/fan.js.map +1 -1
  88. package/dist/irdevice/light.d.ts +1 -0
  89. package/dist/irdevice/light.d.ts.map +1 -1
  90. package/dist/irdevice/light.js +6 -0
  91. package/dist/irdevice/light.js.map +1 -1
  92. package/dist/irdevice/other.d.ts +1 -0
  93. package/dist/irdevice/other.d.ts.map +1 -1
  94. package/dist/irdevice/other.js +6 -0
  95. package/dist/irdevice/other.js.map +1 -1
  96. package/dist/irdevice/tv.d.ts +1 -0
  97. package/dist/irdevice/tv.d.ts.map +1 -1
  98. package/dist/irdevice/tv.js +6 -0
  99. package/dist/irdevice/tv.js.map +1 -1
  100. package/dist/irdevice/vacuumcleaner.d.ts +1 -0
  101. package/dist/irdevice/vacuumcleaner.d.ts.map +1 -1
  102. package/dist/irdevice/vacuumcleaner.js +6 -0
  103. package/dist/irdevice/vacuumcleaner.js.map +1 -1
  104. package/dist/irdevice/waterheater.d.ts +1 -0
  105. package/dist/irdevice/waterheater.d.ts.map +1 -1
  106. package/dist/irdevice/waterheater.js +6 -0
  107. package/dist/irdevice/waterheater.js.map +1 -1
  108. package/dist/platform.d.ts +12 -0
  109. package/dist/platform.d.ts.map +1 -1
  110. package/dist/platform.js +148 -89
  111. package/dist/platform.js.map +1 -1
  112. package/dist/settings.d.ts +5 -6
  113. package/dist/settings.d.ts.map +1 -1
  114. package/dist/settings.js +0 -552
  115. package/dist/settings.js.map +1 -1
  116. package/dist/utils.d.ts +4 -0
  117. package/dist/utils.d.ts.map +1 -1
  118. package/dist/utils.js +553 -1
  119. package/dist/utils.js.map +1 -1
  120. package/package.json +16 -15
  121. package/src/custom.d.ts +1 -1
  122. package/src/device/blindtilt.ts +49 -12
  123. package/src/device/bot.ts +34 -3
  124. package/src/device/ceilinglight.ts +40 -5
  125. package/src/device/colorbulb.ts +42 -5
  126. package/src/device/contact.ts +30 -4
  127. package/src/device/curtain.ts +34 -3
  128. package/src/device/hub.ts +30 -4
  129. package/src/device/humidifier.ts +39 -4
  130. package/src/device/iosensor.ts +30 -4
  131. package/src/device/lightstrip.ts +40 -5
  132. package/src/device/lock.ts +34 -3
  133. package/src/device/meter.ts +30 -4
  134. package/src/device/meterplus.ts +30 -4
  135. package/src/device/motion.ts +30 -4
  136. package/src/device/plug.ts +34 -3
  137. package/src/device/robotvacuumcleaner.ts +41 -7
  138. package/src/device/waterdetector.ts +60 -229
  139. package/src/index.ts +1 -1
  140. package/src/irdevice/airconditioner.ts +7 -0
  141. package/src/irdevice/airpurifier.ts +7 -0
  142. package/src/irdevice/camera.ts +7 -0
  143. package/src/irdevice/fan.ts +7 -0
  144. package/src/irdevice/light.ts +7 -0
  145. package/src/irdevice/other.ts +7 -0
  146. package/src/irdevice/tv.ts +7 -0
  147. package/src/irdevice/vacuumcleaner.ts +7 -0
  148. package/src/irdevice/waterheater.ts +7 -0
  149. package/src/platform.ts +157 -95
  150. package/src/settings.ts +6 -557
  151. package/src/utils.ts +556 -1
package/dist/utils.js CHANGED
@@ -1,8 +1,560 @@
1
- /* Copyright(C) 2017-2023, donavanbecker (https://github.com/donavanbecker). All rights reserved.
1
+ /* Copyright(C) 2017-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
2
2
  *
3
3
  * util.ts: @switchbot/homebridge-switchbot platform class.
4
4
  */
5
5
  export function sleep(ms) {
6
6
  return new Promise((resolve) => setTimeout(resolve, ms));
7
7
  }
8
+ export function rgb2hs(r, g, b) {
9
+ /*
10
+ Credit:
11
+ https://github.com/WickyNilliams/pure-color
12
+ */
13
+ r = parseInt(r);
14
+ g = parseInt(g);
15
+ b = parseInt(b);
16
+ const min = Math.min(r, g, b);
17
+ const max = Math.max(r, g, b);
18
+ const delta = max - min;
19
+ let h;
20
+ let s;
21
+ if (max === 0) {
22
+ s = 0;
23
+ }
24
+ else {
25
+ s = (delta / max) * 100;
26
+ }
27
+ if (max === min) {
28
+ h = 0;
29
+ }
30
+ else if (r === max) {
31
+ h = (g - b) / delta;
32
+ }
33
+ else if (g === max) {
34
+ h = 2 + (b - r) / delta;
35
+ }
36
+ else if (b === max) {
37
+ h = 4 + (r - g) / delta;
38
+ }
39
+ h = Math.min(h * 60, 360);
40
+ if (h < 0) {
41
+ h += 360;
42
+ }
43
+ return [Math.round(h), Math.round(s)];
44
+ }
45
+ export function hs2rgb(h, s) {
46
+ /*
47
+ Credit:
48
+ https://github.com/WickyNilliams/pure-color
49
+ */
50
+ h = parseInt(h) / 60;
51
+ s = parseInt(s) / 100;
52
+ const f = h - Math.floor(h);
53
+ const p = 255 * (1 - s);
54
+ const q = 255 * (1 - s * f);
55
+ const t = 255 * (1 - s * (1 - f));
56
+ let rgb;
57
+ switch (Math.floor(h) % 6) {
58
+ case 0:
59
+ rgb = [255, t, p];
60
+ break;
61
+ case 1:
62
+ rgb = [q, 255, p];
63
+ break;
64
+ case 2:
65
+ rgb = [p, 255, t];
66
+ break;
67
+ case 3:
68
+ rgb = [p, q, 255];
69
+ break;
70
+ case 4:
71
+ rgb = [t, p, 255];
72
+ break;
73
+ case 5:
74
+ rgb = [255, p, q];
75
+ break;
76
+ }
77
+ if (rgb[0] === 255) {
78
+ rgb[1] *= 0.8;
79
+ rgb[2] *= 0.8;
80
+ if (rgb[1] <= 25 && rgb[2] <= 25) {
81
+ rgb[1] = 0;
82
+ rgb[2] = 0;
83
+ }
84
+ }
85
+ return [Math.round(rgb[0]), Math.round(rgb[1]), Math.round(rgb[2])];
86
+ }
87
+ export function k2rgb(k) {
88
+ // Set kelvin to nearest 100, between 2000 and 7100
89
+ k = Math.round(k / 100) * 100;
90
+ k = Math.max(Math.min(k, 7100), 2000);
91
+ // k should now appear in our table of kelvin to rgb
92
+ const values = {
93
+ 2000: [255, 141, 11],
94
+ 2100: [255, 146, 29],
95
+ 2200: [255, 147, 44],
96
+ 2300: [255, 152, 54],
97
+ 2400: [255, 157, 63],
98
+ 2500: [255, 166, 69],
99
+ 2600: [255, 170, 77],
100
+ 2700: [255, 174, 84],
101
+ 2800: [255, 173, 94],
102
+ 2900: [255, 177, 101],
103
+ 3000: [255, 180, 107],
104
+ 3100: [255, 189, 111],
105
+ 3200: [255, 187, 120],
106
+ 3300: [255, 195, 124],
107
+ 3400: [255, 198, 130],
108
+ 3500: [255, 201, 135],
109
+ 3600: [255, 203, 141],
110
+ 3700: [255, 206, 146],
111
+ 3800: [255, 204, 153],
112
+ 3900: [255, 206, 159],
113
+ 4000: [255, 213, 161],
114
+ 4100: [255, 215, 166],
115
+ 4200: [255, 217, 171],
116
+ 4300: [255, 219, 175],
117
+ 4400: [255, 221, 180],
118
+ 4500: [255, 223, 184],
119
+ 4600: [255, 225, 188],
120
+ 4700: [255, 226, 192],
121
+ 4800: [255, 228, 196],
122
+ 4900: [255, 229, 200],
123
+ 5000: [255, 231, 204],
124
+ 5100: [255, 230, 210],
125
+ 5200: [255, 234, 211],
126
+ 5300: [255, 235, 215],
127
+ 5400: [255, 237, 218],
128
+ 5500: [255, 236, 224],
129
+ 5700: [255, 240, 228],
130
+ 5800: [255, 241, 231],
131
+ 5900: [255, 243, 234],
132
+ 6000: [255, 244, 237],
133
+ 6100: [255, 245, 240],
134
+ 6200: [255, 246, 243],
135
+ 6300: [255, 247, 247],
136
+ 6400: [255, 248, 251],
137
+ 6500: [255, 249, 253],
138
+ 6600: [254, 249, 255],
139
+ 6700: [252, 247, 255],
140
+ 6800: [249, 246, 255],
141
+ 6900: [247, 245, 255],
142
+ 7000: [245, 243, 255],
143
+ 7100: [243, 242, 255],
144
+ };
145
+ // Return the value
146
+ return values[k];
147
+ }
148
+ export function m2hs(m) {
149
+ /*
150
+ Credit:
151
+ https://github.com/homebridge/HAP-NodeJS
152
+ */
153
+ const table = {
154
+ 100: [19, 222.1],
155
+ 101: [18.7, 222.2],
156
+ 102: [18.4, 222.3],
157
+ 103: [18.2, 222.3],
158
+ 104: [17.9, 222.4],
159
+ 105: [17.6, 222.5],
160
+ 106: [17.3, 222.7],
161
+ 107: [17, 222.8],
162
+ 108: [16.7, 222.9],
163
+ 109: [16.4, 223],
164
+ 110: [16.1, 223.2],
165
+ 111: [15.8, 223.3],
166
+ 112: [15.4, 223.4],
167
+ 113: [15.2, 223.6],
168
+ 114: [14.9, 223.8],
169
+ 115: [14.7, 223.9],
170
+ 116: [14.3, 224.1],
171
+ 117: [14.1, 224.2],
172
+ 118: [13.8, 224.4],
173
+ 119: [13.5, 224.6],
174
+ 120: [13.2, 224.8],
175
+ 121: [12.9, 225],
176
+ 122: [12.5, 225.3],
177
+ 123: [12.2, 225.6],
178
+ 124: [11.8, 225.9],
179
+ 125: [11.4, 226.3],
180
+ 126: [11.1, 226.7],
181
+ 127: [10.7, 227.1],
182
+ 128: [10.3, 227.6],
183
+ 129: [9.9, 228],
184
+ 130: [9.6, 228.5],
185
+ 131: [9.3, 229.1],
186
+ 132: [8.9, 229.6],
187
+ 133: [8.5, 230.2],
188
+ 134: [8.2, 230.9],
189
+ 135: [7.8, 231.6],
190
+ 136: [7.5, 232.5],
191
+ 137: [7.1, 233.5],
192
+ 138: [6.7, 234.6],
193
+ 139: [6.3, 235.8],
194
+ 140: [6, 237.1],
195
+ 141: [5.6, 238.9],
196
+ 142: [5.2, 240.9],
197
+ 143: [5, 242.9],
198
+ 144: [4.8, 244.9],
199
+ 145: [4.6, 246.9],
200
+ 146: [4.4, 249.3],
201
+ 147: [4.3, 251.9],
202
+ 148: [4.1, 254.9],
203
+ 149: [3.9, 258],
204
+ 150: [3.7, 261.8],
205
+ 151: [3.4, 265.9],
206
+ 152: [3.2, 271],
207
+ 153: [3, 276.4],
208
+ 154: [2.8, 283.6],
209
+ 155: [2.6, 290.4],
210
+ 156: [2.3, 295.3],
211
+ 157: [2.1, 300],
212
+ 158: [1.9, 300],
213
+ 159: [1.6, 300],
214
+ 160: [1.4, 195.8],
215
+ 161: [1.2, 84.3],
216
+ 162: [1.3, 58.2],
217
+ 163: [1.5, 55.9],
218
+ 164: [1.7, 53.2],
219
+ 165: [1.9, 50.2],
220
+ 166: [2.1, 47.1],
221
+ 167: [2.4, 44.5],
222
+ 168: [2.6, 42.6],
223
+ 169: [2.9, 40.9],
224
+ 170: [3.1, 39.5],
225
+ 171: [3.4, 38.3],
226
+ 172: [3.7, 37.3],
227
+ 173: [3.9, 36.5],
228
+ 174: [4.2, 35.7],
229
+ 175: [4.4, 35.1],
230
+ 176: [4.6, 34.5],
231
+ 177: [4.9, 34],
232
+ 178: [5.1, 33.5],
233
+ 179: [5.3, 33],
234
+ 180: [5.6, 32.7],
235
+ 181: [5.8, 32.3],
236
+ 182: [6, 32],
237
+ 183: [6.3, 31.7],
238
+ 184: [6.5, 31.4],
239
+ 185: [6.7, 31.2],
240
+ 186: [7, 30.9],
241
+ 187: [7.2, 30.7],
242
+ 188: [7.4, 30.5],
243
+ 189: [7.6, 30.3],
244
+ 190: [7.9, 30.1],
245
+ 191: [8.1, 29.9],
246
+ 192: [8.4, 29.7],
247
+ 193: [8.6, 29.6],
248
+ 194: [8.9, 29.5],
249
+ 195: [9.1, 29.3],
250
+ 196: [9.4, 29.2],
251
+ 197: [9.6, 29.1],
252
+ 198: [9.8, 29],
253
+ 199: [10, 28.9],
254
+ 200: [10.2, 28.7],
255
+ 201: [10.5, 28.7],
256
+ 202: [10.7, 28.6],
257
+ 203: [11, 28.5],
258
+ 204: [11.2, 28.4],
259
+ 205: [11.4, 28.3],
260
+ 206: [11.6, 28.3],
261
+ 207: [11.8, 28.2],
262
+ 208: [12.1, 28.1],
263
+ 209: [12.3, 28.1],
264
+ 210: [12.5, 28],
265
+ 211: [12.7, 28],
266
+ 212: [12.9, 27.9],
267
+ 213: [13.2, 27.8],
268
+ 214: [13.4, 27.8],
269
+ 215: [13.6, 27.7],
270
+ 216: [13.8, 27.7],
271
+ 217: [14, 27.7],
272
+ 218: [14.3, 27.6],
273
+ 219: [14.5, 27.6],
274
+ 220: [14.7, 27.5],
275
+ 221: [14.9, 27.5],
276
+ 222: [15.1, 27.5],
277
+ 223: [15.3, 27.4],
278
+ 224: [15.5, 27.4],
279
+ 225: [15.8, 27.4],
280
+ 226: [16, 27.3],
281
+ 227: [16.2, 27.3],
282
+ 228: [16.4, 27.3],
283
+ 229: [16.6, 27.3],
284
+ 230: [16.8, 27.2],
285
+ 231: [17, 27.2],
286
+ 232: [17.2, 27.2],
287
+ 233: [17.4, 27.2],
288
+ 234: [17.6, 27.2],
289
+ 235: [17.8, 27.1],
290
+ 236: [18, 27.1],
291
+ 237: [18.2, 27.1],
292
+ 238: [18.4, 27.1],
293
+ 239: [18.7, 27.1],
294
+ 240: [18.8, 27],
295
+ 241: [19, 27],
296
+ 242: [19.2, 27],
297
+ 243: [19.4, 27],
298
+ 244: [19.6, 27],
299
+ 245: [19.8, 27],
300
+ 246: [20, 27],
301
+ 247: [20.3, 26.9],
302
+ 248: [20.5, 26.9],
303
+ 249: [20.6, 26.9],
304
+ 250: [20.8, 26.9],
305
+ 251: [21, 26.9],
306
+ 252: [21.3, 26.9],
307
+ 253: [21.5, 26.9],
308
+ 254: [21.6, 26.9],
309
+ 255: [21.8, 26.8],
310
+ 256: [22, 26.8],
311
+ 257: [22.2, 26.8],
312
+ 258: [22.4, 26.8],
313
+ 259: [22.6, 26.8],
314
+ 260: [22.8, 26.8],
315
+ 261: [23, 26.8],
316
+ 262: [23.2, 26.8],
317
+ 263: [23.4, 26.8],
318
+ 264: [23.6, 26.8],
319
+ 265: [23.8, 26.8],
320
+ 266: [24, 26.8],
321
+ 267: [24.1, 26.8],
322
+ 268: [24.3, 26.8],
323
+ 269: [24.5, 26.8],
324
+ 270: [24.7, 26.8],
325
+ 271: [24.8, 26.8],
326
+ 272: [25.1, 26.7],
327
+ 273: [25.3, 26.7],
328
+ 274: [25.4, 26.7],
329
+ 275: [25.6, 26.7],
330
+ 276: [25.8, 26.7],
331
+ 277: [26, 26.7],
332
+ 278: [26.1, 26.7],
333
+ 279: [26.3, 26.7],
334
+ 280: [26.5, 26.7],
335
+ 281: [26.7, 26.7],
336
+ 282: [26.9, 26.7],
337
+ 283: [27.1, 26.7],
338
+ 284: [27.3, 26.7],
339
+ 285: [27.5, 26.7],
340
+ 286: [27.7, 26.7],
341
+ 287: [27.8, 26.7],
342
+ 288: [28, 26.7],
343
+ 289: [28.2, 26.7],
344
+ 290: [28.4, 26.7],
345
+ 291: [28.6, 26.7],
346
+ 292: [28.8, 26.7],
347
+ 293: [28.9, 26.7],
348
+ 294: [29.1, 26.7],
349
+ 295: [29.3, 26.7],
350
+ 296: [29.5, 26.7],
351
+ 297: [29.6, 26.7],
352
+ 298: [29.8, 26.7],
353
+ 299: [30, 26.7],
354
+ 300: [30.2, 26.7],
355
+ 301: [30.4, 26.7],
356
+ 302: [30.5, 26.7],
357
+ 303: [30.7, 26.7],
358
+ 304: [30.9, 26.7],
359
+ 305: [31.1, 26.7],
360
+ 306: [31.2, 26.7],
361
+ 307: [31.4, 26.7],
362
+ 308: [31.6, 26.7],
363
+ 309: [31.8, 26.8],
364
+ 310: [31.9, 26.8],
365
+ 311: [32.1, 26.8],
366
+ 312: [32.3, 26.8],
367
+ 313: [32.5, 26.8],
368
+ 314: [32.6, 26.8],
369
+ 315: [32.8, 26.8],
370
+ 316: [33, 26.8],
371
+ 317: [33.2, 26.8],
372
+ 318: [33.3, 26.8],
373
+ 319: [33.5, 26.8],
374
+ 320: [33.7, 26.8],
375
+ 321: [33.8, 26.8],
376
+ 322: [34, 26.8],
377
+ 323: [34.2, 26.8],
378
+ 324: [34.4, 26.8],
379
+ 325: [34.5, 26.8],
380
+ 326: [34.7, 26.8],
381
+ 327: [34.9, 26.8],
382
+ 328: [35.1, 26.8],
383
+ 329: [35.2, 26.8],
384
+ 330: [35.4, 26.8],
385
+ 331: [35.5, 26.8],
386
+ 332: [35.7, 26.8],
387
+ 333: [35.9, 26.8],
388
+ 334: [36.1, 26.8],
389
+ 335: [36.3, 26.9],
390
+ 336: [36.5, 26.9],
391
+ 337: [36.7, 26.9],
392
+ 338: [36.9, 26.9],
393
+ 339: [37.1, 26.9],
394
+ 340: [37.2, 26.9],
395
+ 341: [37.4, 26.9],
396
+ 342: [37.5, 26.9],
397
+ 343: [37.7, 26.9],
398
+ 344: [37.9, 26.9],
399
+ 345: [38.1, 26.9],
400
+ 346: [38.3, 26.9],
401
+ 347: [38.5, 26.9],
402
+ 348: [38.7, 26.9],
403
+ 349: [38.9, 26.9],
404
+ 350: [39, 26.9],
405
+ 351: [39.2, 26.9],
406
+ 352: [39.3, 27],
407
+ 353: [39.5, 27],
408
+ 354: [39.7, 27],
409
+ 355: [39.9, 27],
410
+ 356: [40.1, 27],
411
+ 357: [40.2, 27],
412
+ 358: [40.4, 27],
413
+ 359: [40.6, 27],
414
+ 360: [40.8, 27],
415
+ 361: [40.9, 27],
416
+ 362: [41.1, 27],
417
+ 363: [41.2, 27],
418
+ 364: [41.4, 27],
419
+ 365: [41.6, 27],
420
+ 366: [41.8, 27],
421
+ 367: [42, 27],
422
+ 368: [42.1, 27.1],
423
+ 369: [42.3, 27.1],
424
+ 370: [42.4, 27.1],
425
+ 371: [42.6, 27.1],
426
+ 372: [42.8, 27.1],
427
+ 373: [43, 27.1],
428
+ 374: [43.1, 27.1],
429
+ 375: [43.2, 27.1],
430
+ 376: [43.4, 27.1],
431
+ 377: [43.6, 27.1],
432
+ 378: [43.8, 27.1],
433
+ 379: [43.9, 27.1],
434
+ 380: [44.1, 27.1],
435
+ 381: [44.3, 27.2],
436
+ 382: [44.4, 27.2],
437
+ 383: [44.6, 27.2],
438
+ 384: [44.7, 27.2],
439
+ 385: [44.9, 27.2],
440
+ 386: [45.1, 27.2],
441
+ 387: [45.3, 27.2],
442
+ 388: [45.5, 27.2],
443
+ 389: [45.6, 27.2],
444
+ 390: [45.8, 27.2],
445
+ 391: [46, 27.2],
446
+ 392: [46.2, 27.2],
447
+ 393: [46.4, 27.3],
448
+ 394: [46.5, 27.3],
449
+ 395: [46.7, 27.3],
450
+ 396: [46.9, 27.3],
451
+ 397: [47.1, 27.3],
452
+ 398: [47.2, 27.3],
453
+ 399: [47.4, 27.3],
454
+ 400: [47.6, 27.3],
455
+ 401: [47.7, 27.3],
456
+ 402: [47.9, 27.3],
457
+ 403: [48.1, 27.3],
458
+ 404: [48.3, 27.3],
459
+ 405: [48.5, 27.4],
460
+ 406: [48.7, 27.4],
461
+ 407: [48.8, 27.4],
462
+ 408: [49, 27.4],
463
+ 409: [49.2, 27.4],
464
+ 410: [49.4, 27.4],
465
+ 411: [49.6, 27.4],
466
+ 412: [49.7, 27.4],
467
+ 413: [49.9, 27.4],
468
+ 414: [50.1, 27.4],
469
+ 415: [50.2, 27.4],
470
+ 416: [50.4, 27.4],
471
+ 417: [50.6, 27.5],
472
+ 418: [50.7, 27.5],
473
+ 419: [50.9, 27.5],
474
+ 420: [51.1, 27.5],
475
+ 421: [51.2, 27.5],
476
+ 422: [51.4, 27.5],
477
+ 423: [51.6, 27.5],
478
+ 424: [51.7, 27.5],
479
+ 425: [51.9, 27.5],
480
+ 426: [52.1, 27.5],
481
+ 427: [51.2, 27.6],
482
+ 428: [52.4, 27.6],
483
+ 429: [52.5, 27.6],
484
+ 430: [52.7, 27.6],
485
+ 431: [52.9, 27.6],
486
+ 432: [53.1, 27.6],
487
+ 433: [53.2, 27.6],
488
+ 434: [53.4, 27.6],
489
+ 435: [53.6, 27.6],
490
+ 436: [53.7, 27.6],
491
+ 437: [53.9, 27.6],
492
+ 438: [54.1, 27.7],
493
+ 439: [54.2, 27.7],
494
+ 440: [54.3, 27.7],
495
+ 441: [54.5, 27.7],
496
+ 442: [54.7, 27.7],
497
+ 443: [54.8, 27.7],
498
+ 444: [55, 27.7],
499
+ 445: [55.2, 27.7],
500
+ 446: [55.3, 27.7],
501
+ 447: [55.5, 27.7],
502
+ 448: [55.7, 27.7],
503
+ 449: [55.8, 27.8],
504
+ 450: [56, 27.8],
505
+ 451: [56.2, 27.8],
506
+ 452: [56.3, 27.8],
507
+ 453: [56.5, 27.8],
508
+ 454: [56.7, 27.8],
509
+ 455: [56.8, 27.8],
510
+ 456: [57, 27.8],
511
+ 457: [57.2, 27.8],
512
+ 458: [57.3, 27.9],
513
+ 459: [57.4, 27.9],
514
+ 460: [57.6, 27.9],
515
+ 461: [57.8, 27.9],
516
+ 462: [57.9, 27.9],
517
+ 463: [58.1, 27.9],
518
+ 464: [58.3, 27.9],
519
+ 465: [58.4, 27.9],
520
+ 466: [58.6, 27.9],
521
+ 467: [58.8, 27.9],
522
+ 468: [59, 28],
523
+ 469: [59.1, 28],
524
+ 470: [59.2, 28],
525
+ 471: [59.4, 28],
526
+ 472: [59.6, 28],
527
+ 473: [59.7, 28],
528
+ 474: [60, 28],
529
+ 475: [60.1, 28],
530
+ 476: [60.2, 28],
531
+ 477: [60.4, 28],
532
+ 478: [60.6, 28.1],
533
+ 479: [60.7, 28.1],
534
+ 480: [60.9, 28.1],
535
+ 481: [60.1, 28.1],
536
+ 482: [60.3, 28.1],
537
+ 483: [61.4, 28.1],
538
+ 484: [61.5, 28.1],
539
+ 485: [61.7, 28.1],
540
+ 486: [61.9, 28.1],
541
+ 487: [62, 28.2],
542
+ 488: [62.2, 28.2],
543
+ 489: [62.3, 28.2],
544
+ 490: [62.5, 28.2],
545
+ 491: [62.7, 28.2],
546
+ 492: [62.8, 28.2],
547
+ 493: [63, 28.2],
548
+ 494: [63.2, 28.2],
549
+ 495: [63.3, 28.2],
550
+ 496: [63.4, 28.2],
551
+ 497: [63.6, 28.2],
552
+ 498: [63.8, 28.3],
553
+ 499: [63.9, 28.3],
554
+ 500: [64.1, 28.3],
555
+ };
556
+ const input = Math.min(Math.max(Math.round(m), 140), 500);
557
+ const toReturn = table[input];
558
+ return [Math.round(toReturn[1]), Math.round(toReturn[0])];
559
+ }
8
560
  //# sourceMappingURL=utils.js.map
package/dist/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,KAAK,CAAC,EAAU;IAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;KACtB,CAAC;IAEF,mBAAmB;IACnB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,CAAC;IACpB;;;MAGE;IACF,MAAM,KAAK,GAAG;QACZ,GAAG,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC;QAChB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC;QAChB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;QAChB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;QAChB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAClB,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;QACf,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC;QACf,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC;QACf,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;QACf,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;QACf,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC;QACf,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;QACf,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;QACf,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;QACf,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC;QACjB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC;QACd,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC;QACd,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;QACZ,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC;QACd,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;QAChB,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC;QACd,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QACb,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QACb,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QACb,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QACb,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QACb,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;KAClB,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5D,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "displayName": "SwitchBot",
3
3
  "name": "@switchbot/homebridge-switchbot",
4
- "version": "3.5.0-beta.2",
4
+ "version": "3.5.0-beta.21",
5
5
  "description": "The SwitchBot plugin allows you to access your SwitchBot device(s) from HomeKit.",
6
6
  "author": {
7
7
  "name": "SwitchBot",
@@ -24,8 +24,9 @@
24
24
  "bugs": {
25
25
  "url": "https://github.com/OpenWonderLabs/homebridge-switchbot/issues"
26
26
  },
27
+ "engineStrict": true,
27
28
  "engines": {
28
- "homebridge": "^1.7.0",
29
+ "homebridge": "^1.8.0",
29
30
  "node": "^18 || ^20"
30
31
  },
31
32
  "main": "dist/index.js",
@@ -76,27 +77,27 @@
76
77
  "ir"
77
78
  ],
78
79
  "dependencies": {
79
- "@homebridge/plugin-ui-utils": "^1.0.1",
80
+ "@homebridge/plugin-ui-utils": "^1.0.3",
80
81
  "async-mqtt": "^2.6.3",
81
82
  "fakegato-history": "^0.6.4",
82
- "homebridge-lib": "^6.7.3",
83
+ "homebridge-lib": "^7.0.0",
83
84
  "rxjs": "^7.8.1",
84
- "undici": "^6.6.2"
85
+ "undici": "^6.15.0"
85
86
  },
86
87
  "optionalDependencies": {
87
- "node-switchbot": "2.1.0-beta.2"
88
+ "node-switchbot": "2.1.0-beta.4"
88
89
  },
89
90
  "devDependencies": {
90
- "@types/node": "^20.11.17",
91
- "@typescript-eslint/eslint-plugin": "^7.0.1",
92
- "@typescript-eslint/parser": "^7.0.1",
93
- "eslint": "^8.56.0",
94
- "homebridge": "^1.7.0",
95
- "homebridge-config-ui-x": "4.55.1",
96
- "nodemon": "^3.0.3",
97
- "npm-check-updates": "^16.14.15",
91
+ "@types/node": "^20.12.8",
92
+ "@typescript-eslint/eslint-plugin": "^7.8.0",
93
+ "@typescript-eslint/parser": "^7.8.0",
94
+ "eslint": "^8.57.0",
95
+ "homebridge": "^1.8.1",
96
+ "homebridge-config-ui-x": "4.56.2",
97
+ "nodemon": "^3.1.0",
98
+ "npm-check-updates": "^16.14.20",
98
99
  "rimraf": "^5.0.5",
99
100
  "ts-node": "^10.9.2",
100
- "typescript": "^5.3.3"
101
+ "typescript": "^5.4.5"
101
102
  }
102
103
  }
package/src/custom.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- /* Copyright(C) 2017-2023, donavanbecker (https://github.com/donavanbecker). All rights reserved.
1
+ /* Copyright(C) 2017-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
2
2
  *
3
3
  * custom.d.ts: @switchbot/homebridge-switchbot platform class.
4
4
  */