camera.ui3 0.0.34-alpha.1 → 0.0.34-alpha.3
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/dist/interface/@tanstack.CKjDZ58q.0.0.34-alpha.3.js +1 -0
- package/dist/interface/{@vee-validate.BYAqeMXW.0.0.34-alpha.1.js → @vee-validate.D-Deq0c3.0.0.34-alpha.3.js} +2 -2
- package/dist/interface/@vue.DLAsVqT0.0.0.34-alpha.3.js +17 -0
- package/dist/interface/{@vueform.BsJeH1VL.0.0.34-alpha.1.js → @vueform.qn9IITTz.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{@vueuse.C89QVsKq.0.0.34-alpha.1.js → @vueuse.DjSeeuC8.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/Account.DvvXyN4T.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Adminpanel.BJr3r0Mz.0.0.34-alpha.3.js +2 -0
- package/dist/interface/Appearance.uXdE85qT.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Backup.BOpdR87Y.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Camera.Ea4lzNkY.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Cameras.DReUzJFC.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Camview.C-lHMDIW.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Config.DmARP8un.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Console.BQON6fJL.0.0.34-alpha.3.js +4 -0
- package/dist/interface/FirstSteps.eKqamXQr.0.0.34-alpha.3.js +1 -0
- package/dist/interface/{NewCamera.DXZTbw6t.0.0.34-alpha.1.js → NewCamera.BtPDCsHx.0.0.34-alpha.3.js} +2 -2
- package/dist/interface/Plugin.BVXV2PUf.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Plugins.-l2XhEap.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Recordings.BsYf9qT2.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Recordings.D4DiPFO4.0.0.34-alpha.3.js +1 -0
- package/dist/interface/Settings.TaefKvyW.0.0.34-alpha.3.js +1 -0
- package/dist/interface/System.D5b8zuRP.0.0.34-alpha.3.js +4 -0
- package/dist/interface/User.CJDkU1R1.0.0.34-alpha.3.js +1 -0
- package/dist/interface/{VConfigEditor.vue_vue_type_script_setup_true_lang.DaPxq8EI.0.0.34-alpha.1.js → VConfigEditor.vue_vue_type_script_setup_true_lang.C38KT5jm.0.0.34-alpha.3.js} +2 -2
- package/dist/interface/{VConsole.sVPWAfNY.0.0.34-alpha.1.js → VConsole.L8yV4Z6L.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/VPlayer.wmdOYvtC.0.0.34-alpha.3.js +4 -0
- package/dist/interface/VPluginCard.BrBIome8.0.0.34-alpha.3.js +4 -0
- package/dist/interface/{ace-builds.Cnj3uJ-i.0.0.34-alpha.1.js → ace-builds.CBtTJX9v.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{apexcharts.CMLplPnj.0.0.34-alpha.1.js → apexcharts.QzX23ho7.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/assets/Cameras.0.0.34-alpha.3.CF0l3cIy.css +1 -0
- package/dist/interface/assets/Console.0.0.34-alpha.3.DN77xjuI.css +1 -0
- package/dist/interface/assets/{VPlayer.0.0.34-alpha.1.DmbaAA_3.css → VPlayer.0.0.34-alpha.3.BeQb7Ux_.css} +1 -1
- package/dist/interface/assets/VPluginCard.0.0.34-alpha.3.CIc7UhBH.css +1 -0
- package/dist/interface/assets/main.0.0.34-alpha.3.D6i_pncP.css +1 -0
- package/dist/interface/{dnd-core.DXuprW1u.0.0.34-alpha.1.js → dnd-core.771H3Rf1.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{draggabilly.B4gt8cuQ.0.0.34-alpha.1.js → draggabilly.BdAQGCqc.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{engine.io-client.C6Wzx_jT.0.0.34-alpha.1.js → engine.io-client.GcLFdYsX.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{ev-emitter.CCoflQaJ.0.0.34-alpha.1.js → ev-emitter.bnizdbg-.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{fast-deep-equal.A6REbYuf.0.0.34-alpha.1.js → fast-deep-equal.Bu1IfRX2.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{highlight.js.ChQi-SWt.0.0.34-alpha.1.js → highlight.js.CxHcdONQ.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/hookable.B8xFkYCm.0.0.34-alpha.3.js +1 -0
- package/dist/interface/index.html +33 -31
- package/dist/interface/{linkify-it.V_1DZtim.0.0.34-alpha.1.js → linkify-it.CDXhbjwq.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/main.BU_T9HhF.0.0.34-alpha.3.js +5 -0
- package/dist/interface/{markdown-it.BSp5IUES.0.0.34-alpha.1.js → markdown-it.C9bb3p1r.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{nprogress.BMn57QX7.0.0.34-alpha.1.js → nprogress.C7HQcvim.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/perfect-debounce.Cp2ysxOb.0.0.34-alpha.3.js +1 -0
- package/dist/interface/{pinia.C5B5h5W-.0.0.34-alpha.1.js → pinia.CToajcrk.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/plugins.Dliq_mwd.0.0.34-alpha.3.js +1 -0
- package/dist/interface/{qrcode.CoLGEQa3.0.0.34-alpha.1.js → qrcode.BamWRxas.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{react-dnd-touch-backend.CC-llxq1.0.0.34-alpha.1.js → react-dnd-touch-backend.DYJMTAO8.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{rxjs.DhS72WZW.0.0.34-alpha.1.js → rxjs.DAJXKhLO.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{socket.io-client.DA70sIzA.0.0.34-alpha.1.js → socket.io-client.Dh8ucO0x.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{socket.io-parser.Lr_NuxFX.0.0.34-alpha.1.js → socket.io-parser.C5DZRITr.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/sw.js +1 -1
- package/dist/interface/system.BqbFQtZT.0.0.34-alpha.3.js +1 -0
- package/dist/interface/{unidragger.B5ZpJ0o9.0.0.34-alpha.1.js → unidragger.C5CtdjHU.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{v-calendar.BP5jhivB.0.0.34-alpha.1.js → v-calendar.Cp8k6zLg.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/vee-validate.C1QNHqqo.0.0.34-alpha.3.js +5 -0
- package/dist/interface/{vue-i18n.CISOas5G.0.0.34-alpha.1.js → vue-i18n.IXPpf7jY.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{vue-inline-svg.DY4V2SdK.0.0.34-alpha.1.js → vue-inline-svg.B3vDJvZ4.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{vue-router.CA6UHABl.0.0.34-alpha.1.js → vue-router.vVhn0OJa.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/vue.l0sNRNKZ.0.0.34-alpha.3.js +1 -0
- package/dist/interface/vue3-apexcharts.RiQO9rLM.0.0.34-alpha.3.js +1 -0
- package/dist/interface/{vue3-dnd.CcvZ77YQ.0.0.34-alpha.1.js → vue3-dnd.1gSj6i6M.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/{vue3-toastify.BnsRFQgq.0.0.34-alpha.1.js → vue3-toastify.CnxcYI1f.0.0.34-alpha.3.js} +1 -1
- package/dist/interface/vuetify.B9I8IgR0.0.0.34-alpha.3.js +5 -0
- package/dist/server/bin/cameraui.d.ts +3 -2
- package/dist/server/bin/cameraui.js +59 -76
- package/dist/server/bin/cameraui.js.map +1 -1
- package/dist/server/bin/fork.js +1 -4
- package/dist/server/bin/fork.js.map +1 -1
- package/dist/server/bin/installer/win32.js +3 -3
- package/dist/server/bin/installer/win32.js.map +1 -1
- package/dist/server/bin/logger.d.ts +3 -2
- package/dist/server/bin/logger.js +34 -21
- package/dist/server/bin/logger.js.map +1 -1
- package/dist/server/package.json +14 -11
- package/dist/server/requirements.txt +6 -5
- package/dist/server/src/api/controllers/cameras.controller.d.ts +2 -0
- package/dist/server/src/api/controllers/cameras.controller.js +67 -11
- package/dist/server/src/api/controllers/cameras.controller.js.map +1 -1
- package/dist/server/src/api/controllers/frameWorkers.controller.d.ts +1 -1
- package/dist/server/src/api/controllers/frameWorkers.controller.js +14 -6
- package/dist/server/src/api/controllers/frameWorkers.controller.js.map +1 -1
- package/dist/server/src/api/controllers/plugins.controller.d.ts +2 -0
- package/dist/server/src/api/controllers/plugins.controller.js +92 -33
- package/dist/server/src/api/controllers/plugins.controller.js.map +1 -1
- package/dist/server/src/api/controllers/system.controller.d.ts +2 -2
- package/dist/server/src/api/controllers/system.controller.js +18 -40
- package/dist/server/src/api/controllers/system.controller.js.map +1 -1
- package/dist/server/src/api/database/checks.d.ts +55 -0
- package/dist/server/src/api/database/checks.js +183 -0
- package/dist/server/src/api/database/checks.js.map +1 -0
- package/dist/server/src/api/database/index.d.ts +2 -1
- package/dist/server/src/api/database/index.js +6 -2
- package/dist/server/src/api/database/index.js.map +1 -1
- package/dist/server/src/api/database/migration.d.ts +1 -0
- package/dist/server/src/api/database/migration.js +30 -0
- package/dist/server/src/api/database/migration.js.map +1 -1
- package/dist/server/src/api/database/selfcheck.d.ts +48 -0
- package/dist/server/src/api/database/selfcheck.js +397 -0
- package/dist/server/src/api/database/selfcheck.js.map +1 -0
- package/dist/server/src/api/routes/cameras.routes.js +12 -0
- package/dist/server/src/api/routes/cameras.routes.js.map +1 -1
- package/dist/server/src/api/routes/plugins.routes.js +24 -0
- package/dist/server/src/api/routes/plugins.routes.js.map +1 -1
- package/dist/server/src/api/schemas/cameras.schema.d.ts +13 -13
- package/dist/server/src/api/schemas/cameras.schema.js +2 -2
- package/dist/server/src/api/schemas/cameras.schema.js.map +1 -1
- package/dist/server/src/api/services/cameras.service.d.ts +1 -0
- package/dist/server/src/api/services/cameras.service.js +13 -2
- package/dist/server/src/api/services/cameras.service.js.map +1 -1
- package/dist/server/src/api/services/plugins.service.d.ts +1 -0
- package/dist/server/src/api/services/plugins.service.js +8 -3
- package/dist/server/src/api/services/plugins.service.js.map +1 -1
- package/dist/server/src/api/types/index.d.ts +2 -6
- package/dist/server/src/api/types/index.js.map +1 -1
- package/dist/server/src/api/websocket/index.js +1 -0
- package/dist/server/src/api/websocket/index.js.map +1 -1
- package/dist/server/src/api/websocket/nsp/logs.d.ts +7 -1
- package/dist/server/src/api/websocket/nsp/logs.js +70 -51
- package/dist/server/src/api/websocket/nsp/logs.js.map +1 -1
- package/dist/server/src/api/websocket/nsp/metrics.d.ts +1 -1
- package/dist/server/src/api/websocket/nsp/metrics.js +15 -13
- package/dist/server/src/api/websocket/nsp/metrics.js.map +1 -1
- package/dist/server/src/api/websocket/nsp/plugins.js +3 -3
- package/dist/server/src/api/websocket/nsp/plugins.js.map +1 -1
- package/dist/server/src/api/websocket/nsp/status.d.ts +1 -1
- package/dist/server/src/api/websocket/nsp/status.js +8 -6
- package/dist/server/src/api/websocket/nsp/status.js.map +1 -1
- package/dist/server/src/api.d.ts +5 -14
- package/dist/server/src/api.js +43 -24
- package/dist/server/src/api.js.map +1 -1
- package/dist/server/src/camera/controller.d.ts +16 -3
- package/dist/server/src/camera/controller.js +105 -17
- package/dist/server/src/camera/controller.js.map +1 -1
- package/dist/server/src/{decoder/worker.d.ts → camera/frameWorker.d.ts} +9 -6
- package/dist/server/src/{decoder/worker.js → camera/frameWorker.js} +125 -52
- package/dist/server/src/camera/frameWorker.js.map +1 -0
- package/dist/server/src/go2rtc/index.js +18 -5
- package/dist/server/src/go2rtc/index.js.map +1 -1
- package/dist/server/src/main.js +23 -51
- package/dist/server/src/main.js.map +1 -1
- package/dist/server/src/nats/index.d.ts +3 -2
- package/dist/server/src/nats/index.js +3 -1
- package/dist/server/src/nats/index.js.map +1 -1
- package/dist/server/src/nats/proxy/cameraDevice.d.ts +2 -1
- package/dist/server/src/nats/proxy/cameraDevice.js +34 -42
- package/dist/server/src/nats/proxy/cameraDevice.js.map +1 -1
- package/dist/server/src/nats/proxy/coreManager.d.ts +1 -1
- package/dist/server/src/nats/proxy/deviceManager.d.ts +1 -1
- package/dist/server/src/nats/server.js +29 -18
- package/dist/server/src/nats/server.js.map +1 -1
- package/dist/server/src/nats/types.d.ts +1 -1
- package/dist/server/src/nats/utils.d.ts +1 -1
- package/dist/server/src/nats/websocket.js.map +1 -1
- package/dist/server/src/plugins/index.d.ts +2 -4
- package/dist/server/src/plugins/index.js +22 -29
- package/dist/server/src/plugins/index.js.map +1 -1
- package/dist/server/src/plugins/plugin.d.ts +5 -0
- package/dist/server/src/plugins/plugin.js +40 -6
- package/dist/server/src/plugins/plugin.js.map +1 -1
- package/dist/server/src/plugins/worker.d.ts +20 -2
- package/dist/server/src/plugins/worker.js +196 -42
- package/dist/server/src/plugins/worker.js.map +1 -1
- package/dist/server/src/services/config/constants.d.ts +1 -0
- package/dist/server/src/services/config/constants.js +3 -2
- package/dist/server/src/services/config/constants.js.map +1 -1
- package/dist/server/src/services/config/index.d.ts +11 -2
- package/dist/server/src/services/config/index.js +53 -6
- package/dist/server/src/services/config/index.js.map +1 -1
- package/dist/server/src/services/config/types.d.ts +7 -0
- package/dist/server/src/services/config/types.js.map +1 -1
- package/localdeps.txt +1 -0
- package/package.json +14 -11
- package/dist/interface/@tanstack.CxmCad5b.0.0.34-alpha.1.js +0 -1
- package/dist/interface/@vue.DNK0rzTJ.0.0.34-alpha.1.js +0 -17
- package/dist/interface/Account.Dl_h4WcJ.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Adminpanel.B2CrHAQm.0.0.34-alpha.1.js +0 -2
- package/dist/interface/Appearance.8KGURqrg.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Backup.ByUwt7pB.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Camera.DdT22vMP.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Cameras.BsZY_8-0.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Camview.BgyUqS9_.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Config.n7S8GG-f.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Console.C5qRkDn7.0.0.34-alpha.1.js +0 -4
- package/dist/interface/FirstSteps.DBHaCFiB.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Plugin.9gJauF_V.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Plugins.Ek1Yocg_.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Recordings.BIdhE95Q.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Recordings.DVu_tzMT.0.0.34-alpha.1.js +0 -1
- package/dist/interface/Settings.Brji5kRj.0.0.34-alpha.1.js +0 -1
- package/dist/interface/System.DYvfAoEM.0.0.34-alpha.1.js +0 -4
- package/dist/interface/User.Mr1DinvX.0.0.34-alpha.1.js +0 -1
- package/dist/interface/VPlayer.DlJrYynC.0.0.34-alpha.1.js +0 -1
- package/dist/interface/VPluginCard.BXrvS7zB.0.0.34-alpha.1.js +0 -4
- package/dist/interface/assets/Cameras.0.0.34-alpha.1.BgZN27ly.css +0 -1
- package/dist/interface/assets/Console.0.0.34-alpha.1.Cjiivzet.css +0 -1
- package/dist/interface/assets/VPluginCard.0.0.34-alpha.1.BpMChOJT.css +0 -1
- package/dist/interface/assets/main.0.0.34-alpha.1.Degnpyky.css +0 -1
- package/dist/interface/main.bKEuHXmK.0.0.34-alpha.1.js +0 -5
- package/dist/interface/plugins.BbNP66vO.0.0.34-alpha.1.js +0 -1
- package/dist/interface/system.BkLh9FNA.0.0.34-alpha.1.js +0 -1
- package/dist/interface/vee-validate.dtT7hUg2.0.0.34-alpha.1.js +0 -5
- package/dist/interface/vue3-apexcharts.D_2v4auN.0.0.34-alpha.1.js +0 -1
- package/dist/interface/vuetify.DiAVhTT5.0.0.34-alpha.1.js +0 -5
- package/dist/server/src/decoder/index.d.ts +0 -11
- package/dist/server/src/decoder/index.js +0 -32
- package/dist/server/src/decoder/index.js.map +0 -1
- package/dist/server/src/decoder/types.d.ts +0 -7
- package/dist/server/src/decoder/types.js +0 -2
- package/dist/server/src/decoder/types.js.map +0 -1
- package/dist/server/src/decoder/worker.js.map +0 -1
- /package/dist/interface/{@babel.l0sNRNKZ.0.0.34-alpha.1.js → @babel.l0sNRNKZ.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{@intlify.sEJX3RNi.0.0.34-alpha.1.js → @intlify.sEJX3RNi.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{@mdi.C1UTQKuc.0.0.34-alpha.1.js → @mdi.C1UTQKuc.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{@popperjs.l0sNRNKZ.0.0.34-alpha.1.js → @popperjs.l0sNRNKZ.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{@react-dnd.CcwRs9xb.0.0.34-alpha.1.js → @react-dnd.CcwRs9xb.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{@socket.io.Dkula2eQ.0.0.34-alpha.1.js → @socket.io.Dkula2eQ.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{@turf.l0sNRNKZ.0.0.34-alpha.1.js → @turf.l0sNRNKZ.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{@xterm.CEvrn8WJ.0.0.34-alpha.1.js → @xterm.CaIhPNPe.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/assets/{@vueform.0.0.34-alpha.1.h7tNX9p6.css → @vueform.0.0.34-alpha.3.h7tNX9p6.css} +0 -0
- /package/dist/interface/assets/{@xterm.0.0.34-alpha.1.CGrrDQr5.css → @xterm.0.0.34-alpha.3.CGrrDQr5.css} +0 -0
- /package/dist/interface/assets/{Account.0.0.34-alpha.1.Ce3OmKrC.css → Account.0.0.34-alpha.3.Ce3OmKrC.css} +0 -0
- /package/dist/interface/assets/{Adminpanel.0.0.34-alpha.1.BCpVV7QL.css → Adminpanel.0.0.34-alpha.3.BCpVV7QL.css} +0 -0
- /package/dist/interface/assets/{Backup.0.0.34-alpha.1.BIwaSlv3.css → Backup.0.0.34-alpha.3.BIwaSlv3.css} +0 -0
- /package/dist/interface/assets/{Camera.0.0.34-alpha.1.D49XscoW.css → Camera.0.0.34-alpha.3.D49XscoW.css} +0 -0
- /package/dist/interface/assets/{Camview.0.0.34-alpha.1.BdTE1Iny.css → Camview.0.0.34-alpha.3.BdTE1Iny.css} +0 -0
- /package/dist/interface/assets/{Config.0.0.34-alpha.1.BtdZEuQO.css → Config.0.0.34-alpha.3.BtdZEuQO.css} +0 -0
- /package/dist/interface/assets/{FirstSteps.0.0.34-alpha.1.CCo2y-sU.css → FirstSteps.0.0.34-alpha.3.CCo2y-sU.css} +0 -0
- /package/dist/interface/assets/{NewCamera.0.0.34-alpha.1.W16dakdJ.css → NewCamera.0.0.34-alpha.3.W16dakdJ.css} +0 -0
- /package/dist/interface/assets/{Plugin.0.0.34-alpha.1.BtRA6zDt.css → Plugin.0.0.34-alpha.3.BtRA6zDt.css} +0 -0
- /package/dist/interface/assets/{Plugins.0.0.34-alpha.1.Cwu0aGUO.css → Plugins.0.0.34-alpha.3.Cwu0aGUO.css} +0 -0
- /package/dist/interface/assets/{Settings.0.0.34-alpha.1.DTRm1psP.css → Settings.0.0.34-alpha.3.DTRm1psP.css} +0 -0
- /package/dist/interface/assets/{User.0.0.34-alpha.1.DPDcJbx8.css → User.0.0.34-alpha.3.DPDcJbx8.css} +0 -0
- /package/dist/interface/assets/{VConsole.0.0.34-alpha.1.e0RL6-05.css → VConsole.0.0.34-alpha.3.e0RL6-05.css} +0 -0
- /package/dist/interface/assets/{highlight.0.0.34-alpha.1.DgoK_Xib.css → highlight.0.0.34-alpha.3.DgoK_Xib.css} +0 -0
- /package/dist/interface/assets/{logo-256.0.0.34-alpha.1.BCQk9H1-.png → logo-256.0.0.34-alpha.3.BCQk9H1-.png} +0 -0
- /package/dist/interface/assets/{logo-512.0.0.34-alpha.1.DLKVOU2S.png → logo-512.0.0.34-alpha.3.DLKVOU2S.png} +0 -0
- /package/dist/interface/assets/{logo.0.0.34-alpha.1.DmEiRk0z.png → logo.0.0.34-alpha.3.DmEiRk0z.png} +0 -0
- /package/dist/interface/assets/{mode-json.0.0.34-alpha.1.Br7xisR1.js → mode-json.0.0.34-alpha.3.Br7xisR1.js} +0 -0
- /package/dist/interface/assets/{mode-yaml.0.0.34-alpha.1.CIYL8U3d.js → mode-yaml.0.0.34-alpha.3.CIYL8U3d.js} +0 -0
- /package/dist/interface/assets/{vue3-toastify.0.0.34-alpha.1.DTY1DMRs.css → vue3-toastify.0.0.34-alpha.3.DTY1DMRs.css} +0 -0
- /package/dist/interface/assets/{vuetify.0.0.34-alpha.1.B_k2Rcut.css → vuetify.0.0.34-alpha.3.B_k2Rcut.css} +0 -0
- /package/dist/interface/{axios.C-n2IhIP.0.0.34-alpha.1.js → axios.C-n2IhIP.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{point-in-polygon-hao.l0sNRNKZ.0.0.34-alpha.1.js → birpc.l0sNRNKZ.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{compare-versions.DqEOhma6.0.0.34-alpha.1.js → compare-versions.DqEOhma6.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{dijkstrajs.D_NXgYpA.0.0.34-alpha.1.js → dijkstrajs.D_NXgYpA.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{engine.io-parser.BiEtp6m2.0.0.34-alpha.1.js → engine.io-parser.BiEtp6m2.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{entities.C20TfXL6.0.0.34-alpha.1.js → entities.C20TfXL6.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{get-size.D1dS-IaP.0.0.34-alpha.1.js → get-size.D1dS-IaP.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{mdurl.k9Sl0PQj.0.0.34-alpha.1.js → mdurl.k9Sl0PQj.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{sweepline-intersections.l0sNRNKZ.0.0.34-alpha.1.js → point-in-polygon-hao.l0sNRNKZ.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{punycode.js.Dj65hjkv.0.0.34-alpha.1.js → punycode.js.Dj65hjkv.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{react-dnd-html5-backend.1HQjlkwI.0.0.34-alpha.1.js → react-dnd-html5-backend.1HQjlkwI.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{redux.CuxFRhX_.0.0.34-alpha.1.js → redux.CuxFRhX_.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{vue.l0sNRNKZ.0.0.34-alpha.1.js → sweepline-intersections.l0sNRNKZ.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{tslib.9k7AwCpt.0.0.34-alpha.1.js → tslib.9k7AwCpt.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{types.Cz9TaZAP.0.0.34-alpha.1.js → types.Cz9TaZAP.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{uc.micro.kMc2yuuw.0.0.34-alpha.1.js → uc.micro.kMc2yuuw.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{utils.mAKpSMLY.0.0.34-alpha.1.js → utils.mAKpSMLY.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{uuid.DvF23Exx.0.0.34-alpha.1.js → uuid.DvF23Exx.0.0.34-alpha.3.js} +0 -0
- /package/dist/interface/{zod.DnW1_kUe.0.0.34-alpha.1.js → zod.DnW1_kUe.0.0.34-alpha.3.js} +0 -0
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import ansiRegex from 'ansi-regex';
|
|
2
|
+
import { cyan, red } from 'ansicolor';
|
|
2
3
|
import { createReadStream, existsSync } from 'node:fs';
|
|
3
4
|
import { stat } from 'node:fs/promises';
|
|
4
5
|
import { Tail } from 'tail';
|
|
@@ -7,64 +8,76 @@ export class LogsNamespace {
|
|
|
7
8
|
nsp;
|
|
8
9
|
nspName = '/logs';
|
|
9
10
|
nativeTail;
|
|
11
|
+
api;
|
|
10
12
|
configService;
|
|
13
|
+
pluginManager;
|
|
11
14
|
constructor(io) {
|
|
15
|
+
this.api = container.resolve('api');
|
|
12
16
|
this.configService = container.resolve('configService');
|
|
17
|
+
this.pluginManager = container.resolve('pluginManager');
|
|
13
18
|
this.nsp = io.of(this.nspName);
|
|
14
19
|
this.nsp.on('connection', (socket) => {
|
|
15
|
-
socket.on('get-
|
|
20
|
+
socket.on('get-all-logs', () => this.getAllLogs(socket));
|
|
21
|
+
socket.on('get-camera-log', (cameraName) => this.getCameraLog(socket, cameraName));
|
|
22
|
+
socket.on('get-plugin-log', (pluginName) => this.getPluginLog(socket, pluginName));
|
|
16
23
|
});
|
|
17
24
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
socket.emit('stdout', cyan(`File: ${this.configService.LOG_FILE}\r\n\r\n`));
|
|
23
|
-
this.tailLogFromFileNative(socket, filter);
|
|
25
|
+
getAllLogs(socket) {
|
|
26
|
+
const emitTo = 'stdout';
|
|
27
|
+
socket.emit(emitTo, cyan('Loading logs using native method...\r\n'));
|
|
28
|
+
this.tailLogFromFileNative(socket, this.configService.LOG_FILE, emitTo);
|
|
24
29
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
30
|
+
getCameraLog(socket, cameraName) {
|
|
31
|
+
const emitTo = `stdout/${cameraName}`;
|
|
32
|
+
socket.emit(emitTo, cyan('Loading camera log using native method...\r\n'));
|
|
33
|
+
const cameraController = this.api.getCamera(cameraName);
|
|
34
|
+
if (!cameraController) {
|
|
35
|
+
socket.emit(emitTo, red(`Camera "${cameraName}" not found.\r\n`));
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
this.tailLogFromFileNative(socket, cameraController.logPath, emitTo, cameraController.camera.name);
|
|
39
|
+
}
|
|
40
|
+
getPluginLog(socket, pluginName) {
|
|
41
|
+
const emitTo = `stdout/${pluginName}`;
|
|
42
|
+
socket.emit(emitTo, cyan('Loading plugin log using native method...\r\n\r\n'));
|
|
43
|
+
const plugin = this.pluginManager.plugins.get(pluginName);
|
|
44
|
+
if (!plugin) {
|
|
45
|
+
socket.emit(emitTo, red(`Plugin "${pluginName}" not found.\r\n`));
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
this.tailLogFromFileNative(socket, plugin.logPath, emitTo, plugin.displayName);
|
|
49
|
+
}
|
|
50
|
+
async tailLogFromFileNative(socket, logFile, to, filter) {
|
|
51
|
+
if (!existsSync(logFile)) {
|
|
52
|
+
socket.emit(to, red(`\r\nNo log file exists at path: ${logFile}\r\n`));
|
|
53
|
+
return;
|
|
29
54
|
}
|
|
30
|
-
let isRelatedToFilter = false;
|
|
31
|
-
const filterRegex = /(?:\\x1B\[\d+(?:;\d+)*m|\x1B\[\d+(?:;\d+)*m)*\[camera\.ui\](?:\\x1B\[\d+(?:;\d+)*m|\x1B\[\d+(?:;\d+)*m)*\s*/g;
|
|
32
|
-
const isNewEntry = (line) => {
|
|
33
|
-
return /^\[\d{2}\.\d{2}\.\d{4}, \d{2}:\d{2}:\d{2}\]/.test(line);
|
|
34
|
-
};
|
|
35
|
-
// read the first 50000 bytes of the log and emit to the client
|
|
36
55
|
try {
|
|
37
|
-
const logStats = await stat(
|
|
56
|
+
const logStats = await stat(logFile);
|
|
38
57
|
const logStartPosition = logStats.size <= 50000 ? 0 : logStats.size - 50000;
|
|
39
|
-
const logStream = createReadStream(
|
|
58
|
+
const logStream = createReadStream(logFile, { start: logStartPosition });
|
|
40
59
|
logStream.on('data', (buffer) => {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
return line;
|
|
50
|
-
}
|
|
51
|
-
});
|
|
52
|
-
socket.emit('stdout', filteredLines.join('\n\r') + '\n\r');
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
socket.emit('stdout', buffer.toString('utf8').split('\n').join('\n\r') + '\n\r');
|
|
60
|
+
let line = buffer.toString().split(/\r?\n/).join('\r\n');
|
|
61
|
+
if (filter !== undefined) {
|
|
62
|
+
if (typeof filter === 'string') {
|
|
63
|
+
line = this.removeName(line, filter);
|
|
64
|
+
}
|
|
65
|
+
else if (typeof filter === 'number') {
|
|
66
|
+
line = this.removeBracketedContent(line, filter);
|
|
67
|
+
}
|
|
56
68
|
}
|
|
69
|
+
socket.emit(to, line + '\r\n');
|
|
57
70
|
});
|
|
58
71
|
logStream.on('end', () => {
|
|
59
72
|
logStream.close();
|
|
60
73
|
});
|
|
61
74
|
}
|
|
62
75
|
catch (error) {
|
|
63
|
-
socket.emit(
|
|
76
|
+
socket.emit(to, red(`Failed to read log file: ${error.message}\r\n`));
|
|
64
77
|
return;
|
|
65
78
|
}
|
|
66
79
|
if (!this.nativeTail) {
|
|
67
|
-
this.nativeTail = new Tail(
|
|
80
|
+
this.nativeTail = new Tail(logFile, {
|
|
68
81
|
fromBeginning: false,
|
|
69
82
|
useWatchFile: true,
|
|
70
83
|
fsWatchOptions: {
|
|
@@ -77,22 +90,10 @@ export class LogsNamespace {
|
|
|
77
90
|
}
|
|
78
91
|
// watch for lines and emit to client
|
|
79
92
|
const onLine = (line) => {
|
|
80
|
-
|
|
81
|
-
const newLine = line.replace(filterRegex, '');
|
|
82
|
-
const clearLine = strip(line);
|
|
83
|
-
if (isNewEntry(clearLine)) {
|
|
84
|
-
isRelatedToFilter = filter.some((key) => clearLine.includes(key));
|
|
85
|
-
}
|
|
86
|
-
if (isRelatedToFilter) {
|
|
87
|
-
socket.emit('stdout', newLine + '\n\r');
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
socket.emit('stdout', line + '\n\r');
|
|
92
|
-
}
|
|
93
|
+
socket.emit(to, line.split(/\r?\n/).join('\r\n') + '\r\n');
|
|
93
94
|
};
|
|
94
95
|
const onError = (err) => {
|
|
95
|
-
socket.emit(
|
|
96
|
+
socket.emit(to, err.message.split(/\r?\n/).join('\r\n') + '\r\n');
|
|
96
97
|
};
|
|
97
98
|
this.nativeTail?.on('line', onLine);
|
|
98
99
|
this.nativeTail?.on('error', onError);
|
|
@@ -110,5 +111,23 @@ export class LogsNamespace {
|
|
|
110
111
|
socket.on('end', onEnd.bind(this));
|
|
111
112
|
socket.on('disconnect', onEnd.bind(this));
|
|
112
113
|
}
|
|
114
|
+
removeName(str, cameraName) {
|
|
115
|
+
const escapeRegex = (string) => string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
116
|
+
const escapedCameraName = escapeRegex(cameraName);
|
|
117
|
+
const regex = new RegExp(`(${ansiRegex().source}\\s*\\[${escapedCameraName}\\]\\s*${ansiRegex().source})`, 'g');
|
|
118
|
+
return str
|
|
119
|
+
.replace(regex, ' ')
|
|
120
|
+
.replace(/[^\S\r\n]+/g, ' ')
|
|
121
|
+
.replace(/^[^\S\r\n]+|[^\S\r\n]+$/gm, '');
|
|
122
|
+
}
|
|
123
|
+
removeBracketedContent(str, n) {
|
|
124
|
+
let count = 0;
|
|
125
|
+
const regex = new RegExp(`(${ansiRegex().source}\\s*\\[[^\\]]+\\]\\s*${ansiRegex().source})`, 'g');
|
|
126
|
+
const replacedStr = str.replace(regex, (match) => {
|
|
127
|
+
count++;
|
|
128
|
+
return count === n ? ' ' : match;
|
|
129
|
+
});
|
|
130
|
+
return replacedStr.replace(/[^\S\r\n]+/g, ' ').replace(/^[^\S\r\n]+|[^\S\r\n]+$/gm, '');
|
|
131
|
+
}
|
|
113
132
|
}
|
|
114
133
|
//# sourceMappingURL=logs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/logs.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@ import type { ProcessInfo, ServerProcesses, SocketNsp, WorkerProcesses } from '.
|
|
|
3
3
|
export declare class MetricsNamespace {
|
|
4
4
|
nsp: Namespace;
|
|
5
5
|
nspName: SocketNsp;
|
|
6
|
+
private api;
|
|
6
7
|
private pluginManager;
|
|
7
|
-
private frameManager;
|
|
8
8
|
private go2rtc;
|
|
9
9
|
private natsServer;
|
|
10
10
|
private processServerHistory;
|
|
@@ -4,8 +4,8 @@ import { container } from 'tsyringe';
|
|
|
4
4
|
export class MetricsNamespace {
|
|
5
5
|
nsp;
|
|
6
6
|
nspName = '/metrics';
|
|
7
|
+
api;
|
|
7
8
|
pluginManager;
|
|
8
|
-
frameManager;
|
|
9
9
|
go2rtc;
|
|
10
10
|
natsServer;
|
|
11
11
|
processServerHistory = [];
|
|
@@ -15,8 +15,8 @@ export class MetricsNamespace {
|
|
|
15
15
|
processFrameWorkerHistory = {};
|
|
16
16
|
systemHistory = [];
|
|
17
17
|
constructor(io) {
|
|
18
|
+
this.api = container.resolve('api');
|
|
18
19
|
this.pluginManager = container.resolve('pluginManager');
|
|
19
|
-
this.frameManager = container.resolve('frameManager');
|
|
20
20
|
this.go2rtc = container.resolve('go2rtc');
|
|
21
21
|
this.natsServer = container.resolve('natsServer');
|
|
22
22
|
this.nsp = io.of(this.nspName);
|
|
@@ -54,14 +54,15 @@ export class MetricsNamespace {
|
|
|
54
54
|
return data;
|
|
55
55
|
}
|
|
56
56
|
async getPluginsProcessesInfo(payload, callback) {
|
|
57
|
-
if (this.pluginManager.
|
|
57
|
+
if (this.pluginManager.plugins.size > 0 && !Object.keys(this.processPluginsHistory).length) {
|
|
58
58
|
await this.getProcesses();
|
|
59
59
|
}
|
|
60
60
|
callback?.(this.processPluginsHistory);
|
|
61
61
|
return this.processPluginsHistory;
|
|
62
62
|
}
|
|
63
63
|
async getFrameWorkerProcessesInfo(payload, callback) {
|
|
64
|
-
|
|
64
|
+
const cameraControllers = this.api.getCameras();
|
|
65
|
+
if (cameraControllers.length > 0 && !Object.keys(this.processFrameWorkerHistory).length) {
|
|
65
66
|
await this.getProcesses();
|
|
66
67
|
}
|
|
67
68
|
callback?.(this.processFrameWorkerHistory);
|
|
@@ -88,8 +89,8 @@ export class MetricsNamespace {
|
|
|
88
89
|
updateProcessHistory(process, name, history[name]);
|
|
89
90
|
};
|
|
90
91
|
const processList = allProcesses.list;
|
|
91
|
-
const
|
|
92
|
-
const
|
|
92
|
+
const plugins = Array.from(this.pluginManager.plugins);
|
|
93
|
+
const cameraControllers = this.api.getCameras();
|
|
93
94
|
// Update server process
|
|
94
95
|
const serverProcess = processList.find((p) => p.pid === process.pid);
|
|
95
96
|
if (serverProcess)
|
|
@@ -103,26 +104,27 @@ export class MetricsNamespace {
|
|
|
103
104
|
if (natsProcess)
|
|
104
105
|
updateProcessHistory(natsProcess, 'nats', this.processNatHistory);
|
|
105
106
|
// Update plugin processes
|
|
106
|
-
|
|
107
|
-
const pluginProcess = processList.find((p) => p.pid === worker.getPID());
|
|
107
|
+
plugins.forEach(([pluginName, plugin]) => {
|
|
108
|
+
const pluginProcess = processList.find((p) => p.pid === plugin.worker.getPID());
|
|
108
109
|
if (pluginProcess)
|
|
109
110
|
updateWorkerHistory(pluginProcess, pluginName, this.processPluginsHistory);
|
|
110
111
|
});
|
|
111
112
|
// Clean up old plugin entries
|
|
112
113
|
Object.keys(this.processPluginsHistory).forEach((name) => {
|
|
113
|
-
if (!
|
|
114
|
+
if (!plugins.some(([pluginName]) => pluginName === name)) {
|
|
114
115
|
delete this.processPluginsHistory[name];
|
|
115
116
|
}
|
|
116
117
|
});
|
|
117
118
|
// Update frame worker processes
|
|
118
|
-
|
|
119
|
-
const
|
|
119
|
+
cameraControllers.forEach((cameraController) => {
|
|
120
|
+
const frameWorker = cameraController.frameWorker;
|
|
121
|
+
const frameProcess = processList.find((p) => p.pid === frameWorker.getPID());
|
|
120
122
|
if (frameProcess)
|
|
121
|
-
updateWorkerHistory(frameProcess,
|
|
123
|
+
updateWorkerHistory(frameProcess, frameWorker.name, this.processFrameWorkerHistory);
|
|
122
124
|
});
|
|
123
125
|
// Clean up old frame worker entries
|
|
124
126
|
Object.keys(this.processFrameWorkerHistory).forEach((name) => {
|
|
125
|
-
if (!
|
|
127
|
+
if (!cameraControllers.some((cameraController) => cameraController.frameWorker.name === name)) {
|
|
126
128
|
delete this.processFrameWorkerHistory[name];
|
|
127
129
|
}
|
|
128
130
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAUrC,MAAM,OAAO,gBAAgB;IACpB,GAAG,CAAY;IACf,OAAO,GAAc,UAAU,CAAC;IAE/B,aAAa,CAAgB;IAC7B,
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,9 @@ export class PluginsNamespace {
|
|
|
14
14
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
15
15
|
// public async pluginInfo(socket: Socket) {}
|
|
16
16
|
async pluginStatus(pluginName, callback) {
|
|
17
|
-
const
|
|
18
|
-
if (
|
|
19
|
-
const status =
|
|
17
|
+
const plugins = this.pluginManager.plugins.get(pluginName);
|
|
18
|
+
if (plugins) {
|
|
19
|
+
const status = plugins.worker.status;
|
|
20
20
|
const data = {
|
|
21
21
|
pluginName,
|
|
22
22
|
status,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOrC,MAAM,OAAO,gBAAgB;IACpB,GAAG,CAAY;IACf,OAAO,GAAc,UAAU,CAAC;IAE/B,aAAa,CAAgB;IAErC,YAAY,EAAU;QACpB,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAgB,eAAe,CAAC,CAAC;QAEvE,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,MAAc,EAAE,EAAE;YAC3C,+DAA+D;YAC/D,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,6DAA6D;IAC7D,6CAA6C;IAEtC,KAAK,CAAC,YAAY,CAAC,UAAkB,EAAE,QAAmB;QAC/D,MAAM,
|
|
1
|
+
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOrC,MAAM,OAAO,gBAAgB;IACpB,GAAG,CAAY;IACf,OAAO,GAAc,UAAU,CAAC;IAE/B,aAAa,CAAgB;IAErC,YAAY,EAAU;QACpB,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAgB,eAAe,CAAC,CAAC;QAEvE,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,MAAc,EAAE,EAAE;YAC3C,+DAA+D;YAC/D,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,6DAA6D;IAC7D,6CAA6C;IAEtC,KAAK,CAAC,YAAY,CAAC,UAAkB,EAAE,QAAmB;QAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAE3D,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;YACrC,MAAM,IAAI,GAAG;gBACX,UAAU;gBACV,MAAM;aACP,CAAC;YAEF,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF"}
|
|
@@ -3,9 +3,9 @@ import type { ServerRuntime, SocketNsp, WorkerRuntime } from '../types.js';
|
|
|
3
3
|
export declare class StatusNamespace {
|
|
4
4
|
nsp: Namespace;
|
|
5
5
|
nspName: SocketNsp;
|
|
6
|
+
private api;
|
|
6
7
|
private configService;
|
|
7
8
|
private pluginManager;
|
|
8
|
-
private frameManager;
|
|
9
9
|
private go2rtc;
|
|
10
10
|
private natsServer;
|
|
11
11
|
constructor(io: Server);
|
|
@@ -3,15 +3,15 @@ import { RUNTIME_STATUS } from '../../../services/config/types.js';
|
|
|
3
3
|
export class StatusNamespace {
|
|
4
4
|
nsp;
|
|
5
5
|
nspName = '/status';
|
|
6
|
+
api;
|
|
6
7
|
configService;
|
|
7
8
|
pluginManager;
|
|
8
|
-
frameManager;
|
|
9
9
|
go2rtc;
|
|
10
10
|
natsServer;
|
|
11
11
|
constructor(io) {
|
|
12
|
+
this.api = container.resolve('api');
|
|
12
13
|
this.configService = container.resolve('configService');
|
|
13
14
|
this.pluginManager = container.resolve('pluginManager');
|
|
14
|
-
this.frameManager = container.resolve('frameManager');
|
|
15
15
|
this.go2rtc = container.resolve('go2rtc');
|
|
16
16
|
this.natsServer = container.resolve('natsServer');
|
|
17
17
|
this.nsp = io.of(this.nspName);
|
|
@@ -33,8 +33,8 @@ export class StatusNamespace {
|
|
|
33
33
|
}
|
|
34
34
|
watchPluginStats(socket, payload, callback) {
|
|
35
35
|
const pluginWorkers = {};
|
|
36
|
-
Array.from(this.pluginManager.
|
|
37
|
-
pluginWorkers[
|
|
36
|
+
Array.from(this.pluginManager.plugins).map(([pluginName, plugin]) => {
|
|
37
|
+
pluginWorkers[pluginName] = { name: pluginName, status: plugin.worker.status };
|
|
38
38
|
});
|
|
39
39
|
socket.emit('plugin-process-status', pluginWorkers);
|
|
40
40
|
callback?.(pluginWorkers);
|
|
@@ -42,8 +42,10 @@ export class StatusNamespace {
|
|
|
42
42
|
}
|
|
43
43
|
watchFrameWorkerStats(socket, payload, callback) {
|
|
44
44
|
const frameWorkers = {};
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
const cameraControllers = this.api.getCameras();
|
|
46
|
+
cameraControllers.forEach((cameraController) => {
|
|
47
|
+
const frameWorker = cameraController.frameWorker;
|
|
48
|
+
frameWorkers[frameWorker.name] = { name: frameWorker.name, status: frameWorker.status };
|
|
47
49
|
});
|
|
48
50
|
socket.emit('frameworker-process-status', frameWorkers);
|
|
49
51
|
callback?.(frameWorkers);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAUnE,MAAM,OAAO,eAAe;IACnB,GAAG,CAAY;IACf,OAAO,GAAc,SAAS,CAAC;IAE9B,aAAa,CAAgB;IAC7B,aAAa,CAAgB;IAC7B,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/status.ts"],"names":[],"mappings":"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"}
|
package/dist/server/src/api.d.ts
CHANGED
|
@@ -3,7 +3,6 @@ import { EventEmitter } from 'node:events';
|
|
|
3
3
|
import { CameraController } from './camera/controller.js';
|
|
4
4
|
import type { Camera, CameraExtension } from '@camera.ui/types';
|
|
5
5
|
import type { CameraExtensions } from './api/database/types.js';
|
|
6
|
-
import type { FrameWorker } from './decoder/worker.js';
|
|
7
6
|
export declare enum API_EVENT {
|
|
8
7
|
FINISH_LAUNCHING = "finishLaunching",
|
|
9
8
|
SHUTDOWN = "shutdown"
|
|
@@ -15,23 +14,15 @@ export declare interface CameraUiAPI {
|
|
|
15
14
|
emit(event: 'shutdown'): boolean;
|
|
16
15
|
}
|
|
17
16
|
export declare class CameraUiAPI extends EventEmitter {
|
|
18
|
-
private
|
|
17
|
+
private cameraControllers;
|
|
19
18
|
constructor();
|
|
20
19
|
configureCameras(): Promise<void>;
|
|
21
|
-
addCamera(camera: Camera): Promise<
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}>;
|
|
25
|
-
getCamera(cameraId: string): {
|
|
26
|
-
controller: CameraController;
|
|
27
|
-
worker: FrameWorker;
|
|
28
|
-
} | undefined;
|
|
29
|
-
getCameras(pluginId?: string): {
|
|
30
|
-
controller: CameraController;
|
|
31
|
-
worker: FrameWorker;
|
|
32
|
-
}[];
|
|
20
|
+
addCamera(camera: Camera): Promise<CameraController>;
|
|
21
|
+
getCamera(cameraIdOrName: string): CameraController | undefined;
|
|
22
|
+
getCameras(pluginId?: string): CameraController[];
|
|
33
23
|
updateCamera(camera: Camera): void;
|
|
34
24
|
removeCamera(camera: Camera, extensions: CameraExtensions): Promise<void>;
|
|
35
25
|
selectCamera(pluginId: string, camera: Camera, extension: CameraExtension): void;
|
|
36
26
|
deselectCamera(pluginId: string, camera: Camera, extension: CameraExtension): void;
|
|
27
|
+
writeCameraLog(cameraId: string, msg: string): void;
|
|
37
28
|
}
|
package/dist/server/src/api.js
CHANGED
|
@@ -10,7 +10,7 @@ export var API_EVENT;
|
|
|
10
10
|
API_EVENT["SHUTDOWN"] = "shutdown";
|
|
11
11
|
})(API_EVENT || (API_EVENT = {}));
|
|
12
12
|
export class CameraUiAPI extends EventEmitter {
|
|
13
|
-
|
|
13
|
+
cameraControllers = new Map();
|
|
14
14
|
constructor() {
|
|
15
15
|
super();
|
|
16
16
|
container.registerInstance('api', this);
|
|
@@ -21,39 +21,41 @@ export class CameraUiAPI extends EventEmitter {
|
|
|
21
21
|
await Promise.all(cameras.map((camera) => this.addCamera(camera)));
|
|
22
22
|
}
|
|
23
23
|
async addCamera(camera) {
|
|
24
|
-
let
|
|
25
|
-
if (!
|
|
24
|
+
let cameraController = this.cameraControllers.get(camera._id);
|
|
25
|
+
if (!cameraController) {
|
|
26
26
|
const logger = container.resolve('logger');
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
cameraMap = { controller: cameraDevice, worker: frameWorker };
|
|
32
|
-
this.camerasMap.set(camera._id, cameraMap);
|
|
27
|
+
const cameraLogger = logger.createLogger({ prefix: camera.name });
|
|
28
|
+
cameraController = new CameraController(camera, cameraLogger);
|
|
29
|
+
await cameraController.frameWorker.start();
|
|
30
|
+
this.cameraControllers.set(camera._id, cameraController);
|
|
33
31
|
}
|
|
34
|
-
return
|
|
32
|
+
return cameraController;
|
|
35
33
|
}
|
|
36
|
-
getCamera(
|
|
37
|
-
|
|
34
|
+
getCamera(cameraIdOrName) {
|
|
35
|
+
let cameraController = this.cameraControllers.get(cameraIdOrName);
|
|
36
|
+
if (!cameraController) {
|
|
37
|
+
const cameras = Array.from(this.cameraControllers.values());
|
|
38
|
+
cameraController = cameras.find((cc) => cc.name === cameraIdOrName);
|
|
39
|
+
}
|
|
40
|
+
return cameraController;
|
|
38
41
|
}
|
|
39
42
|
getCameras(pluginId) {
|
|
40
|
-
const
|
|
43
|
+
const cameraController = Array.from(this.cameraControllers.values());
|
|
41
44
|
if (pluginId) {
|
|
42
|
-
return
|
|
45
|
+
return cameraController.filter((cc) => cc.pluginId === pluginId);
|
|
43
46
|
}
|
|
44
|
-
return
|
|
47
|
+
return cameraController;
|
|
45
48
|
}
|
|
46
49
|
updateCamera(camera) {
|
|
47
|
-
const
|
|
48
|
-
|
|
50
|
+
const cameraController = this.cameraControllers.get(camera._id);
|
|
51
|
+
cameraController?.updateCamera(camera);
|
|
49
52
|
}
|
|
50
53
|
async removeCamera(camera, extensions) {
|
|
51
|
-
const frameManager = container.resolve('frameManager');
|
|
52
54
|
const pluginsService = new PluginsService();
|
|
53
|
-
const
|
|
54
|
-
if (
|
|
55
|
-
|
|
56
|
-
await
|
|
55
|
+
const cameraController = this.cameraControllers.get(camera._id);
|
|
56
|
+
if (cameraController) {
|
|
57
|
+
cameraController.cleanup();
|
|
58
|
+
await cameraController.frameWorker.close();
|
|
57
59
|
for (const [extension, pluginName] of Object.entries(extensions)) {
|
|
58
60
|
if (extension !== 'plugins') {
|
|
59
61
|
const pluginNames = [];
|
|
@@ -71,20 +73,37 @@ export class CameraUiAPI extends EventEmitter {
|
|
|
71
73
|
}
|
|
72
74
|
}
|
|
73
75
|
}
|
|
74
|
-
this.
|
|
76
|
+
this.cameraControllers.delete(camera._id);
|
|
75
77
|
}
|
|
76
78
|
}
|
|
77
79
|
selectCamera(pluginId, camera, extension) {
|
|
80
|
+
if (camera.pluginId === pluginId) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
78
83
|
const proxyServer = container.resolve('proxy');
|
|
79
|
-
if (!this.
|
|
84
|
+
if (!this.cameraControllers.get(camera._id)) {
|
|
80
85
|
this.addCamera(camera);
|
|
81
86
|
}
|
|
82
87
|
proxyServer.publishDeviceManagerEvent(pluginId, 'cameraSelected', { camera, extension });
|
|
83
88
|
}
|
|
84
89
|
deselectCamera(pluginId, camera, extension) {
|
|
90
|
+
if (camera.pluginId === pluginId) {
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
85
93
|
const proxyServer = container.resolve('proxy');
|
|
94
|
+
const cameraController = this.cameraControllers.get(camera._id);
|
|
95
|
+
if (extension === 'motionDetection') {
|
|
96
|
+
cameraController?.updateState('motion', { state: false, detections: [] });
|
|
97
|
+
}
|
|
98
|
+
else if (extension === 'objectDetection') {
|
|
99
|
+
cameraController?.updateState('object', { detections: [] });
|
|
100
|
+
}
|
|
86
101
|
proxyServer.publishCameraEvent(camera._id, 'removed', undefined, `${camera._id}.camera.${pluginId}`);
|
|
87
102
|
proxyServer.publishDeviceManagerEvent(pluginId, 'cameraDeselected', { camera, extension });
|
|
88
103
|
}
|
|
104
|
+
writeCameraLog(cameraId, msg) {
|
|
105
|
+
const cameraController = this.cameraControllers.get(cameraId);
|
|
106
|
+
cameraController?.writeLog(msg);
|
|
107
|
+
}
|
|
89
108
|
}
|
|
90
109
|
//# sourceMappingURL=api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/api.ts"],"names":[],"mappings":"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"}
|