perf: eliminate usage of zwave-js's /safe entrypoints and reduce bundle size by 60% (#4214)

AlCalzone · web-flow · commit 60d08cea5ea5 · 2025-04-30T08:47:26.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -114,7 +114,7 @@
     "vuetify": "^2.7.2",
     "winston": "^3.13.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "zwave-js": "^15.1.3",
+    "zwave-js": "^15.2.1",
     "zxing-wasm": "^1.2.15"
   },
   "devDependencies": {
diff --git a/src/App.vue b/src/App.vue
@@ -434,12 +434,9 @@ import {
 	socketEvents,
 	inboundEvents as socketActions,
 } from '@server/lib/SocketEvents'
-import {
-	getEnumMemberName,
-	SecurityBootstrapFailure,
-	FirmwareUpdateStatus,
-	InclusionState,
-} from 'zwave-js/safe'
+import { getEnumMemberName } from '@zwave-js/shared'
+import { FirmwareUpdateStatus } from '@zwave-js/cc'
+import { SecurityBootstrapFailure, InclusionState } from 'zwave-js'
 import DialogNodesManager from '@/components/dialogs/DialogNodesManager.vue'
 import { uuid } from './lib/utils'
 
diff --git a/src/components/Confirm.vue b/src/components/Confirm.vue
@@ -225,7 +225,7 @@
 </template>
 
 <script>
-import { tryParseDSKFromQRCodeString } from '@zwave-js/core/safe'
+import { tryParseDSKFromQRCodeString } from '@zwave-js/core'
 import 'vue-prism-editor/dist/prismeditor.min.css' // import the styles somewhere
 
 // import highlighting library (you can use any library you want just return html string)
diff --git a/src/components/custom/BgRssiChart.vue b/src/components/custom/BgRssiChart.vue
@@ -10,7 +10,7 @@
 <script>
 import uPlot from 'uplot'
 import 'uplot/dist/uPlot.min.css'
-import { isRssiError } from 'zwave-js/safe'
+import { isRssiError } from '@zwave-js/core'
 
 // eslint-disable-next-line no-unused-vars
 function touchZoomPlugin(opts) {
diff --git a/src/components/custom/NodePanel.vue b/src/components/custom/NodePanel.vue
@@ -399,8 +399,9 @@ import {
 	protocolDataRateToString,
 	isRssiError,
 	rssiToString,
-} from 'zwave-js/safe'
-import { Protocols, zwaveDataRateToString } from '@zwave-js/core/safe'
+	Protocols,
+	zwaveDataRateToString,
+} from '@zwave-js/core'
 import draggable from 'vuedraggable'
 
 import { Routes } from '../../router/index.js'
diff --git a/src/components/custom/ZwaveGraph.vue b/src/components/custom/ZwaveGraph.vue
@@ -296,8 +296,8 @@ import {
 	protocolDataRateToString,
 	rssiToString,
 	isRssiError,
-} from 'zwave-js/safe'
-import { RouteKind } from '@zwave-js/core/safe'
+	RouteKind,
+} from '@zwave-js/core'
 import { uuid, arraysEqual } from '../../lib/utils'
 import useBaseStore from '../../stores/base.js'
 import { mapState } from 'pinia'
diff --git a/src/components/dialogs/DialogAssociation.vue b/src/components/dialogs/DialogAssociation.vue
@@ -124,12 +124,12 @@
 </template>
 
 <script>
-import { Protocols } from '@zwave-js/core/safe'
+import { Protocols } from '@zwave-js/core'
 import { mapState } from 'pinia'
 import useBaseStore from '../../stores/base.js'
 import { getAssociationAddress } from '../../lib/utils'
-import { AssociationCheckResult } from '@zwave-js/cc/safe'
-import { getEnumMemberName } from 'zwave-js/safe'
+import { AssociationCheckResult } from '@zwave-js/cc'
+import { getEnumMemberName } from '@zwave-js/shared'
 import InstancesMixin from '../../mixins/InstancesMixin.js'
 
 export default {
diff --git a/src/components/dialogs/DialogHealthCheck.vue b/src/components/dialogs/DialogHealthCheck.vue
@@ -411,13 +411,13 @@
 
 <script>
 import { copy } from '@/lib/utils'
-import { getEnumMemberName } from 'zwave-js/safe'
-import { Powerlevel } from '@zwave-js/cc/safe'
+import { getEnumMemberName } from '@zwave-js/shared'
+import { Powerlevel } from '@zwave-js/cc'
 import { mapActions, mapState } from 'pinia'
+import { Protocols } from '@zwave-js/core'
 
 import useBaseStore from '../../stores/base.js'
 import InstancesMixin from '../../mixins/InstancesMixin.js'
-import { Protocols } from '@zwave-js/core/safe'
 
 export default {
 	components: {},
diff --git a/src/components/dialogs/DialogNodesManager.vue b/src/components/dialogs/DialogNodesManager.vue
@@ -670,7 +670,7 @@
 
 <script>
 import { mapState } from 'pinia'
-import { tryParseDSKFromQRCodeString } from '@zwave-js/core/safe'
+import { tryParseDSKFromQRCodeString } from '@zwave-js/core'
 
 import {
 	parseSecurityClasses,
@@ -679,7 +679,7 @@ import {
 	validTopic,
 } from '../../lib/utils.js'
 import useBaseStore from '../../stores/base.js'
-import { InclusionStrategy, SecurityBootstrapFailure } from 'zwave-js/safe'
+import { InclusionStrategy, SecurityBootstrapFailure } from 'zwave-js'
 import InstancesMixin from '../../mixins/InstancesMixin.js'
 
 export default {
diff --git a/src/components/nodes-table/AssociationGroups.vue b/src/components/nodes-table/AssociationGroups.vue
@@ -79,8 +79,8 @@ import { mapState, mapActions } from 'pinia'
 
 import useBaseStore from '../../stores/base.js'
 import InstancesMixin from '../../mixins/InstancesMixin.js'
-import { getEnumMemberName } from 'zwave-js/safe'
-import { AssociationCheckResult } from '@zwave-js/cc/safe'
+import { getEnumMemberName } from '@zwave-js/shared'
+import { AssociationCheckResult } from '@zwave-js/cc'
 import { getAssociationAddress } from '../../lib/utils'
 
 export default {
diff --git a/src/components/nodes-table/ExpandedNode.vue b/src/components/nodes-table/ExpandedNode.vue
@@ -327,8 +327,8 @@ import InstancesMixin from '../../mixins/InstancesMixin.js'
 import {
 	SetValueStatus,
 	setValueWasUnsupervisedOrSucceeded,
-} from '@zwave-js/cc/safe'
-import { Protocols } from '@zwave-js/core/safe'
+} from '@zwave-js/cc'
+import { Protocols } from '@zwave-js/core'
 
 export default {
 	props: {
diff --git a/src/components/nodes-table/NodeDetails.vue b/src/components/nodes-table/NodeDetails.vue
@@ -382,10 +382,9 @@
 import { mapState, mapActions } from 'pinia'
 import { validTopic } from '../../lib/utils'
 import { maxLRPowerLevels } from '../../lib/items'
-import { ConfigValueFormat } from '@zwave-js/core/safe'
 import useBaseStore from '../../stores/base.js'
 import InstancesMixin from '../../mixins/InstancesMixin.js'
-import { isUnsupervisedOrSucceeded } from '@zwave-js/core/safe'
+import { isUnsupervisedOrSucceeded, ConfigValueFormat } from '@zwave-js/core'
 
 export default {
 	props: {
diff --git a/src/components/nodes-table/NodeScheduler.vue b/src/components/nodes-table/NodeScheduler.vue
@@ -83,8 +83,8 @@ import { mapActions } from 'pinia'
 
 import useBaseStore from '../../stores/base.js'
 import InstancesMixin from '../../mixins/InstancesMixin.js'
-import { getEnumMemberName } from 'zwave-js/safe'
-import { ScheduleEntryLockWeekday } from '@zwave-js/cc/safe'
+import { getEnumMemberName } from '@zwave-js/shared'
+import { ScheduleEntryLockWeekday } from '@zwave-js/cc'
 import { padNumber, copy } from '../../lib/utils.js'
 
 const months = [
diff --git a/src/lib/items.js b/src/lib/items.js
@@ -1,5 +1,9 @@
-import { RFRegion, Protocols } from 'zwave-js/safe'
-import { ZnifferLRChannelConfig, ZnifferRegion } from '@zwave-js/core/safe'
+import {
+	ZnifferLRChannelConfig,
+	ZnifferRegion,
+	RFRegion,
+	Protocols,
+} from '@zwave-js/core'
 
 export const rfRegions = Object.keys(RFRegion)
 	.filter((k) => isNaN(k))
diff --git a/src/lib/utils.js b/src/lib/utils.js
@@ -2,16 +2,13 @@ import {
 	isValidDSK,
 	Protocols,
 	znifferProtocolDataRateToString,
-} from '@zwave-js/core/safe'
-import colors from 'vuetify/lib/util/colors'
-
-import {
 	isRssiError,
 	rssiToString,
-	getEnumMemberName,
-	ZWaveFrameType,
-	LongRangeFrameType,
-} from 'zwave-js/safe'
+} from '@zwave-js/core'
+import colors from 'vuetify/lib/util/colors'
+
+import { getEnumMemberName } from '@zwave-js/shared'
+import { ZWaveFrameType, LongRangeFrameType } from 'zwave-js'
 import { znifferRegions } from './items'
 import { mdiZWave } from '@mdi/js'
 
diff --git a/src/views/SmartStart.vue b/src/views/SmartStart.vue
diff --git a/src/views/Zniffer.vue b/src/views/Zniffer.vue
diff --git a/vite.config.mjs b/vite.config.mjs
