homebridge-config-ui-x 5.0.0-beta.4 → 5.0.0-beta.40

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 (302) hide show
  1. package/CHANGELOG.md +224 -20
  2. package/CONTRIBUTING.md +5 -4
  3. package/LICENSE +1 -1
  4. package/config.schema.json +38 -18
  5. package/dist/bin/fork.js +17 -7
  6. package/dist/bin/fork.js.map +1 -1
  7. package/dist/bin/hb-service.d.ts +2 -2
  8. package/dist/bin/hb-service.js +68 -57
  9. package/dist/bin/hb-service.js.map +1 -1
  10. package/dist/bin/platforms/win32.js +4 -2
  11. package/dist/bin/platforms/win32.js.map +1 -1
  12. package/dist/bin/standalone.js +18 -7
  13. package/dist/bin/standalone.js.map +1 -1
  14. package/dist/core/auth/auth.controller.d.ts +2 -0
  15. package/dist/core/auth/auth.controller.js.map +1 -1
  16. package/dist/core/auth/auth.module.js +1 -1
  17. package/dist/core/auth/auth.module.js.map +1 -1
  18. package/dist/core/auth/auth.service.js +10 -10
  19. package/dist/core/auth/auth.service.js.map +1 -1
  20. package/dist/core/auth/jwt.strategy.d.ts +3 -1
  21. package/dist/core/config/config.service.d.ts +3 -0
  22. package/dist/core/config/config.service.js +2 -1
  23. package/dist/core/config/config.service.js.map +1 -1
  24. package/dist/core/config/config.startup.js +2 -2
  25. package/dist/core/config/config.startup.js.map +1 -1
  26. package/dist/core/homebridge-ipc/homebridge-ipc.service.js +3 -3
  27. package/dist/core/homebridge-ipc/homebridge-ipc.service.js.map +1 -1
  28. package/dist/index.js +25 -14
  29. package/dist/index.js.map +1 -1
  30. package/dist/main.js +1 -1
  31. package/dist/main.js.map +1 -1
  32. package/dist/modules/accessories/accessories.controller.js +5 -5
  33. package/dist/modules/accessories/accessories.controller.js.map +1 -1
  34. package/dist/modules/accessories/accessories.service.js +7 -6
  35. package/dist/modules/accessories/accessories.service.js.map +1 -1
  36. package/dist/modules/backup/backup.controller.js +7 -7
  37. package/dist/modules/backup/backup.controller.js.map +1 -1
  38. package/dist/modules/backup/backup.service.js +17 -17
  39. package/dist/modules/backup/backup.service.js.map +1 -1
  40. package/dist/modules/child-bridges/child-bridges.service.js +3 -3
  41. package/dist/modules/child-bridges/child-bridges.service.js.map +1 -1
  42. package/dist/modules/config-editor/config-editor.controller.d.ts +1 -1
  43. package/dist/modules/config-editor/config-editor.controller.js +8 -8
  44. package/dist/modules/config-editor/config-editor.controller.js.map +1 -1
  45. package/dist/modules/config-editor/config-editor.service.d.ts +1 -1
  46. package/dist/modules/config-editor/config-editor.service.js +6 -6
  47. package/dist/modules/config-editor/config-editor.service.js.map +1 -1
  48. package/dist/modules/custom-plugins/plugins-settings-ui/plugins-settings-ui.service.js +11 -9
  49. package/dist/modules/custom-plugins/plugins-settings-ui/plugins-settings-ui.service.js.map +1 -1
  50. package/dist/modules/log/log.service.js +3 -3
  51. package/dist/modules/log/log.service.js.map +1 -1
  52. package/dist/modules/platform-tools/docker/docker.controller.js +3 -3
  53. package/dist/modules/platform-tools/docker/docker.controller.js.map +1 -1
  54. package/dist/modules/platform-tools/docker/docker.service.js +1 -1
  55. package/dist/modules/platform-tools/docker/docker.service.js.map +1 -1
  56. package/dist/modules/platform-tools/hb-service/hb-service.controller.js +2 -2
  57. package/dist/modules/platform-tools/hb-service/hb-service.controller.js.map +1 -1
  58. package/dist/modules/platform-tools/hb-service/hb-service.service.js +6 -6
  59. package/dist/modules/platform-tools/hb-service/hb-service.service.js.map +1 -1
  60. package/dist/modules/platform-tools/linux/linux.controller.js +2 -2
  61. package/dist/modules/platform-tools/linux/linux.controller.js.map +1 -1
  62. package/dist/modules/platform-tools/linux/linux.service.js +2 -2
  63. package/dist/modules/platform-tools/linux/linux.service.js.map +1 -1
  64. package/dist/modules/platform-tools/terminal/terminal.service.js +2 -2
  65. package/dist/modules/platform-tools/terminal/terminal.service.js.map +1 -1
  66. package/dist/modules/plugins/plugins.controller.js +4 -4
  67. package/dist/modules/plugins/plugins.controller.js.map +1 -1
  68. package/dist/modules/plugins/plugins.service.d.ts +3 -1
  69. package/dist/modules/plugins/plugins.service.js +116 -60
  70. package/dist/modules/plugins/plugins.service.js.map +1 -1
  71. package/dist/modules/server/server.controller.d.ts +22 -2
  72. package/dist/modules/server/server.controller.js +96 -18
  73. package/dist/modules/server/server.controller.js.map +1 -1
  74. package/dist/modules/server/server.service.d.ts +24 -6
  75. package/dist/modules/server/server.service.js +186 -59
  76. package/dist/modules/server/server.service.js.map +1 -1
  77. package/dist/modules/status/status.controller.js +3 -3
  78. package/dist/modules/status/status.controller.js.map +1 -1
  79. package/dist/modules/status/status.gateway.d.ts +1 -0
  80. package/dist/modules/status/status.service.d.ts +1 -0
  81. package/dist/modules/status/status.service.js +5 -4
  82. package/dist/modules/status/status.service.js.map +1 -1
  83. package/dist/modules/users/users.controller.js +7 -7
  84. package/dist/modules/users/users.controller.js.map +1 -1
  85. package/dist/self-check.js +6 -6
  86. package/dist/self-check.js.map +1 -1
  87. package/package.json +38 -37
  88. package/public/3rdpartylicenses.txt +87 -61
  89. package/public/assets/hap-icons/airpurifier.svg +49 -16
  90. package/public/assets/hap-icons/airquality.svg +24 -13
  91. package/public/assets/hap-icons/contactsensor-closed.svg +35 -2
  92. package/public/assets/hap-icons/contactsensor-open.svg +80 -2
  93. package/public/assets/hap-icons/door-closed.svg +32 -2
  94. package/public/assets/hap-icons/door-open.svg +48 -2
  95. package/public/assets/hap-icons/fan-off.svg +24 -13
  96. package/public/assets/hap-icons/fan-on.svg +24 -13
  97. package/public/assets/hap-icons/garagedoor.svg +24 -13
  98. package/public/assets/hap-icons/humidity.svg +24 -13
  99. package/public/assets/hap-icons/irrigation-system.svg +47 -18
  100. package/public/assets/hap-icons/leaksensor.svg +52 -2
  101. package/public/assets/hap-icons/light.svg +47 -28
  102. package/public/assets/hap-icons/lightbulb.svg +24 -13
  103. package/public/assets/hap-icons/lock-locked.svg +24 -13
  104. package/public/assets/hap-icons/lock-unlocked.svg +24 -13
  105. package/public/assets/hap-icons/motionsensor.svg +100 -2
  106. package/public/assets/hap-icons/occupancysensor.svg +97 -2
  107. package/public/assets/hap-icons/outlet.svg +24 -13
  108. package/public/assets/hap-icons/securitysystem-active.svg +102 -2
  109. package/public/assets/hap-icons/securitysystem-off.svg +68 -2
  110. package/public/assets/hap-icons/smokesensor.svg +42 -9
  111. package/public/assets/hap-icons/speaker.svg +29 -13
  112. package/public/assets/hap-icons/statelessprogrammableswitch.svg +51 -2
  113. package/public/assets/hap-icons/switch.svg +24 -13
  114. package/public/assets/hap-icons/television.svg +15 -4
  115. package/public/assets/hap-icons/temperature.svg +24 -13
  116. package/public/assets/hap-icons/unknown.svg +24 -13
  117. package/public/assets/hap-icons/valve-generic.svg +27 -16
  118. package/public/assets/hap-icons/valve-irrigation.svg +37 -21
  119. package/public/assets/hap-icons/valve-showerhead.svg +52 -0
  120. package/public/assets/hap-icons/valve-waterfaucet.svg +21 -0
  121. package/public/assets/hap-icons/window-closed.svg +85 -2
  122. package/public/assets/hap-icons/window-open.svg +136 -2
  123. package/public/assets/hap-icons/windowcovering-closed.svg +45 -49
  124. package/public/assets/hap-icons/windowcovering-open.svg +40 -44
  125. package/public/assets/homebridge-color-round.svg +36 -1
  126. package/public/assets/homebridge-logo.svg +11 -1
  127. package/public/assets/mask-icon.svg +5 -1
  128. package/public/{chunk-WHJOLAED.js → chunk-2ARSC6O4.js} +1 -1
  129. package/public/{chunk-WNWWUCCZ.js → chunk-2BBAYFXG.js} +1 -1
  130. package/public/{chunk-WHJSVGC7.js → chunk-2MYACURS.js} +1 -1
  131. package/public/{chunk-76SU4XMO.js → chunk-44LZWM2S.js} +1 -1
  132. package/public/chunk-4ECWVXWO.js +1 -0
  133. package/public/chunk-4NHYE2FR.js +1 -0
  134. package/public/chunk-53FTBKZ2.js +1 -0
  135. package/public/chunk-54CRHY6E.js +1 -0
  136. package/public/{chunk-JZZQRLNW.js → chunk-5CH326YZ.js} +1 -1
  137. package/public/chunk-5OK3UPY6.js +1 -0
  138. package/public/chunk-6D5CGXDI.js +1 -0
  139. package/public/chunk-6E2DKPOC.js +20 -0
  140. package/public/chunk-6EMRSQU4.js +1 -0
  141. package/public/chunk-6IMEZ7FY.js +1 -0
  142. package/public/chunk-6WX6Z5CR.js +1 -0
  143. package/public/chunk-6YPC2AEN.js +5 -0
  144. package/public/chunk-7G5DYE67.js +1 -0
  145. package/public/chunk-7J7D4RFK.js +1 -0
  146. package/public/{chunk-OE6MK722.js → chunk-AOWW4OIM.js} +1 -1
  147. package/public/chunk-BFQLKNRB.js +1 -0
  148. package/public/chunk-BWUSBIAD.js +1 -0
  149. package/public/chunk-DF45VVYA.js +1 -0
  150. package/public/chunk-DMDV5FDH.js +1 -0
  151. package/public/chunk-ELHNJFMR.js +1 -0
  152. package/public/chunk-EPP37PKN.js +1 -0
  153. package/public/{chunk-NW6AFAD7.js → chunk-FFBZNIV4.js} +1 -1
  154. package/public/{chunk-QE7DO6J3.js → chunk-FLTVAPLJ.js} +2 -2
  155. package/public/chunk-FRLSQQFD.js +1 -0
  156. package/public/{chunk-VAW3X7MD.js → chunk-G5GZAWHN.js} +5 -5
  157. package/public/{chunk-MK5BZOUV.js → chunk-GJMAX2VB.js} +2 -2
  158. package/public/{chunk-BKUGARB4.js → chunk-GOHZ4DC4.js} +1 -1
  159. package/public/{chunk-EA5J2VEJ.js → chunk-GQS3624Y.js} +1 -1
  160. package/public/chunk-H7Z4IBKG.js +1 -0
  161. package/public/chunk-HZCDB2XT.js +1 -0
  162. package/public/chunk-I3H24QH7.js +1 -0
  163. package/public/chunk-I6GEQFAT.js +1 -0
  164. package/public/chunk-IH7FZAXF.js +1 -0
  165. package/public/chunk-IHTWEI6M.js +1 -0
  166. package/public/chunk-JZMQ5FID.js +1 -0
  167. package/public/chunk-KA5TFBDD.js +1 -0
  168. package/public/chunk-KXPEHDL7.js +1 -0
  169. package/public/chunk-LKGOWE5W.js +8 -0
  170. package/public/chunk-M5W2I2BE.js +1 -0
  171. package/public/chunk-MDCNYIS7.js +1 -0
  172. package/public/chunk-MOAVQNSZ.js +1 -0
  173. package/public/chunk-NZL2QIFO.js +2 -0
  174. package/public/chunk-O22A7NB6.js +1 -0
  175. package/public/chunk-O5XTXPP3.js +1 -0
  176. package/public/chunk-OXVPJJQX.js +1 -0
  177. package/public/chunk-P2P3GCNU.js +1 -0
  178. package/public/chunk-P6BRMZWX.js +1 -0
  179. package/public/chunk-PMMW3JTB.js +1 -0
  180. package/public/{chunk-CGQI6VDR.js → chunk-POPRPNGN.js} +1 -1
  181. package/public/chunk-PSPML5VW.js +1 -0
  182. package/public/chunk-PTWEXIAR.js +1 -0
  183. package/public/chunk-PYFJNWPU.js +1 -0
  184. package/public/chunk-PYUYYML6.js +1 -0
  185. package/public/chunk-Q3MPBSDZ.js +1 -0
  186. package/public/chunk-QH4HLTWE.js +1 -0
  187. package/public/chunk-QW6PJ27Z.js +1 -0
  188. package/public/chunk-R472JQFQ.js +1 -0
  189. package/public/chunk-RXML52B3.js +14 -0
  190. package/public/chunk-SLPB5ZSZ.js +1 -0
  191. package/public/chunk-SM4YBIEF.js +1 -0
  192. package/public/chunk-SSMNJVEP.js +1 -0
  193. package/public/chunk-SYEG3RCH.js +1 -0
  194. package/public/chunk-T7WHHJXM.js +1 -0
  195. package/public/chunk-U3FAOEAT.js +1 -0
  196. package/public/{chunk-7EUQWCP5.js → chunk-UFFY2L3W.js} +1 -1
  197. package/public/{chunk-6TCHCTXZ.js → chunk-V5R6RQCC.js} +1 -1
  198. package/public/chunk-VRNVEPFN.js +7 -0
  199. package/public/chunk-W27OUA7Y.js +1 -0
  200. package/public/chunk-WBTQONWJ.js +5 -0
  201. package/public/chunk-WKPZS7OX.js +1 -0
  202. package/public/chunk-WNR5LBIY.js +32 -0
  203. package/public/chunk-XRLB2LD5.js +1 -0
  204. package/public/chunk-XTCHYX2M.js +1 -0
  205. package/public/chunk-XXIHDRQS.js +1 -0
  206. package/public/chunk-Y5Y7DDHQ.js +1 -0
  207. package/public/chunk-YHMNHDNW.js +1 -0
  208. package/public/chunk-YPQN2F2L.js +1 -0
  209. package/public/{chunk-CCUID66K.js → chunk-ZDFTIT3A.js} +1 -1
  210. package/public/chunk-ZYAECXAT.js +6 -0
  211. package/public/index.html +2 -2
  212. package/public/main-NRSJXXDK.js +1 -0
  213. package/public/media/fa-brands-400-Q3XCMWHQ.woff2 +0 -0
  214. package/public/media/{fa-brands-400-KOKGDU7E.ttf → fa-brands-400-R2XQZCET.ttf} +0 -0
  215. package/public/media/fa-regular-400-QSNYFYRT.woff2 +0 -0
  216. package/public/media/{fa-regular-400-IPMAEX5Y.ttf → fa-regular-400-XUOPSR7E.ttf} +0 -0
  217. package/public/media/fa-solid-900-5ZUYHGA7.woff2 +0 -0
  218. package/public/media/{fa-solid-900-SRFFQLRM.ttf → fa-solid-900-PJNKLK6W.ttf} +0 -0
  219. package/public/styles-5ZGAUY5X.css +1 -0
  220. package/scripts/upgrade-install-plugin.sh +1 -1
  221. package/public/chunk-2FJGS2P4.js +0 -1
  222. package/public/chunk-2PVYUZMG.js +0 -1
  223. package/public/chunk-2VTFU3NZ.js +0 -6
  224. package/public/chunk-3FUV2YFB.js +0 -1
  225. package/public/chunk-3IX3CLER.js +0 -1
  226. package/public/chunk-43QJK3CH.js +0 -1
  227. package/public/chunk-4AYTHKYE.js +0 -1
  228. package/public/chunk-4JQFZGIU.js +0 -1
  229. package/public/chunk-5L7KCDO7.js +0 -1
  230. package/public/chunk-5SGGTYVP.js +0 -1
  231. package/public/chunk-64I555F6.js +0 -1
  232. package/public/chunk-6F552PS2.js +0 -14
  233. package/public/chunk-6GDRRHLT.js +0 -1
  234. package/public/chunk-7C3EOONK.js +0 -1
  235. package/public/chunk-7I2U653A.js +0 -1
  236. package/public/chunk-A6RDT6EE.js +0 -32
  237. package/public/chunk-ACHJ26XR.js +0 -1
  238. package/public/chunk-AMGSXBKP.js +0 -1
  239. package/public/chunk-AX2NKG76.js +0 -1
  240. package/public/chunk-BPMSJ2VF.js +0 -1
  241. package/public/chunk-CDC5JJGR.js +0 -5
  242. package/public/chunk-CNIFYHFS.js +0 -1
  243. package/public/chunk-DPHWZNEL.js +0 -1
  244. package/public/chunk-DXCU4YH5.js +0 -1
  245. package/public/chunk-ENTRCZRC.js +0 -1
  246. package/public/chunk-F3LCRXOB.js +0 -1
  247. package/public/chunk-FUOZMXIE.js +0 -1
  248. package/public/chunk-GNMMNSKZ.js +0 -1
  249. package/public/chunk-GONTC5RL.js +0 -1
  250. package/public/chunk-HC4ULUF5.js +0 -1
  251. package/public/chunk-HSJSWZHD.js +0 -1
  252. package/public/chunk-JAM2DL6O.js +0 -1
  253. package/public/chunk-JLUPHWBK.js +0 -1
  254. package/public/chunk-KQJ7ONUG.js +0 -1
  255. package/public/chunk-LAAC3HKW.js +0 -1
  256. package/public/chunk-MOTRKWPN.js +0 -1
  257. package/public/chunk-N3JMUDBI.js +0 -1
  258. package/public/chunk-NZNNTHFQ.js +0 -1
  259. package/public/chunk-ODPNK7TG.js +0 -1
  260. package/public/chunk-ORPWYWCL.js +0 -5
  261. package/public/chunk-OURFK6JB.js +0 -1
  262. package/public/chunk-PEPJOU6R.js +0 -1
  263. package/public/chunk-PWJLSQWP.js +0 -8
  264. package/public/chunk-QHPDGSZ6.js +0 -1
  265. package/public/chunk-RFBKWUOP.js +0 -20
  266. package/public/chunk-S22XAG5G.js +0 -1
  267. package/public/chunk-S23B67SO.js +0 -1
  268. package/public/chunk-S3ABXPGO.js +0 -1
  269. package/public/chunk-SUCUQYZ3.js +0 -1
  270. package/public/chunk-TCSXGQNF.js +0 -1
  271. package/public/chunk-TXOB7R5K.js +0 -7
  272. package/public/chunk-U4TY4QYN.js +0 -1
  273. package/public/chunk-UG5DK2RQ.js +0 -2
  274. package/public/chunk-UNXETFMR.js +0 -1
  275. package/public/chunk-VF4E7Q42.js +0 -1
  276. package/public/chunk-VOPS522V.js +0 -1
  277. package/public/chunk-VVFRD7PI.js +0 -1
  278. package/public/chunk-WWTMEHKF.js +0 -1
  279. package/public/chunk-X6HR3FKR.js +0 -1
  280. package/public/chunk-Y6NAMXTD.js +0 -1
  281. package/public/chunk-YAOIYDRH.js +0 -1
  282. package/public/chunk-ZOOTYXXF.js +0 -1
  283. package/public/chunk-ZT23DWNL.js +0 -1
  284. package/public/chunk-ZTCVXHR7.js +0 -1
  285. package/public/chunk-ZUBSOVIF.js +0 -1
  286. package/public/main-XXZ7MAPQ.js +0 -1
  287. package/public/media/01-RQ3S2L53.png +0 -0
  288. package/public/media/02-VNCG2I2A.png +0 -0
  289. package/public/media/03-HI42L4ZG.png +0 -0
  290. package/public/media/04-FJLL55LZ.png +0 -0
  291. package/public/media/05-V3EO6SPT.png +0 -0
  292. package/public/media/06-EOJZCQZN.png +0 -0
  293. package/public/media/07-KMKB5PBD.png +0 -0
  294. package/public/media/08-UQJRF6B2.png +0 -0
  295. package/public/media/09-2DJQFRHH.png +0 -0
  296. package/public/media/arrow_left-CQT7FZM7.svg +0 -4
  297. package/public/media/arrow_right-SBUDRR2G.svg +0 -4
  298. package/public/media/fa-brands-400-6PJPV6JM.woff2 +0 -0
  299. package/public/media/fa-regular-400-OHB6J4OK.woff2 +0 -0
  300. package/public/media/fa-solid-900-ABTK6BNK.woff2 +0 -0
  301. package/public/scripts-6GVLYD7F.js +0 -62
  302. package/public/styles-EG5MFQEM.css +0 -1
@@ -40,11 +40,12 @@ let PluginsService = PluginsService_1 = class PluginsService {
40
40
  this.npm = this.getNpmPath();
41
41
  this.paths = this.getBasePaths();
42
42
  this.pluginListUrl = 'https://raw.githubusercontent.com/homebridge/plugins/latest/';
43
- this.pluginListFile = `${this.pluginListUrl}assets/plugins.min.json`;
43
+ this.pluginListFile = `${this.pluginListUrl}assets/plugins-v2.min.json`;
44
44
  this.hiddenPlugins = [];
45
45
  this.maintainedPlugins = [];
46
46
  this.pluginIcons = {};
47
- this.scopedPlugins = {};
47
+ this.pluginAuthors = {};
48
+ this.pluginNames = {};
48
49
  this.newScopePlugins = {};
49
50
  this.verifiedPlugins = [];
50
51
  this.verifiedPlusPlugins = [];
@@ -67,6 +68,12 @@ let PluginsService = PluginsService_1 = class PluginsService {
67
68
  this.loadPluginList();
68
69
  setInterval(this.loadPluginList.bind(this), 60000 * 60 * 12);
69
70
  }
71
+ fixDisplayName(plugin) {
72
+ plugin.displayName = plugin.displayName || (plugin.name.charAt(0) === '@' ? plugin.name.split('/')[1] : plugin.name)
73
+ .replace(/-/g, ' ')
74
+ .replace(/\w\S*/g, (txt) => txt.charAt(0).toUpperCase() + txt.substring(1).toLowerCase());
75
+ return plugin;
76
+ }
70
77
  async getInstalledPlugins() {
71
78
  const plugins = [];
72
79
  const modules = await this.getInstalledModules();
@@ -92,12 +99,12 @@ let PluginsService = PluginsService_1 = class PluginsService {
92
99
  }
93
100
  }
94
101
  catch (e) {
95
- this.logger.error(`Failed to parse plugin "${pkg.name}": ${e.message}`);
102
+ this.logger.error(`Failed to parse plugin ${pkg.name} as ${e.message}.`);
96
103
  }
97
104
  });
98
105
  }));
99
- this.installedPlugins = plugins;
100
- return plugins;
106
+ this.installedPlugins = plugins.map(plugin => this.fixDisplayName(plugin));
107
+ return this.installedPlugins;
101
108
  }
102
109
  async getOutOfDatePlugins() {
103
110
  const plugins = await this.getInstalledPlugins();
@@ -146,14 +153,21 @@ let PluginsService = PluginsService_1 = class PluginsService {
146
153
  if (!this.installedPlugins) {
147
154
  await this.getInstalledPlugins();
148
155
  }
149
- const q = `${(!query || !query.length) ? '' : `${query}+`}keywords:homebridge-plugin+not:deprecated&size=30`;
156
+ query = query.trim().toLowerCase();
157
+ if ((query.startsWith('homebridge-') || this.isScopedPlugin(query)) && !this.hiddenPlugins.includes(query)) {
158
+ if (!this.installedPlugins.find(x => x.name === query) && Object.keys(this.newScopePlugins).includes(query)) {
159
+ query = `@homebridge-plugins/${query}`;
160
+ }
161
+ return await this.searchNpmRegistrySingle(query);
162
+ }
163
+ const q = `${(!query || !query.length) ? '' : `${query.substring(0, 15)}+`}keywords:homebridge-plugin+not:deprecated&size=99`;
150
164
  let searchResults;
151
165
  try {
152
166
  searchResults = (await (0, rxjs_1.firstValueFrom)(this.httpService.get(`https://registry.npmjs.org/-/v1/search?text=${q}`))).data;
153
167
  }
154
168
  catch (e) {
155
- this.logger.error(`Failed to search the npm registry - "${e.message}" - see https://homebridge.io/w/JJSz6 for help.`);
156
- throw new common_1.InternalServerErrorException(`Failed to search the npm registry - "${e.message}" - see logs.`);
169
+ this.logger.error(`Failed to search the npm registry (see https://homebridge.io/w/JJSz6 for help) as ${e.message}.`);
170
+ throw new common_1.InternalServerErrorException(`Failed to search the npm registry as ${e.message}, see logs.`);
157
171
  }
158
172
  const result = searchResults.objects
159
173
  .filter(x => x.package.name.indexOf('homebridge-') === 0 || this.isScopedPlugin(x.package.name))
@@ -161,12 +175,14 @@ let PluginsService = PluginsService_1 = class PluginsService {
161
175
  .map((pkg) => {
162
176
  let plugin = {
163
177
  name: pkg.package.name,
178
+ displayName: this.pluginNames[pkg.package.name],
164
179
  private: false,
165
180
  };
166
181
  const isInstalled = this.installedPlugins.find(x => x.name === plugin.name);
167
182
  if (isInstalled) {
168
183
  plugin = isInstalled;
169
184
  plugin.lastUpdated = pkg.package.date;
185
+ plugin.keywords = pkg.package.keywords;
170
186
  return plugin;
171
187
  }
172
188
  plugin.publicPackage = true;
@@ -176,24 +192,45 @@ let PluginsService = PluginsService_1 = class PluginsService {
176
192
  plugin.description = (pkg.package.description)
177
193
  ? pkg.package.description.replace(/\(?(?:https?|ftp):\/\/[\n\S]+/g, '').trim()
178
194
  : pkg.package.name;
195
+ plugin.keywords = pkg.package.keywords;
179
196
  plugin.links = pkg.package.links;
180
- plugin.author = this.scopedPlugins[pkg.package.name] || ((pkg.package.publisher) ? pkg.package.publisher.username : null);
197
+ plugin.author = this.pluginAuthors[pkg.package.name] || ((pkg.package.publisher) ? pkg.package.publisher.username : null);
181
198
  plugin.verifiedPlugin = this.verifiedPlugins.includes(pkg.package.name);
182
199
  plugin.verifiedPlusPlugin = this.verifiedPlusPlugins.includes(pkg.package.name);
183
200
  plugin.icon = this.pluginIcons[pkg.package.name]
184
201
  ? `${this.pluginListUrl}${this.pluginIcons[pkg.package.name]}`
185
202
  : null;
186
- plugin.isHbScoped = !!this.scopedPlugins[pkg.package.name];
203
+ plugin.isHbScoped = pkg.package.name.startsWith('@homebridge-plugins/');
187
204
  plugin.newHbScope = this.newScopePlugins[pkg.package.name];
188
205
  plugin.isHbMaintained = this.maintainedPlugins.includes(pkg.package.name);
189
206
  return plugin;
190
207
  });
191
- if (!result.length
192
- && (query.indexOf('homebridge-') === 0 || this.isScopedPlugin(query))
193
- && !this.hiddenPlugins.includes(query.toLowerCase())) {
194
- return await this.searchNpmRegistrySingle(query.toLowerCase());
195
- }
196
- return (0, lodash_1.orderBy)(result, ['verifiedPlusPlugin', 'verifiedPlugin'], ['desc', 'desc']);
208
+ const searchTerm = query
209
+ .replace(/[.,/#!$%^&*;:{}=\-_`~()]/g, '');
210
+ const searchTerms = searchTerm
211
+ .split(/\s+/)
212
+ .filter(term => term.length > 0);
213
+ const exactMatchPlugins = [];
214
+ const partialMatchPlugins = [];
215
+ result.forEach((plugin) => {
216
+ const pluginKeywords = plugin.keywords.map(keyword => keyword.toLowerCase());
217
+ const isExactMatch = pluginKeywords.includes(searchTerm);
218
+ if (isExactMatch) {
219
+ exactMatchPlugins.push(plugin);
220
+ return;
221
+ }
222
+ const pluginName = plugin.name.toLowerCase();
223
+ const pluginDescription = plugin.description.toLowerCase();
224
+ const isPartialMatch = searchTerms.some(term => pluginName.includes(term))
225
+ || searchTerms.some(term => pluginKeywords.some(keyword => keyword.includes(term)))
226
+ || searchTerms.some(term => pluginDescription.includes(term));
227
+ if (isPartialMatch) {
228
+ partialMatchPlugins.push(plugin);
229
+ }
230
+ });
231
+ return (0, lodash_1.orderBy)([...exactMatchPlugins, ...partialMatchPlugins], ['verifiedPlusPlugin', 'verifiedPlugin'], ['desc', 'desc'])
232
+ .slice(0, 30)
233
+ .map(plugin => this.fixDisplayName(plugin));
197
234
  }
198
235
  async searchNpmRegistrySingle(query) {
199
236
  try {
@@ -224,10 +261,11 @@ let PluginsService = PluginsService_1 = class PluginsService {
224
261
  verifiedPlugin: this.verifiedPlugins.includes(pkg.name),
225
262
  verifiedPlusPlugin: this.verifiedPlusPlugins.includes(pkg.name),
226
263
  icon: this.pluginIcons[pkg.name],
227
- isHbScoped: !!this.scopedPlugins[pkg.name],
264
+ isHbScoped: pkg.name.startsWith('@homebridge-plugins/'),
228
265
  newHbScope: this.newScopePlugins[pkg.name],
229
266
  isHbMaintained: this.maintainedPlugins.includes(pkg.name),
230
267
  };
268
+ plugin.displayName = this.pluginNames[pkg.name];
231
269
  plugin.publicPackage = true;
232
270
  plugin.latestVersion = pkg['dist-tags'] ? pkg['dist-tags'].latest : undefined;
233
271
  plugin.lastUpdated = pkg.time.modified;
@@ -238,21 +276,21 @@ let PluginsService = PluginsService_1 = class PluginsService {
238
276
  homepage: pkg.homepage,
239
277
  bugs: typeof pkg.bugs === 'object' && pkg.bugs?.url ? pkg.bugs.url : null,
240
278
  };
241
- plugin.author = this.scopedPlugins[pkg.name]
279
+ plugin.author = this.pluginAuthors[pkg.name]
242
280
  || ((pkg.maintainers && pkg.maintainers.length) ? pkg.maintainers[0].name : null);
243
281
  plugin.verifiedPlugin = this.verifiedPlugins.includes(pkg.name);
244
282
  plugin.verifiedPlusPlugin = this.verifiedPlusPlugins.includes(pkg.name);
245
283
  plugin.icon = this.pluginIcons[pkg.name]
246
284
  ? `${this.pluginListUrl}${this.pluginIcons[pkg.name]}`
247
285
  : null;
248
- plugin.isHbScoped = !!this.scopedPlugins[pkg.name];
286
+ plugin.isHbScoped = pkg.name.startsWith('@homebridge-plugins/');
249
287
  plugin.newHbScope = this.newScopePlugins[pkg.name];
250
288
  plugin.isHbMaintained = this.maintainedPlugins.includes(pkg.name);
251
- return [plugin];
289
+ return [this.fixDisplayName(plugin)];
252
290
  }
253
291
  catch (e) {
254
292
  if (e.response?.status !== 404) {
255
- this.logger.error(`Failed to search the npm registry - "${e.message}" - see https://homebridge.io/w/JJSz6 for help.`);
293
+ this.logger.error(`Failed to search the npm registry (see https://homebridge.io/w/JJSz6 for help) as ${e.message}.`);
256
294
  }
257
295
  return [];
258
296
  }
@@ -269,6 +307,14 @@ let PluginsService = PluginsService_1 = class PluginsService {
269
307
  if (action === 'install' && pluginAction.version === 'latest') {
270
308
  pluginAction.version = await this.getNpmModuleLatestVersion(pluginAction.name);
271
309
  }
310
+ const userPlatform = (0, node_os_1.platform)();
311
+ if (pluginAction.name === this.configService.name && userPlatform === 'linux') {
312
+ const uname = (0, node_child_process_1.execSync)('uname -m').toString().trim();
313
+ const majorVersion = +pluginAction.version.split('.')[0];
314
+ if (uname === 'armv6l' && majorVersion > 4) {
315
+ throw new Error('Versions 5 and above of the Homebridge UI are not compatible with your armv6l device.');
316
+ }
317
+ }
272
318
  let installPath = (this.configService.customPluginPath)
273
319
  ? this.configService.customPluginPath
274
320
  : this.installedPlugins.find(x => x.name === this.configService.name).installPath;
@@ -309,7 +355,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
309
355
  installOptions.push('--save');
310
356
  }
311
357
  installPath = (0, node_path_1.resolve)(installPath, '../');
312
- if (!this.configService.customPluginPath || (0, node_os_1.platform)() === 'win32' || existingPlugin?.globalInstall === true) {
358
+ if (!this.configService.customPluginPath || userPlatform === 'win32' || existingPlugin?.globalInstall === true) {
313
359
  installOptions.push('-g');
314
360
  }
315
361
  const npmPluginLabel = action === 'uninstall' ? pluginAction.name : `${pluginAction.name}@${pluginAction.version}`;
@@ -334,21 +380,21 @@ let PluginsService = PluginsService_1 = class PluginsService {
334
380
  return await this.parsePackageJson(await (0, fs_extra_1.readJson)(pkgJsonPath), this.configService.ui.homebridgePackagePath);
335
381
  }
336
382
  else {
337
- this.logger.error(`"homebridgePath" (${this.configService.ui.homebridgePackagePath}) does not exist`);
383
+ this.logger.error(`The Homebridge path ${this.configService.ui.homebridgePackagePath} does not exist.`);
338
384
  }
339
385
  }
340
386
  const modules = await this.getInstalledModules();
341
387
  const homebridgeInstalls = modules.filter(x => x.name === 'homebridge');
342
388
  if (homebridgeInstalls.length > 1) {
343
- this.logger.warn('Multiple Instances Of Homebridge Found Installed - see https://homebridge.io/w/JJSgm for help.');
389
+ this.logger.warn('Multiple instances of Homebridge were found, see https://homebridge.io/w/JJSgm for help.');
344
390
  homebridgeInstalls.forEach((instance) => {
345
391
  this.logger.warn(instance.installPath);
346
392
  });
347
393
  }
348
394
  if (!homebridgeInstalls.length) {
349
395
  this.configService.hbServiceUiRestartRequired = true;
350
- this.logger.error('Unable To Find Homebridge Installation - see https://homebridge.io/w/JJSgZ for help.');
351
- throw new Error('Unable To Find Homebridge Installation');
396
+ this.logger.error('Unable to find Homebridge installation, see https://homebridge.io/w/JJSgZ for help.');
397
+ throw new Error('Unable To Find Homebridge Installation.');
352
398
  }
353
399
  const homebridgeModule = homebridgeInstalls[0];
354
400
  const pkgJson = await (0, fs_extra_1.readJson)((0, node_path_1.join)(homebridgeModule.installPath, 'package.json'));
@@ -416,7 +462,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
416
462
  && pluginAction.name !== this.configService.name
417
463
  && pluginAction.version !== 'latest') {
418
464
  try {
419
- await (0, rxjs_1.firstValueFrom)(this.httpService.head(`https://github.com/homebridge/verified/releases/download/v1.0.0/${pluginAction.name.replace('/', '@')}-${pluginAction.version}.sha256`));
465
+ await (0, rxjs_1.firstValueFrom)(this.httpService.head(`https://github.com/homebridge/plugins/releases/download/v1.0.0/${pluginAction.name.replace('/', '@')}-${pluginAction.version}.sha256`));
420
466
  return true;
421
467
  }
422
468
  catch (e) {
@@ -454,7 +500,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
454
500
  }
455
501
  }
456
502
  catch (e) {
457
- this.logger.error(`Failed to check for bundled update: ${e.message}`);
503
+ this.logger.error(`Failed to check for bundled update as ${e.message}.`);
458
504
  return '';
459
505
  }
460
506
  }
@@ -494,14 +540,14 @@ let PluginsService = PluginsService_1 = class PluginsService {
494
540
  let configSchema = await (0, fs_extra_1.readJson)(schemaPath);
495
541
  if (configSchema.dynamicSchemaVersion) {
496
542
  const dynamicSchemaPath = (0, node_path_1.resolve)(this.configService.storagePath, `.${pluginName}-v${configSchema.dynamicSchemaVersion}.schema.json`);
497
- this.logger.log(`[${pluginName}] dynamic schema path: ${dynamicSchemaPath}`);
543
+ this.logger.log(`[${pluginName}] dynamic schema path: ${dynamicSchemaPath}.`);
498
544
  if ((0, fs_extra_1.existsSync)(dynamicSchemaPath)) {
499
545
  try {
500
546
  configSchema = await (0, fs_extra_1.readJson)(dynamicSchemaPath);
501
- this.logger.log(`[${pluginName}] dynamic schema loaded from: ${dynamicSchemaPath}`);
547
+ this.logger.log(`[${pluginName}] dynamic schema loaded from ${dynamicSchemaPath}.`);
502
548
  }
503
549
  catch (e) {
504
- this.logger.error(`[${pluginName}] Failed to load dynamic schema at ${dynamicSchemaPath}: ${e.message}`);
550
+ this.logger.error(`[${pluginName}] failed to load dynamic schema from ${dynamicSchemaPath} as ${e.message}.`);
505
551
  }
506
552
  }
507
553
  }
@@ -626,7 +672,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
626
672
  ?.name;
627
673
  }
628
674
  catch (e) {
629
- this.logger.error(`Failed to get list of branches from GitHub: ${e.message}`);
675
+ this.logger.error(`Failed to get list of branches from GitHub as ${e.message}.`);
630
676
  }
631
677
  }
632
678
  return {
@@ -696,7 +742,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
696
742
  });
697
743
  }
698
744
  catch (e) {
699
- this.logger.debug('Failed to extract plugin alias:', e);
745
+ this.logger.debug(`Failed to extract ${pluginName} plugin alias as ${e.message}.`);
700
746
  if (this.pluginAliasHints[pluginName]) {
701
747
  output.pluginAlias = this.pluginAliasHints[pluginName].pluginAlias;
702
748
  output.pluginType = this.pluginAliasHints[pluginName].pluginType;
@@ -788,7 +834,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
788
834
  }
789
835
  }
790
836
  catch (e) {
791
- this.logger.log(`Failed to parse item "${module}" in ${requiredPath}: ${e.message}`);
837
+ this.logger.log(`Failed to parse ${module} in ${requiredPath} as ${e.message}.`);
792
838
  }
793
839
  }
794
840
  }
@@ -824,8 +870,8 @@ let PluginsService = PluginsService_1 = class PluginsService {
824
870
  return [windowsNpmPath[0]];
825
871
  }
826
872
  else {
827
- this.logger.error('ERROR: Cannot find npm binary. You will not be able to manage plugins or update homebridge.');
828
- this.logger.error('ERROR: You might be able to fix this problem by running: npm install -g npm');
873
+ this.logger.error('Cannot find npm binary, you will not be able to manage plugins or update Homebridge. You might be able to fix this problem by running:');
874
+ this.logger.error('npm install -g npm');
829
875
  }
830
876
  }
831
877
  return ['npm'];
@@ -876,8 +922,8 @@ let PluginsService = PluginsService_1 = class PluginsService {
876
922
  async parsePackageJson(pkgJson, installPath) {
877
923
  const plugin = {
878
924
  name: pkgJson.name,
925
+ displayName: pkgJson.displayName || this.pluginNames[pkgJson.name],
879
926
  private: pkgJson.private || false,
880
- displayName: pkgJson.displayName,
881
927
  description: (pkgJson.description)
882
928
  ? pkgJson.description.replace(/(?:https?|ftp):\/\/[\n\S]+/g, '').trim()
883
929
  : pkgJson.name,
@@ -886,7 +932,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
886
932
  icon: this.pluginIcons[pkgJson.name]
887
933
  ? `${this.pluginListUrl}${this.pluginIcons[pkgJson.name]}`
888
934
  : null,
889
- isHbScoped: !!this.scopedPlugins[pkgJson.name],
935
+ isHbScoped: pkgJson.name.startsWith('@homebridge-plugins/'),
890
936
  newHbScope: this.newScopePlugins[pkgJson.name],
891
937
  isHbMaintained: this.maintainedPlugins.includes(pkgJson.name),
892
938
  installedVersion: installPath ? (pkgJson.version || '0.0.1') : null,
@@ -938,12 +984,12 @@ let PluginsService = PluginsService_1 = class PluginsService {
938
984
  homepage: pkg.homepage,
939
985
  bugs: typeof pkg.bugs === 'object' && pkg.bugs?.url ? pkg.bugs.url : null,
940
986
  };
941
- plugin.author = this.scopedPlugins[pkg.name]
987
+ plugin.author = this.pluginAuthors[pkg.name]
942
988
  || ((pkg.maintainers && pkg.maintainers.length) ? pkg.maintainers[0].name : null);
943
989
  }
944
990
  catch (e) {
945
991
  if (e.response?.status !== 404) {
946
- this.logger.log(`[${plugin.name}] Failed to check registry.npmjs.org for updates: "${e.message}" - see https://homebridge.io/w/JJSz6 for help.`);
992
+ this.logger.log(`[${plugin.name}] failed to check registry.npmjs.org for updates (see https://homebridge.io/w/JJSz6 for help) as ${e.message}.`);
947
993
  }
948
994
  plugin.publicPackage = false;
949
995
  plugin.latestVersion = null;
@@ -970,18 +1016,25 @@ let PluginsService = PluginsService_1 = class PluginsService {
970
1016
  command.unshift('sudo', '-E', '-n');
971
1017
  }
972
1018
  else {
1019
+ let npmInstallPath;
973
1020
  try {
974
- await (0, fs_extra_1.access)((0, node_path_1.resolve)(cwd, 'node_modules'), fs_extra_1.constants.W_OK);
1021
+ npmInstallPath = (0, node_child_process_1.execSync)('npm root -g').toString().trim();
1022
+ }
1023
+ catch (e) {
1024
+ npmInstallPath = (0, node_path_1.resolve)(cwd, 'node_modules');
1025
+ }
1026
+ try {
1027
+ await (0, fs_extra_1.access)(npmInstallPath, fs_extra_1.constants.W_OK);
975
1028
  }
976
1029
  catch (e) {
977
1030
  client.emit('stdout', (0, bash_color_1.yellow)(`The user "${(0, node_os_1.userInfo)().username}" does not have write access to the target directory:\n\r\n\r`));
978
- client.emit('stdout', `${(0, node_path_1.resolve)(cwd, 'node_modules')}\n\r\n\r`);
1031
+ client.emit('stdout', `${npmInstallPath}\n\r\n\r`);
979
1032
  client.emit('stdout', (0, bash_color_1.yellow)('This may cause the operation to fail.\n\r'));
980
1033
  client.emit('stdout', (0, bash_color_1.yellow)('See the docs for details on how to enable sudo mode:\n\r'));
981
1034
  client.emit('stdout', (0, bash_color_1.yellow)('https://github.com/homebridge/homebridge-config-ui-x/wiki/Manual-Configuration#sudo-mode\n\r\n\r'));
982
1035
  }
983
1036
  }
984
- this.logger.log(`Running Command: ${command.join(' ')}`);
1037
+ this.logger.log(`Running command ${command.join(' ')}.`);
985
1038
  if (!(0, semver_1.satisfies)(node_process_1.default.version, `>=${this.configService.minimumNodeVersion}`)) {
986
1039
  client.emit('stdout', (0, bash_color_1.yellow)(`Node.js v${this.configService.minimumNodeVersion} higher is required for ${this.configService.name}.\n\r`));
987
1040
  client.emit('stdout', (0, bash_color_1.yellow)(`You may experience issues while running on Node.js ${node_process_1.default.version}.\n\r\n\r`));
@@ -1042,13 +1095,12 @@ let PluginsService = PluginsService_1 = class PluginsService {
1042
1095
  return;
1043
1096
  }
1044
1097
  if (!await (0, fs_extra_1.pathExists)(this.configService.customPluginPath)) {
1045
- this.logger.warn(`Custom plugin directory was removed. Re-creating: ${this.configService.customPluginPath}`);
1098
+ this.logger.warn(`Custom plugin directory was removed, re-creating ${this.configService.customPluginPath}.`);
1046
1099
  try {
1047
1100
  await (0, fs_extra_1.ensureDir)(this.configService.customPluginPath);
1048
1101
  }
1049
1102
  catch (e) {
1050
- this.logger.error('Failed to recreate custom plugin directory');
1051
- this.logger.error(e.message);
1103
+ this.logger.error(`Failed to re-create custom plugin directory as ${e.message}.`);
1052
1104
  }
1053
1105
  }
1054
1106
  }
@@ -1063,7 +1115,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
1063
1115
  }
1064
1116
  }
1065
1117
  catch (e) {
1066
- this.logger.error(`Failed to remove ${offendingPath}`, e.message);
1118
+ this.logger.error(`Failed to remove ${offendingPath} as ${e.message}.`);
1067
1119
  }
1068
1120
  }
1069
1121
  async cleanNpmCache() {
@@ -1074,7 +1126,7 @@ let PluginsService = PluginsService_1 = class PluginsService {
1074
1126
  return new Promise((res) => {
1075
1127
  const child = (0, node_child_process_1.spawn)(command.shift(), command);
1076
1128
  child.on('exit', (code) => {
1077
- this.logger.log('npm cache clear command executed with exit code', code);
1129
+ this.logger.log(`Executed npm cache clear command with exit code ${code}.`);
1078
1130
  res(null);
1079
1131
  });
1080
1132
  child.on('error', () => {
@@ -1093,36 +1145,40 @@ let PluginsService = PluginsService_1 = class PluginsService {
1093
1145
  this.pluginIcons = {};
1094
1146
  this.hiddenPlugins = [];
1095
1147
  this.maintainedPlugins = [];
1096
- this.scopedPlugins = {};
1148
+ this.pluginAuthors = {};
1149
+ this.pluginNames = {};
1097
1150
  this.newScopePlugins = {};
1098
1151
  Object.keys(pluginListData).forEach((key) => {
1099
1152
  const plugin = pluginListData[key];
1100
- if (plugin.icon) {
1101
- this.pluginIcons[key] = `icons/${plugin.icon}.png`;
1153
+ if (plugin.i) {
1154
+ this.pluginIcons[key] = `icons/${plugin.i}.png`;
1102
1155
  }
1103
- if (plugin.hidden) {
1156
+ if (plugin.h) {
1104
1157
  this.hiddenPlugins.push(key);
1105
1158
  }
1106
- if (plugin.maintained) {
1159
+ if (plugin.m) {
1107
1160
  this.maintainedPlugins.push(key);
1108
1161
  }
1109
- if (plugin.scoped) {
1110
- this.scopedPlugins[key] = plugin.scoped;
1162
+ if (plugin.a) {
1163
+ this.pluginAuthors[key] = plugin.a;
1164
+ }
1165
+ if (plugin.n) {
1166
+ this.pluginNames[key] = plugin.n;
1111
1167
  }
1112
- if (plugin.newScope) {
1113
- this.newScopePlugins[key] = plugin.newScope;
1168
+ if (plugin.s) {
1169
+ this.newScopePlugins[key] = plugin.s;
1114
1170
  }
1115
- if (plugin.verified) {
1171
+ if (plugin.v) {
1116
1172
  this.verifiedPlugins.push(key);
1117
1173
  }
1118
- if (plugin.verifiedPlus) {
1174
+ if (plugin.p) {
1119
1175
  this.verifiedPlusPlugins.push(key);
1120
1176
  }
1121
1177
  });
1122
1178
  }
1123
1179
  catch (e) {
1124
1180
  this.pluginListRetryTimeout = setTimeout(() => this.loadPluginList(), 60000);
1125
- this.logger.debug('Error when trying to get github plugin list:', e.message);
1181
+ this.logger.debug(`Could not obtain plugin list from plugins repo as ${e.message}.`);
1126
1182
  }
1127
1183
  }
1128
1184
  };