@camera.ui/server 0.0.14-alpha.2 → 0.0.14-alpha.4
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.DxR9TqNT.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{@vee-validate.CMWfUAIL.0.0.13.js → @vee-validate.DH43ss6R.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/@vueform.BEK-4lp8.0.0.14-alpha.4.js +1 -0
- package/dist/interface/@vueuse.0r_4ERfz.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Account.BKb5WCug.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Adminpanel.CV_YvWCC.0.0.14-alpha.4.js +2 -0
- package/dist/interface/Appearance.DHt3Aut6.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Backup.rY0lEVR6.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Camera.CtLcCWEv.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Cameras.CFeTbskA.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Camview.BtrGE5XA.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Config.qRLVQl_r.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Console.5Xw8RJIu.0.0.14-alpha.4.js +4 -0
- package/dist/interface/FirstSteps.Bc-g53Gw.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{NewCamera.Bj0fRtL4.0.0.13.js → NewCamera.CVpitp4W.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/Plugin.DQMR2bcj.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Plugins.BlnUOFH6.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Recordings.YR4raWR-.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Recordings.a9uscpmX.0.0.14-alpha.4.js +1 -0
- package/dist/interface/Settings.Bqtc0cQ3.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{System.ARC4u3oS.0.0.13.js → System.DLJuO_7K.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/User.LrBOLpvr.0.0.14-alpha.4.js +1 -0
- package/dist/interface/VConfigEditor.vue_vue_type_script_setup_true_lang.D7BKvf1P.0.0.14-alpha.4.js +2 -0
- package/dist/interface/VConsole.B6n_q1I4.0.0.14-alpha.4.js +1 -0
- package/dist/interface/VPlayer.Cse-EfS2.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{VPluginCard.DFLSjIDw.0.0.13.js → VPluginCard.BXBkPqIn.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/{ace-builds.DW_mO3FQ.0.0.13.js → ace-builds.DFZjdKko.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/dnd-core.BM-WmXXD.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{draggabilly.9bsDBvd2.0.0.13.js → draggabilly.B1sGLlkC.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/engine.io-client.C1WzcoRG.0.0.14-alpha.4.js +1 -0
- package/dist/interface/ev-emitter.BTd_mWjj.0.0.14-alpha.4.js +1 -0
- package/dist/interface/fast-deep-equal.HwPw-pxY.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{highlight.js.DhQG6_ss.0.0.13.js → highlight.js.0YB-0mi8.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/index.html +33 -33
- package/dist/interface/linkify-it.BFvjiZc3.0.0.14-alpha.4.js +1 -0
- package/dist/interface/main.V0WK2QMW.0.0.14-alpha.4.js +9 -0
- package/dist/interface/{markdown-it.CYBQYH34.0.0.13.js → markdown-it.BKNgIiXo.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/{nprogress.BFdCzr-7.0.0.13.js → nprogress.CyIg_Gxi.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/{pinia.Bga1JTi8.0.0.13.js → pinia.CecoA7CB.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/plugins.CXiJ27uA.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{qrcode.BcRvH17-.0.0.13.js → qrcode.DendPh0T.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/react-dnd-touch-backend.C5ABPVRb.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{rxjs.CmasQk-X.0.0.13.js → rxjs.CRxlDfq_.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/socket.io-client.DRrdPiqk.0.0.14-alpha.4.js +1 -0
- package/dist/interface/socket.io-parser.CgdzaAil.0.0.14-alpha.4.js +1 -0
- package/dist/interface/sw.js +1 -1
- package/dist/interface/system.CTiWjzrS.0.0.14-alpha.4.js +1 -0
- package/dist/interface/ui.DS0tO89R.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{unidragger.DdVxANhH.0.0.13.js → unidragger.D3rkYrUG.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/v-calendar.BsChHPaY.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{vee-validate.D2wCUJfh.0.0.13.js → vee-validate.pvxJMmMq.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/{vue-i18n.DryJT-yG.0.0.13.js → vue-i18n.CozUMf0M.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/vue-inline-svg.Dt8SW6Et.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{vue-router.DqihDWFz.0.0.13.js → vue-router.BvzGucu2.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/{vue3-apexcharts.BHMHoOx8.0.0.13.js → vue3-apexcharts.CVBbHYHw.0.0.14-alpha.4.js} +1 -1
- package/dist/interface/vue3-dnd.10LbMhwv.0.0.14-alpha.4.js +1 -0
- package/dist/interface/vue3-toastify.RTQ6RfPx.0.0.14-alpha.4.js +1 -0
- package/dist/interface/{vuetify.BenoxTsr.0.0.13.js → vuetify.h38bTLGK.0.0.14-alpha.4.js} +1 -1
- package/dist/server/bin/installer/linux.js +1 -1
- package/dist/server/bin/installer/linux.js.map +1 -1
- package/dist/server/package.json +5 -6
- package/dist/server/src/api/controllers/frameWorkers.controller.d.ts +0 -5
- package/dist/server/src/api/controllers/frameWorkers.controller.js.map +1 -1
- package/dist/server/src/api/controllers/plugins.controller.d.ts +2 -6
- package/dist/server/src/api/controllers/plugins.controller.js +2 -3
- package/dist/server/src/api/controllers/plugins.controller.js.map +1 -1
- package/dist/server/src/api/controllers/system.controller.js +6 -0
- package/dist/server/src/api/controllers/system.controller.js.map +1 -1
- package/dist/server/src/api/database/types.d.ts +5 -0
- package/dist/server/src/api/schemas/config.schema.d.ts +6 -6
- package/dist/server/src/api/schemas/go2rtc.schema.d.ts +84 -84
- package/dist/server/src/api/websocket/nsp/server.js +1 -1
- package/dist/server/src/api/websocket/nsp/server.js.map +1 -1
- package/dist/server/src/camera/controller.d.ts +0 -3
- package/dist/server/src/camera/controller.js +0 -6
- package/dist/server/src/camera/controller.js.map +1 -1
- package/dist/server/src/camera/device.d.ts +0 -1
- package/dist/server/src/camera/device.js +1 -2
- package/dist/server/src/camera/device.js.map +1 -1
- package/dist/server/src/camera/index.d.ts +0 -2
- package/dist/server/src/camera/index.js.map +1 -1
- package/dist/server/src/camera/streaming/peer-connection.d.ts +2 -1
- package/dist/server/src/camera/streaming/peer-connection.js +1 -1
- package/dist/server/src/camera/streaming/peer-connection.js.map +1 -1
- package/dist/server/src/camera/streaming/webrtc-connection.d.ts +1 -2
- package/dist/server/src/camera/streaming/webrtc-connection.js +2 -2
- package/dist/server/src/camera/streaming/webrtc-connection.js.map +1 -1
- package/dist/server/src/camera/streaming/werift-session.d.ts +1 -0
- package/dist/server/src/camera/streaming/werift-session.js +2 -4
- package/dist/server/src/camera/streaming/werift-session.js.map +1 -1
- package/dist/server/src/camera/types.d.ts +1 -0
- package/dist/server/src/camera/types.js.map +1 -1
- package/dist/server/src/index.d.ts +2 -0
- package/dist/server/src/index.js.map +1 -1
- package/dist/server/src/nats/index.d.ts +4 -1
- package/dist/server/src/nats/index.js +10 -0
- package/dist/server/src/nats/index.js.map +1 -1
- package/dist/server/src/nats/proxy/cameraDevice.d.ts +0 -3
- package/dist/server/src/nats/proxy/cameraDevice.js +0 -7
- package/dist/server/src/nats/proxy/cameraDevice.js.map +1 -1
- package/dist/server/src/nats/proxy/coreManager.d.ts +14 -0
- package/dist/server/src/nats/proxy/coreManager.js +63 -0
- package/dist/server/src/nats/proxy/coreManager.js.map +1 -0
- package/dist/server/src/nats/types.d.ts +25 -6
- package/dist/server/src/nats/websocket.js +3 -0
- package/dist/server/src/nats/websocket.js.map +1 -1
- package/dist/server/src/polyglot/node/decoder/child.js +44 -40
- package/dist/server/src/polyglot/node/decoder/child.js.map +1 -1
- package/dist/server/src/polyglot/node/plugins/child.js +4 -3
- package/dist/server/src/polyglot/node/plugins/child.js.map +1 -1
- package/dist/server/src/polyglot/node/plugins/pluginApi.d.ts +3 -0
- package/dist/server/src/polyglot/node/plugins/pluginApi.js +3 -0
- package/dist/server/src/polyglot/node/plugins/pluginApi.js.map +1 -1
- package/dist/server/src/polyglot/node/plugins/proxy/cameraDevice.d.ts +0 -3
- package/dist/server/src/polyglot/node/plugins/proxy/cameraDevice.js +0 -6
- package/dist/server/src/polyglot/node/plugins/proxy/cameraDevice.js.map +1 -1
- package/dist/server/src/polyglot/node/plugins/proxy/coreManager.d.ts +40 -0
- package/dist/server/src/polyglot/node/plugins/proxy/coreManager.js +105 -0
- package/dist/server/src/polyglot/node/plugins/proxy/coreManager.js.map +1 -0
- package/dist/server/src/polyglot/node/plugins/proxy/deviceManager.js +1 -3
- package/dist/server/src/polyglot/node/plugins/proxy/deviceManager.js.map +1 -1
- package/dist/server/src/polyglot/python/camera_ui_types/__init__.py +9 -2
- package/dist/server/src/polyglot/python/decoder/child.py +47 -39
- package/dist/server/src/polyglot/python/plugins/child.py +7 -4
- package/dist/server/src/polyglot/python/plugins/plugin_api.py +2 -0
- package/dist/server/src/polyglot/python/plugins/proxy/camera_device.py +0 -7
- package/dist/server/src/polyglot/python/plugins/proxy/core_manager.py +145 -0
- package/dist/server/src/polyglot/python/plugins/typings.py +2 -3
- package/package.json +5 -6
- package/dist/interface/@tanstack.rNNqDXib.0.0.13.js +0 -1
- package/dist/interface/@vueform.CaTOdvWk.0.0.13.js +0 -1
- package/dist/interface/@vueuse.RXnPbHnz.0.0.13.js +0 -1
- package/dist/interface/Account.PfEWxAFM.0.0.13.js +0 -1
- package/dist/interface/Adminpanel.CcWcIKUA.0.0.13.js +0 -2
- package/dist/interface/Appearance.C7FMN0Df.0.0.13.js +0 -1
- package/dist/interface/Backup.CBhLiyDH.0.0.13.js +0 -1
- package/dist/interface/Camera.CAY4hEbY.0.0.13.js +0 -1
- package/dist/interface/Cameras.DehQ2Kr-.0.0.13.js +0 -1
- package/dist/interface/Camview.BgVFhaOD.0.0.13.js +0 -1
- package/dist/interface/Config.Bi4TsfDK.0.0.13.js +0 -1
- package/dist/interface/Console.DCZ7CAsZ.0.0.13.js +0 -4
- package/dist/interface/FirstSteps.Dk4PJeYm.0.0.13.js +0 -1
- package/dist/interface/Plugin.DgEI_yw3.0.0.13.js +0 -1
- package/dist/interface/Plugins.DPDGR4C9.0.0.13.js +0 -1
- package/dist/interface/Recordings.BNMvS0Zl.0.0.13.js +0 -1
- package/dist/interface/Recordings.Dia3EI7d.0.0.13.js +0 -1
- package/dist/interface/Settings.CJSuquSl.0.0.13.js +0 -1
- package/dist/interface/User.BaEc6hd_.0.0.13.js +0 -1
- package/dist/interface/VConfigEditor.vue_vue_type_script_setup_true_lang.Bm5SFyqC.0.0.13.js +0 -2
- package/dist/interface/VConsole.C_HPGX9O.0.0.13.js +0 -1
- package/dist/interface/VPlayer.BpY-Monz.0.0.13.js +0 -1
- package/dist/interface/dnd-core.gediqdsP.0.0.13.js +0 -1
- package/dist/interface/engine.io-client.jWnV_OQN.0.0.13.js +0 -1
- package/dist/interface/ev-emitter.BnUBws8R.0.0.13.js +0 -1
- package/dist/interface/fast-deep-equal.ChQuHYG8.0.0.13.js +0 -1
- package/dist/interface/linkify-it.CGqg1utY.0.0.13.js +0 -1
- package/dist/interface/main.DjqbBtoK.0.0.13.js +0 -9
- package/dist/interface/plugins.DAiWoszy.0.0.13.js +0 -1
- package/dist/interface/react-dnd-touch-backend.Ch5f5vRm.0.0.13.js +0 -1
- package/dist/interface/socket.io-client.C_MSFRzn.0.0.13.js +0 -1
- package/dist/interface/socket.io-parser.DoUhVOYo.0.0.13.js +0 -1
- package/dist/interface/system.CJaTvmhD.0.0.13.js +0 -1
- package/dist/interface/ui.Bnc_R-SN.0.0.13.js +0 -1
- package/dist/interface/v-calendar.CxnDxlOi.0.0.13.js +0 -1
- package/dist/interface/vue-inline-svg.va799EvK.0.0.13.js +0 -1
- package/dist/interface/vue3-dnd.ZjtawZir.0.0.13.js +0 -1
- package/dist/interface/vue3-toastify.CudLrsQ6.0.0.13.js +0 -1
- package/install/lmdb.js +0 -81
- /package/dist/interface/{@babel.l0sNRNKZ.0.0.13.js → @babel.l0sNRNKZ.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{@intlify.YW_pt133.0.0.13.js → @intlify.YW_pt133.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{@mdi.jq8isxax.0.0.13.js → @mdi.jq8isxax.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{@popperjs.BQBsAJpH.0.0.13.js → @popperjs.BQBsAJpH.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{@react-dnd.CcwRs9xb.0.0.13.js → @react-dnd.CcwRs9xb.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{@socket.io.Dkula2eQ.0.0.13.js → @socket.io.Dkula2eQ.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{@vue.CIFymae3.0.0.13.js → @vue.CIFymae3.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{@xterm.hsdrI-pt.0.0.13.js → @xterm.B_cEcIAu.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/assets/{@vueform.0.0.13.h7tNX9p6.css → @vueform.0.0.14-alpha.4.h7tNX9p6.css} +0 -0
- /package/dist/interface/assets/{@xterm.0.0.13.CGrrDQr5.css → @xterm.0.0.14-alpha.4.CGrrDQr5.css} +0 -0
- /package/dist/interface/assets/{Account.0.0.13.DlOUWknb.css → Account.0.0.14-alpha.4.DlOUWknb.css} +0 -0
- /package/dist/interface/assets/{Adminpanel.0.0.13.BHh3IMeu.css → Adminpanel.0.0.14-alpha.4.BHh3IMeu.css} +0 -0
- /package/dist/interface/assets/{Backup.0.0.13.BIwaSlv3.css → Backup.0.0.14-alpha.4.BIwaSlv3.css} +0 -0
- /package/dist/interface/assets/{Camera.0.0.13.B5hAZmeQ.css → Camera.0.0.14-alpha.4.B5hAZmeQ.css} +0 -0
- /package/dist/interface/assets/{Cameras.0.0.13.D7bnvH42.css → Cameras.0.0.14-alpha.4.D7bnvH42.css} +0 -0
- /package/dist/interface/assets/{Camview.0.0.13.cgjDTjXy.css → Camview.0.0.14-alpha.4.cgjDTjXy.css} +0 -0
- /package/dist/interface/assets/{Config.0.0.13.CncRTcjC.css → Config.0.0.14-alpha.4.CncRTcjC.css} +0 -0
- /package/dist/interface/assets/{Console.0.0.13.DWrfRWs9.css → Console.0.0.14-alpha.4.DWrfRWs9.css} +0 -0
- /package/dist/interface/assets/{FirstSteps.0.0.13.LZWhAsRR.css → FirstSteps.0.0.14-alpha.4.LZWhAsRR.css} +0 -0
- /package/dist/interface/assets/{NewCamera.0.0.13.DJ3tUBT_.css → NewCamera.0.0.14-alpha.4.DJ3tUBT_.css} +0 -0
- /package/dist/interface/assets/{Plugin.0.0.13.BGZE7hpr.css → Plugin.0.0.14-alpha.4.BGZE7hpr.css} +0 -0
- /package/dist/interface/assets/{Plugins.0.0.13.Cwu0aGUO.css → Plugins.0.0.14-alpha.4.Cwu0aGUO.css} +0 -0
- /package/dist/interface/assets/{Settings.0.0.13.BfSP_zcY.css → Settings.0.0.14-alpha.4.BfSP_zcY.css} +0 -0
- /package/dist/interface/assets/{User.0.0.13.BHWFyck9.css → User.0.0.14-alpha.4.BHWFyck9.css} +0 -0
- /package/dist/interface/assets/{VConsole.0.0.13.BZT1WyS-.css → VConsole.0.0.14-alpha.4.BZT1WyS-.css} +0 -0
- /package/dist/interface/assets/{VPlayer.0.0.13.H4sGdlHU.css → VPlayer.0.0.14-alpha.4.H4sGdlHU.css} +0 -0
- /package/dist/interface/assets/{VPluginCard.0.0.13.B4G51MYn.css → VPluginCard.0.0.14-alpha.4.B4G51MYn.css} +0 -0
- /package/dist/interface/assets/{highlight.0.0.13.DgoK_Xib.css → highlight.0.0.14-alpha.4.DgoK_Xib.css} +0 -0
- /package/dist/interface/assets/{logo-256.0.0.13.BCQk9H1-.png → logo-256.0.0.14-alpha.4.BCQk9H1-.png} +0 -0
- /package/dist/interface/assets/{logo-512.0.0.13.DLKVOU2S.png → logo-512.0.0.14-alpha.4.DLKVOU2S.png} +0 -0
- /package/dist/interface/assets/{logo.0.0.13.DmEiRk0z.png → logo.0.0.14-alpha.4.DmEiRk0z.png} +0 -0
- /package/dist/interface/assets/{main.0.0.13.BPl82sqN.css → main.0.0.14-alpha.4.BPl82sqN.css} +0 -0
- /package/dist/interface/assets/{mode-json.0.0.13.Br7xisR1.js → mode-json.0.0.14-alpha.4.Br7xisR1.js} +0 -0
- /package/dist/interface/assets/{mode-yaml.0.0.13.CIYL8U3d.js → mode-yaml.0.0.14-alpha.4.CIYL8U3d.js} +0 -0
- /package/dist/interface/assets/{v-calendar.0.0.13.CtSuDYZU.css → v-calendar.0.0.14-alpha.4.CtSuDYZU.css} +0 -0
- /package/dist/interface/assets/{vue3-toastify.0.0.13.DTY1DMRs.css → vue3-toastify.0.0.14-alpha.4.DTY1DMRs.css} +0 -0
- /package/dist/interface/assets/{vuetify.0.0.13.DPyVfAPv.css → vuetify.0.0.14-alpha.4.DPyVfAPv.css} +0 -0
- /package/dist/interface/{axios.BI2i94Vb.0.0.13.js → axios.BI2i94Vb.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{compare-versions.DqEOhma6.0.0.13.js → compare-versions.DqEOhma6.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{dijkstrajs.D_NXgYpA.0.0.13.js → dijkstrajs.D_NXgYpA.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{engine.io-parser.BiEtp6m2.0.0.13.js → engine.io-parser.BiEtp6m2.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{entities.C20TfXL6.0.0.13.js → entities.C20TfXL6.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{get-size.D1dS-IaP.0.0.13.js → get-size.D1dS-IaP.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{mdurl.k9Sl0PQj.0.0.13.js → mdurl.k9Sl0PQj.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{punycode.js.Dj65hjkv.0.0.13.js → punycode.js.Dj65hjkv.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{react-dnd-html5-backend.1HQjlkwI.0.0.13.js → react-dnd-html5-backend.1HQjlkwI.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{redux.CuxFRhX_.0.0.13.js → redux.CuxFRhX_.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{tslib.9k7AwCpt.0.0.13.js → tslib.9k7AwCpt.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{uc.micro.kMc2yuuw.0.0.13.js → uc.micro.kMc2yuuw.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{utils.BvINh1mj.0.0.13.js → utils.BvINh1mj.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{uuid.DvF23Exx.0.0.13.js → uuid.DvF23Exx.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{vue.l0sNRNKZ.0.0.13.js → vue.l0sNRNKZ.0.0.14-alpha.4.js} +0 -0
- /package/dist/interface/{zod.BaF2dDCd.0.0.13.js → zod.BaF2dDCd.0.0.14-alpha.4.js} +0 -0
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { EventEmitter } from 'node:events';
|
|
2
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
3
|
+
import { API_EVENT } from '../../../../api.js';
|
|
4
|
+
import { ProxyConnection } from '../../../../nats/connection.js';
|
|
5
|
+
import { MessageQueue } from '../../../../nats/messageQueue.js';
|
|
6
|
+
import { unpack } from '../../../../utils/packer.js';
|
|
7
|
+
export class CoreManagerProxy extends EventEmitter {
|
|
8
|
+
api;
|
|
9
|
+
logger;
|
|
10
|
+
initialized = false;
|
|
11
|
+
subject;
|
|
12
|
+
cmSubject;
|
|
13
|
+
publisher;
|
|
14
|
+
dmPublisher;
|
|
15
|
+
subscriber;
|
|
16
|
+
dmSubscriber;
|
|
17
|
+
messageQueue;
|
|
18
|
+
auth;
|
|
19
|
+
proxyEndpoints;
|
|
20
|
+
plugin;
|
|
21
|
+
constructor(api, logger, plugin, proxyEndpoints, auth) {
|
|
22
|
+
super();
|
|
23
|
+
this.api = api;
|
|
24
|
+
this.logger = logger;
|
|
25
|
+
this.auth = auth;
|
|
26
|
+
this.proxyEndpoints = proxyEndpoints;
|
|
27
|
+
this.plugin = plugin;
|
|
28
|
+
this.subject = `${this.plugin.id}.coreManager`;
|
|
29
|
+
this.cmSubject = 'coreManager.subscriber';
|
|
30
|
+
// console.log('CoreManager', this.pluginName, this.dealerId, this.subscriberIds);
|
|
31
|
+
this.api.once(API_EVENT.SHUTDOWN, this.close.bind(this));
|
|
32
|
+
}
|
|
33
|
+
async init() {
|
|
34
|
+
if (this.initialized) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
this.initialized = true;
|
|
38
|
+
const servers = this.proxyEndpoints.filter((endpoint) => endpoint.startsWith('nats://'));
|
|
39
|
+
this.publisher = new ProxyConnection(this.subject, servers, this.auth);
|
|
40
|
+
await this.publisher.connect();
|
|
41
|
+
this.dmPublisher = new ProxyConnection(this.cmSubject, servers, this.auth);
|
|
42
|
+
await this.dmPublisher.connect();
|
|
43
|
+
this.subscriber = this.publisher.subscribe(this.subject);
|
|
44
|
+
this.messageQueue = new MessageQueue('client', this.publisher, this.subscriber, this.logger, this.requestHandler.bind(this));
|
|
45
|
+
this.dmSubscriber = this.dmPublisher.subscribe(this.cmSubject);
|
|
46
|
+
this.dmSubscriber.on('message', this.onProxyMessage.bind(this));
|
|
47
|
+
}
|
|
48
|
+
async getFFmpegPath() {
|
|
49
|
+
return await this.onRequest('getFFmpegPath');
|
|
50
|
+
}
|
|
51
|
+
async getServerAddresses() {
|
|
52
|
+
return await this.onRequest('getServerAddresses');
|
|
53
|
+
}
|
|
54
|
+
async getIceServers() {
|
|
55
|
+
return await this.onRequest('getIceServers');
|
|
56
|
+
}
|
|
57
|
+
emit() {
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
61
|
+
requestHandler(message) { }
|
|
62
|
+
async emitEvent(message) {
|
|
63
|
+
switch (message.type) {
|
|
64
|
+
case 'systemUpdated': {
|
|
65
|
+
const { system } = message.data;
|
|
66
|
+
super.emit(message.type, system);
|
|
67
|
+
break;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
async onProxyMessage(msg) {
|
|
72
|
+
if (!this.initialized) {
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
const message = unpack(msg.data);
|
|
76
|
+
this.emitEvent(message);
|
|
77
|
+
}
|
|
78
|
+
onRequest(fn, args, timeout = 5000) {
|
|
79
|
+
if (!this.messageQueue) {
|
|
80
|
+
throw new Error('Message queue is not initialized');
|
|
81
|
+
}
|
|
82
|
+
const payload = {
|
|
83
|
+
requestId: uuidv4(),
|
|
84
|
+
targetId: this.subject,
|
|
85
|
+
targetName: this.plugin.name,
|
|
86
|
+
pluginId: this.plugin.id,
|
|
87
|
+
type: 'request',
|
|
88
|
+
proxy: 'core',
|
|
89
|
+
client: 'cameraFn',
|
|
90
|
+
fn,
|
|
91
|
+
args: args || [],
|
|
92
|
+
timestamp: Date.now(),
|
|
93
|
+
timeout,
|
|
94
|
+
};
|
|
95
|
+
return this.messageQueue.enqueue(payload);
|
|
96
|
+
}
|
|
97
|
+
async close() {
|
|
98
|
+
this.initialized = false;
|
|
99
|
+
this.removeAllListeners();
|
|
100
|
+
this.api.removeListener('shutdown', this.close.bind(this));
|
|
101
|
+
this.messageQueue?.abortQueue();
|
|
102
|
+
await Promise.allSettled([this.publisher?.close(), this.dmPublisher?.close()]);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
//# sourceMappingURL=coreManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"coreManager.js","sourceRoot":"","sources":["../../../../../../../src/polyglot/node/plugins/proxy/coreManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -90,9 +90,7 @@ export class DeviceManagerProxy extends EventEmitter {
|
|
|
90
90
|
cameraDevices.forEach((cameraDevice) => this.devices.set(cameraDevice.id, cameraDevice));
|
|
91
91
|
}
|
|
92
92
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
93
|
-
requestHandler(message) {
|
|
94
|
-
//
|
|
95
|
-
}
|
|
93
|
+
requestHandler(message) { }
|
|
96
94
|
async emitEvent(message) {
|
|
97
95
|
switch (message.type) {
|
|
98
96
|
case 'cameraSelected': {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceManager.js","sourceRoot":"","sources":["../../../../../../../src/polyglot/node/plugins/proxy/deviceManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"deviceManager.js","sourceRoot":"","sources":["../../../../../../../src/polyglot/node/plugins/proxy/deviceManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -806,8 +806,6 @@ class CameraDevice(Protocol):
|
|
|
806
806
|
async def snapshot(self, force_new: Optional[bool] = None) -> Optional[bytes]: ...
|
|
807
807
|
async def get_frames(self, prebuffer_duration: int = 0) -> AsyncGenerator[VideoFrame, None]: ...
|
|
808
808
|
async def get_motion_frames(self) -> AsyncGenerator[MotionFrame, None]: ...
|
|
809
|
-
async def get_ffmpeg_path(self) -> str: ...
|
|
810
|
-
async def get_ice_servers(self) -> list[IceServer]: ...
|
|
811
809
|
|
|
812
810
|
async def get_value(
|
|
813
811
|
self, state_name: str
|
|
@@ -953,6 +951,14 @@ CameraDeselectedCallback = Union[
|
|
|
953
951
|
]
|
|
954
952
|
|
|
955
953
|
|
|
954
|
+
# CoreManager
|
|
955
|
+
@runtime_checkable
|
|
956
|
+
class CoreManager(Protocol):
|
|
957
|
+
async def get_ffmpeg_path(self) -> str: ...
|
|
958
|
+
async def get_ice_servers(self) -> list[IceServer]: ...
|
|
959
|
+
async def get_server_addresses(self) -> list[str]: ...
|
|
960
|
+
|
|
961
|
+
|
|
956
962
|
# DeviceManager
|
|
957
963
|
DeviceManagerEventType = Literal[
|
|
958
964
|
"cameraSelected",
|
|
@@ -1096,6 +1102,7 @@ class PluginAPI(Protocol[PA]):
|
|
|
1096
1102
|
config_file: str
|
|
1097
1103
|
config_service: PluginConfigService
|
|
1098
1104
|
storage_controller: StorageController[PA]
|
|
1105
|
+
core_manager: CoreManager
|
|
1099
1106
|
device_manager: DeviceManager
|
|
1100
1107
|
|
|
1101
1108
|
def on(self, event: APIEventType, listener: Callback) -> "PluginAPI": ...
|
|
@@ -37,40 +37,46 @@ from utilities.packer import pack, unpack
|
|
|
37
37
|
from utilities.subscriptions import ProxySubscription
|
|
38
38
|
from utilities.task import TaskSet
|
|
39
39
|
|
|
40
|
-
config: BaseFrameWorkerConfig = {
|
|
41
|
-
"frameWorkerId": os.environ["FRAME_WORKER_ID"],
|
|
42
|
-
"cameraId": os.environ["CAMERA_ID"],
|
|
43
|
-
"cameraName": os.environ["CAMERA_NAME"],
|
|
44
|
-
"ffmpegPath": os.environ["FFMPEG_PATH"],
|
|
45
|
-
"logLevel": os.environ.get("LOGGER_LEVEL") or "debug",
|
|
46
|
-
"disableTimestamps": os.environ.get("LOGGER_DISABLE_TIMESTAMPS") == "true",
|
|
47
|
-
"auth": {
|
|
48
|
-
"user": os.environ["PROXY_USER"],
|
|
49
|
-
"password": os.environ["PROXY_PASSWORD"],
|
|
50
|
-
},
|
|
51
|
-
"proxyEndpoints": [endpoint for endpoint in os.environ["PROXY_ENDPOINTS"].split(",")],
|
|
52
|
-
"fps": int(os.environ["FPS"]) if "FPS" in os.environ else 10,
|
|
53
|
-
"resolution": int(os.environ["RESOLUTION"]) if "RESOLUTION" in os.environ else 640,
|
|
54
|
-
}
|
|
55
|
-
|
|
56
40
|
PIX_FMT: Literal["yuv420p", "rgb24"] = "yuv420p"
|
|
57
41
|
|
|
58
42
|
|
|
59
43
|
class FrameWorkerChild:
|
|
60
44
|
def __init__(self):
|
|
61
|
-
self.
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
45
|
+
self.config: BaseFrameWorkerConfig = {
|
|
46
|
+
"frameWorkerId": os.environ["FRAME_WORKER_ID"],
|
|
47
|
+
"cameraId": os.environ["CAMERA_ID"],
|
|
48
|
+
"cameraName": os.environ["CAMERA_NAME"],
|
|
49
|
+
"ffmpegPath": os.environ["FFMPEG_PATH"],
|
|
50
|
+
"logLevel": os.environ.get("LOGGER_LEVEL") or "debug",
|
|
51
|
+
"disableTimestamps": os.environ.get("LOGGER_DISABLE_TIMESTAMPS") == "true",
|
|
52
|
+
"auth": {
|
|
53
|
+
"user": os.environ["PROXY_USER"],
|
|
54
|
+
"password": os.environ["PROXY_PASSWORD"],
|
|
55
|
+
},
|
|
56
|
+
"proxyEndpoints": [endpoint for endpoint in os.environ["PROXY_ENDPOINTS"].split(",")],
|
|
57
|
+
"fps": int(os.environ["FPS"]) if "FPS" in os.environ else 10,
|
|
58
|
+
"resolution": int(os.environ["RESOLUTION"]) if "RESOLUTION" in os.environ else 640,
|
|
59
|
+
}
|
|
68
60
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
61
|
+
del os.environ["FRAME_WORKER_ID"]
|
|
62
|
+
del os.environ["CAMERA_ID"]
|
|
63
|
+
del os.environ["CAMERA_NAME"]
|
|
64
|
+
del os.environ["FFMPEG_PATH"]
|
|
65
|
+
del os.environ["PROXY_USER"]
|
|
66
|
+
del os.environ["PROXY_PASSWORD"]
|
|
67
|
+
del os.environ["PROXY_ENDPOINTS"]
|
|
68
|
+
del os.environ["FPS"]
|
|
69
|
+
del os.environ["RESOLUTION"]
|
|
70
|
+
|
|
71
|
+
self.logger = PluginLogger("Frame Worker", self.config["disableTimestamps"])
|
|
72
|
+
self.logger.debug_enabled = self.config["logLevel"] == "debug" or self.config["logLevel"] == "trace"
|
|
73
|
+
self.logger.trace_enabled = self.config["logLevel"] == "trace"
|
|
74
|
+
|
|
75
|
+
self.subject = f"{self.config['frameWorkerId']}.frameWorkerChild"
|
|
76
|
+
self.ipc_subject = f"{self.config['frameWorkerId']}.frameWorker"
|
|
77
|
+
self.image_subject = f"{self.config['cameraId']}.frameGenerator"
|
|
78
|
+
self.signaling_subject = f"{self.config['cameraId']}.frameGenerator.signaling"
|
|
79
|
+
self.frame_subject = f"{self.config['cameraId']}.frameReceiver"
|
|
74
80
|
|
|
75
81
|
self.publisher: Optional[ProxyConnection] = None
|
|
76
82
|
self.signaling_publisher: Optional[ProxyConnection] = None
|
|
@@ -124,18 +130,18 @@ class FrameWorkerChild:
|
|
|
124
130
|
async def listen(self) -> None:
|
|
125
131
|
self.setup_signal_handlers()
|
|
126
132
|
|
|
127
|
-
servers = [endpoint for endpoint in config["proxyEndpoints"] if endpoint.startswith("nats://")]
|
|
133
|
+
servers = [endpoint for endpoint in self.config["proxyEndpoints"] if endpoint.startswith("nats://")]
|
|
128
134
|
|
|
129
|
-
self.publisher = ProxyConnection(self.subject, servers, config["auth"])
|
|
135
|
+
self.publisher = ProxyConnection(self.subject, servers, self.config["auth"])
|
|
130
136
|
await self.publisher.connect()
|
|
131
137
|
|
|
132
|
-
self.image_publisher = ProxyConnection(self.image_subject, servers, config["auth"])
|
|
138
|
+
self.image_publisher = ProxyConnection(self.image_subject, servers, self.config["auth"])
|
|
133
139
|
await self.image_publisher.connect()
|
|
134
140
|
|
|
135
|
-
self.frame_publisher = ProxyConnection(self.frame_subject, servers, config["auth"])
|
|
141
|
+
self.frame_publisher = ProxyConnection(self.frame_subject, servers, self.config["auth"])
|
|
136
142
|
await self.frame_publisher.connect()
|
|
137
143
|
|
|
138
|
-
self.signaling_publisher = ProxyConnection(self.signaling_subject, servers, config["auth"])
|
|
144
|
+
self.signaling_publisher = ProxyConnection(self.signaling_subject, servers, self.config["auth"])
|
|
139
145
|
await self.signaling_publisher.connect()
|
|
140
146
|
|
|
141
147
|
self.subscriber = await self.publisher.subscribe(subject=self.subject)
|
|
@@ -268,7 +274,7 @@ class FrameWorkerChild:
|
|
|
268
274
|
"-threads",
|
|
269
275
|
ffmpeg_args["threads"],
|
|
270
276
|
"-vf",
|
|
271
|
-
f"showinfo=checksum=0,{ffmpeg_args['hwaccelFilter'].replace('640', str(config['resolution']))},fps=fps={config['fps']}",
|
|
277
|
+
f"showinfo=checksum=0,{ffmpeg_args['hwaccelFilter'].replace('640', str(self.config['resolution']))},fps=fps={self.config['fps']}",
|
|
272
278
|
"-an",
|
|
273
279
|
"-dn",
|
|
274
280
|
"-sn",
|
|
@@ -287,7 +293,9 @@ class FrameWorkerChild:
|
|
|
287
293
|
if not response:
|
|
288
294
|
raise Exception("Error getting FFmpeg args from main process")
|
|
289
295
|
|
|
290
|
-
args = self.build_ffmpeg_args(
|
|
296
|
+
args = self.build_ffmpeg_args(
|
|
297
|
+
self.config["ffmpegPath"], response["cameraSource"], response["ffmpegArgs"]
|
|
298
|
+
)
|
|
291
299
|
|
|
292
300
|
self.logger.debug(f"{self.log_prefix} Starting FFmpeg process: {' '.join(args)}")
|
|
293
301
|
|
|
@@ -495,7 +503,7 @@ class FrameWorkerChild:
|
|
|
495
503
|
return None
|
|
496
504
|
|
|
497
505
|
width, height = map(int, matches["s"].split("x"))
|
|
498
|
-
new_width = config["resolution"]
|
|
506
|
+
new_width = self.config["resolution"]
|
|
499
507
|
new_height = round((new_width * height) / width)
|
|
500
508
|
format: DecoderFormat = "yuv" if PIX_FMT == "yuv420p" else "rgb"
|
|
501
509
|
bytes_per_pixel = 1.5 if format == "yuv" else 3
|
|
@@ -605,7 +613,7 @@ class FrameWorkerChild:
|
|
|
605
613
|
async def disconnect_all_clients(self) -> None:
|
|
606
614
|
for client in self.clients.values():
|
|
607
615
|
for request_id in client.request_ids:
|
|
608
|
-
await self.disconnect_client(self.
|
|
616
|
+
await self.disconnect_client(self.config["cameraId"], client.plugin_id, request_id)
|
|
609
617
|
|
|
610
618
|
async def handle_connect_message(self, message: SignalingRequest) -> None:
|
|
611
619
|
await self.add_client(message["pluginId"], message["requestId"])
|
|
@@ -760,7 +768,7 @@ class FrameWorkerChild:
|
|
|
760
768
|
return self.prebuffer_container[target_index]
|
|
761
769
|
|
|
762
770
|
def find_nearest_frame(self, frame_data: FrameData) -> Optional[PrebufferContainer]:
|
|
763
|
-
max_time_diff = self.max_diff_frame * (1000 / config["fps"])
|
|
771
|
+
max_time_diff = self.max_diff_frame * (1000 / self.config["fps"])
|
|
764
772
|
|
|
765
773
|
nearest_frame = None
|
|
766
774
|
min_time_diff = float("inf")
|
|
@@ -777,7 +785,7 @@ class FrameWorkerChild:
|
|
|
777
785
|
return nearest_frame
|
|
778
786
|
|
|
779
787
|
def find_nearest_frame_by_time(self, target_time: float) -> Optional[PrebufferContainer]:
|
|
780
|
-
max_time_diff = (self.max_diff_frame / config["fps"]) * 1000
|
|
788
|
+
max_time_diff = (self.max_diff_frame / self.config["fps"]) * 1000
|
|
781
789
|
nearest_frame = None
|
|
782
790
|
min_diff = float("inf")
|
|
783
791
|
|
|
@@ -140,10 +140,10 @@ class PluginChild:
|
|
|
140
140
|
plugin_info, storage_path, config_file, self.logger, self.proxy_endpoints, self.auth
|
|
141
141
|
)
|
|
142
142
|
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
143
|
+
await asyncio.gather(
|
|
144
|
+
self.api.core_manager.init(),
|
|
145
|
+
self.api.device_manager.init(),
|
|
146
|
+
)
|
|
147
147
|
|
|
148
148
|
cameras_devices = [
|
|
149
149
|
CameraDeviceProxy(
|
|
@@ -159,6 +159,9 @@ class PluginChild:
|
|
|
159
159
|
|
|
160
160
|
await asyncio.gather(*(camera_device.init() for camera_device in cameras_devices))
|
|
161
161
|
|
|
162
|
+
plugin_constructor = self.load_plugin()
|
|
163
|
+
self.plugin = cast(BasePlugin, plugin_constructor(self.logger, self.api))
|
|
164
|
+
|
|
162
165
|
self.api.device_manager.configure_cameras(cameras_devices)
|
|
163
166
|
self.plugin.configure_cameras(cast(list[CameraDevice], cameras_devices))
|
|
164
167
|
|
|
@@ -17,6 +17,7 @@ class PluginAPI(AsyncIOEventEmitter):
|
|
|
17
17
|
) -> None:
|
|
18
18
|
super().__init__()
|
|
19
19
|
|
|
20
|
+
from proxy.core_manager import CoreManager
|
|
20
21
|
from proxy.device_manager import DeviceManager
|
|
21
22
|
from storage_controller import StorageController
|
|
22
23
|
|
|
@@ -25,4 +26,5 @@ class PluginAPI(AsyncIOEventEmitter):
|
|
|
25
26
|
|
|
26
27
|
self.config_service = PluginConfigService(config_file)
|
|
27
28
|
self.storage_controller = StorageController(self)
|
|
29
|
+
self.core_manager = CoreManager(self, logger, plugin, proxy_endpoints, auth)
|
|
28
30
|
self.device_manager = DeviceManager(self, logger, plugin, proxy_endpoints, auth)
|
|
@@ -40,7 +40,6 @@ from camera_ui_types import (
|
|
|
40
40
|
FrameData,
|
|
41
41
|
FrameMetadata,
|
|
42
42
|
FrameState,
|
|
43
|
-
IceServer,
|
|
44
43
|
LightSetEvent,
|
|
45
44
|
LightState,
|
|
46
45
|
MotionSetEvent,
|
|
@@ -517,12 +516,6 @@ class CameraDeviceProxy:
|
|
|
517
516
|
if self.active_motion_requests <= 0:
|
|
518
517
|
self.tasks.add(self.__close_motion_frame_subscriber())
|
|
519
518
|
|
|
520
|
-
async def get_ffmpeg_path(self) -> str:
|
|
521
|
-
return await self.on_request("cameraFn", "getFfmpegPath")
|
|
522
|
-
|
|
523
|
-
async def get_ice_servers(self) -> list[IceServer]:
|
|
524
|
-
return await self.on_request("cameraFn", "getIceServers")
|
|
525
|
-
|
|
526
519
|
@overload
|
|
527
520
|
def get_value(self, state_name: Literal["light"]) -> LightState: ...
|
|
528
521
|
@overload
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
from contextlib import suppress
|
|
2
|
+
from datetime import datetime
|
|
3
|
+
from typing import Any, Optional
|
|
4
|
+
from uuid import uuid4
|
|
5
|
+
|
|
6
|
+
from camera_ui_types import IceServer
|
|
7
|
+
from decoder.typings import AuthConfig
|
|
8
|
+
from message_queue import MessageQueue
|
|
9
|
+
from nats.aio.msg import Msg
|
|
10
|
+
from plugin_api import PluginAPI
|
|
11
|
+
from plugin_logger import PluginLogger
|
|
12
|
+
from pyeecui.asyncio import AsyncIOEventEmitter
|
|
13
|
+
from typings import PluginInfo, ProxyMessageStructure
|
|
14
|
+
from utilities.connection import ProxyConnection
|
|
15
|
+
from utilities.packer import unpack
|
|
16
|
+
from utilities.subscriptions import ProxySubscription
|
|
17
|
+
from utilities.task import TaskSet
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
class CoreManager(AsyncIOEventEmitter):
|
|
21
|
+
def __init__(
|
|
22
|
+
self,
|
|
23
|
+
api: PluginAPI,
|
|
24
|
+
logger: PluginLogger,
|
|
25
|
+
plugin: PluginInfo,
|
|
26
|
+
proxy_endpoints: list[str],
|
|
27
|
+
auth: AuthConfig,
|
|
28
|
+
):
|
|
29
|
+
super().__init__()
|
|
30
|
+
|
|
31
|
+
self.initialized = False
|
|
32
|
+
|
|
33
|
+
self.api = api
|
|
34
|
+
self.logger = logger
|
|
35
|
+
|
|
36
|
+
self.auth = auth
|
|
37
|
+
self.proxy_endpoints = proxy_endpoints
|
|
38
|
+
self.plugin = plugin
|
|
39
|
+
|
|
40
|
+
self.subject = f"{self.plugin['id']}.coreManager"
|
|
41
|
+
self.cm_subject = "coreManager.subscriber"
|
|
42
|
+
|
|
43
|
+
self.publisher: Optional[ProxyConnection] = None
|
|
44
|
+
self.dm_publisher: Optional[ProxyConnection] = None
|
|
45
|
+
|
|
46
|
+
self.subscriber: Optional[ProxySubscription] = None
|
|
47
|
+
self.dm_subscriber: Optional[ProxySubscription] = None
|
|
48
|
+
|
|
49
|
+
self.tasks: TaskSet = TaskSet(f"{self.plugin['name']} CoreManager")
|
|
50
|
+
self.message_queue: Optional[MessageQueue] = None
|
|
51
|
+
|
|
52
|
+
# print("CoreManager", self.plugin["name"], self.dealer_id, self.subscriber_ids)
|
|
53
|
+
|
|
54
|
+
self.api.once("shutdown", self.__close)
|
|
55
|
+
|
|
56
|
+
async def init(self):
|
|
57
|
+
if self.initialized:
|
|
58
|
+
return
|
|
59
|
+
|
|
60
|
+
self.initialized = True
|
|
61
|
+
|
|
62
|
+
servers = [endpoint for endpoint in self.proxy_endpoints if endpoint.startswith("nats://")]
|
|
63
|
+
|
|
64
|
+
self.publisher = ProxyConnection(self.subject, servers, self.auth)
|
|
65
|
+
await self.publisher.connect()
|
|
66
|
+
|
|
67
|
+
self.dm_publisher = ProxyConnection(self.cm_subject, servers, self.auth)
|
|
68
|
+
await self.dm_publisher.connect()
|
|
69
|
+
|
|
70
|
+
self.subscriber = await self.publisher.subscribe(subject=self.subject)
|
|
71
|
+
self.message_queue = MessageQueue(
|
|
72
|
+
self.logger,
|
|
73
|
+
self.publisher,
|
|
74
|
+
self.subscriber,
|
|
75
|
+
self.__request_handler,
|
|
76
|
+
)
|
|
77
|
+
|
|
78
|
+
self.dm_subscriber = await self.dm_publisher.subscribe(subject=self.cm_subject)
|
|
79
|
+
self.dm_subscriber.on("message", self.__on_proxy_message)
|
|
80
|
+
|
|
81
|
+
async def get_ffmpeg_path(self) -> str:
|
|
82
|
+
return await self.__on_request("getFFmpegPath")
|
|
83
|
+
|
|
84
|
+
async def get_ice_servers(self) -> list[IceServer]:
|
|
85
|
+
return await self.__on_request("getIceServers")
|
|
86
|
+
|
|
87
|
+
async def get_server_addresses(self) -> list[str]:
|
|
88
|
+
return await self.__on_request("getServerAddresses")
|
|
89
|
+
|
|
90
|
+
def emit(self, event: str, *args: Any, **kwargs: Any) -> Any:
|
|
91
|
+
pass
|
|
92
|
+
|
|
93
|
+
async def __request_handler(self, message: ProxyMessageStructure):
|
|
94
|
+
pass
|
|
95
|
+
|
|
96
|
+
async def __emit_event(self, msg: Msg) -> None:
|
|
97
|
+
message = unpack(msg.data)
|
|
98
|
+
|
|
99
|
+
type = message.get("type")
|
|
100
|
+
data = message.get("data", {})
|
|
101
|
+
system = data.get("system", {})
|
|
102
|
+
|
|
103
|
+
if type == "systemUpdated":
|
|
104
|
+
super().emit(type, system)
|
|
105
|
+
|
|
106
|
+
async def __on_proxy_message(self, msg: Msg) -> None:
|
|
107
|
+
if not self.initialized:
|
|
108
|
+
return
|
|
109
|
+
|
|
110
|
+
self.tasks.add(self.__emit_event(msg))
|
|
111
|
+
|
|
112
|
+
async def __on_request(self, fn: str, args: list[Any] = []) -> Any:
|
|
113
|
+
if not self.message_queue:
|
|
114
|
+
raise Exception("Message queue is not initialized")
|
|
115
|
+
|
|
116
|
+
message: ProxyMessageStructure = {
|
|
117
|
+
"requestId": str(uuid4()),
|
|
118
|
+
"targetId": self.subject,
|
|
119
|
+
"targetName": self.plugin["name"],
|
|
120
|
+
"pluginId": self.plugin["id"],
|
|
121
|
+
"type": "request",
|
|
122
|
+
"proxy": "core",
|
|
123
|
+
"client": "coreFn",
|
|
124
|
+
"fn": fn,
|
|
125
|
+
"args": args,
|
|
126
|
+
"timestamp": int(datetime.now().timestamp() * 1000),
|
|
127
|
+
"timeout": 5000,
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
return await self.message_queue.enqueue(message)
|
|
131
|
+
|
|
132
|
+
async def __close(self) -> None:
|
|
133
|
+
self.initialized = False
|
|
134
|
+
self.remove_all_listeners()
|
|
135
|
+
self.api.remove_listener("shutdown", self.__close)
|
|
136
|
+
|
|
137
|
+
if self.message_queue:
|
|
138
|
+
self.message_queue.abort_queue()
|
|
139
|
+
|
|
140
|
+
with suppress(Exception):
|
|
141
|
+
if self.publisher:
|
|
142
|
+
await self.publisher.close()
|
|
143
|
+
|
|
144
|
+
if self.dm_publisher:
|
|
145
|
+
await self.dm_publisher.close()
|
|
@@ -70,12 +70,13 @@ class ProcessResponse(TypedDict, total=False):
|
|
|
70
70
|
data: str
|
|
71
71
|
|
|
72
72
|
|
|
73
|
-
ProxyType = Literal["device", "plugin", "camera"]
|
|
73
|
+
ProxyType = Literal["device", "plugin", "camera", "core"]
|
|
74
74
|
|
|
75
75
|
ClientType = Literal[
|
|
76
76
|
"cameraFn",
|
|
77
77
|
"pluginFn",
|
|
78
78
|
"deviceFn",
|
|
79
|
+
"coreFn",
|
|
79
80
|
"storageFn",
|
|
80
81
|
"cameraDelegate",
|
|
81
82
|
"prebufferDelegate",
|
|
@@ -224,8 +225,6 @@ class RefreshStatesReturnData(TypedDict):
|
|
|
224
225
|
CameraDeviceProxyMethodNames = Literal[
|
|
225
226
|
"connect",
|
|
226
227
|
"disconnect",
|
|
227
|
-
"getFfmpegPath",
|
|
228
|
-
"getIceServers",
|
|
229
228
|
"updateState",
|
|
230
229
|
"updatePrebufferState",
|
|
231
230
|
"addCameraSource",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@camera.ui/server",
|
|
3
|
-
"version": "0.0.14-alpha.
|
|
3
|
+
"version": "0.0.14-alpha.4",
|
|
4
4
|
"description": "camera.ui",
|
|
5
5
|
"author": "seydx (https://github.com/seydx/camera.ui)",
|
|
6
6
|
"bin": {
|
|
@@ -23,8 +23,7 @@
|
|
|
23
23
|
"format": "prettier --write 'src/' 'bin/' --ignore-unknown --no-error-on-unmatched-pattern",
|
|
24
24
|
"install-updates": "npm i --save",
|
|
25
25
|
"lint": "ruff check --fix && eslint --fix --ext .js,.ts .",
|
|
26
|
-
"postinstall": "
|
|
27
|
-
"rebuild-lmdb": "cd $INIT_CWD && npm install lmdb --build-from-source --use_data_v1=true",
|
|
26
|
+
"postinstall": "cd $INIT_CWD && npm rebuild lmdb --build-from-source --use_data_v1=true",
|
|
28
27
|
"update": "updates --update ./",
|
|
29
28
|
"watch": "nodemon",
|
|
30
29
|
"prepublishOnly": "npm i --package-lock-only && cd .. && npm run lint && npm run format && npm run build"
|
|
@@ -84,7 +83,7 @@
|
|
|
84
83
|
"@types/fs-extra": "^11.0.4",
|
|
85
84
|
"@types/js-yaml": "^4.0.9",
|
|
86
85
|
"@types/jsonwebtoken": "^9.0.6",
|
|
87
|
-
"@types/node": "^22.4.
|
|
86
|
+
"@types/node": "^22.4.1",
|
|
88
87
|
"@types/node-forge": "^1.3.11",
|
|
89
88
|
"@types/object-path": "^0.11.4",
|
|
90
89
|
"@types/safe-timers": "^1.1.2",
|
|
@@ -95,8 +94,8 @@
|
|
|
95
94
|
"@types/uuid": "^10.0.0",
|
|
96
95
|
"@types/validator": "^13.12.0",
|
|
97
96
|
"@types/ws": "^8.5.12",
|
|
98
|
-
"@typescript-eslint/eslint-plugin": "^8.
|
|
99
|
-
"@typescript-eslint/parser": "^8.
|
|
97
|
+
"@typescript-eslint/eslint-plugin": "^8.2.0",
|
|
98
|
+
"@typescript-eslint/parser": "^8.2.0",
|
|
100
99
|
"assemblyscript": "^0.27.29",
|
|
101
100
|
"copyfiles": "^2.4.1",
|
|
102
101
|
"cross-env": "^7.0.3",
|